ARM: dts: exynos: Use labels instead of full paths in exynos4412-trats2

Extend camera and i2c1_isp nodes by labels, not by full path in Exynos
4412 Trats2.  This avoids error-prone redefinition of nodes.

Signed-off-by: Maciej Purski <m.purski@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index 7da66003a3e3c3c12ab4e2aa0455d61d0a6696e7..95b638fd281f6ff26fcbfa9be1fb869abcc1a021 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -285,17 +285,6 @@
                };
        };
 
-       camera: camera {
-               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_XUSBXTI>,
-                                        <&clock CLK_XUSBXTI>;
-
-
-       };
 
        wlan_pwrseq: sdhci3-pwrseq {
                compatible = "mmc-pwrseq-simple";
@@ -400,6 +389,16 @@
        status = "okay";
 };
 
+&camera {
+       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_XUSBXTI>,
+                                <&clock CLK_XUSBXTI>;
+};
+
 &cpu0 {
        cpu0-supply = <&buck2_reg>;
 };
@@ -524,32 +523,6 @@
        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>;
-                       afvdd-supply = <&ldo19_reg>;
-                       clock-frequency = <24000000>;
-                       /* CAM_B_CLKOUT */
-                       clocks = <&camera 1>;
-                       clock-names = "extclk";
-                       samsung,camclk-out = <1>;
-                       gpios = <&gpm1 6 GPIO_ACTIVE_HIGH>;
-
-                       port {
-                               is_s5k6a3_ep: endpoint {
-                                       remote-endpoint = <&csis1_ep>;
-                                       data-lanes = <1>;
-                               };
-                       };
-               };
-       };
 };
 
 &fimc_lite_0 {
@@ -626,6 +599,32 @@
        };
 };
 
+&i2c1_isp {
+       pinctrl-0 = <&fimc_is_i2c1>;
+       pinctrl-names = "default";
+
+       s5k6a3@10 {
+               compatible = "samsung,s5k6a3";
+               reg = <0x10>;
+               svdda-supply = <&cam_io_reg>;
+               svddio-supply = <&ldo19_reg>;
+               afvdd-supply = <&ldo19_reg>;
+               clock-frequency = <24000000>;
+               /* CAM_B_CLKOUT */
+               clocks = <&camera 1>;
+               clock-names = "extclk";
+               samsung,camclk-out = <1>;
+               gpios = <&gpm1 6 GPIO_ACTIVE_HIGH>;
+
+               port {
+                       is_s5k6a3_ep: endpoint {
+                               remote-endpoint = <&csis1_ep>;
+                               data-lanes = <1>;
+                       };
+               };
+       };
+};
+
 &i2c_3 {
        samsung,i2c-sda-delay = <100>;
        samsung,i2c-slave-addr = <0x10>;