linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/3] ARM: dts: i.MX5: Remove outdated VPU clock lookups
@ 2014-03-19 14:49 Lucas Stach
  2014-03-19 14:49 ` [PATCH 2/3] ARM: dts: i.MX53: Enable CODA7541 VPU Lucas Stach
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Lucas Stach @ 2014-03-19 14:49 UTC (permalink / raw)
  To: linux-arm-kernel

From: Philipp Zabel <p.zabel@pengutronix.de>

CODA7 clock lookups are now defined in the device tree.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/mach-imx/clk-imx51-imx53.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/arm/mach-imx/clk-imx51-imx53.c b/arch/arm/mach-imx/clk-imx51-imx53.c
index 19fca1fdc6fe..b53c5ca7650a 100644
--- a/arch/arm/mach-imx/clk-imx51-imx53.c
+++ b/arch/arm/mach-imx/clk-imx51-imx53.c
@@ -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");
-- 
1.9.0

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 2/3] ARM: dts: i.MX53: Enable CODA7541 VPU
  2014-03-19 14:49 [PATCH 1/3] ARM: dts: i.MX5: Remove outdated VPU clock lookups Lucas Stach
@ 2014-03-19 14:49 ` Lucas Stach
  2014-03-19 14:49 ` [PATCH 3/3] ARM: dts: i.MX53: Add reset line to VPU device node Lucas Stach
  2014-03-24  2:26 ` [PATCH 1/3] ARM: dts: i.MX5: Remove outdated VPU clock lookups Shawn Guo
  2 siblings, 0 replies; 4+ messages in thread
From: Lucas Stach @ 2014-03-19 14:49 UTC (permalink / raw)
  To: linux-arm-kernel

From: Philipp Zabel <p.zabel@pengutronix.de>

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 <p.zabel@pengutronix.de>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/boot/dts/imx53.dtsi | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 80615dfa2177..a6f361b08439 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -667,7 +667,6 @@
 				         <&clks IMX5_CLK_VPU_GATE>;
 				clock-names = "per", "ahb";
 				iram = <&ocram>;
-				status = "disabled";
 			};
 		};
 
-- 
1.9.0

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 3/3] ARM: dts: i.MX53: Add reset line to VPU device node
  2014-03-19 14:49 [PATCH 1/3] ARM: dts: i.MX5: Remove outdated VPU clock lookups Lucas Stach
  2014-03-19 14:49 ` [PATCH 2/3] ARM: dts: i.MX53: Enable CODA7541 VPU Lucas Stach
@ 2014-03-19 14:49 ` Lucas Stach
  2014-03-24  2:26 ` [PATCH 1/3] ARM: dts: i.MX5: Remove outdated VPU clock lookups Shawn Guo
  2 siblings, 0 replies; 4+ messages in thread
From: Lucas Stach @ 2014-03-19 14:49 UTC (permalink / raw)
  To: linux-arm-kernel

From: Philipp Zabel <p.zabel@pengutronix.de>

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/boot/dts/imx53.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index a6f361b08439..4ecf773b52f5 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -666,6 +666,7 @@
 				clocks = <&clks IMX5_CLK_VPU_GATE>,
 				         <&clks IMX5_CLK_VPU_GATE>;
 				clock-names = "per", "ahb";
+				resets = <&src 1>;
 				iram = <&ocram>;
 			};
 		};
-- 
1.9.0

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 1/3] ARM: dts: i.MX5: Remove outdated VPU clock lookups
  2014-03-19 14:49 [PATCH 1/3] ARM: dts: i.MX5: Remove outdated VPU clock lookups Lucas Stach
  2014-03-19 14:49 ` [PATCH 2/3] ARM: dts: i.MX53: Enable CODA7541 VPU Lucas Stach
  2014-03-19 14:49 ` [PATCH 3/3] ARM: dts: i.MX53: Add reset line to VPU device node Lucas Stach
@ 2014-03-24  2:26 ` Shawn Guo
  2 siblings, 0 replies; 4+ messages in thread
From: Shawn Guo @ 2014-03-24  2:26 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, Mar 19, 2014 at 03:49:22PM +0100, Lucas Stach wrote:
> From: Philipp Zabel <p.zabel@pengutronix.de>
> 
> CODA7 clock lookups are now defined in the device tree.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

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

Shawn

> ---
>  arch/arm/mach-imx/clk-imx51-imx53.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/clk-imx51-imx53.c b/arch/arm/mach-imx/clk-imx51-imx53.c
> index 19fca1fdc6fe..b53c5ca7650a 100644
> --- a/arch/arm/mach-imx/clk-imx51-imx53.c
> +++ b/arch/arm/mach-imx/clk-imx51-imx53.c
> @@ -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");
> -- 
> 1.9.0
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> 
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2014-03-24  2:26 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-19 14:49 [PATCH 1/3] ARM: dts: i.MX5: Remove outdated VPU clock lookups Lucas Stach
2014-03-19 14:49 ` [PATCH 2/3] ARM: dts: i.MX53: Enable CODA7541 VPU Lucas Stach
2014-03-19 14:49 ` [PATCH 3/3] ARM: dts: i.MX53: Add reset line to VPU device node Lucas Stach
2014-03-24  2:26 ` [PATCH 1/3] ARM: dts: i.MX5: Remove outdated VPU clock lookups Shawn Guo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).