p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Simon Horman 2014-06-09 11:09:44 +09:00
parent 7b16c61a86
commit aca4ec446c
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
arch/arm/boot/dts/r8a7790-lager.dts
View File

@ -333,22 +333,6 @@ &sdhi2 {
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 @@ &i2c2 {
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;
};
};