diff mbox

ARM: dts: Specify default clocks for Exynos4 camera devices

Message ID 1416500099-19656-1-git-send-email-s.nawrocki@samsung.com (mailing list archive)
State New, archived
Headers show

Commit Message

Sylwester Nawrocki/Kernel \(PLT\) /SRPOL/Staff Engineer/Samsung Electronics Nov. 20, 2014, 4:14 p.m. UTC 
Specify the default mux and divider clocks in device tree
to ensure the FIMC devices on Trats, Trats2, Universal_c210
and Odroid X2/U3 boards are clocked from recommended clock
source and with maximum supported frequency.
For Trats2 also the MIPI-CSIS and the camera sensor clocks
are configured, the 'clock-frequency' property is deprecated
in favour of 'assigned-clock-rates' property.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
---
 arch/arm/boot/dts/exynos4210-trats.dts          |   16 ++++++++++++
 arch/arm/boot/dts/exynos4210-universal_c210.dts |   16 ++++++++++++
 arch/arm/boot/dts/exynos4412-odroid-common.dtsi |   16 ++++++++++++
 arch/arm/boot/dts/exynos4412-trats2.dts         |   32 ++++++++++++++++++++---
 4 files changed, 77 insertions(+), 3 deletions(-)

Comments

kgene@kernel.org Nov. 22, 2014, 2:14 p.m. UTC | #1 
On 11/21/14 01:14, Sylwester Nawrocki wrote:
> Specify the default mux and divider clocks in device tree
> to ensure the FIMC devices on Trats, Trats2, Universal_c210
> and Odroid X2/U3 boards are clocked from recommended clock
> source and with maximum supported frequency.
> For Trats2 also the MIPI-CSIS and the camera sensor clocks
> are configured, the 'clock-frequency' property is deprecated
> in favour of 'assigned-clock-rates' property.
> 
> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> ---
>  arch/arm/boot/dts/exynos4210-trats.dts          |   16 ++++++++++++
>  arch/arm/boot/dts/exynos4210-universal_c210.dts |   16 ++++++++++++
>  arch/arm/boot/dts/exynos4412-odroid-common.dtsi |   16 ++++++++++++
>  arch/arm/boot/dts/exynos4412-trats2.dts         |   32 ++++++++++++++++++++---
>  4 files changed, 77 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts
> index f516da9..7208362 100644
> --- a/arch/arm/boot/dts/exynos4210-trats.dts
> +++ b/arch/arm/boot/dts/exynos4210-trats.dts
> @@ -431,18 +431,34 @@
>  
>  		fimc_0: fimc@11800000 {
>  			status = "okay";
> +			assigned-clocks = <&clock CLK_MOUT_FIMC0>,
> +					<&clock CLK_SCLK_FIMC0>;
> +			assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
> +			assigned-clock-rates = <0>, <160000000>;
>  		};
>  
>  		fimc_1: fimc@11810000 {
>  			status = "okay";
> +			assigned-clocks = <&clock CLK_MOUT_FIMC1>,
> +					<&clock CLK_SCLK_FIMC1>;
> +			assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
> +			assigned-clock-rates = <0>, <160000000>;
>  		};
>  
>  		fimc_2: fimc@11820000 {
>  			status = "okay";
> +			assigned-clocks = <&clock CLK_MOUT_FIMC2>,
> +					<&clock CLK_SCLK_FIMC2>;
> +			assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
> +			assigned-clock-rates = <0>, <160000000>;
>  		};
>  
>  		fimc_3: fimc@11830000 {
>  			status = "okay";
> +			assigned-clocks = <&clock CLK_MOUT_FIMC3>,
> +					<&clock CLK_SCLK_FIMC3>;
> +			assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
> +			assigned-clock-rates = <0>, <160000000>;
>  		};
>  	};
>  };
> diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts
> index d50eb3a..aaf0cae 100644
> --- a/arch/arm/boot/dts/exynos4210-universal_c210.dts
> +++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts
> @@ -473,18 +473,34 @@
>  
>  		fimc_0: fimc@11800000 {
>  			status = "okay";
> +			assigned-clocks = <&clock CLK_MOUT_FIMC0>,
> +					<&clock CLK_SCLK_FIMC0>;
> +			assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
> +			assigned-clock-rates = <0>, <160000000>;
>  		};
>  
>  		fimc_1: fimc@11810000 {
>  			status = "okay";
> +			assigned-clocks = <&clock CLK_MOUT_FIMC1>,
> +					<&clock CLK_SCLK_FIMC1>;
> +			assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
> +			assigned-clock-rates = <0>, <160000000>;
>  		};
>  
>  		fimc_2: fimc@11820000 {
>  			status = "okay";
> +			assigned-clocks = <&clock CLK_MOUT_FIMC2>,
> +					<&clock CLK_SCLK_FIMC2>;
> +			assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
> +			assigned-clock-rates = <0>, <160000000>;
>  		};
>  
>  		fimc_3: fimc@11830000 {
>  			status = "okay";
> +			assigned-clocks = <&clock CLK_MOUT_FIMC3>,
> +					<&clock CLK_SCLK_FIMC3>;
> +			assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
> +			assigned-clock-rates = <0>, <160000000>;
>  		};
>  	};
>  };
> diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
> index c697ff0..adf1331 100644
> --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
> +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
> @@ -82,18 +82,34 @@
>  
>  		fimc_0: fimc@11800000 {
>  			status = "okay";
> +			assigned-clocks = <&clock CLK_MOUT_FIMC0>,
> +					<&clock CLK_SCLK_FIMC0>;
> +			assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
> +			assigned-clock-rates = <0>, <176000000>;
>  		};
>  
>  		fimc_1: fimc@11810000 {
>  			status = "okay";
> +			assigned-clocks = <&clock CLK_MOUT_FIMC1>,
> +					<&clock CLK_SCLK_FIMC1>;
> +			assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
> +			assigned-clock-rates = <0>, <176000000>;
>  		};
>  
>  		fimc_2: fimc@11820000 {
>  			status = "okay";
> +			assigned-clocks = <&clock CLK_MOUT_FIMC2>,
> +					<&clock CLK_SCLK_FIMC2>;
> +			assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
> +			assigned-clock-rates = <0>, <176000000>;
>  		};
>  
>  		fimc_3: fimc@11830000 {
>  			status = "okay";
> +			assigned-clocks = <&clock CLK_MOUT_FIMC3>,
> +					<&clock CLK_SCLK_FIMC3>;
> +			assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
> +			assigned-clock-rates = <0>, <176000000>;
>  		};
>  	};
>  
> diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
> index 8ee20bd..08bc948 100644
> --- a/arch/arm/boot/dts/exynos4412-trats2.dts
> +++ b/arch/arm/boot/dts/exynos4412-trats2.dts
> @@ -701,28 +701,51 @@
>  		pinctrl-0 = <&cam_port_a_clk_active &cam_port_b_clk_active>;
>  		pinctrl-names = "default";
>  		status = "okay";
> +		assigned-clocks = <&clock CLK_MOUT_CAM0>,
> +				  <&clock CLK_MOUT_CAM1>;
> +		assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>,
> +				         <&clock CLK_MOUT_MPLL_USER_T>;
>  
>  		fimc_0: fimc@11800000 {
>  			status = "okay";
> +			assigned-clocks = <&clock CLK_MOUT_FIMC0>,
> +					<&clock CLK_SCLK_FIMC0>;
> +			assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
> +			assigned-clock-rates = <0>, <176000000>;
>  		};
>  
>  		fimc_1: fimc@11810000 {
>  			status = "okay";
> +			assigned-clocks = <&clock CLK_MOUT_FIMC1>,
> +					<&clock CLK_SCLK_FIMC1>;
> +			assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
> +			assigned-clock-rates = <0>, <176000000>;
>  		};
>  
>  		fimc_2: fimc@11820000 {
>  			status = "okay";
> +			assigned-clocks = <&clock CLK_MOUT_FIMC2>,
> +					<&clock CLK_SCLK_FIMC2>;
> +			assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
> +			assigned-clock-rates = <0>, <176000000>;
>  		};
>  
>  		fimc_3: fimc@11830000 {
>  			status = "okay";
> +			assigned-clocks = <&clock CLK_MOUT_FIMC3>,
> +					<&clock CLK_SCLK_FIMC3>;
> +			assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
> +			assigned-clock-rates = <0>, <176000000>;
>  		};
>  
>  		csis_0: csis@11880000 {
>  			status = "okay";
>  			vddcore-supply = <&ldo8_reg>;
>  			vddio-supply = <&ldo10_reg>;
> -			clock-frequency = <176000000>;
> +			assigned-clocks = <&clock CLK_MOUT_CSIS0>,
> +					<&clock CLK_SCLK_CSIS0>;
> +			assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
> +			assigned-clock-rates = <0>, <176000000>;
>  
>  			/* Camera C (3) MIPI CSI-2 (CSIS0) */
>  			port@3 {
> @@ -736,10 +759,13 @@
>  		};
>  
>  		csis_1: csis@11890000 {
> +			status = "okay";
>  			vddcore-supply = <&ldo8_reg>;
>  			vddio-supply = <&ldo10_reg>;
> -			clock-frequency = <160000000>;
> -			status = "okay";
> +			assigned-clocks = <&clock CLK_MOUT_CSIS1>,
> +					<&clock CLK_SCLK_CSIS1>;
> +			assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
> +			assigned-clock-rates = <0>, <176000000>;
>  
>  			/* Camera D (4) MIPI CSI-2 (CSIS1) */
>  			port@4 {

Applied, thanks.

- Kukjin
diff mbox

Patch

diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts
index f516da9..7208362 100644
--- a/arch/arm/boot/dts/exynos4210-trats.dts
+++ b/arch/arm/boot/dts/exynos4210-trats.dts
@@ -431,18 +431,34 @@ 
 
 		fimc_0: fimc@11800000 {
 			status = "okay";
+			assigned-clocks = <&clock CLK_MOUT_FIMC0>,
+					<&clock CLK_SCLK_FIMC0>;
+			assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
+			assigned-clock-rates = <0>, <160000000>;
 		};
 
 		fimc_1: fimc@11810000 {
 			status = "okay";
+			assigned-clocks = <&clock CLK_MOUT_FIMC1>,
+					<&clock CLK_SCLK_FIMC1>;
+			assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
+			assigned-clock-rates = <0>, <160000000>;
 		};
 
 		fimc_2: fimc@11820000 {
 			status = "okay";
+			assigned-clocks = <&clock CLK_MOUT_FIMC2>,
+					<&clock CLK_SCLK_FIMC2>;
+			assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
+			assigned-clock-rates = <0>, <160000000>;
 		};
 
 		fimc_3: fimc@11830000 {
 			status = "okay";
+			assigned-clocks = <&clock CLK_MOUT_FIMC3>,
+					<&clock CLK_SCLK_FIMC3>;
+			assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
+			assigned-clock-rates = <0>, <160000000>;
 		};
 	};
 };
diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts
index d50eb3a..aaf0cae 100644
--- a/arch/arm/boot/dts/exynos4210-universal_c210.dts
+++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts
@@ -473,18 +473,34 @@ 
 
 		fimc_0: fimc@11800000 {
 			status = "okay";
+			assigned-clocks = <&clock CLK_MOUT_FIMC0>,
+					<&clock CLK_SCLK_FIMC0>;
+			assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
+			assigned-clock-rates = <0>, <160000000>;
 		};
 
 		fimc_1: fimc@11810000 {
 			status = "okay";
+			assigned-clocks = <&clock CLK_MOUT_FIMC1>,
+					<&clock CLK_SCLK_FIMC1>;
+			assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
+			assigned-clock-rates = <0>, <160000000>;
 		};
 
 		fimc_2: fimc@11820000 {
 			status = "okay";
+			assigned-clocks = <&clock CLK_MOUT_FIMC2>,
+					<&clock CLK_SCLK_FIMC2>;
+			assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
+			assigned-clock-rates = <0>, <160000000>;
 		};
 
 		fimc_3: fimc@11830000 {
 			status = "okay";
+			assigned-clocks = <&clock CLK_MOUT_FIMC3>,
+					<&clock CLK_SCLK_FIMC3>;
+			assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
+			assigned-clock-rates = <0>, <160000000>;
 		};
 	};
 };
diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index c697ff0..adf1331 100644
--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -82,18 +82,34 @@ 
 
 		fimc_0: fimc@11800000 {
 			status = "okay";
+			assigned-clocks = <&clock CLK_MOUT_FIMC0>,
+					<&clock CLK_SCLK_FIMC0>;
+			assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
+			assigned-clock-rates = <0>, <176000000>;
 		};
 
 		fimc_1: fimc@11810000 {
 			status = "okay";
+			assigned-clocks = <&clock CLK_MOUT_FIMC1>,
+					<&clock CLK_SCLK_FIMC1>;
+			assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
+			assigned-clock-rates = <0>, <176000000>;
 		};
 
 		fimc_2: fimc@11820000 {
 			status = "okay";
+			assigned-clocks = <&clock CLK_MOUT_FIMC2>,
+					<&clock CLK_SCLK_FIMC2>;
+			assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
+			assigned-clock-rates = <0>, <176000000>;
 		};
 
 		fimc_3: fimc@11830000 {
 			status = "okay";
+			assigned-clocks = <&clock CLK_MOUT_FIMC3>,
+					<&clock CLK_SCLK_FIMC3>;
+			assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
+			assigned-clock-rates = <0>, <176000000>;
 		};
 	};
 
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index 8ee20bd..08bc948 100644
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -701,28 +701,51 @@ 
 		pinctrl-0 = <&cam_port_a_clk_active &cam_port_b_clk_active>;
 		pinctrl-names = "default";
 		status = "okay";
