| From 58710ff548ad5c07b53bbfee0115d998c92adfb4 Mon Sep 17 00:00:00 2001 |
| From: Simon Horman <horms+renesas@verge.net.au> |
| Date: Fri, 6 Jun 2014 16:11:00 +0900 |
| Subject: 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> |
| (cherry picked from commit d90bf60ceaf453b59c8cd5dbfa59538e27255706) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/boot/dts/r8a7790-lager.dts | 20 ++++++++++---------- |
| 1 file changed, 10 insertions(+), 10 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts |
| index c72372484548..85a5107c9396 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"; |
| -- |
| 2.1.2 |
| |
