Skip to content

Commit

Permalink
ARM: shmobile: koelsch: Remove duplicate i2c6 nodes
Browse files Browse the repository at this point in the history
A second i2c6 node was a added by
05e234a187058ee ("ARM: shmobile: koelsch dts: Add VDD MPU regulator for
DVFS"). Merge this into the existing node.

Also shuffle i2c nodes so they are all together.

Cc: Gaku Inami <gaku.inami.xw@bp.renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  • Loading branch information
Simon Horman committed Jun 17, 2014
1 parent aca4ec4 commit 897dfdb
Showing 1 changed file with 15 additions and 19 deletions.
34 changes: 15 additions & 19 deletions arch/arm/boot/dts/r8a7791-koelsch.dts
Original file line number Diff line number Diff line change
Expand Up @@ -215,25 +215,6 @@
clock-frequency = <20000000>;
};

&i2c2 {
pinctrl-0 = <&i2c2_pins>;
pinctrl-names = "default";

status = "okay";
clock-frequency = <400000>;

eeprom@50 {
compatible = "renesas,24c02";
reg = <0x50>;
pagesize = <16>;
};
};

&i2c6 {
status = "okay";
clock-frequency = <100000>;
};

&pfc {
pinctrl-0 = <&du_pins>;
pinctrl-names = "default";
Expand Down Expand Up @@ -414,10 +395,25 @@
};
};

&i2c2 {
pinctrl-0 = <&i2c2_pins>;
pinctrl-names = "default";

status = "okay";
clock-frequency = <400000>;

eeprom@50 {
compatible = "renesas,24c02";
reg = <0x50>;
pagesize = <16>;
};
};

&i2c6 {
pinctrl-names = "default";
pinctrl-0 = <&i2c6_pins>;
status = "okay";
clock-frequency = <100000>;

vdd_dvfs: regulator@68 {
compatible = "diasemi,da9210";
Expand Down

0 comments on commit 897dfdb

Please sign in to comment.