ARM: dts: imx6qdl: move iomuxc compatible assignment out of root node

The common imx6qdl.dtsi already defines the iomuxc phandle. Make use of
it in the imx6dl.dtsi and imx6q.dtsi.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
index 77b65a402e197c3dfd8056363eb21466c491b5d0..fdd81fdc3f35721395240c44a417f7c99ff43240 100644 (file)
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
@@ -88,10 +88,6 @@
                };
 
                aips1: bus@2000000 {
-                       iomuxc: pinctrl@20e0000 {
-                               compatible = "fsl,imx6dl-iomuxc";
-                       };
-
                        pxp: pxp@20f0000 {
                                reg = <0x020f0000 0x4000>;
                                interrupts = <0 98 IRQ_TYPE_LEVEL_HIGH>;
@@ -298,6 +294,10 @@
        compatible = "fsl,imx6dl-hdmi";
 };
 
+&iomuxc {
+       compatible = "fsl,imx6dl-iomuxc";
+};
+
 &ipu1_csi1 {
        ipu1_csi1_from_ipu1_csi1_mux: endpoint {
                remote-endpoint = <&ipu1_csi1_mux_to_ipu1_csi1>;

diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index 78a4d64929f38303d894a71138ca95dbdd972c79..5277e390329126313549b2021fd1d1f447d995bc 100644 (file)
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -182,10 +182,6 @@
                                        status = "disabled";
                                };
                        };
-
-                       iomuxc: pinctrl@20e0000 {
-                               compatible = "fsl,imx6q-iomuxc";
-                       };
                };
 
                sata: sata@2200000 {
@@ -427,6 +423,10 @@
        };
 };
 
+&iomuxc {
+       compatible = "fsl,imx6q-iomuxc";
+};
+
 &ipu1_csi1 {
        ipu1_csi1_from_mipi_vc1: endpoint {
                remote-endpoint = <&mipi_vc1_to_ipu1_csi1>;