Commit 60e72093 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull clk fixes from Stephen Boyd:
 "Another batch of clk driver fixes:

   - Make sure DRAM and ChipID region doesn't get disabled on Exynos

   - Fix a SATA failure on Tegra

   - Fix the emac_ptp clk divider on stratix10"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  clk: socfpga: stratix10: fix the divider for the emac_ptp_free_clk
  clk: samsung: exynos4: mark 'chipid' clock as CLK_IGNORE_UNUSED
  clk: tegra: Fix missing prototype for tegra210_clk_register_emc()
  clk: tegra: Always program PLL_E when enabled
  clk: tegra: Capitalization fixes
  clk: samsung: Keep top BPLL mux on Exynos542x enabled
parents 02de58b2 b02cf0c4

drivers/clk/samsung/clk-exynos4.c

+2 −2
Original line number Diff line number Diff line
@@ -927,7 +927,7 @@ static const struct samsung_gate_clock exynos4210_gate_clks[] __initconst = { 
	GATE(CLK_PCIE, "pcie", "aclk133", GATE_IP_FSYS, 14, 0, 0),

	GATE(CLK_SMMU_PCIE, "smmu_pcie", "aclk133", GATE_IP_FSYS, 18, 0, 0),

	GATE(CLK_MODEMIF, "modemif", "aclk100", GATE_IP_PERIL, 28, 0, 0),

	GATE(CLK_CHIPID, "chipid", "aclk100", E4210_GATE_IP_PERIR, 0, 0, 0),

	GATE(CLK_CHIPID, "chipid", "aclk100", E4210_GATE_IP_PERIR, 0, CLK_IGNORE_UNUSED, 0),

	GATE(CLK_SYSREG, "sysreg", "aclk100", E4210_GATE_IP_PERIR, 0,

			CLK_IGNORE_UNUSED, 0),

	GATE(CLK_HDMI_CEC, "hdmi_cec", "aclk100", E4210_GATE_IP_PERIR, 11, 0,
@@ -969,7 +969,7 @@ static const struct samsung_gate_clock exynos4x12_gate_clks[] __initconst = { 
		0),

	GATE(CLK_TSADC, "tsadc", "aclk133", E4X12_GATE_BUS_FSYS1, 16, 0, 0),

	GATE(CLK_MIPI_HSI, "mipi_hsi", "aclk133", GATE_IP_FSYS, 10, 0, 0),

	GATE(CLK_CHIPID, "chipid", "aclk100", E4X12_GATE_IP_PERIR, 0, 0, 0),

	GATE(CLK_CHIPID, "chipid", "aclk100", E4X12_GATE_IP_PERIR, 0, CLK_IGNORE_UNUSED, 0),

	GATE(CLK_SYSREG, "sysreg", "aclk100", E4X12_GATE_IP_PERIR, 1,

			CLK_IGNORE_UNUSED, 0),

	GATE(CLK_HDMI_CEC, "hdmi_cec", "aclk100", E4X12_GATE_IP_PERIR, 11, 0,

drivers/clk/samsung/clk-exynos5420.c

+5 −0
Original line number Diff line number Diff line
@@ -1655,6 +1655,11 @@ static void __init exynos5x_clk_init(struct device_node *np, 
	 * main G3D clock enablement status.

	 */

	clk_prepare_enable(__clk_lookup("mout_sw_aclk_g3d"));

	/*

	 * Keep top BPLL mux enabled permanently to ensure that DRAM operates

	 * properly.

	 */

	clk_prepare_enable(__clk_lookup("mout_bpll"));



	samsung_clk_of_add_provider(np, ctx);

}

drivers/clk/socfpga/clk-s10.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static const struct stratix10_perip_cnt_clock s10_main_perip_cnt_clks[] = { 
	{ STRATIX10_EMAC_B_FREE_CLK, "emacb_free_clk", NULL, emacb_free_mux, ARRAY_SIZE(emacb_free_mux),

	  0, 0, 2, 0xB0, 1},

	{ STRATIX10_EMAC_PTP_FREE_CLK, "emac_ptp_free_clk", NULL, emac_ptp_free_mux,

	  ARRAY_SIZE(emac_ptp_free_mux), 0, 0, 4, 0xB0, 2},

	  ARRAY_SIZE(emac_ptp_free_mux), 0, 0, 2, 0xB0, 2},

	{ STRATIX10_GPIO_DB_FREE_CLK, "gpio_db_free_clk", NULL, gpio_db_free_mux,

	  ARRAY_SIZE(gpio_db_free_mux), 0, 0, 0, 0xB0, 3},

	{ STRATIX10_SDMMC_FREE_CLK, "sdmmc_free_clk", NULL, sdmmc_free_mux,

drivers/clk/tegra/clk-pll.c

+2 −5
Original line number Diff line number Diff line
@@ -1611,9 +1611,6 @@ static int clk_plle_tegra114_enable(struct clk_hw *hw) 
	unsigned long flags = 0;

	unsigned long input_rate;



	if (clk_pll_is_enabled(hw))

		return 0;



	input_rate = clk_hw_get_rate(clk_hw_get_parent(hw));



	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) 
	pll_writel(val, PLLE_SS_CTRL, pll);

	udelay(1);



	/* Enable hw control of xusb brick pll */

	/* Enable HW control of XUSB brick PLL */

	val = pll_readl_misc(pll);

	val &= ~PLLE_MISC_IDDQ_SW_CTRL;

	pll_writel_misc(val, pll);
@@ -1696,7 +1693,7 @@ static int clk_plle_tegra114_enable(struct clk_hw *hw) 
	val |= XUSBIO_PLL_CFG0_SEQ_ENABLE;

	pll_writel(val, XUSBIO_PLL_CFG0, pll);



	/* Enable hw control of SATA pll */

	/* Enable HW control of SATA PLL */

	val = pll_readl(SATA_PLL_CFG0, pll);

	val &= ~SATA_PLL_CFG0_PADPLL_RESET_SWCTL;

	val |= SATA_PLL_CFG0_PADPLL_USE_LOCKDET;

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

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 
#include <linux/io.h>

#include <linux/slab.h>



#include "clk.h"



#define CLK_SOURCE_EMC 0x19c

#define  CLK_SOURCE_EMC_2X_CLK_SRC GENMASK(31, 29)

#define  CLK_SOURCE_EMC_MC_EMC_SAME_FREQ BIT(16)

CRA Git | Maintained and supported by SUSTech CRA and CCSE