ARM: dts: imx6qdl: add multiplexer controls

The IOMUXC General Purpose Register space contains various bitfields
that control video bus multiplexers. Describe them using a mmio-mux
node. The placement of the IPU CSI video mux controls differs between
i.MX6D/Q and i.MX6S/DL.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

3 files changed, 26 insertions, 1 deletions

diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
index 7aa120fbdc71..10bc9d135956 100644
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
@@ -181,6 +181,16 @@
                       "di0", "di1";
 };
 
+&mux {
+        mux-reg-masks = <0x34 0x00000007>, /* IPU_CSI0_MUX */
+                        <0x34 0x00000038>, /* IPU_CSI1_MUX */
+                        <0x0c 0x0000000c>, /* HDMI_MUX_CTL */
+                        <0x0c 0x000000c0>, /* LVDS0_MUX_CTL */
+                        <0x0c 0x00000300>, /* LVDS1_MUX_CTL */
+                        <0x28 0x00000003>, /* DCIC1_MUX_CTL */
+                        <0x28 0x0000000c>; /* DCIC2_MUX_CTL */
+};
+
 &vpu {
         compatible = "fsl,imx6dl-vpu", "cnm,coda960";
 };
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index dd33849335b2..1a14ae2ce6d8 100644
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -332,6 +332,16 @@
         };
 };
 
+&mux {
+        mux-reg-masks = <0x04 0x00080000>, /* MIPI_IPU1_MUX */
+                        <0x04 0x00100000>, /* MIPI_IPU2_MUX */
+                        <0x0c 0x0000000c>, /* HDMI_MUX_CTL */
+                        <0x0c 0x000000c0>, /* LVDS0_MUX_CTL */
+                        <0x0c 0x00000300>, /* LVDS1_MUX_CTL */
+                        <0x28 0x00000003>, /* DCIC1_MUX_CTL */
+                        <0x28 0x0000000c>; /* DCIC2_MUX_CTL */
+};
+
 &vpu {
         compatible = "fsl,imx6q-vpu", "cnm,coda960";
 };
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index f325411f66aa..4ea7d86e625e 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -826,8 +826,13 @@
                         };
 
                         gpr: iomuxc-gpr@020e0000 {
-                                compatible = "fsl,imx6q-iomuxc-gpr", "syscon";
+                                compatible = "fsl,imx6q-iomuxc-gpr", "syscon", "simple-mfd";
                                 reg = <0x020e0000 0x38>;
+
+                                mux: mux-controller {
+                                        compatible = "mmio-mux";
+                                        #mux-control-cells = <1>;
+                                };
                         };
 
                         iomuxc: iomuxc@020e0000 {