Skip to contentSkip to conversation

ARM: dts: i.MX5: Remove outdated VPU clock lookups

PATCH New Lucas Stach 2 participants 4 messages Mar 19, 2014 – Mar 24, 2014

Subsystems (4)
Device tree bindings Arm (32-bit) Arm sub-architectures Arm i.MX and Layerscape
lore
Share & tools
lore

Lucas Stach

author
#0 lore raw

PATCH 1/3 ARM: dts: i.MX5: Remove outdated VPU clock lookups

From: Philipp Zabel <[email protected]>

CODA7 clock lookups are now defined in the device tree.

Signed-off-by Philipp Zabel <[email protected]>
Signed-off-by Lucas Stach <[email protected]>
---
 arch/arm/mach-imx/clk-imx51-imx53.c | 2 --
 1 file changed, 2 deletions(-)
arch/arm/mach-imx/clk-imx51-imx53.c +0 -2
index 19fca1fdc6fe..b53c5ca7650a 100644
@@ -438,7 +438,6 @@ int __init mx51_clocks_init(unsigned long rate_ckil, unsigned long rate_osc,
 
 	clk_register_clkdev(clk[IMX5_CLK_HSI2C_GATE], NULL, "imx21-i2c.2");
 	clk_register_clkdev(clk[IMX5_CLK_MX51_MIPI], "mipi_hsp", NULL);
-	clk_register_clkdev(clk[IMX5_CLK_VPU_GATE], NULL, "imx51-vpu.0");
 	clk_register_clkdev(clk[IMX5_CLK_FEC_GATE], NULL, "imx27-fec.0");
 	clk_register_clkdev(clk[IMX5_CLK_USB_PHY_GATE], "phy", "mxc-ehci.0");
 	clk_register_clkdev(clk[IMX5_CLK_ESDHC1_IPG_GATE], "ipg", "sdhci-esdhc-imx51.0");

@@ -563,7 +562,6 @@ static void __init mx53_clocks_init(struct device_node *np)
 
 	mx5_clocks_common_init(0, 0, 0, 0);
 
-	clk_register_clkdev(clk[IMX5_CLK_VPU_GATE], NULL, "imx53-vpu.0");
 	clk_register_clkdev(clk[IMX5_CLK_I2C3_GATE], NULL, "imx21-i2c.2");
 	clk_register_clkdev(clk[IMX5_CLK_FEC_GATE], NULL, "imx25-fec.0");
 	clk_register_clkdev(clk[IMX5_CLK_USB_PHY1_GATE], "usb_phy1", "mxc-ehci.0");
Signature · 1 line
1.9.0
author
#1 lore raw

PATCH 2/3 ARM: dts: i.MX53: Enable CODA7541 VPU

From: Philipp Zabel <[email protected]>

This IP module is always present and has no external connections. There is no reason to disable it in the device tree.

Signed-off-by Philipp Zabel <[email protected]>
Signed-off-by Lucas Stach <[email protected]>
---
 arch/arm/boot/dts/imx53.dtsi | 1 -
 1 file changed, 1 deletion(-)
arch/arm/boot/dts/imx53.dtsi +0 -1
index 80615dfa2177..a6f361b08439 100644
@@ -667,7 +667,6 @@
 				         <&clks IMX5_CLK_VPU_GATE>;
 				clock-names = "per", "ahb";
 				iram = <&ocram>;
-				status = "disabled";
 			};
 		};
Signature · 1 line
1.9.0
author
#2 lore raw

PATCH 3/3 ARM: dts: i.MX53: Add reset line to VPU device node

In reply to Lucas Stach

From: Philipp Zabel <[email protected]>

Signed-off-by Philipp Zabel <[email protected]>
Signed-off-by Lucas Stach <[email protected]>
---
 arch/arm/boot/dts/imx53.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm/boot/dts/imx53.dtsi +1 -0
index a6f361b08439..4ecf773b52f5 100644
@@ -666,6 +666,7 @@
 				clocks = <&clks IMX5_CLK_VPU_GATE>,
 				         <&clks IMX5_CLK_VPU_GATE>;
 				clock-names = "per", "ahb";
+				resets = <&src 1>;
 				iram = <&ocram>;
 			};
 		};
Signature · 1 line
1.9.0
#3 lore raw

PATCH 1/3 ARM: dts: i.MX5: Remove outdated VPU clock lookups

In reply to Lucas Stach
Quoted 6 lines · Lucas Stach

From: Philipp Zabel <[email protected]>

CODA7 clock lookups are now defined in the device tree.

Signed-off-by Philipp Zabel <[email protected]>
Signed-off-by Lucas Stach <[email protected]>

Applied with removing 'dts:' from patch subject, since it's not a dts change. And the other 2 get applied without any change.

Shawn

Quoted 34 lines
---
 arch/arm/mach-imx/clk-imx51-imx53.c | 2 --
 1 file changed, 2 deletions(-)
arch/arm/mach-imx/clk-imx51-imx53.c +0 -2
index 19fca1fdc6fe..b53c5ca7650a 100644
@@ -438,7 +438,6 @@ int __init mx51_clocks_init(unsigned long rate_ckil, unsigned long rate_osc,
 
 	clk_register_clkdev(clk[IMX5_CLK_HSI2C_GATE], NULL, "imx21-i2c.2");
 	clk_register_clkdev(clk[IMX5_CLK_MX51_MIPI], "mipi_hsp", NULL);
-	clk_register_clkdev(clk[IMX5_CLK_VPU_GATE], NULL, "imx51-vpu.0");
 	clk_register_clkdev(clk[IMX5_CLK_FEC_GATE], NULL, "imx27-fec.0");
 	clk_register_clkdev(clk[IMX5_CLK_USB_PHY_GATE], "phy", "mxc-ehci.0");
 	clk_register_clkdev(clk[IMX5_CLK_ESDHC1_IPG_GATE], "ipg", "sdhci-esdhc-imx51.0");

@@ -563,7 +562,6 @@ static void __init mx53_clocks_init(struct device_node *np)
 
 	mx5_clocks_common_init(0, 0, 0, 0);
 
-	clk_register_clkdev(clk[IMX5_CLK_VPU_GATE], NULL, "imx53-vpu.0");
 	clk_register_clkdev(clk[IMX5_CLK_I2C3_GATE], NULL, "imx21-i2c.2");
 	clk_register_clkdev(clk[IMX5_CLK_FEC_GATE], NULL, "imx25-fec.0");
 	clk_register_clkdev(clk[IMX5_CLK_USB_PHY1_GATE], "usb_phy1", "mxc-ehci.0");
Signature · 7 lines
1.9.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel