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

Commit 4901f343 authored by Lucas Stach's avatar Lucas Stach Committed by Shawn Guo
Browse files

ARM: dts: imx6qp: correct IPU nodes 



Reference them by handle and remove the changed clocks that are copied
from the downstream DT and are not part of the mainline binding.

Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent c871b91e

arch/arm/boot/dts/imx6qp.dtsi

+8 −26
Original line number Diff line number Diff line
@@ -55,32 +55,6 @@ 
			reg = <0x00960000 0x20000>;

			clocks = <&clks IMX6QDL_CLK_OCRAM>;

		};



		ipu1: ipu@02400000 {

			compatible = "fsl,imx6qp-ipu", "fsl,imx6q-ipu";

			clocks = <&clks IMX6QDL_CLK_IPU1>,

				 <&clks IMX6QDL_CLK_IPU1_DI0>, <&clks IMX6QDL_CLK_IPU1_DI1>,

				 <&clks IMX6QDL_CLK_IPU1_DI0_SEL>, <&clks IMX6QDL_CLK_IPU1_DI1_SEL>,

				 <&clks IMX6QDL_CLK_LDB_DI0_PODF>, <&clks IMX6QDL_CLK_LDB_DI1_PODF>,

				 <&clks IMX6QDL_CLK_PRG0_APB>;

			clock-names = "bus",

				      "di0", "di1",

				      "di0_sel", "di1_sel",

				      "ldb_di0", "ldb_di1", "prg";

		};



		ipu2: ipu@02800000 {

			compatible = "fsl,imx6qp-ipu", "fsl,imx6q-ipu";

			clocks = <&clks IMX6QDL_CLK_IPU2>,

				 <&clks IMX6QDL_CLK_IPU2_DI0>, <&clks IMX6QDL_CLK_IPU2_DI1>,

				 <&clks IMX6QDL_CLK_IPU2_DI0_SEL>, <&clks IMX6QDL_CLK_IPU2_DI1_SEL>,

				 <&clks IMX6QDL_CLK_LDB_DI0_PODF>, <&clks IMX6QDL_CLK_LDB_DI1_PODF>,

				 <&clks IMX6QDL_CLK_PRG1_APB>;

			clock-names = "bus",

				      "di0", "di1",

				      "di0_sel", "di1_sel",

				      "ldb_di0", "ldb_di1", "prg";

		};

	};

};
@@ -90,6 +64,14 @@ 
		     <0 119 IRQ_TYPE_LEVEL_HIGH>;

};



&ipu1 {

	compatible = "fsl,imx6qp-ipu", "fsl,imx6q-ipu";

};



&ipu2 {

	compatible = "fsl,imx6qp-ipu", "fsl,imx6q-ipu";

};



&ldb {

	clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>, <&clks IMX6QDL_CLK_LDB_DI1_SEL>,

		 <&clks IMX6QDL_CLK_IPU1_DI0_SEL>, <&clks IMX6QDL_CLK_IPU1_DI1_SEL>,