ARM: shmobile: lager: Move i2c[12]_pins nodes to pfc node
authorSimon Horman <horms+renesas@verge.net.au>
Fri, 6 Jun 2014 07:11:00 +0000 (16:11 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Tue, 17 Jun 2014 10:58:23 +0000 (19:58 +0900)
Due to an error when resolving conflicts df40f256b18300e1 ("ARM: shmobile:
lager: add i2c1, i2c2 pins") added the i2c[12]_pins nodes to the wrong
node.

This patch moves them to their correct location in the pfc node.

Cc: Ben Dooks <ben.dooks@codethink.co.uk>
Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
arch/arm/boot/dts/r8a7790-lager.dts

index 3297b86a52b75f70237b9c8e92919672d9e914fd..b68ff56be67edc7c9691526be7641ea6cac81c87 100644 (file)
                states = <3300000 1
                          1800000 0>;
        };
-
-       i2c1_pins: i2c1 {
-               renesas,groups = "i2c1";
-               renesas,function = "i2c1";
-       };
-
-       i2c2_pins: i2c2 {
-               renesas,groups = "i2c2";
-               renesas,function = "i2c2";
-       };
 };
 
 &extal_clk {
                renesas,function = "msiof1";
        };
 
+       i2c1_pins: i2c1 {
+               renesas,groups = "i2c1";
+               renesas,function = "i2c1";
+       };
+
+       i2c2_pins: i2c2 {
+               renesas,groups = "i2c2";
+               renesas,function = "i2c2";
+       };
+
        i2c3_pins: i2c3 {
                renesas,groups = "i2c3";
                renesas,function = "i2c3";