Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: kirkwood: set default pinctrl for I2C0

There is only one valid pinctrl setting for I2C0 on Kirkwood. Now that we
have the setting in the common SoC pinctrl, move it to the I2C0 controller
node directly and remove it from the individual boards.

While at it, also fix up status = "okay" to "ok" on one board's I2C0 node.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/1398862602-29595-13-git-send-email-sebastian.hesselbarth@gmail.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

authored by

Sebastian Hesselbarth and committed by
Jason Cooper
ce55b1f4 cbfaea96

+3 -11
-2
arch/arm/boot/dts/kirkwood-laplug.dts
··· 42 42 }; 43 43 44 44 i2c@11000 { 45 - pinctrl-0 = <&pmx_twsi0>; 46 - pinctrl-names = "default"; 47 45 status = "okay"; 48 46 49 47 eeprom@50 {
-2
arch/arm/boot/dts/kirkwood-ns2-common.dtsi
··· 42 42 }; 43 43 44 44 i2c@11000 { 45 - pinctrl-0 = <&pmx_twsi0>; 46 - pinctrl-names = "default"; 47 45 status = "okay"; 48 46 49 47 eeprom@50 {
-2
arch/arm/boot/dts/kirkwood-synology.dtsi
··· 257 257 i2c@11000 { 258 258 status = "okay"; 259 259 clock-frequency = <400000>; 260 - pinctrl-0 = <&pmx_twsi0>; 261 - pinctrl-names = "default"; 262 260 263 261 rs5c372: rs5c372@32 { 264 262 status = "disabled";
+1 -3
arch/arm/boot/dts/kirkwood-topkick.dts
··· 95 95 }; 96 96 97 97 i2c@11000 { 98 - status = "ok"; 99 - pinctrl-0 = <&pmx_twsi0>; 100 - pinctrl-names = "default"; 98 + status = "okay"; 101 99 }; 102 100 103 101 mvsdio@90000 {
-2
arch/arm/boot/dts/kirkwood-ts219.dtsi
··· 26 26 i2c@11000 { 27 27 status = "okay"; 28 28 clock-frequency = <400000>; 29 - pinctrl-0 = <&pmx_twsi0>; 30 - pinctrl-names = "default"; 31 29 32 30 s35390a: s35390a@30 { 33 31 compatible = "s35390a";
+2
arch/arm/boot/dts/kirkwood.dtsi
··· 170 170 interrupts = <29>; 171 171 clock-frequency = <100000>; 172 172 clocks = <&gate_clk 7>; 173 + pinctrl-0 = <&pmx_twsi0>; 174 + pinctrl-names = "default"; 173 175 status = "disabled"; 174 176 }; 175 177