Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4438a6a1 authored by Philipp Zabel's avatar Philipp Zabel Committed by Shawn Guo
Browse files

ARM i.MX5: Move IPU clock lookups into device tree 



Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent 00ba2459

arch/arm/boot/dts/imx51.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ 
			compatible = "fsl,imx51-ipu";

			reg = <0x40000000 0x20000000>;

			interrupts = <11 10>;

			clocks = <&clks 59>, <&clks 110>, <&clks 61>;

			clock-names = "bus", "di0", "di1";

		};



		aips@70000000 { /* AIPS1 */

arch/arm/boot/dts/imx53.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ 
			compatible = "fsl,imx53-ipu";

			reg = <0x18000000 0x080000000>;

			interrupts = <11 10>;

			clocks = <&clks 59>, <&clks 110>, <&clks 61>;

			clock-names = "bus", "di0", "di1";

		};



		aips@50000000 { /* AIPS1 */

arch/arm/mach-imx/clk-imx51-imx53.c

+0 −7
Original line number Diff line number Diff line
@@ -362,9 +362,6 @@ int __init mx51_clocks_init(unsigned long rate_ckil, unsigned long rate_osc, 
	clk_register_clkdev(clk[mx51_mipi], "mipi_hsp", NULL);

	clk_register_clkdev(clk[vpu_gate], NULL, "imx51-vpu.0");

	clk_register_clkdev(clk[fec_gate], NULL, "imx27-fec.0");

	clk_register_clkdev(clk[ipu_gate], "bus", "40000000.ipu");

	clk_register_clkdev(clk[ipu_di0_gate], "di0", "40000000.ipu");

	clk_register_clkdev(clk[ipu_di1_gate], "di1", "40000000.ipu");

	clk_register_clkdev(clk[usb_phy_gate], "phy", "mxc-ehci.0");

	clk_register_clkdev(clk[esdhc1_ipg_gate], "ipg", "sdhci-esdhc-imx51.0");

	clk_register_clkdev(clk[dummy], "ahb", "sdhci-esdhc-imx51.0");
@@ -471,10 +468,6 @@ int __init mx53_clocks_init(unsigned long rate_ckil, unsigned long rate_osc, 
	clk_register_clkdev(clk[vpu_gate], NULL, "imx53-vpu.0");

	clk_register_clkdev(clk[i2c3_gate], NULL, "imx21-i2c.2");

	clk_register_clkdev(clk[fec_gate], NULL, "imx25-fec.0");

	clk_register_clkdev(clk[ipu_gate], "bus", "18000000.ipu");

	clk_register_clkdev(clk[ipu_di0_gate], "di0", "18000000.ipu");

	clk_register_clkdev(clk[ipu_di1_gate], "di1", "18000000.ipu");

	clk_register_clkdev(clk[ipu_gate], "hsp", "18000000.ipu");

	clk_register_clkdev(clk[usb_phy1_gate], "usb_phy1", "mxc-ehci.0");

	clk_register_clkdev(clk[esdhc1_ipg_gate], "ipg", "sdhci-esdhc-imx53.0");

	clk_register_clkdev(clk[dummy], "ahb", "sdhci-esdhc-imx53.0");