From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: References: <20190328142516.30372-1-rui.silva@linaro.org> <20190328142516.30372-4-rui.silva@linaro.org> <20190403101114.GC12646@pendragon.ideasonboard.com> From: Rui Miguel Silva Subject: Re: [PATCH v3 3/5] ARM: dts: imx7s: Add video mux, csi and mipi_csi In-reply-to: <20190403101114.GC12646@pendragon.ideasonboard.com> Date: Thu, 04 Apr 2019 05:10:21 +0100 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; format=flowed To: Laurent Pinchart Cc: Shawn Guo , Rob Herring , Fabio Estevam , devicetree@vger.kernel.org List-ID: Hi Laurent, On Wed 03 Apr 2019 at 11:11, Laurent Pinchart wrote: > Hi Rui, > > Thank you for the patch. > > On Thu, Mar 28, 2019 at 02:25:14PM +0000, Rui Miguel Silva > wrote: >> Add device tree nodes for csi, video multiplexer and mipi-csi. >> >> Signed-off-by: Rui Miguel Silva >> --- >> arch/arm/boot/dts/imx7s.dtsi | 75 >> ++++++++++++++++++++++++++++++++++++ >> 1 file changed, 75 insertions(+) >> >> diff --git a/arch/arm/boot/dts/imx7s.dtsi >> b/arch/arm/boot/dts/imx7s.dtsi >> index 792efcd2caa1..3286838105c6 100644 >> --- a/arch/arm/boot/dts/imx7s.dtsi >> +++ b/arch/arm/boot/dts/imx7s.dtsi >> @@ -8,6 +8,7 @@ >> #include >> #include >> #include >> +#include >> #include "imx7d-pinfunc.h" >> >> / { >> @@ -506,6 +507,34 @@ >> #mux-control-cells = <0>; >> mux-reg-masks = <0x14 >> 0x00000010>; >> }; >> + >> + video_mux: csi-mux { > > I wonder if the node should be renamed from csi-mux to > video-mux, and > possibly the label from video_mux to csi_mux (video_mux is a bit > generic > and may lead to name clashes). Apart from that, > > Reviewed-by: Laurent Pinchart > Thanks for the review. --- Cheers, Rui > >> + 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: ocotp-ctrl@30350000 { >> @@ -709,6 +738,23 @@ >> status = "disabled"; >> }; >> >> + csi: csi@30710000 { >> + compatible = "fsl,imx7-csi"; >> + reg = <0x30710000 0x10000>; >> + interrupts = > IRQ_TYPE_LEVEL_HIGH>; >> + clocks = <&clks IMX7D_CLK_DUMMY>, >> + <&clks >> IMX7D_CSI_MCLK_ROOT_CLK>, >> + <&clks IMX7D_CLK_DUMMY>; >> + clock-names = "axi", "mclk", >> "dcic"; >> + status = "disabled"; >> + >> + port { >> + csi_from_csi_mux: endpoint >> { >> + remote-endpoint = >> <&csi_mux_to_csi>; >> + }; >> + }; >> + }; >> + >> lcdif: lcdif@30730000 { >> compatible = "fsl,imx7d-lcdif", >> "fsl,imx28-lcdif"; >> reg = <0x30730000 0x10000>; >> @@ -718,6 +764,35 @@ >> clock-names = "pix", "axi"; >> status = "disabled"; >> }; >> + >> + mipi_csi: mipi-csi@30750000 { >> + compatible = "fsl,imx7-mipi-csi2"; >> + reg = <0x30750000 0x10000>; >> + #address-cells = <1>; >> + #size-cells = <0>; >> + interrupts = > IRQ_TYPE_LEVEL_HIGH>; >> + clocks = <&clks >> IMX7D_IPG_ROOT_CLK>, >> + <&clks >> IMX7D_MIPI_CSI_ROOT_CLK>, >> + <&clks >> IMX7D_MIPI_DPHY_ROOT_CLK>; >> + clock-names = "pclk", "wrap", >> "phy"; >> + power-domains = <&pgc_mipi_phy>; >> + phy-supply = <®_1p0d>; >> + resets = <&src >> IMX7_RESET_MIPI_PHY_MRST>; >> + reset-names = "mrst"; >> + status = "disabled"; >> + >> + port@0 { >> + reg = <0>; >> + }; >> + >> + port@1 { >> + reg = <1>; >> + >> + mipi_vc0_to_csi_mux: >> endpoint { >> + remote-endpoint = >> <&csi_mux_from_mipi_vc0>; >> + }; >> + }; >> + }; >> }; >> >> aips3: aips-bus@30800000 {