Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c4565de authored by Mike Turquette's avatar Mike Turquette
Browse files

Merge tag 'tegra-clk-3.17-1' of... 

Merge tag 'tegra-clk-3.17-1' of git://nv-tegra.nvidia.com/user/pdeschrijver/linux into clk-next-tegra

tegra clk updates for 3.17 including PLLE fixes for xusb
parents cdae1730 0e548d50

drivers/clk/tegra/clk-pll.c

+19 −0
Original line number Diff line number Diff line
@@ -110,6 +110,12 @@ 
#define XUSBIO_PLL_CFG0_SEQ_ENABLE		BIT(24)

#define XUSBIO_PLL_CFG0_SEQ_START_STATE		BIT(25)



#define SATA_PLL_CFG0		0x490

#define SATA_PLL_CFG0_PADPLL_RESET_SWCTL	BIT(0)

#define SATA_PLL_CFG0_PADPLL_USE_LOCKDET	BIT(2)

#define SATA_PLL_CFG0_SEQ_ENABLE		BIT(24)

#define SATA_PLL_CFG0_SEQ_START_STATE		BIT(25)



#define PLLE_MISC_PLLE_PTS	BIT(8)

#define PLLE_MISC_IDDQ_SW_VALUE	BIT(13)

#define PLLE_MISC_IDDQ_SW_CTRL	BIT(14)
@@ -1361,6 +1367,19 @@ 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 */

	val = pll_readl(SATA_PLL_CFG0, pll);

	val &= ~SATA_PLL_CFG0_PADPLL_RESET_SWCTL;

	val |= SATA_PLL_CFG0_PADPLL_USE_LOCKDET;

	val |= SATA_PLL_CFG0_SEQ_START_STATE;

	pll_writel(val, SATA_PLL_CFG0, pll);



	udelay(1);



	val = pll_readl(SATA_PLL_CFG0, pll);

	val |= SATA_PLL_CFG0_SEQ_ENABLE;

	pll_writel(val, SATA_PLL_CFG0, pll);



out:

	if (pll->lock)

		spin_unlock_irqrestore(pll->lock, flags);

drivers/clk/tegra/clk-tegra-periph.c

