aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorSimon Horman <horms+renesas@verge.net.au>2014-06-06 16:11:00 +0900
committerSimon Horman <horms+renesas@verge.net.au>2014-06-17 19:58:23 +0900
commitd90bf60ceaf453b59c8cd5dbfa59538e27255706 (patch)
tree80590599a4cbd474863c6162823e17ba8e1d01ec /arch/arm
parente1a2c4eb132018ce5b988c9ff5ba7a01e5494af5 (diff)
ARM: shmobile: lager: Move i2c[12]_pins nodes to pfc node
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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/r8a7790-lager.dts20
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 3297b86a52b7..b68ff56be67e 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -144,16 +144,6 @@
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 {
@@ -215,6 +205,16 @@
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";