Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'for-5.10-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into clk-fixes

Pull Tegra clk driver fixes from Thierry Reding:

This is a set of small fixes for the Tegra clock driver.

* tag 'for-5.10-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
clk: tegra: Fix missing prototype for tegra210_clk_register_emc()
clk: tegra: Always program PLL_E when enabled
clk: tegra: Capitalization fixes

+4 -5
+2 -5
drivers/clk/tegra/clk-pll.c
··· 1611 1611 unsigned long flags = 0; 1612 1612 unsigned long input_rate; 1613 1613 1614 - if (clk_pll_is_enabled(hw)) 1615 - return 0; 1616 - 1617 1614 input_rate = clk_hw_get_rate(clk_hw_get_parent(hw)); 1618 1615 1619 1616 if (_get_table_rate(hw, &sel, pll->params->fixed_rate, input_rate)) ··· 1670 1673 pll_writel(val, PLLE_SS_CTRL, pll); 1671 1674 udelay(1); 1672 1675 1673 - /* Enable hw control of xusb brick pll */ 1676 + /* Enable HW control of XUSB brick PLL */ 1674 1677 val = pll_readl_misc(pll); 1675 1678 val &= ~PLLE_MISC_IDDQ_SW_CTRL; 1676 1679 pll_writel_misc(val, pll); ··· 1693 1696 val |= XUSBIO_PLL_CFG0_SEQ_ENABLE; 1694 1697 pll_writel(val, XUSBIO_PLL_CFG0, pll); 1695 1698 1696 - /* Enable hw control of SATA pll */ 1699 + /* Enable HW control of SATA PLL */ 1697 1700 val = pll_readl(SATA_PLL_CFG0, pll); 1698 1701 val &= ~SATA_PLL_CFG0_PADPLL_RESET_SWCTL; 1699 1702 val |= SATA_PLL_CFG0_PADPLL_USE_LOCKDET;
+2
drivers/clk/tegra/clk-tegra210-emc.c
··· 12 12 #include <linux/io.h> 13 13 #include <linux/slab.h> 14 14 15 + #include "clk.h" 16 + 15 17 #define CLK_SOURCE_EMC 0x19c 16 18 #define CLK_SOURCE_EMC_2X_CLK_SRC GENMASK(31, 29) 17 19 #define CLK_SOURCE_EMC_MC_EMC_SAME_FREQ BIT(16)