Skip to content

Commit

Permalink
ARM: shmobile: lager: Move i2c[12]_pins nodes to pfc node
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Simon Horman committed Jun 17, 2014
1 parent e1a2c4e commit d90bf60
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions arch/arm/boot/dts/r8a7790-lager.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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";
Expand Down

0 comments on commit d90bf60

Please sign in to comment.