ARM: dts: Update camera nodes for exynos4 and exynos4412-trats2

Remove unused /camera/clock-controller node and add required clock
properties to the camera node. This is required for a clock provider
that will be referenced by image sensor devices.
Also add required clock related changes to s5k6a3 device node and
afvdd regulator supply.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

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 @@
                 status = "disabled";
                 #address-cells = <1>;
                 #size-cells = <1>;
+                #clock-cells = <1>;
+                clock-output-names = "cam_a_clkout", "cam_b_clkout";
                 ranges;
 
-                clock_cam: clock-controller {
-                         #clock-cells = <1>;
-                };
-
                 fimc_0: fimc@11800000 {
                         compatible = "samsung,exynos4210-fimc";
                         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 @@
                                         reg = <0x10>;
                                         svdda-supply = <&cam_io_reg>;
                                         svddio-supply = <&ldo19_reg>;
+                                        afvdd-supply = <&ldo19_reg>;
                                         clock-frequency = <24000000>;
                                         /* CAM_B_CLKOUT */
-                                        clocks = <&clock_cam 1>;
-                                        clock-names = "mclk";
+                                        clocks = <&camera 1>;
+                                        clock-names = "extclk";
                                         samsung,camclk-out = <1>;
                                         gpios = <&gpm1 6 0>;