* [PATCH] ARM: shmobile: lager: Remove duplicate i2c3 nodes
@ 2014-06-09 2:09 Simon Horman
2014-06-09 9:32 ` Ben Dooks
0 siblings, 1 reply; 2+ messages in thread
From: Simon Horman @ 2014-06-09 2:09 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
arch/arm/boot/dts/r8a7790-lager.dts | 32 ++++++++++++++------------------
1 file changed, 14 insertions(+), 18 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 295a60e..850dff8 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;
+ };
};
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ARM: shmobile: lager: Remove duplicate i2c3 nodes
2014-06-09 2:09 [PATCH] ARM: shmobile: lager: Remove duplicate i2c3 nodes Simon Horman
@ 2014-06-09 9:32 ` Ben Dooks
0 siblings, 0 replies; 2+ messages in thread
From: Ben Dooks @ 2014-06-09 9:32 UTC (permalink / raw)
To: linux-arm-kernel
On 09/06/14 03:09, Simon Horman wrote:
> 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>
Reviewed-by: Ben Dooks <ben.dooks@codethink.co.uk>
--
Ben Dooks http://www.codethink.co.uk/
Senior Engineer Codethink - Providing Genius
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-06-09 9:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-09 2:09 [PATCH] ARM: shmobile: lager: Remove duplicate i2c3 nodes Simon Horman
2014-06-09 9:32 ` Ben Dooks
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).