aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylwester Nawrocki <s.nawrocki@samsung.com>2014-11-22 09:13:03 -0500
committerKukjin Kim <kgene.kim@samsung.com>2014-11-22 09:13:03 -0500
commit0357a4438d531ef3cf529e80ffcd208eb8e35f55 (patch)
treec18b74dcf9884572517c7ca186bcab103d33cf23
parent432047f947bac093a4b322765fc2ce365353bc61 (diff)
ARM: dts: Specify default clocks for Exynos4 camera devices
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> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r--arch/arm/boot/dts/exynos4210-trats.dts16
-rw-r--r--arch/arm/boot/dts/exynos4210-universal_c210.dts16
-rw-r--r--arch/arm/boot/dts/exynos4412-odroid-common.dtsi16
-rw-r--r--arch/arm/boot/dts/exynos4412-trats2.dts32
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 f516da9e8b3a..720836205546 100644
--- a/arch/arm/boot/dts/exynos4210-trats.dts
+++ b/arch/arm/boot/dts/exynos4210-trats.dts
@@ -431,18 +431,34 @@
431 431
432 fimc_0: fimc@11800000 { 432 fimc_0: fimc@11800000 {
433 status = "okay"; 433 status = "okay";
434 assigned-clocks = <&clock CLK_MOUT_FIMC0>,
435 <&clock CLK_SCLK_FIMC0>;
436 assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
437 assigned-clock-rates = <0>, <160000000>;
434 }; 438 };
435 439
436 fimc_1: fimc@11810000 { 440 fimc_1: fimc@11810000 {
437 status = "okay"; 441 status = "okay";
442 assigned-clocks = <&clock CLK_MOUT_FIMC1>,
443 <&clock CLK_SCLK_FIMC1>;
444 assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
445 assigned-clock-rates = <0>, <160000000>;
438 }; 446 };
439 447
440 fimc_2: fimc@11820000 { 448 fimc_2: fimc@11820000 {
441 status = "okay"; 449 status = "okay";
450 assigned-clocks = <&clock CLK_MOUT_FIMC2>,
451 <&clock CLK_SCLK_FIMC2>;
452 assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
453 assigned-clock-rates = <0>, <160000000>;
442 }; 454 };
443 455
444 fimc_3: fimc@11830000 { 456 fimc_3: fimc@11830000 {
445 status = "okay"; 457 status = "okay";
458 assigned-clocks = <&clock CLK_MOUT_FIMC3>,
459 <&clock CLK_SCLK_FIMC3>;
460 assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
461 assigned-clock-rates = <0>, <160000000>;
446 }; 462 };
447 }; 463 };
448}; 464};
diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts
index d50eb3aa708e..aaf0cae4f5e8 100644
--- a/arch/arm/boot/dts/exynos4210-universal_c210.dts
+++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts
@@ -473,18 +473,34 @@
473 473
474 fimc_0: fimc@11800000 { 474 fimc_0: fimc@11800000 {
475 status = "okay"; 475 status = "okay";
476 assigned-clocks = <&clock CLK_MOUT_FIMC0>,
477 <&clock CLK_SCLK_FIMC0>;
478 assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
479 assigned-clock-rates = <0>, <160000000>;
476 }; 480 };
477 481
478 fimc_1: fimc@11810000 { 482 fimc_1: fimc@11810000 {
479 status = "okay"; 483 status = "okay";
484 assigned-clocks = <&clock CLK_MOUT_FIMC1>,
485 <&clock CLK_SCLK_FIMC1>;
486 assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
487 assigned-clock-rates = <0>, <160000000>;
480 }; 488 };
481 489
482 fimc_2: fimc@11820000 { 490 fimc_2: fimc@11820000 {
483 status = "okay"; 491 status = "okay";
492 assigned-clocks = <&clock CLK_MOUT_FIMC2>,
493 <&clock CLK_SCLK_FIMC2>;
494 assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
495 assigned-clock-rates = <0>, <160000000>;
484 }; 496 };
485 497
486 fimc_3: fimc@11830000 { 498 fimc_3: fimc@11830000 {
487 status = "okay"; 499 status = "okay";
500 assigned-clocks = <&clock CLK_MOUT_FIMC3>,
501 <&clock CLK_SCLK_FIMC3>;
502 assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
503 assigned-clock-rates = <0>, <160000000>;
488 }; 504 };
489 }; 505 };
490}; 506};
diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index c697ff01ae8d..adf13311cf91 100644
--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -82,18 +82,34 @@
82 82
83 fimc_0: fimc@11800000 { 83 fimc_0: fimc@11800000 {
84 status = "okay"; 84 status = "okay";
85 assigned-clocks = <&clock CLK_MOUT_FIMC0>,
86 <&clock CLK_SCLK_FIMC0>;
87 assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
88 assigned-clock-rates = <0>, <176000000>;
85 }; 89 };
86 90
87 fimc_1: fimc@11810000 { 91 fimc_1: fimc@11810000 {
88 status = "okay"; 92 status = "okay";
93 assigned-clocks = <&clock CLK_MOUT_FIMC1>,
94 <&clock CLK_SCLK_FIMC1>;
95 assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
96 assigned-clock-rates = <0>, <176000000>;
89 }; 97 };
90 98
91 fimc_2: fimc@11820000 { 99 fimc_2: fimc@11820000 {
92 status = "okay"; 100 status = "okay";
101 assigned-clocks = <&clock CLK_MOUT_FIMC2>,
102 <&clock CLK_SCLK_FIMC2>;
103 assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
104 assigned-clock-rates = <0>, <176000000>;
93 }; 105 };
94 106
95 fimc_3: fimc@11830000 { 107 fimc_3: fimc@11830000 {
96 status = "okay"; 108 status = "okay";
109 assigned-clocks = <&clock CLK_MOUT_FIMC3>,
110 <&clock CLK_SCLK_FIMC3>;
111 assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
112 assigned-clock-rates = <0>, <176000000>;
97 }; 113 };
98 }; 114 };
99 115
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index 4c6e58a6b8cb..b86120db84da 100644
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -706,28 +706,51 @@
706 pinctrl-0 = <&cam_port_a_clk_active &cam_port_b_clk_active>; 706 pinctrl-0 = <&cam_port_a_clk_active &cam_port_b_clk_active>;
707 pinctrl-names = "default"; 707 pinctrl-names = "default";
708 status = "okay"; 708 status = "okay";
709 assigned-clocks = <&clock CLK_MOUT_CAM0>,
710 <&clock CLK_MOUT_CAM1>;
711 assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>,
712 <&clock CLK_MOUT_MPLL_USER_T>;
709 713
710 fimc_0: fimc@11800000 { 714 fimc_0: fimc@11800000 {
711 status = "okay"; 715 status = "okay";
716 assigned-clocks = <&clock CLK_MOUT_FIMC0>,
717 <&clock CLK_SCLK_FIMC0>;
718 assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
719 assigned-clock-rates = <0>, <176000000>;
712 }; 720 };
713 721
714 fimc_1: fimc@11810000 { 722 fimc_1: fimc@11810000 {
715 status = "okay"; 723 status = "okay";
724 assigned-clocks = <&clock CLK_MOUT_FIMC1>,
725 <&clock CLK_SCLK_FIMC1>;
726 assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
727 assigned-clock-rates = <0>, <176000000>;
716 }; 728 };
717 729
718 fimc_2: fimc@11820000 { 730 fimc_2: fimc@11820000 {
719 status = "okay"; 731 status = "okay";
732 assigned-clocks = <&clock CLK_MOUT_FIMC2>,
733 <&clock CLK_SCLK_FIMC2>;
734 assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
735 assigned-clock-rates = <0>, <176000000>;
720 }; 736 };
721 737
722 fimc_3: fimc@11830000 { 738 fimc_3: fimc@11830000 {
723 status = "okay"; 739 status = "okay";
740 assigned-clocks = <&clock CLK_MOUT_FIMC3>,
741 <&clock CLK_SCLK_FIMC3>;
742 assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
743 assigned-clock-rates = <0>, <176000000>;
724 }; 744 };
725 745
726 csis_0: csis@11880000 { 746 csis_0: csis@11880000 {
727 status = "okay"; 747 status = "okay";
728 vddcore-supply = <&ldo8_reg>; 748 vddcore-supply = <&ldo8_reg>;
729 vddio-supply = <&ldo10_reg>; 749 vddio-supply = <&ldo10_reg>;
730 clock-frequency = <176000000>; 750 assigned-clocks = <&clock CLK_MOUT_CSIS0>,
751 <&clock CLK_SCLK_CSIS0>;
752 assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
753 assigned-clock-rates = <0>, <176000000>;
731 754
732 /* Camera C (3) MIPI CSI-2 (CSIS0) */ 755 /* Camera C (3) MIPI CSI-2 (CSIS0) */
733 port@3 { 756 port@3 {
@@ -741,10 +764,13 @@
741 }; 764 };
742 765
743 csis_1: csis@11890000 { 766 csis_1: csis@11890000 {
767 status = "okay";
744 vddcore-supply = <&ldo8_reg>; 768 vddcore-supply = <&ldo8_reg>;
745 vddio-supply = <&ldo10_reg>; 769 vddio-supply = <&ldo10_reg>;
746 clock-frequency = <160000000>; 770 assigned-clocks = <&clock CLK_MOUT_CSIS1>,
747 status = "okay"; 771 <&clock CLK_SCLK_CSIS1>;
772 assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
773 assigned-clock-rates = <0>, <176000000>;
748 774
749 /* Camera D (4) MIPI CSI-2 (CSIS1) */ 775 /* Camera D (4) MIPI CSI-2 (CSIS1) */
750 port@4 { 776 port@4 {