diff mbox

[v3,08/13] ARM: dts: Add camera device nodes for Exynos4412 TRATS2 board

Message ID 1372692155-17653-9-git-send-email-s.nawrocki@samsung.com (mailing list archive)
State New, archived
Headers show

Commit Message

This patch enables the front camera using the internal
camera ISP (FIMC-IS).

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
 arch/arm/boot/dts/exynos4412-trats2.dts |   91 +++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)

Comments

Tomasz Figa July 5, 2013, 11:23 p.m. UTC | #1
Hi Sylwester,

On Monday 01 of July 2013 17:22:30 Sylwester Nawrocki wrote:
> This patch enables the front camera using the internal
> camera ISP (FIMC-IS).
> 
> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> ---
>  arch/arm/boot/dts/exynos4412-trats2.dts |   91
> +++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts
> b/arch/arm/boot/dts/exynos4412-trats2.dts index b9de3b5..e9fb3de 100644
> --- a/arch/arm/boot/dts/exynos4412-trats2.dts
> +++ b/arch/arm/boot/dts/exynos4412-trats2.dts
> @@ -62,6 +62,15 @@
>  			enable-active-high;
>  		};
> 
> +		cam_io_reg: voltage-regulator@3 {

Same comment here as for patch 7/13. This is not an address of this 
regulator, so I would rather use -3 prefix.

> +			compatible = "regulator-fixed";
> +			regulator-name = "CAM_SENSOR_A";
> +			regulator-min-microvolt = <2800000>;
> +			regulator-max-microvolt = <2800000>;
> +			gpio = <&gpm0 2 0>;
> +			enable-active-high;
> +		};
> +
>  		/* More to come */
>  	};
> 
> @@ -472,4 +481,86 @@
>  			gpios = <&gpj0 7 0>;
>  		};
>  	};
> +
> +	camera {
> +		pinctrl-names = "default";
> +		pinctrl-0 = <&cam_port_b_clk_active>;
> +		status = "okay";
> +
> +		fimc_0: fimc@11800000 {
> +			clock-frequency = <160000000>;
> +			status = "okay";
> +		};
> +
> +		fimc_1: fimc@11810000 {
> +			clock-frequency = <160000000>;
> +			status = "okay";
> +		};
> +
> +		fimc_2: fimc@11820000 {
> +			clock-frequency = <160000000>;
> +			status = "okay";
> +		};
> +
> +		fimc_3: fimc@11830000 {
> +			clock-frequency = <160000000>;
> +			status = "okay";
> +		};
> +
> +		csis_1: csis@11890000 {
> +			vddcore-supply = <&ldo8_reg>;
> +			vddio-supply = <&ldo10_reg>;
> +			clock-frequency = <160000000>;
> +			#address-cells = <1>;
> +			#size-cells = <0>;

Hmm. Couldn't the two #properties above be moved to exynos4.dtsi instead?

Otherwise looks good.

Best regards,
Tomasz

> +			status = "okay";
> +
> +			/* Camera D (4) MIPI CSI-2 (CSIS1) */
> +			port@4 {
> +				reg = <4>;
> +				csis1_ep: endpoint {
> +					remote-endpoint = <&is_s5k6a3_ep>;
> +					data-lanes = <1>;
> +					samsung,csis-hs-settle = <18>;
> +					samsung,csis-wclk;
> +				};
> +			};
> +		};
> +
> +		fimc_lite_0: fimc-lite@12390000 {
> +			status = "okay";
> +		};
> +
> +		fimc_lite_1: fimc-lite@123A0000 {
> +			status = "okay";
> +		};
> +
> +		fimc-is@12000000 {
> +			pinctrl-0 = <&fimc_is_uart>;
> +			pinctrl-names = "default";
> +			status = "okay";
> +
> +			i2c1_isp: i2c-isp@12140000 {
> +				pinctrl-0 = <&fimc_is_i2c1>;
> +				pinctrl-names = "default";
> +
> +				s5k6a3@10 {
> +					compatible = "samsung,s5k6a3";
> +					reg = <0x10>;
> +					svdda-supply = <&cam_io_reg>;
> +					svddio-supply = <&ldo19_reg>;
> +					clock-frequency = <24000000>;
> +					samsung,camclk-out = <1>;
> +					gpios = <&gpm1 6 0>;
> +
> +					port {
> +						is_s5k6a3_ep: endpoint {
> +							remote-endpoint = 
<&csis1_ep>;
> +							data-lanes = <1>;
> +						};
> +					};
> +				};
> +			};
> +		};
> +	};
>  };
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
On 07/06/2013 01:23 AM, Tomasz Figa wrote:
> On Monday 01 of July 2013 17:22:30 Sylwester Nawrocki wrote:
>> This patch enables the front camera using the internal
>> camera ISP (FIMC-IS).
>>
>> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
>> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
>> ---
>>  arch/arm/boot/dts/exynos4412-trats2.dts |   91
>> +++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+)
>>
>> diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts
>> b/arch/arm/boot/dts/exynos4412-trats2.dts index b9de3b5..e9fb3de 100644
>> --- a/arch/arm/boot/dts/exynos4412-trats2.dts
>> +++ b/arch/arm/boot/dts/exynos4412-trats2.dts
>> @@ -62,6 +62,15 @@
>>  			enable-active-high;
>>  		};
>>
>> +		cam_io_reg: voltage-regulator@3 {
> 
> Same comment here as for patch 7/13. This is not an address of this 
> regulator, so I would rather use -3 prefix.

Yes, and this is the convention already used in this 'regulators' node.
I'll rename that node to 'voltage-regulator-1'.

>> +			compatible = "regulator-fixed";
>> +			regulator-name = "CAM_SENSOR_A";
>> +			regulator-min-microvolt = <2800000>;
>> +			regulator-max-microvolt = <2800000>;
>> +			gpio = <&gpm0 2 0>;
>> +			enable-active-high;
>> +		};
>> +
>>  		/* More to come */
>>  	};
>>
>> @@ -472,4 +481,86 @@
>>  			gpios = <&gpj0 7 0>;
>>  		};
>>  	};
>> +
>> +	camera {
>> +		pinctrl-names = "default";
>> +		pinctrl-0 = <&cam_port_b_clk_active>;
>> +		status = "okay";
>> +
>> +		fimc_0: fimc@11800000 {
>> +			clock-frequency = <160000000>;
>> +			status = "okay";
>> +		};
>> +
>> +		fimc_1: fimc@11810000 {
>> +			clock-frequency = <160000000>;
>> +			status = "okay";
>> +		};
>> +
>> +		fimc_2: fimc@11820000 {
>> +			clock-frequency = <160000000>;
>> +			status = "okay";
>> +		};
>> +
>> +		fimc_3: fimc@11830000 {
>> +			clock-frequency = <160000000>;
>> +			status = "okay";
>> +		};
>> +
>> +		csis_1: csis@11890000 {
>> +			vddcore-supply = <&ldo8_reg>;
>> +			vddio-supply = <&ldo10_reg>;
>> +			clock-frequency = <160000000>;
>> +			#address-cells = <1>;
>> +			#size-cells = <0>;
> 
> Hmm. Couldn't the two #properties above be moved to exynos4.dtsi instead?

Normally the port/endpoint nodes are board specific. But since the binding
requires at least one port and endpoint node, these properties will always
need to be specified. Thus it's a good idea to move them to exynos4.dtsi.

--
Thanks,
Sylwester
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index b9de3b5..e9fb3de 100644
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -62,6 +62,15 @@ 
 			enable-active-high;
 		};
 
+		cam_io_reg: voltage-regulator@3 {
+			compatible = "regulator-fixed";
+			regulator-name = "CAM_SENSOR_A";
+			regulator-min-microvolt = <2800000>;
+			regulator-max-microvolt = <2800000>;
+			gpio = <&gpm0 2 0>;
+			enable-active-high;
+		};
+
 		/* More to come */
 	};
 
