[v12,07/13] ARM: dts: imx7s: add multiplexer controls

Message ID	20190204120039.1198-8-rui.silva@linaro.org
State	Superseded
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; From: Rui Miguel Silva <rui.silva@linaro.org> To: sakari.ailus@linux.intel.com, Steve Longerbeam <slongerbeam@gmail.com>, Hans Verkuil <hverkuil@xs4all.nl>, Philipp Zabel <p.zabel@pengutronix.de> Cc: linux-media@vger.kernel.org, devel@driverdev.osuosl.org, devicetree@vger.kernel.org, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Rui Miguel Silva <rui.silva@linaro.org> Subject: [PATCH v12 07/13] ARM: dts: imx7s: add multiplexer controls Date: Mon, 4 Feb 2019 12:00:33 +0000 Message-Id: <20190204120039.1198-8-rui.silva@linaro.org> In-Reply-To: <20190204120039.1198-1-rui.silva@linaro.org> References: <20190204120039.1198-1-rui.silva@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: devicetree-owner@vger.kernel.org Precedence: bulk
Series	media: staging/imx7: add i.MX7 media driver \| expand [v12,00/13] media: staging/imx7: add i.MX7 media driver [v12,03/13] media: dt-bindings: add bindings for i.MX7 media driver [v12,05/13] media: staging/imx7: add MIPI CSI-2 receiver subdev for i.MX7 [v12,06/13] ARM: dts: imx7s: add mipi phy power domain [v12,07/13] ARM: dts: imx7s: add multiplexer controls [v12,08/13] ARM: dts: imx7: Add video mux, csi and mipi_csi and connections [v12,10/13] media: imx7.rst: add documentation for i.MX7 media driver [v12,13/13] media: MAINTAINERS: add entry for Freescale i.MX7 media driver

Message ID

20190204120039.1198-8-rui.silva@linaro.org

State

Superseded

Headers

Received-SPF: pass (google.com: best guess record for domain of
	devicetree-owner@vger.kernel.org designates 209.132.180.67 as
	permitted sender) client-ip=209.132.180.67; 
From: Rui Miguel Silva <rui.silva@linaro.org>
To: sakari.ailus@linux.intel.com, Steve Longerbeam <slongerbeam@gmail.com>,
	Hans Verkuil <hverkuil@xs4all.nl>, Philipp Zabel <p.zabel@pengutronix.de>
Cc: linux-media@vger.kernel.org, devel@driverdev.osuosl.org,
	devicetree@vger.kernel.org,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Rui Miguel Silva <rui.silva@linaro.org>
Subject: [PATCH v12 07/13] ARM: dts: imx7s: add multiplexer controls
Date: Mon,  4 Feb 2019 12:00:33 +0000
Message-Id: <20190204120039.1198-8-rui.silva@linaro.org>
In-Reply-To: <20190204120039.1198-1-rui.silva@linaro.org>
References: <20190204120039.1198-1-rui.silva@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: devicetree-owner@vger.kernel.org
Precedence: bulk

Series

media: staging/imx7: add i.MX7 media driver | expand

Commit Message

Rui Miguel Silva Feb. 4, 2019, noon UTC

The IOMUXC General Purpose Register has bitfield to control video bus
multiplexer to control the CSI input between the MIPI-CSI2 and parallel
interface. Add that register and mask.

Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>

Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>

---
 arch/arm/boot/dts/imx7s.dtsi | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

-- 
2.20.1

diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 9a680d3d6424..792efcd2caa1 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -497,8 +497,15 @@ 
 
 			gpr: iomuxc-gpr@30340000 {
 				compatible = "fsl,imx7d-iomuxc-gpr",
-					"fsl,imx6q-iomuxc-gpr", "syscon";
+					"fsl,imx6q-iomuxc-gpr", "syscon",
+					"simple-mfd";
 				reg = <0x30340000 0x10000>;
+
+				mux: mux-controller {
+					compatible = "mmio-mux";
+					#mux-control-cells = <0>;
+					mux-reg-masks = <0x14 0x00000010>;
+				};
 			};
 
 			ocotp: ocotp-ctrl@30350000 {

[v12,07/13] ARM: dts: imx7s: add multiplexer controls

Commit Message

Patch