[PATCH 0/4] OMAP 3 ISP (and N9/N950 primary camera support) dts changes

[PATCH 0/4] OMAP 3 ISP (and N9/N950 primary camera support) dts changes

[Sakari Ailus]

Hi Tony and others,

I had a couple of patches that contained dts changes in my OMAP 3 ISP / N9
camera DT support set. Since it became apparent that at least some of the
changes should go through linux-omap due to potential conflicts with other
patches, I decided to separate the dts changes from the set that could go
through the linux-omap tree. Here they are.

There's also the OMAP 3 ISP DT binding change, including a corresponding
header file that's included for human-readable names for the PHY types.

There are no dependencies between the sets, other than the obvious one that
omap3isp DT support won't work unless both are applied. The original thread
can be found here:

<URL:http://www.spinics.net/lists/linux-media/msg87263.html>

What's changed since the RFC set in the domain of these patches, there are
lots of changes elsewhere as well:

- syscon register range extension as a separate patchset,

- Fixed OMAP 3 ISP DT binding documentation according to Laurent's comments.
  Especially the PHY types have now human-readable names that refer to the
  PHY names in the documentation.

- The isp nodes are called isp rather than omap3_isp.

-- 
Kind regards,
Sakari

[PATCH 1/4] arm: dts: omap3: Extend the syscon register range

[Sakari Ailus]

