Skip to content

Commit

Permalink
ARM: shmobile: lager: Remove duplicate i2c3 nodes
Browse files Browse the repository at this point in the history
Due to an error when merging df40f25 ("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 <[email protected]>
Signed-off-by: Simon Horman <[email protected]>
  • Loading branch information
horms committed Jun 17, 2014
1 parent 7b16c61 commit aca4ec4
Showing 1 changed file with 14 additions and 18 deletions.
32 changes: 14 additions & 18 deletions arch/arm/boot/dts/r8a7790-lager.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
};
Expand All @@ -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;
};
};

0 comments on commit aca4ec4

Please sign in to comment.