+		assigned-clocks = <&clock CLK_MOUT_CAM0>,
+				  <&clock CLK_MOUT_CAM1>;
+		assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>,
+				         <&clock CLK_MOUT_MPLL_USER_T>;
 
 		fimc_0: fimc@11800000 {
 			status = "okay";
+			assigned-clocks = <&clock CLK_MOUT_FIMC0>,
+					<&clock CLK_SCLK_FIMC0>;
+			assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
+			assigned-clock-rates = <0>, <176000000>;
 		};
 
 		fimc_1: fimc@11810000 {
 			status = "okay";
+			assigned-clocks = <&clock CLK_MOUT_FIMC1>,
+					<&clock CLK_SCLK_FIMC1>;
+			assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
+			assigned-clock-rates = <0>, <176000000>;
 		};
 
 		fimc_2: fimc@11820000 {
 			status = "okay";
+			assigned-clocks = <&clock CLK_MOUT_FIMC2>,
+					<&clock CLK_SCLK_FIMC2>;
+			assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
+			assigned-clock-rates = <0>, <176000000>;
 		};
 
 		fimc_3: fimc@11830000 {
 			status = "okay";
+			assigned-clocks = <&clock CLK_MOUT_FIMC3>,
+					<&clock CLK_SCLK_FIMC3>;
+			assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
+			assigned-clock-rates = <0>, <176000000>;
 		};
 
 		csis_0: csis@11880000 {
 			status = "okay";
 			vddcore-supply = <&ldo8_reg>;
 			vddio-supply = <&ldo10_reg>;
-			clock-frequency = <176000000>;
+			assigned-clocks = <&clock CLK_MOUT_CSIS0>,
+					<&clock CLK_SCLK_CSIS0>;
+			assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
+			assigned-clock-rates = <0>, <176000000>;
 
 			/* Camera C (3) MIPI CSI-2 (CSIS0) */
 			port@3 {
@@ -736,10 +759,13 @@ 
 		};
 
 		csis_1: csis@11890000 {
+			status = "okay";
 			vddcore-supply = <&ldo8_reg>;
 			vddio-supply = <&ldo10_reg>;
-			clock-frequency = <160000000>;
-			status = "okay";
+			assigned-clocks = <&clock CLK_MOUT_CSIS1>,
+					<&clock CLK_SCLK_CSIS1>;
+			assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
+			assigned-clock-rates = <0>, <176000000>;
 
 			/* Camera D (4) MIPI CSI-2 (CSIS1) */
 			port@4 {