mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-27 12:57:53 +00:00
Code Issues Releases Wiki Activity

ARM: shmobile: lager: Move i2c[12]_pins nodes to pfc node

Browse source 
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>
This commit is contained in:
Simon Horman 2014-06-06 16:11:00 +09:00
parent e1a2c4eb13
commit d90bf60cea
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
arch/arm/boot/dts/r8a7790-lager.dts
View file

@ -144,16 +144,6 @@ vccq_sdhi2: regulator@4 {
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 @@ msiof1_pins: spi2 {
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";