The OMAP 3630 syscon register set was missing
OMAP3630_CONTROL_CAMERA_PHY_CTRL register at offset 0x2f0. This register
used to be mapped directly by the omap3isp driver, which is now moving to
use syscon instead. The omap3isp driver did not support DT so no driver
change is needed in this patch.

Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
---
 arch/arm/boot/dts/omap3.dtsi |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 01b7111..fe0b293 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -183,7 +183,7 @@
 
 		omap3_scm_general: tisyscon@48002270 {
 			compatible = "syscon";
-			reg = <0x48002270 0x2f0>;
+			reg = <0x48002270 0x2f4>;
 		};
 
 		pbias_regulator: pbias_regulator {
-- 
1.7.10.4

Re: [PATCH 1/4] arm: dts: omap3: Extend the syscon register range

[Laurent Pinchart]

Hi Sakari,

Thank you for the patch.

On Monday 16 March 2015 02:01:17 Sakari Ailus wrote:
> The OMAP 3630 syscon register set was missing
> OMAP3630_CONTROL_CAMERA_PHY_CTRL register at offset 0x2f0. This register
> used to be mapped directly by the omap3isp driver, which is now moving to
> use syscon instead. The omap3isp driver did not support DT so no driver
> change is needed in this patch.
> 
> Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  arch/arm/boot/dts/omap3.dtsi |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
> index 01b7111..fe0b293 100644
> --- a/arch/arm/boot/dts/omap3.dtsi
> +++ b/arch/arm/boot/dts/omap3.dtsi
> @@ -183,7 +183,7 @@
> 
>  		omap3_scm_general: tisyscon@48002270 {
>  			compatible = "syscon";
> -			reg = <0x48002270 0x2f0>;
> +			reg = <0x48002270 0x2f4>;
>  		};
> 
>  		pbias_regulator: pbias_regulator {

-- 
Regards,

Laurent Pinchart

[PATCH 2/4] dt: bindings: Add bindings for omap3isp

[Sakari Ailus]

Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
---
 .../devicetree/bindings/media/ti,omap3isp.txt      |   71 ++++++++++++++++++++
 MAINTAINERS                                        |    1 +
 include/dt-bindings/media/omap3-isp.h              |   22 ++++++
 3 files changed, 94 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/media/ti,omap3isp.txt
 create mode 100644 include/dt-bindings/media/omap3-isp.h

diff --git a/Documentation/devicetree/bindings/media/ti,omap3isp.txt b/Documentation/devicetree/bindings/media/ti,omap3isp.txt
new file mode 100644
index 0000000..547b493
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/ti,omap3isp.txt
@@ -0,0 +1,71 @@
+OMAP 3 ISP Device Tree bindings
+===============================
+
+The DT definitions can be found in include/dt-bindings/media/omap3-isp.h.
+
+Required properties
+===================
+
+compatible	: must contain "ti,omap3-isp"
+
+reg		: the two registers sets (physical address and length) for the
+		  ISP. The first set contains the core ISP registers up to
+		  the end of the SBL block. The second set contains the
+		  CSI PHYs and receivers registers.
+interrupts	: the ISP interrupt specifier
+iommus		: phandle and IOMMU specifier for the IOMMU that serves the ISP
+syscon		: the phandle and register offset to the Complex I/O or CSI-PHY
+		  register
+ti,phy-type	: 0 -- OMAP3ISP_PHY_TYPE_COMPLEX_IO (e.g. 3430)
+		  1 -- OMAP3ISP_PHY_TYPE_CSIPHY (e.g. 3630)
+#clock-cells	: Must be 1 --- the ISP provides two external clocks,
+		  cam_xclka and cam_xclkb, at indices 0 and 1,
+		  respectively. Please find more information on common
+		  clock bindings in ../clock/clock-bindings.txt.
+
+Port nodes (optional)
+---------------------
+
+More documentation on these bindings is available in
+video-interfaces.txt in the same directory.
+
+reg		: The interface:
+		  0 - parallel (CCDC)
+		  1 - CSIPHY1 -- CSI2C / CCP2B on 3630;
+		      CSI1 -- CSIb on 3430
+		  2 - CSIPHY2 -- CSI2A / CCP2B on 3630;
+		      CSI2 -- CSIa on 3430
+
+Optional properties
+===================
+
+vdd-csiphy1-supply : voltage supply of the CSI-2 PHY 1
+vdd-csiphy2-supply : voltage supply of the CSI-2 PHY 2
+
+Endpoint nodes
+--------------
+
+lane-polarity	: lane polarity (required on CSI-2)
+		  0 -- not inverted; 1 -- inverted
+data-lanes	: an array of data lanes from 1 to 3. The length can
+		  be either 1 or 2. (required on CSI-2)
+clock-lanes	: the clock lane (from 1 to 3). (required on CSI-2)
+
+
+Example
+=======
+
+		isp@480bc000 {
+			compatible = "ti,omap3-isp";
+			reg = <0x480bc000 0x12fc
+			       0x480bd800 0x0600>;
+			interrupts = <24>;
+			iommus = <&mmu_isp>;
+			syscon = <&omap3_scm_general 0x2f0>;
+			ti,phy-type = <1>;
+			#clock-cells = <1>;
+			ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
+			};
+		};
diff --git a/MAINTAINERS b/MAINTAINERS
index af8df65..a102624 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6949,6 +6949,7 @@ OMAP IMAGING SUBSYSTEM (OMAP3 ISP and OMAP4 ISS)
 M:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:	linux-media@vger.kernel.org
 S:	Maintained
+F:	Documentation/devicetree/bindings/media/ti,omap3isp.txt
 F:	drivers/media/platform/omap3isp/
 F:	drivers/staging/media/omap4iss/
 
diff --git a/include/dt-bindings/media/omap3-isp.h b/include/dt-bindings/media/omap3-isp.h
new file mode 100644
index 0000000..b18c60e
--- /dev/null
+++ b/include/dt-bindings/media/omap3-isp.h
@@ -0,0 +1,22 @@
+/*
+ * include/dt-bindings/media/omap3-isp.h
+ *
+ * Copyright (C) 2015 Sakari Ailus
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ */
+
+#ifndef __DT_BINDINGS_OMAP3_ISP_H__
+#define __DT_BINDINGS_OMAP3_ISP_H__
+
+#define OMAP3ISP_PHY_TYPE_COMPLEX_IO	0
+#define OMAP3ISP_PHY_TYPE_CSIPHY	1
+
+#endif /* __DT_BINDINGS_OMAP3_ISP_H__ */
-- 
1.7.10.4

Re: [PATCH 2/4] dt: bindings: Add bindings for omap3isp

[Laurent Pinchart]

Hi Sakari,

Thank you for the patch.

On Monday 16 March 2015 02:01:18 Sakari Ailus wrote:
> Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
> ---
>  .../devicetree/bindings/media/ti,omap3isp.txt      |   71 +++++++++++++++++
>  MAINTAINERS                                        |    1 +
>  include/dt-bindings/media/omap3-isp.h              |   22 ++++++
>  3 files changed, 94 insertions(+)
>  create mode 100644 Documentation/devicetree/bindings/media/ti,omap3isp.txt
>  create mode 100644 include/dt-bindings/media/omap3-isp.h
> 
> diff --git a/Documentation/devicetree/bindings/media/ti,omap3isp.txt
> b/Documentation/devicetree/bindings/media/ti,omap3isp.txt new file mode
> 100644
> index 0000000..547b493
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/media/ti,omap3isp.txt
> @@ -0,0 +1,71 @@
> +OMAP 3 ISP Device Tree bindings
> +===============================
> +
> +The DT definitions can be found in include/dt-bindings/media/omap3-isp.h.
> +
> +Required properties
> +===================
> +
> +compatible	: must contain "ti,omap3-isp"
> +
> +reg		: the two registers sets (physical address and length) for the
> +		  ISP. The first set contains the core ISP registers up to
> +		  the end of the SBL block. The second set contains the
> +		  CSI PHYs and receivers registers.
> +interrupts	: the ISP interrupt specifier
> +iommus		: phandle and IOMMU specifier for the IOMMU that serves the ISP
> +syscon		: the phandle and register offset to the Complex I/O or CSI-PHY
> +		  register
> +ti,phy-type	: 0 -- OMAP3ISP_PHY_TYPE_COMPLEX_IO (e.g. 3430)
> +		  1 -- OMAP3ISP_PHY_TYPE_CSIPHY (e.g. 3630)
> +#clock-cells	: Must be 1 --- the ISP provides two external clocks,
> +		  cam_xclka and cam_xclkb, at indices 0 and 1,
> +		  respectively. Please find more information on common
> +		  clock bindings in ../clock/clock-bindings.txt.
> +
> +Port nodes (optional)
> +---------------------
> +
> +More documentation on these bindings is available in
> +video-interfaces.txt in the same directory.
> +
> +reg		: The interface:
> +		  0 - parallel (CCDC)
> +		  1 - CSIPHY1 -- CSI2C / CCP2B on 3630;
> +		      CSI1 -- CSIb on 3430
> +		  2 - CSIPHY2 -- CSI2A / CCP2B on 3630;
> +		      CSI2 -- CSIa on 3430
> +
> +Optional properties
> +===================
> +
> +vdd-csiphy1-supply : voltage supply of the CSI-2 PHY 1
> +vdd-csiphy2-supply : voltage supply of the CSI-2 PHY 2
> +
> +Endpoint nodes
> +--------------
> +
> +lane-polarity	: lane polarity (required on CSI-2)
> +		  0 -- not inverted; 1 -- inverted
> +data-lanes	: an array of data lanes from 1 to 3. The length can
> +		  be either 1 or 2. (required on CSI-2)
> +clock-lanes	: the clock lane (from 1 to 3). (required on CSI-2)
> +
> +
> +Example
> +=======
> +
> +		isp@480bc000 {
> +			compatible = "ti,omap3-isp";
> +			reg = <0x480bc000 0x12fc
> +			       0x480bd800 0x0600>;
> +			interrupts = <24>;
> +			iommus = <&mmu_isp>;
> +			syscon = <&omap3_scm_general 0x2f0>;
> +			ti,phy-type = <1>;

I would use OMAP3ISP_PHY_TYPE_CSIPHY instead of 1 here. Apart from that,

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> +			#clock-cells = <1>;
> +			ports {
> +				#address-cells = <1>;
> +				#size-cells = <0>;
> +			};
> +		};
> diff --git a/MAINTAINERS b/MAINTAINERS
> index af8df65..a102624 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -6949,6 +6949,7 @@ OMAP IMAGING SUBSYSTEM (OMAP3 ISP and OMAP4 ISS)
>  M:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>  L:	linux-media@vger.kernel.org
>  S:	Maintained
> +F:	Documentation/devicetree/bindings/media/ti,omap3isp.txt
>  F:	drivers/media/platform/omap3isp/
>  F:	drivers/staging/media/omap4iss/
> 
> diff --git a/include/dt-bindings/media/omap3-isp.h
> b/include/dt-bindings/media/omap3-isp.h new file mode 100644
> index 0000000..b18c60e
> --- /dev/null
> +++ b/include/dt-bindings/media/omap3-isp.h
> @@ -0,0 +1,22 @@
> +/*
> + * include/dt-bindings/media/omap3-isp.h
> + *
> + * Copyright (C) 2015 Sakari Ailus
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License
> + * version 2 as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful, but
> + * WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> + * General Public License for more details.
> + */
> +
> +#ifndef __DT_BINDINGS_OMAP3_ISP_H__
> +#define __DT_BINDINGS_OMAP3_ISP_H__
> +
> +#define OMAP3ISP_PHY_TYPE_COMPLEX_IO	0
> +#define OMAP3ISP_PHY_TYPE_CSIPHY	1
> +
> +#endif /* __DT_BINDINGS_OMAP3_ISP_H__ */

-- 
Regards,

Laurent Pinchart

[PATCH 3/4] arm: dts: omap3: Add DT entries for OMAP 3

[Sakari Ailus]

The resources the ISP needs are slightly different on 3[45]xx and 3[67]xx.
Especially the phy-type property is different.

Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
---
 arch/arm/boot/dts/omap34xx.dtsi |   17 +++++++++++++++++
 arch/arm/boot/dts/omap36xx.dtsi |   17 +++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/arch/arm/boot/dts/omap34xx.dtsi b/arch/arm/boot/dts/omap34xx.dtsi
index 3819c1e..7bc8c0f 100644
--- a/arch/arm/boot/dts/omap34xx.dtsi
+++ b/arch/arm/boot/dts/omap34xx.dtsi
@@ -8,6 +8,8 @@
  * kind, whether express or implied.
  */
 
+#include <dt-bindings/media/omap3-isp.h>
+
 #include "omap3.dtsi"
 
 / {
@@ -37,6 +39,21 @@
 			pinctrl-single,register-width = <16>;
 			pinctrl-single,function-mask = <0xff1f>;
 		};
+
+		isp: isp@480bc000 {
+			compatible = "ti,omap3-isp";
+			reg = <0x480bc000 0x12fc
+			       0x480bd800 0x017c>;
+			interrupts = <24>;
+			iommus = <&mmu_isp>;
+			syscon = <&omap3_scm_general 0xdc>;
+			ti,phy-type = <OMAP3ISP_PHY_TYPE_COMPLEX_IO>;
+			#clock-cells = <1>;
+			ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
+			};
+		};
 	};
 };
 
