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>

diff --git a/arch/arm/boot/dts/kirkwood-laplug.dts b/arch/arm/boot/dts/kirkwood-laplug.dts
index 642755acf2fef3ac6a257bb83853f19abccf938d..92c2d3c165467e6d19c7b777a16bc4056bf6e6a5 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-laplug.dts
+++ b/arch/arm/boot/dts/kirkwood-laplug.dts
@@ -42,8 +42,6 @@ serial@12000 {
                };
 
                i2c@11000 {
-                       pinctrl-0 = <&pmx_twsi0>;
-                       pinctrl-names = "default";
                        status = "okay";
 
                        eeprom@50 {

diff --git a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
index c10ff0f5290b0725047fddb90f14ddfafb91ef13..e6863ed87d76ba5ffac2702b275684739b5fd912 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
@@ -42,8 +42,6 @@ partition@0 {
                };
 
                i2c@11000 {
-                       pinctrl-0 = <&pmx_twsi0>;
-                       pinctrl-names = "default";
                        status = "okay";
 
                        eeprom@50 {

diff --git a/arch/arm/boot/dts/kirkwood-synology.dtsi b/arch/arm/boot/dts/kirkwood-synology.dtsi
index a21419f78beed0876e84b714944a2a402046199a..811e0971fc588a2cc9f59ddbd8f64d51e38acb14 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-synology.dtsi
+++ b/arch/arm/boot/dts/kirkwood-synology.dtsi
@@ -257,8 +257,6 @@ partition@003f0000 {
                i2c@11000 {
                        status = "okay";
                        clock-frequency = <400000>;
-                       pinctrl-0 = <&pmx_twsi0>;
-                       pinctrl-names = "default";
 
                        rs5c372: rs5c372@32 {
                                status = "disabled";

diff --git a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts
index a4dd47acf98aab6406e4fbb17cd050f97e700151..f5c8c0dd41dc82f7e7671f7713182186b250ec8e 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-topkick.dts
+++ b/arch/arm/boot/dts/kirkwood-topkick.dts
@@ -95,9 +95,7 @@ sata@80000 {
                };
 
                i2c@11000 {
-                       status = "ok";
-                       pinctrl-0 = <&pmx_twsi0>;
-                       pinctrl-names = "default";
+                       status = "okay";
                };
 
                mvsdio@90000 {

diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
index 539a2f80a3adc8f75939ccdcd115fa981b5887be..df7f15276575ada26c356e224bb223c63e0b42f8 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@ -26,8 +26,6 @@ ocp@f1000000 {
                i2c@11000 {
                        status = "okay";
                        clock-frequency = <400000>;
-                       pinctrl-0 = <&pmx_twsi0>;
-                       pinctrl-names = "default";
 
                        s35390a: s35390a@30 {
                                compatible = "s35390a";

diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index caafcde88f67a3942958da5d8724cfd9db22ef56..0399a096e324da5ac1ac1ecf7277c192de307ec5 100644 (file)
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -170,6 +170,8 @@ i2c0: i2c@11000 {
                        interrupts = <29>;
                        clock-frequency = <100000>;
                        clocks = <&gate_clk 7>;
+                       pinctrl-0 = <&pmx_twsi0>;
+                       pinctrl-names = "default";
                        status = "disabled";
                };