+2 −2
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ static struct tegra_periph_init_data periph_clks[] = { 
	MUX("sata", mux_pllp_pllc_pllm_clkm, CLK_SOURCE_SATA, 124, TEGRA_PERIPH_ON_APB, tegra_clk_sata),

	MUX("adx1", mux_plla_pllc_pllp_clkm, CLK_SOURCE_ADX1, 180, TEGRA_PERIPH_ON_APB, tegra_clk_adx1),

	MUX("amx1", mux_plla_pllc_pllp_clkm, CLK_SOURCE_AMX1, 185, TEGRA_PERIPH_ON_APB, tegra_clk_amx1),

	MUX("vi_sensor2", mux_pllm_pllc2_c_c3_pllp_plla, CLK_SOURCE_VI_SENSOR2, 20, TEGRA_PERIPH_NO_RESET, tegra_clk_vi_sensor2),

	MUX("vi_sensor2", mux_pllm_pllc2_c_c3_pllp_plla, CLK_SOURCE_VI_SENSOR2, 165, TEGRA_PERIPH_NO_RESET, tegra_clk_vi_sensor2),

	MUX8("sdmmc1", mux_pllp_pllc2_c_c3_pllm_clkm, CLK_SOURCE_SDMMC1, 14, 0, tegra_clk_sdmmc1_8),

	MUX8("sdmmc2", mux_pllp_pllc2_c_c3_pllm_clkm, CLK_SOURCE_SDMMC2, 9, 0, tegra_clk_sdmmc2_8),

	MUX8("sdmmc3", mux_pllp_pllc2_c_c3_pllm_clkm, CLK_SOURCE_SDMMC3, 69, 0, tegra_clk_sdmmc3_8),
@@ -487,7 +487,7 @@ static struct tegra_periph_init_data periph_clks[] = { 
	MUX8("extern2", mux_plla_clk32_pllp_clkm_plle, CLK_SOURCE_EXTERN2, 121, 0, tegra_clk_extern2),

	MUX8("extern3", mux_plla_clk32_pllp_clkm_plle, CLK_SOURCE_EXTERN3, 122, 0, tegra_clk_extern3),

	MUX8("soc_therm", mux_pllm_pllc_pllp_plla, CLK_SOURCE_SOC_THERM, 78, TEGRA_PERIPH_ON_APB, tegra_clk_soc_therm),

	MUX8("vi_sensor", mux_pllm_pllc2_c_c3_pllp_plla, CLK_SOURCE_VI_SENSOR, 20, TEGRA_PERIPH_NO_RESET, tegra_clk_vi_sensor_8),

	MUX8("vi_sensor", mux_pllm_pllc2_c_c3_pllp_plla, CLK_SOURCE_VI_SENSOR, 164, TEGRA_PERIPH_NO_RESET, tegra_clk_vi_sensor_8),

	MUX8("isp", mux_pllm_pllc_pllp_plla_clkm_pllc4, CLK_SOURCE_ISP, 23, TEGRA_PERIPH_ON_APB, tegra_clk_isp_8),

	MUX8("entropy", mux_pllp_clkm1, CLK_SOURCE_ENTROPY, 149,  0, tegra_clk_entropy),

	MUX8("hdmi_audio", mux_pllp3_pllc_clkm, CLK_SOURCE_HDMI_AUDIO, 176, TEGRA_PERIPH_NO_RESET, tegra_clk_hdmi_audio),

drivers/clk/tegra/clk-tegra114.c

+30 −1
Original line number Diff line number Diff line
@@ -151,6 +151,13 @@ 
/* Tegra CPU clock and reset control regs */

#define CLK_RST_CONTROLLER_CPU_CMPLX_STATUS	0x470



#define MUX8(_name, _parents, _offset, \

			     _clk_num, _gate_flags, _clk_id)	\

	TEGRA_INIT_DATA_TABLE(_name, NULL, NULL, _parents, _offset,\

			29, MASK(3), 0, 0, 8, 1, TEGRA_DIVIDER_ROUND_UP,\

			_clk_num, _gate_flags, _clk_id, _parents##_idx, 0,\

			NULL)



#ifdef CONFIG_PM_SLEEP

static struct cpu_clk_suspend_context {

	u32 clk_csite_src;
@@ -777,7 +784,6 @@ static struct tegra_clk tegra114_clks[tegra_clk_max] __initdata = { 
	[tegra_clk_spdif_in] = { .dt_id = TEGRA114_CLK_SPDIF_IN, .present = true },

	[tegra_clk_spdif_out] = { .dt_id = TEGRA114_CLK_SPDIF_OUT, .present = true },

	[tegra_clk_vi_8] = { .dt_id = TEGRA114_CLK_VI, .present = true },

	[tegra_clk_vi_sensor_8] = { .dt_id = TEGRA114_CLK_VI_SENSOR, .present = true },

	[tegra_clk_fuse] = { .dt_id = TEGRA114_CLK_FUSE, .present = true },

	[tegra_clk_fuse_burn] = { .dt_id = TEGRA114_CLK_FUSE_BURN, .present = true },

	[tegra_clk_clk_32k] = { .dt_id = TEGRA114_CLK_CLK_32K, .present = true },
@@ -923,6 +929,13 @@ static struct tegra_devclk devclks[] __initdata = { 
	{ .dev_id = "timer", .dt_id = TEGRA114_CLK_TIMER },

};



static const char *mux_pllm_pllc2_c_c3_pllp_plla[] = {

	"pll_m", "pll_c2", "pll_c", "pll_c3", "pll_p", "pll_a_out0"

};

static u32 mux_pllm_pllc2_c_c3_pllp_plla_idx[] = {

	[0] = 0, [1] = 1, [2] = 2, [3] = 3, [4] = 4, [5] = 6,

};



static struct clk **clks;



static unsigned long osc_freq;
@@ -1178,10 +1191,18 @@ static void __init tegra114_pll_init(void __iomem *clk_base, 
	clks[TEGRA114_CLK_PLL_E_OUT0] = clk;

}



#define CLK_SOURCE_VI_SENSOR 0x1a8



static struct tegra_periph_init_data tegra_periph_clk_list[] = {

	MUX8("vi_sensor", mux_pllm_pllc2_c_c3_pllp_plla, CLK_SOURCE_VI_SENSOR, 20, TEGRA_PERIPH_NO_RESET, TEGRA114_CLK_VI_SENSOR),

};



static __init void tegra114_periph_clk_init(void __iomem *clk_base,

					    void __iomem *pmc_base)

{

	struct clk *clk;

	struct tegra_periph_init_data *data;

	int i;



	/* xusb_ss_div2 */

	clk = clk_register_fixed_factor(NULL, "xusb_ss_div2", "xusb_ss_src", 0,
@@ -1209,6 +1230,14 @@ static __init void tegra114_periph_clk_init(void __iomem *clk_base, 
			       clk_base + CLK_SOURCE_EMC,

			       29, 3, 0, NULL);



	for (i = 0; i < ARRAY_SIZE(tegra_periph_clk_list); i++) {

		data = &tegra_periph_clk_list[i];

		clk = tegra_clk_register_periph(data->name,

			data->p.parent_names, data->num_parents,

			&data->periph, clk_base, data->offset, data->flags);

		clks[data->clk_id] = clk;

	}



	tegra_periph_clk_init(clk_base, pmc_base, tegra114_clks,

				&pll_p_params);

}

drivers/clk/tegra/clk-tegra124.c

+9 −1
Original line number Diff line number Diff line
@@ -869,7 +869,7 @@ static struct tegra_clk tegra124_clks[tegra_clk_max] __initdata = { 
	[tegra_clk_spdif_in] = { .dt_id = TEGRA124_CLK_SPDIF_IN, .present = true },

	[tegra_clk_spdif_out] = { .dt_id = TEGRA124_CLK_SPDIF_OUT, .present = true },

	[tegra_clk_vi_9] = { .dt_id = TEGRA124_CLK_VI, .present = true },

	[tegra_clk_vi_sensor] = { .dt_id = TEGRA124_CLK_VI_SENSOR, .present = true },

	[tegra_clk_vi_sensor_8] = { .dt_id = TEGRA124_CLK_VI_SENSOR, .present = true },

	[tegra_clk_fuse] = { .dt_id = TEGRA124_CLK_FUSE, .present = true },

	[tegra_clk_fuse_burn] = { .dt_id = TEGRA124_CLK_FUSE_BURN, .present = true },

	[tegra_clk_clk_32k] = { .dt_id = TEGRA124_CLK_CLK_32K, .present = true },
@@ -1369,6 +1369,14 @@ static struct tegra_clk_init_table init_table[] __initdata = { 
	{TEGRA124_CLK_XUSB_HS_SRC, TEGRA124_CLK_PLL_U_60M, 60000000, 0},

	{TEGRA124_CLK_XUSB_FALCON_SRC, TEGRA124_CLK_PLL_RE_OUT, 224000000, 0},

	{TEGRA124_CLK_XUSB_HOST_SRC, TEGRA124_CLK_PLL_RE_OUT, 112000000, 0},

	{TEGRA124_CLK_SATA, TEGRA124_CLK_PLL_P, 104000000, 0},

	{TEGRA124_CLK_SATA_OOB, TEGRA124_CLK_PLL_P, 204000000, 0},

	{TEGRA124_CLK_EMC, TEGRA124_CLK_CLK_MAX, 0, 1},

	{TEGRA124_CLK_CCLK_G, TEGRA124_CLK_CLK_MAX, 0, 1},

	{TEGRA124_CLK_MSELECT, TEGRA124_CLK_CLK_MAX, 0, 1},

	{TEGRA124_CLK_CSITE, TEGRA124_CLK_CLK_MAX, 0, 1},

	{TEGRA124_CLK_TSENSOR, TEGRA124_CLK_CLK_M, 400000, 0},

	{TEGRA124_CLK_SOC_THERM, TEGRA124_CLK_PLL_P, 51000000, 0},

	/* This MUST be the last entry. */

	{TEGRA124_CLK_CLK_MAX, TEGRA124_CLK_CLK_MAX, 0, 0},

};

drivers/clk/tegra/clk.c

+6 −0
Original line number Diff line number Diff line
@@ -277,6 +277,12 @@ void __init tegra_register_devclks(struct tegra_devclk *dev_clks, int num) 
	for (i = 0; i < num; i++, dev_clks++)

		clk_register_clkdev(clks[dev_clks->dt_id], dev_clks->con_id,

				dev_clks->dev_id);



	for (i = 0; i < clk_num; i++) {

		if (!IS_ERR_OR_NULL(clks[i]))

			clk_register_clkdev(clks[i], __clk_get_name(clks[i]),

				"tegra-clk-debug");

	}

}



struct clk ** __init tegra_lookup_dt_id(int clk_id,