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

Pull clk fixes from Stephen Boyd: - build fix to export the clk_bulk_prepare() symbol - suspend fix for Samsung Exynos SoCs where we need to keep clks on across suspend - two critical clk markings for clks that shouldn't ever turn off on Rockchip SoCs - a fix for a copy-paste mistake on Rockchip rk3128 causing some clks to touch the same bit and trample over one another * tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: clk: samsung: exynos4: Enable VPLL and EPLL clocks for suspend/resume cycle clk: Export clk_bulk_prepare() clk: rockchip: add sclk_timer5 as critical clock on rk3128 clk: rockchip: fix up rk3128 pvtm and mipi_24m gate regs error clk: rockchip: add pclk_pmu as critical clock on rk3128

Linus Torvalds committed 9 years ago

Commit dbeb1a82 parents ed0f72f 5dcbeca3 files · +23 −5Browse files

Unified · Split

3 files

drivers/clk/clk-bulk.c +1 −0
drivers/clk/rockchip/clk-rk3128.c +7 −5
drivers/clk/samsung/clk-exynos4.c +15 −0

drivers/clk/clk-bulk.c+1−0

@@ -105,6 +105,7 @@ err: · 104 unmodified lines
105		105
106	return ret;	106	return ret;
107	}	107	}
		108	EXPORT_SYMBOL_GPL(clk_bulk_prepare);
108		109
109	#endif /* CONFIG_HAVE_CLK_PREPARE */	110	#endif /* CONFIG_HAVE_CLK_PREPARE */
110		111

drivers/clk/rockchip/clk-rk3128.c+7−5

 			RK2928_CLKGATE_CON(10), 8, GFLAGS),
 	GATE(SCLK_PVTM_CORE, "clk_pvtm_core", "xin24m", 0,
-			RK2928_CLKGATE_CON(10), 8, GFLAGS),
+			RK2928_CLKGATE_CON(10), 0, GFLAGS),
 	GATE(SCLK_PVTM_GPU, "clk_pvtm_gpu", "xin24m", 0,
-			RK2928_CLKGATE_CON(10), 8, GFLAGS),
+			RK2928_CLKGATE_CON(10), 1, GFLAGS),
 	GATE(SCLK_PVTM_FUNC, "clk_pvtm_func", "xin24m", 0,
-			RK2928_CLKGATE_CON(10), 8, GFLAGS),
+			RK2928_CLKGATE_CON(10), 2, GFLAGS),
 	GATE(SCLK_MIPI_24M, "clk_mipi_24m", "xin24m", CLK_IGNORE_UNUSED,
-			RK2928_CLKGATE_CON(10), 8, GFLAGS),
+			RK2928_CLKGATE_CON(2), 15, GFLAGS),
 	COMPOSITE(SCLK_SDMMC, "sclk_sdmmc0", mux_mmc_src_p, 0,
 			RK2928_CLKSEL_CON(11), 6, 2, MFLAGS, 0, 6, DFLAGS,
 	GATE(0, "pclk_grf", "pclk_cpu", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(5), 4, GFLAGS),
 	GATE(0, "pclk_mipiphy", "pclk_cpu", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(5), 0, GFLAGS),
-	GATE(0, "pclk_pmu", "pclk_pmu_pre", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(9), 2, GFLAGS),
+	GATE(0, "pclk_pmu", "pclk_pmu_pre", 0, RK2928_CLKGATE_CON(9), 2, GFLAGS),
 	GATE(0, "pclk_pmu_niu", "pclk_pmu_pre", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(9), 3, GFLAGS),
 	/* PD_MMC */
 	"aclk_peri",
 	"hclk_peri",
 	"pclk_peri",
+	"pclk_pmu",
+	"sclk_timer5",
 };
 static struct rockchip_clk_provider *__init rk3128_common_clk_init(struct device_node *np)

drivers/clk/samsung/clk-exynos4.c+15−0

@@ -294,6 +294,18 @@ static const struct samsung_clk_reg_dump src_mask_suspend_e4210[] = { · 293 unmodified lines
294	#define PLL_ENABLED (1 << 31)	294	#define PLL_ENABLED (1 << 31)
295	#define PLL_LOCKED (1 << 29)	295	#define PLL_LOCKED (1 << 29)
296		296
		297	static void exynos4_clk_enable_pll(u32 reg)
		298	{
		299	u32 pll_con = readl(reg_base + reg);
		300	pll_con \|= PLL_ENABLED;
		301	writel(pll_con, reg_base + reg);
		302
		303	while (!(pll_con & PLL_LOCKED)) {
		304	cpu_relax();
		305	pll_con = readl(reg_base + reg);
		306	}
		307	}
		308
297	static void exynos4_clk_wait_for_pll(u32 reg)	309	static void exynos4_clk_wait_for_pll(u32 reg)
298	{	310	{
299	u32 pll_con;	311	u32 pll_con;
@@ -315,6 +327,9 @@ static int exynos4_clk_suspend(void) · 15 unmodified lines
315	samsung_clk_save(reg_base, exynos4_save_pll,	327	samsung_clk_save(reg_base, exynos4_save_pll,
316	ARRAY_SIZE(exynos4_clk_pll_regs));	328	ARRAY_SIZE(exynos4_clk_pll_regs));
317		329
		330	exynos4_clk_enable_pll(EPLL_CON0);
		331	exynos4_clk_enable_pll(VPLL_CON0);
		332
318	if (exynos4_soc == EXYNOS4210) {	333	if (exynos4_soc == EXYNOS4210) {
319	samsung_clk_save(reg_base, exynos4_save_soc,	334	samsung_clk_save(reg_base, exynos4_save_soc,
320	ARRAY_SIZE(exynos4210_clk_save));	335	ARRAY_SIZE(exynos4210_clk_save));

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

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code