diff --git a/arch/arm/boot/dts/omap36xx.dtsi b/arch/arm/boot/dts/omap36xx.dtsi
index 541704a..3502fe0 100644
--- a/arch/arm/boot/dts/omap36xx.dtsi
+++ b/arch/arm/boot/dts/omap36xx.dtsi
@@ -8,6 +8,8 @@
  * kind, whether express or implied.
  */
 
+#include <dt-bindings/media/omap3-isp.h>
+
 #include "omap3.dtsi"
 
 / {
@@ -69,6 +71,21 @@
 			pinctrl-single,register-width = <16>;
 			pinctrl-single,function-mask = <0xff1f>;
 		};
+
+		isp: isp@480bc000 {
+			compatible = "ti,omap3-isp";
+			reg = <0x480bc000 0x12fc
+			       0x480bd800 0x0600>;
+			interrupts = <24>;
+			iommus = <&mmu_isp>;
+			syscon = <&omap3_scm_general 0x2f0>;
+			ti,phy-type = <OMAP3ISP_PHY_TYPE_CSIPHY>;
+			#clock-cells = <1>;
+			ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
+			};
+		};
 	};
 };
 
-- 
1.7.10.4

Re: [PATCH 3/4] arm: dts: omap3: Add DT entries for OMAP 3

