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

Message ID	20190206151328.21629-8-rui.silva@linaro.org
State	Accepted
Commit	94a905a79f2cf337376c195acda406a2385792f4
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: best guess record for domain of linux-media-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 v14 07/13] ARM: dts: imx7s: add multiplexer controls Date: Wed, 6 Feb 2019 15:13:22 +0000 Message-Id: <20190206151328.21629-8-rui.silva@linaro.org> In-Reply-To: <20190206151328.21629-1-rui.silva@linaro.org> References: <20190206151328.21629-1-rui.silva@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org Precedence: bulk
Series	[v14,01/13] media: staging/imx: refactor imx media device probe \| expand [v14,01/13] media: staging/imx: refactor imx media device probe [v14,03/13] media: dt-bindings: add bindings for i.MX7 media driver [v14,04/13] media: staging/imx7: add imx7 CSI subdev driver [v14,05/13] media: staging/imx7: add MIPI CSI-2 receiver subdev for i.MX7 [v14,06/13] ARM: dts: imx7s: add mipi phy power domain [v14,07/13] ARM: dts: imx7s: add multiplexer controls [v14,09/13] ARM: dts: imx7s-warp: add ov2680 sensor node [v14,13/13] media: MAINTAINERS: add entry for Freescale i.MX7 media driver

Message ID

20190206151328.21629-8-rui.silva@linaro.org

State

Accepted

Commit

94a905a79f2cf337376c195acda406a2385792f4

Headers

Received-SPF: pass (google.com: best guess record for domain of
	linux-media-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 v14 07/13] ARM: dts: imx7s: add multiplexer controls
Date: Wed,  6 Feb 2019 15:13:22 +0000
Message-Id: <20190206151328.21629-8-rui.silva@linaro.org>
In-Reply-To: <20190206151328.21629-1-rui.silva@linaro.org>
References: <20190206151328.21629-1-rui.silva@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-media-owner@vger.kernel.org
Precedence: bulk

Series

[v14,01/13] media: staging/imx: refactor imx media device probe | expand

Commit Message

Rui Miguel Silva Feb. 6, 2019, 3:13 p.m. 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 {

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

Commit Message

Patch