Skip to contentSkip to conversation

ARM: mxs: drop last board file user of enet_out

PATCH New Uwe Kleine-König 2 participants 3 messages Oct 20, 2016

Subsystems (4)
Arm (32-bit) Arm sub-architectures Arm i.MX and Layerscape Common clk
lore
Share & tools
lore

Uwe Kleine-König

author
#0 lore raw

PATCH 1/2 ARM: mxs: drop last board file user of enet_out

The ethernet at 800f0000 node in the device tree for apx4devkit references the enet_out clk (inherited from imx28.dtsi). This should be good enough to drop its handling from the board file.

As this removes the last user of enable_clk_enet_out remove this function, too.

Signed-off-by Uwe Kleine-K?nig <[email protected]>
---
 arch/arm/mach-mxs/mach-mxs.c | 10 ----------
 1 file changed, 10 deletions(-)
arch/arm/mach-mxs/mach-mxs.c +0 -10
index e4f21086b42b..8f759d160828 100644
@@ -233,14 +233,6 @@ static void __init update_fec_mac_prop(enum mac_oui oui)
 	}
 }
 
-static inline void enable_clk_enet_out(void)
-{
-	struct clk *clk = clk_get_sys("enet_out", NULL);
-
-	if (!IS_ERR(clk))
-		clk_prepare_enable(clk);
-}
-
 static void __init imx28_evk_init(void)
 {
 	update_fec_mac_prop(OUI_FSL);

@@ -261,8 +253,6 @@ static int apx4devkit_phy_fixup(struct phy_device *phy)
 
 static void __init apx4devkit_init(void)
 {
-	enable_clk_enet_out();
-
 	if (IS_BUILTIN(CONFIG_PHYLIB))
 		phy_register_fixup_for_uid(PHY_ID_KSZ8051, MICREL_PHY_ID_MASK,
 					   apx4devkit_phy_fixup);
Signature · 1 line
2.9.3
author
#1 lore raw

PATCH 2/2 clk: mxs: don't register a clkdev for enet_out

The last user is gone in the previous commit. So this can be removed, too.

Signed-off-by Uwe Kleine-K?nig <[email protected]>
---
 drivers/clk/mxs/clk-imx28.c | 2 --
 1 file changed, 2 deletions(-)
drivers/clk/mxs/clk-imx28.c +0 -2
index 6b572b759f9a..cf6b0ab9ac72 100644
@@ -247,8 +247,6 @@ static void __init mx28_clocks_init(struct device_node *np)
 	clk_data.clk_num = ARRAY_SIZE(clks);
 	of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
 
-	clk_register_clkdev(clks[enet_out], NULL, "enet_out");
-
 	for (i = 0; i < ARRAY_SIZE(clks_init_on); i++)
 		clk_prepare_enable(clks[clks_init_on[i]]);
 }
Signature · 1 line
2.9.3
#2 lore raw

PATCH 2/2 clk: mxs: don't register a clkdev for enet_out

Quoted 4 lines · Uwe Kleine-K?nig

The last user is gone in the previous commit. So this can be removed, too.

Signed-off-by Uwe Kleine-K?nig <[email protected]>

---

Acked-by Stephen Boyd <[email protected]>

I'm fine if this goes through arm-soc if you want to bunch them together. Otherwise just resend the patch once the ARM side merges into some -rc1 and we can remove it in the next next release.

Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project