[Laurent Pinchart]

Hi Sakari,

Thank you for the patch.

On Monday 16 March 2015 02:01:19 Sakari Ailus wrote:
> The resources the ISP needs are slightly different on 3[45]xx and 3[67]xx.
> Especially the phy-type property is different.
> 
> Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  arch/arm/boot/dts/omap34xx.dtsi |   17 +++++++++++++++++
>  arch/arm/boot/dts/omap36xx.dtsi |   17 +++++++++++++++++
>  2 files changed, 34 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/omap34xx.dtsi
> b/arch/arm/boot/dts/omap34xx.dtsi index 3819c1e..7bc8c0f 100644
> --- a/arch/arm/boot/dts/omap34xx.dtsi
> +++ b/arch/arm/boot/dts/omap34xx.dtsi
> @@ -8,6 +8,8 @@
>   * kind, whether express or implied.
>   */
> 
> +#include <dt-bindings/media/omap3-isp.h>
> +
>  #include "omap3.dtsi"
> 
>  / {
> @@ -37,6 +39,21 @@
>  			pinctrl-single,register-width = <16>;
>  			pinctrl-single,function-mask = <0xff1f>;
>  		};
> +
> +		isp: isp@480bc000 {
> +			compatible = "ti,omap3-isp";
> +			reg = <0x480bc000 0x12fc
> +			       0x480bd800 0x017c>;
> +			interrupts = <24>;
> +			iommus = <&mmu_isp>;
> +			syscon = <&omap3_scm_general 0xdc>;
> +			ti,phy-type = <OMAP3ISP_PHY_TYPE_COMPLEX_IO>;
> +			#clock-cells = <1>;
> +			ports {
> +				#address-cells = <1>;
> +				#size-cells = <0>;
> +			};
> +		};
>  	};
>  };
> 
> diff --git a/arch/arm/boot/dts/omap36xx.dtsi
> b/arch/arm/boot/dts/omap36xx.dtsi index 541704a..3502fe0 100644
> --- a/arch/arm/boot/dts/omap36xx.dtsi
> +++ b/arch/arm/boot/dts/omap36xx.dtsi
> @@ -8,6 +8,8 @@
>   * kind, whether express or implied.
>   */
> 
> +#include <dt-bindings/media/omap3-isp.h>
> +
>  #include "omap3.dtsi"
> 
>  / {
> @@ -69,6 +71,21 @@
>  			pinctrl-single,register-width = <16>;
>  			pinctrl-single,function-mask = <0xff1f>;
>  		};
> +
> +		isp: isp@480bc000 {
> +			compatible = "ti,omap3-isp";
> +			reg = <0x480bc000 0x12fc
> +			       0x480bd800 0x0600>;
> +			interrupts = <24>;
> +			iommus = <&mmu_isp>;
> +			syscon = <&omap3_scm_general 0x2f0>;
> +			ti,phy-type = <OMAP3ISP_PHY_TYPE_CSIPHY>;
> +			#clock-cells = <1>;
> +			ports {
> +				#address-cells = <1>;
> +				#size-cells = <0>;
> +			};
> +		};
>  	};
>  };