@@ -472,4 +481,86 @@ 
 			gpios = <&gpj0 7 0>;
 		};
 	};
+
+	camera {
+		pinctrl-names = "default";
+		pinctrl-0 = <&cam_port_b_clk_active>;
+		status = "okay";
+
+		fimc_0: fimc@11800000 {
+			clock-frequency = <160000000>;
+			status = "okay";
+		};
+
+		fimc_1: fimc@11810000 {
+			clock-frequency = <160000000>;
+			status = "okay";
+		};
+
+		fimc_2: fimc@11820000 {
+			clock-frequency = <160000000>;
+			status = "okay";
+		};
+
+		fimc_3: fimc@11830000 {
+			clock-frequency = <160000000>;
+			status = "okay";
+		};
+
+		csis_1: csis@11890000 {
+			vddcore-supply = <&ldo8_reg>;
+			vddio-supply = <&ldo10_reg>;
+			clock-frequency = <160000000>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "okay";
+
+			/* Camera D (4) MIPI CSI-2 (CSIS1) */
+			port@4 {
+				reg = <4>;
+				csis1_ep: endpoint {
+					remote-endpoint = <&is_s5k6a3_ep>;
+					data-lanes = <1>;
+					samsung,csis-hs-settle = <18>;
+					samsung,csis-wclk;
+				};
+			};
+		};
+
+		fimc_lite_0: fimc-lite@12390000 {
+			status = "okay";
+		};
+
+		fimc_lite_1: fimc-lite@123A0000 {
+			status = "okay";
+		};
+
+		fimc-is@12000000 {
+			pinctrl-0 = <&fimc_is_uart>;
+			pinctrl-names = "default";
+			status = "okay";
+
+			i2c1_isp: i2c-isp@12140000 {
+				pinctrl-0 = <&fimc_is_i2c1>;
+				pinctrl-names = "default";
+
+				s5k6a3@10 {
+					compatible = "samsung,s5k6a3";
+					reg = <0x10>;
+					svdda-supply = <&cam_io_reg>;
+					svddio-supply = <&ldo19_reg>;
+					clock-frequency = <24000000>;
+					samsung,camclk-out = <1>;
+					gpios = <&gpm1 6 0>;
+
+					port {
+						is_s5k6a3_ep: endpoint {
+							remote-endpoint = <&csis1_ep>;
+							data-lanes = <1>;
+						};
+					};
+				};
+			};
+		};
+	};
 };