Patchwork [v4,22/31] clk: mpc512x: remove PSC (UART, SPI) compat workarounds

login
register
mail settings
Submitter Gerhard Sittig
Date Aug. 6, 2013, 8:44 p.m.
Message ID <1375821851-31609-23-git-send-email-gsi@denx.de>
Download mbox | patch
Permalink /patch/265234/
State Superseded
Delegated to: Anatolij Gustschin
Headers show

Comments

Gerhard Sittig - Aug. 6, 2013, 8:44 p.m.
after the UART and SPI peripheral drivers have switched to device tree
based clock lookup and no longer construct clock names from their PSC
component index, the "psc%d_mclk" alias names have become obsolete --
remove the corresponding clk_register_clkdev() calls

after the UART and SPI peripheral drivers acquire the 'ipg' clock item,
the platform's clock driver need no longer pre-enable it

Signed-off-by: Gerhard Sittig <gsi@denx.de>
---
 arch/powerpc/platforms/512x/clock-commonclk.c |   13 -------------
 1 file changed, 13 deletions(-)

Patch

diff --git a/arch/powerpc/platforms/512x/clock-commonclk.c b/arch/powerpc/platforms/512x/clock-commonclk.c
index 3f559fe..bd704b3 100644
--- a/arch/powerpc/platforms/512x/clock-commonclk.c
+++ b/arch/powerpc/platforms/512x/clock-commonclk.c
@@ -500,17 +500,6 @@  static void mpc512x_clk_setup_mclk(struct mclk_setup_data *entry, size_t idx)
 				entry->parent_names_mux1[0],
 				1, 1);
 	}
-
-	/*
-	 * without this "clock device" registration, "simple" lookups in
-	 * the SPI master initialization and serial port setup will fail
-	 *
-	 * those drivers need to get adjusted to lookup their required
-	 * clocks from device tree specs, and device tree nodes need to
-	 * provide the clock specs, before this clkdev registration
-	 * becomes obsolete
-	 */
-	clk_register_clkdev(clks[clks_idx_pub], entry->name_mclk, NULL);
 }
 
 static void mpc512x_clk_setup_clock_tree(int busfreq)
@@ -686,8 +675,6 @@  static void mpc512x_clk_setup_clock_tree(int busfreq)
 	/* some are not yet acquired by their respective drivers */
 	clk_prepare_enable(clks[MPC512x_CLK_PSC3_MCLK]);/* serial console */
 	clk_prepare_enable(clks[MPC512x_CLK_DIU]);	/* display */
-	for (mclk_idx = 0; mclk_idx < ARRAY_SIZE(mclk_psc_data); mclk_idx++)
-		clk_prepare_enable(clks[MPC512x_CLK_PSC0 + mclk_idx]);
 	clk_prepare_enable(clks[MPC512x_CLK_BDLC]);
 	for (mclk_idx = 0; mclk_idx < ARRAY_SIZE(mclk_mscan_data); mclk_idx++)
 		clk_prepare_enable(clks[MPC512x_CLK_MSCAN0_MCLK + mclk_idx]);