-- 
Regards,

Laurent Pinchart

[PATCH 4/4] arm: dts: n950, n9: Add primary camera support

[Sakari Ailus]

Add support for the primary camera of the Nokia N950 and N9.

Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
---
 arch/arm/boot/dts/omap3-n9.dts   |   37 +++++++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/omap3-n950.dts |   37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/arch/arm/boot/dts/omap3-n9.dts b/arch/arm/boot/dts/omap3-n9.dts
index 9938b5d..7711df1 100644
--- a/arch/arm/boot/dts/omap3-n9.dts
+++ b/arch/arm/boot/dts/omap3-n9.dts
@@ -16,3 +16,40 @@
 	model = "Nokia N9";
 	compatible = "nokia,omap3-n9", "ti,omap36xx", "ti,omap3";
 };
+
+&i2c2 {
+	smia_1: camera@10 {
+		compatible = "nokia,smia";
+		reg = <0x10>;
+		/* No reset gpio */
+		vana-supply = <&vaux3>;
+		clocks = <&isp 0>;
+		clock-frequency = <9600000>;
+		nokia,nvm-size = <(16 * 64)>;
+		port {
+			smia_1_1: endpoint {
+				link-frequencies = /bits/ 64 <199200000 210000000 499200000>;
+				clock-lanes = <0>;
+				data-lanes = <1 2>;
+				remote-endpoint = <&csi2a_ep>;
+			};
+		};
+	};
+};
+
+&isp {
+	vdd-csiphy1-supply = <&vaux2>;
+	vdd-csiphy2-supply = <&vaux2>;
+	ports {
+		port@2 {
+			reg = <2>;
+			csi2a_ep: endpoint {
+				remote-endpoint = <&smia_1_1>;
+				clock-lanes = <2>;
+				data-lanes = <1 3>;
+				crc = <1>;
+				lane-polarity = <1 1 1>;
+			};
+		};
+	};
+};
diff --git a/arch/arm/boot/dts/omap3-n950.dts b/arch/arm/boot/dts/omap3-n950.dts
index 261c558..761f275 100644
--- a/arch/arm/boot/dts/omap3-n950.dts
+++ b/arch/arm/boot/dts/omap3-n950.dts
@@ -16,3 +16,40 @@
 	model = "Nokia N950";
 	compatible = "nokia,omap3-n950", "ti,omap36xx", "ti,omap3";
 };
+
+&i2c2 {
+	smia_1: camera@10 {
+		compatible = "nokia,smia";
+		reg = <0x10>;
+		/* No reset gpio */
+		vana-supply = <&vaux3>;
+		clocks = <&isp 0>;
+		clock-frequency = <9600000>;
+		nokia,nvm-size = <(16 * 64)>;
+		port {
+			smia_1_1: endpoint {
+				link-frequencies = /bits/ 64 <210000000 333600000 398400000>;
+				clock-lanes = <0>;
+				data-lanes = <1 2>;
+				remote-endpoint = <&csi2a_ep>;
+			};
+		};
+	};
+};
+
+&isp {
+	vdd-csiphy1-supply = <&vaux2>;
+	vdd-csiphy2-supply = <&vaux2>;
+	ports {
+		port@2 {
+			reg = <2>;
+			csi2a_ep: endpoint {
+				remote-endpoint = <&smia_1_1>;
+				clock-lanes = <2>;
+				data-lanes = <3 1>;
+				crc = <1>;
+				lane-polarity = <1 1 1>;
+			};
+		};
+	};
+};
-- 
1.7.10.4

Re: [PATCH 4/4] arm: dts: n950, n9: Add primary camera support

[Laurent Pinchart]

Hi Sakari,

Thank you for the patch.

