Skip to content

Commit 51644df

Browse files
committed
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
2 parents e56b4d4 + 2f878d0 commit 51644df

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

drivers/clk/tegra/clk-pll.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1611,9 +1611,6 @@ static int clk_plle_tegra114_enable(struct clk_hw *hw)
16111611
unsigned long flags = 0;
16121612
unsigned long input_rate;
16131613

1614-
if (clk_pll_is_enabled(hw))
1615-
return 0;
1616-
16171614
input_rate = clk_hw_get_rate(clk_hw_get_parent(hw));
16181615

16191616
if (_get_table_rate(hw, &sel, pll->params->fixed_rate, input_rate))
@@ -1673,7 +1670,7 @@ static int clk_plle_tegra114_enable(struct clk_hw *hw)
16731670
pll_writel(val, PLLE_SS_CTRL, pll);
16741671
udelay(1);
16751672

1676-
/* Enable hw control of xusb brick pll */
1673+
/* Enable HW control of XUSB brick PLL */
16771674
val = pll_readl_misc(pll);
16781675
val &= ~PLLE_MISC_IDDQ_SW_CTRL;
16791676
pll_writel_misc(val, pll);
@@ -1696,7 +1693,7 @@ static int clk_plle_tegra114_enable(struct clk_hw *hw)
16961693
val |= XUSBIO_PLL_CFG0_SEQ_ENABLE;
16971694
pll_writel(val, XUSBIO_PLL_CFG0, pll);
16981695

1699-
/* Enable hw control of SATA pll */
1696+
/* Enable HW control of SATA PLL */
17001697
val = pll_readl(SATA_PLL_CFG0, pll);
17011698
val &= ~SATA_PLL_CFG0_PADPLL_RESET_SWCTL;
17021699
val |= SATA_PLL_CFG0_PADPLL_USE_LOCKDET;

drivers/clk/tegra/clk-tegra210-emc.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
#include <linux/io.h>
1313
#include <linux/slab.h>
1414

15+
#include "clk.h"
16+
1517
#define CLK_SOURCE_EMC 0x19c
1618
#define CLK_SOURCE_EMC_2X_CLK_SRC GENMASK(31, 29)
1719
#define CLK_SOURCE_EMC_MC_EMC_SAME_FREQ BIT(16)

0 commit comments

Comments
 (0)