ARM: dts: kirkwood: set default pinctrl for I2C1 on 6282

Currently, the only 6282-based Kirkwood boards that use I2C1 are Openblocks
A6/A7. Both use the same default I2C1 pinctrl setting from kirkwood-6282.dtsi.
Move the pinctrl setting to the I2C1 node directly and put a note in front of
the corresponding pinctrl node to overwrite the setting on board level.

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

diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
index b869f48cac02dad1adce9b9c41da0876ab03d91f..4680eec990f0cd3bc92a985b57e954303ee2f0b4 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-6282.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
@@ -68,6 +68,10 @@
                                marvell,function = "sata1";
                        };
 
+                       /*
+                        * Default I2C1 pinctrl setting on mpp36/mpp37,
+                        * overwrite marvell,pins on board level if required.
+                        */
                        pmx_twsi1: pmx-twsi1 {
                                marvell,pins = "mpp36", "mpp37";
                                marvell,function = "twsi1";
@@ -101,6 +105,8 @@
                        interrupts = <32>;
                        clock-frequency = <100000>;
                        clocks = <&gate_clk 7>;
+                       pinctrl-0 = <&pmx_twsi1>;
+                       pinctrl-names = "default";
                        status = "disabled";
                };
 

diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
index 00c2e5a9d8632ab3935229d8a429f6119789d1fc..3dcb5c26b78b9dc60e56efb1ff2fddc8fa8dcb2c 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
@@ -33,8 +33,6 @@
 
                i2c@11100 {
                        status = "okay";
-                       pinctrl-0 = <&pmx_twsi1>;
-                       pinctrl-names = "default";
 
                        s35390a: s35390a@30 {
                                compatible = "s35390a";

diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
index bc07aa5e669847387f604fba1d4409f76938bc48..4e10e92b7822c374b6b562b0503cb3b8dbcf2d66 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
@@ -45,8 +45,6 @@
 
                i2c@11100 {
                        status = "okay";
-                       pinctrl-0 = <&pmx_twsi1>;
-                       pinctrl-names = "default";
 
                        s24c02: s24c02@50 {
                                compatible = "24c02";