On Monday 16 March 2015 02:01:20 Sakari Ailus wrote:
> Add support for the primary camera of the Nokia N950 and N9.
> 
> Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
> ---
>  arch/arm/boot/dts/omap3-n9.dts   |   37 +++++++++++++++++++++++++++++++++++
>  arch/arm/boot/dts/omap3-n950.dts |   37 +++++++++++++++++++++++++++++++++++
>  2 files changed, 74 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/omap3-n9.dts b/arch/arm/boot/dts/omap3-n9.dts
> index 9938b5d..7711df1 100644
> --- a/arch/arm/boot/dts/omap3-n9.dts
> +++ b/arch/arm/boot/dts/omap3-n9.dts
> @@ -16,3 +16,40 @@
>  	model = "Nokia N9";
>  	compatible = "nokia,omap3-n9", "ti,omap36xx", "ti,omap3";
>  };
> +
> +&i2c2 {
> +	smia_1: camera@10 {
> +		compatible = "nokia,smia";
> +		reg = <0x10>;
> +		/* No reset gpio */
> +		vana-supply = <&vaux3>;
> +		clocks = <&isp 0>;
> +		clock-frequency = <9600000>;
> +		nokia,nvm-size = <(16 * 64)>;
> +		port {
> +			smia_1_1: endpoint {
> +				link-frequencies = /bits/ 64 <199200000 210000000 499200000>;
> +				clock-lanes = <0>;
> +				data-lanes = <1 2>;
> +				remote-endpoint = <&csi2a_ep>;
> +			};
> +		};
> +	};
> +};
> +
> +&isp {
> +	vdd-csiphy1-supply = <&vaux2>;
> +	vdd-csiphy2-supply = <&vaux2>;
> +	ports {
> +		port@2 {
> +			reg = <2>;
> +			csi2a_ep: endpoint {
> +				remote-endpoint = <&smia_1_1>;
> +				clock-lanes = <2>;
> +				data-lanes = <1 3>;
> +				crc = <1>;
> +				lane-polarity = <1 1 1>;
> +			};
> +		};
> +	};
> +};

Wouldn't it make sense to move the common parts to arch/arm/boot/dts/omap3-
n950-n9.dtsi ?

> diff --git a/arch/arm/boot/dts/omap3-n950.dts
> b/arch/arm/boot/dts/omap3-n950.dts index 261c558..761f275 100644
> --- a/arch/arm/boot/dts/omap3-n950.dts
> +++ b/arch/arm/boot/dts/omap3-n950.dts
> @@ -16,3 +16,40 @@
>  	model = "Nokia N950";
>  	compatible = "nokia,omap3-n950", "ti,omap36xx", "ti,omap3";
>  };
> +
> +&i2c2 {
> +	smia_1: camera@10 {
> +		compatible = "nokia,smia";
> +		reg = <0x10>;
> +		/* No reset gpio */
> +		vana-supply = <&vaux3>;
> +		clocks = <&isp 0>;
> +		clock-frequency = <9600000>;
> +		nokia,nvm-size = <(16 * 64)>;
> +		port {
> +			smia_1_1: endpoint {
> +				link-frequencies = /bits/ 64 <210000000 333600000 398400000>;
> +				clock-lanes = <0>;
> +				data-lanes = <1 2>;
> +				remote-endpoint = <&csi2a_ep>;
> +			};
> +		};
> +	};
> +};
> +
> +&isp {
> +	vdd-csiphy1-supply = <&vaux2>;
> +	vdd-csiphy2-supply = <&vaux2>;
> +	ports {
> +		port@2 {
> +			reg = <2>;
> +			csi2a_ep: endpoint {
> +				remote-endpoint = <&smia_1_1>;
> +				clock-lanes = <2>;
> +				data-lanes = <3 1>;
> +				crc = <1>;
> +				lane-polarity = <1 1 1>;
> +			};
> +		};
> +	};
> +};

-- 
Regards,

Laurent Pinchart