* [PATCH 2/3] ARM: dts: imx6qp: reference MMDC node by handle and remove duplication
2017-02-17 13:48 [PATCH 1/3] ARM: dts: imx6qp: reference PCIe node by handle Lucas Stach
@ 2017-02-17 13:48 ` Lucas Stach
2017-02-17 13:48 ` [PATCH 3/3] ARM: dts: imx6qp: correct IPU nodes Lucas Stach
2017-03-10 5:35 ` [PATCH 1/3] ARM: dts: imx6qp: reference PCIe node by handle Shawn Guo
2 siblings, 0 replies; 4+ messages in thread
From: Lucas Stach @ 2017-02-17 13:48 UTC (permalink / raw)
To: linux-arm-kernel
Referencing the node by handle make the QP DT more resilent against
changes of the base DT. Also remove the duplicated reg property, it's
not needed as it the same as in the base DT, just the compatible is
actually different.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
arch/arm/boot/dts/imx6qp.dtsi | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/imx6qp.dtsi b/arch/arm/boot/dts/imx6qp.dtsi
index bceab2d87af4..b077394ed586 100644
--- a/arch/arm/boot/dts/imx6qp.dtsi
+++ b/arch/arm/boot/dts/imx6qp.dtsi
@@ -81,13 +81,6 @@
"di0_sel", "di1_sel",
"ldb_di0", "ldb_di1", "prg";
};
-
- aips-bus at 02100000 {
- mmdc0: mmdc at 021b0000 { /* MMDC0 */
- compatible = "fsl,imx6qp-mmdc", "fsl,imx6q-mmdc";
- reg = <0x021b0000 0x4000>;
- };
- };
};
};
@@ -107,6 +100,10 @@
"di0", "di1";
};
+&mmdc0 {
+ compatible = "fsl,imx6qp-mmdc", "fsl,imx6q-mmdc";
+};
+
&pcie {
compatible = "fsl,imx6qp-pcie", "snps,dw-pcie";
};
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 3/3] ARM: dts: imx6qp: correct IPU nodes
2017-02-17 13:48 [PATCH 1/3] ARM: dts: imx6qp: reference PCIe node by handle Lucas Stach
2017-02-17 13:48 ` [PATCH 2/3] ARM: dts: imx6qp: reference MMDC node by handle and remove duplication Lucas Stach
@ 2017-02-17 13:48 ` Lucas Stach
2017-03-10 5:35 ` [PATCH 1/3] ARM: dts: imx6qp: reference PCIe node by handle Shawn Guo
2 siblings, 0 replies; 4+ messages in thread
From: Lucas Stach @ 2017-02-17 13:48 UTC (permalink / raw)
To: linux-arm-kernel
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: Lucas Stach <l.stach@pengutronix.de>
---
arch/arm/boot/dts/imx6qp.dtsi | 34 ++++++++--------------------------
1 file changed, 8 insertions(+), 26 deletions(-)
diff --git a/arch/arm/boot/dts/imx6qp.dtsi b/arch/arm/boot/dts/imx6qp.dtsi
index b077394ed586..4fd6f26b89a6 100644
--- a/arch/arm/boot/dts/imx6qp.dtsi
+++ b/arch/arm/boot/dts/imx6qp.dtsi
@@ -55,32 +55,6 @@
reg = <0x00960000 0x20000>;
clocks = <&clks IMX6QDL_CLK_OCRAM>;
};
-
- ipu1: ipu at 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 at 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>,
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread