aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/exynos4.dtsi6
-rw-r--r--arch/arm/boot/dts/exynos4412-trats2.dts5
2 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index a2302b55e9e5..58ff8e28c74f 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -129,12 +129,10 @@
129 status = "disabled"; 129 status = "disabled";
130 #address-cells = <1>; 130 #address-cells = <1>;
131 #size-cells = <1>; 131 #size-cells = <1>;
132 #clock-cells = <1>;
133 clock-output-names = "cam_a_clkout", "cam_b_clkout";
132 ranges; 134 ranges;
133 135
134 clock_cam: clock-controller {
135 #clock-cells = <1>;
136 };
137
138 fimc_0: fimc@11800000 { 136 fimc_0: fimc@11800000 {
139 compatible = "samsung,exynos4210-fimc"; 137 compatible = "samsung,exynos4210-fimc";
140 reg = <0x11800000 0x1000>; 138 reg = <0x11800000 0x1000>;
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index a61fa7e3168b..cf0e11037729 100644
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -647,10 +647,11 @@
647 reg = <0x10>; 647 reg = <0x10>;
648 svdda-supply = <&cam_io_reg>; 648 svdda-supply = <&cam_io_reg>;
649 svddio-supply = <&ldo19_reg>; 649 svddio-supply = <&ldo19_reg>;
650 afvdd-supply = <&ldo19_reg>;
650 clock-frequency = <24000000>; 651 clock-frequency = <24000000>;
651 /* CAM_B_CLKOUT */ 652 /* CAM_B_CLKOUT */
652 clocks = <&clock_cam 1>; 653 clocks = <&camera 1>;
653 clock-names = "mclk"; 654 clock-names = "extclk";
654 samsung,camclk-out = <1>; 655 samsung,camclk-out = <1>;
655 gpios = <&gpm1 6 0>; 656 gpios = <&gpm1 6 0>;
656 657