ARM: shmobile: lager: Remove duplicate i2c3 nodes
authorSimon Horman <horms+renesas@verge.net.au>
Mon, 9 Jun 2014 02:09:44 +0000 (11:09 +0900)
committerSimon Horman <horms@verge.net.au>
Fri, 5 Dec 2014 00:24:57 +0000 (09:24 +0900)
Due to an error when merging df40f256b18300e1 ("ARM: shmobile:
lager: add i2c1, i2c2 pins") a duplicate i2c3 node.

This patch moves the duplicate and moves to old node to
be closer to the other new i2c nodes.

Cc: Ben Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit aca4ec446c646d8794fdbf617d187423a227305d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
arch/arm/boot/dts/r8a7790-lager.dts

index 295a60e..850dff8 100644 (file)
        status = "okay";
 };
 
-&i2c3 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&i2c3_pins>;
-       status = "okay";
-
-       vdd_dvfs: regulator@68 {
-               compatible = "diasemi,da9210";
-               reg = <0x68>;
-
-               regulator-min-microvolt = <1000000>;
-               regulator-max-microvolt = <1000000>;
-               regulator-boot-on;
-               regulator-always-on;
-       };
-};
-
 &cpu0 {
        cpu0-supply = <&vdd_dvfs>;
 };
        pinctrl-names = "default";
 };
 
-&i2c3  {
-       status = "ok";
+&i2c3 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&i2c3_pins>;
+       status = "okay";
+
+       vdd_dvfs: regulator@68 {
+               compatible = "diasemi,da9210";
+               reg = <0x68>;
+
+               regulator-min-microvolt = <1000000>;
+               regulator-max-microvolt = <1000000>;
+               regulator-boot-on;
+               regulator-always-on;
+       };
 };