diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2014-06-09 04:09:44 +0200 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2014-06-17 12:58:24 +0200 |
| commit | aca4ec446c646d8794fdbf617d187423a227305d (patch) | |
| tree | 11816e517ef528335de05fbc025dd151f58fff88 /arch/arm/boot/dts/r8a7790-lager.dts | |
| parent | ARM: shmobile: Lager memory map update (diff) | |
| download | linux-aca4ec446c646d8794fdbf617d187423a227305d.tar.xz linux-aca4ec446c646d8794fdbf617d187423a227305d.zip | |
ARM: shmobile: lager: Remove duplicate i2c3 nodes
Due to an error when merging df40f256b18300e1 ("ARM: shmobile:
lager: add i2c1, i2c2 pins") a duplicate i2c3 node.
This patch moves the duplicate and moves to old node to
be closer to the other new i2c nodes.
Cc: Ben Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/boot/dts/r8a7790-lager.dts')
| -rw-r--r-- | arch/arm/boot/dts/r8a7790-lager.dts | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts index b04d25762f1d..0890d475c2c7 100644 --- a/arch/arm/boot/dts/r8a7790-lager.dts +++ b/arch/arm/boot/dts/r8a7790-lager.dts @@ -333,22 +333,6 @@ status = "okay"; }; -&i2c3 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c3_pins>; - status = "okay"; - - vdd_dvfs: regulator@68 { - compatible = "diasemi,da9210"; - reg = <0x68>; - - regulator-min-microvolt = <1000000>; - regulator-max-microvolt = <1000000>; - regulator-boot-on; - regulator-always-on; - }; -}; - &cpu0 { cpu0-supply = <&vdd_dvfs>; }; @@ -369,6 +353,18 @@ pinctrl-names = "default"; }; -&i2c3 { - status = "ok"; +&i2c3 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c3_pins>; + status = "okay"; + + vdd_dvfs: regulator@68 { + compatible = "diasemi,da9210"; + reg = <0x68>; + + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + regulator-boot-on; + regulator-always-on; + }; }; |