ARM: dts: imx7s: Move csi-mux to below root

fsl,imx-iomuxc-gpr.yaml only contains the mux-controller but the actual
video-mux is not part of it. So move it below root node.
Fixes the dtbs_check warning:
arch/arm/boot/dts/nxp/imx/imx7s-mba7.dtb: iomuxc-gpr@30340000: 'csi-mux' does not match any of the regexes: 'pinctrl-[0-9]+'
  from schema $id: http://devicetree.org/schemas/soc/imx/fsl,imx-iomuxc-gpr.yaml#

Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/nxp/imx/imx7s.dtsi b/arch/arm/boot/dts/nxp/imx/imx7s.dtsi
index 22dd72499ef27851f13fe02ece118f30cfbb40d4..2629968001a746dccf69dfae58db3d6b5aeb3238 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx7s.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx7s.dtsi
@@ -176,6 +176,34 @@
                             <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>;
        };
 
+       video_mux: csi-mux {
+               compatible = "video-mux";
+               mux-controls = <&mux 0>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+               status = "disabled";
+
+               port@0 {
+                       reg = <0>;
+               };
+
+               port@1 {
+                       reg = <1>;
+
+                       csi_mux_from_mipi_vc0: endpoint {
+                               remote-endpoint = <&mipi_vc0_to_csi_mux>;
+                       };
+               };
+
+               port@2 {
+                       reg = <2>;
+
+                       csi_mux_to_csi: endpoint {
+                               remote-endpoint = <&csi_from_csi_mux>;
+                       };
+               };
+       };
+
        soc: soc {
                #address-cells = <1>;
                #size-cells = <1>;
@@ -529,34 +557,6 @@
                                        #mux-control-cells = <1>;
                                        mux-reg-masks = <0x14 0x00000010>;
                                };
-
-                               video_mux: csi-mux {
-                                       compatible = "video-mux";
-                                       mux-controls = <&mux 0>;
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-                                       status = "disabled";
-
-                                       port@0 {
-                                               reg = <0>;
-                                       };
-
-                                       port@1 {
-                                               reg = <1>;
-
-                                               csi_mux_from_mipi_vc0: endpoint {
-                                                       remote-endpoint = <&mipi_vc0_to_csi_mux>;
-                                               };
-                                       };
-
-                                       port@2 {
-                                               reg = <2>;
-
-                                               csi_mux_to_csi: endpoint {
-                                                       remote-endpoint = <&csi_from_csi_mux>;
-                                               };
-                                       };
-                               };
                        };
 
                        ocotp: efuse@30350000 {