ath79: fix pinmux for ar933x devices

Properly disable the SoC's internal Switch LEDs on the pinmux.
Devices that previously called ath79_gpio_function_disable for
the switch LEDs, just need to reference switch_led_pins in the
pinctrl-0 property of the gpio-leds node.

Signed-off-by: Paul Wassi <p.wassi@gmx.at>
[changed desired pinctrl register value from 0x1f to proper 0xf8]
Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
[renamed pinmux name to switch_led_disable_pins to make purpose more clear]
Signed-off-by: Petr Štetiar <ynezz@true.cz>

diff --git a/target/linux/ath79/dts/ar9330.dtsi b/target/linux/ath79/dts/ar9330.dtsi
index 49c6f698597692356fb9bdb75220c39a462be692..ca8d69c37156e126c1ea606dfe891df89650face 100644 (file)
--- a/target/linux/ath79/dts/ar9330.dtsi
+++ b/target/linux/ath79/dts/ar9330.dtsi
@@ -74,8 +74,8 @@
                                        pinctrl-single,bits = <0x0 0x1 0x1>;
                                };
 
-                               switch_led_pins: pinmux_switch_led_pins {
-                                       pinctrl-single,bits = <0x0 0x1f 0xf8>;
+                               switch_led_disable_pins: pinmux_switch_led_disable_pins {
+                                       pinctrl-single,bits = <0x0 0xf8 0xf8>;
                                };
                        };
 

diff --git a/target/linux/ath79/dts/ar9331_dragino_ms14.dts b/target/linux/ath79/dts/ar9331_dragino_ms14.dts
index 713fe4103ac327410eef2eea05f2a4e99e16f19b..6d0fcbcedd8bb0f3768bf84c48058741e6a43db6 100644 (file)
--- a/target/linux/ath79/dts/ar9331_dragino_ms14.dts
+++ b/target/linux/ath79/dts/ar9331_dragino_ms14.dts
@@ -16,6 +16,8 @@
 
        leds {
                compatible = "gpio-leds";
+               pinctrl-names = "default";
+               pinctrl-0 = <&switch_led_disable_pins>;
 
                wlan {
                        label = "dragino2:red:wlan";

diff --git a/target/linux/ath79/dts/ar9331_etactica_eg200.dts b/target/linux/ath79/dts/ar9331_etactica_eg200.dts
index d566647a058d267aa795be9edccd08e97c613eac..d18a239d3263f53c2a877b0615406a9616aee653 100644 (file)
--- a/target/linux/ath79/dts/ar9331_etactica_eg200.dts
+++ b/target/linux/ath79/dts/ar9331_etactica_eg200.dts
@@ -26,6 +26,8 @@
 
        leds {
                compatible = "gpio-leds";
+               pinctrl-names = "default";
+               pinctrl-0 = <&switch_led_disable_pins>;
 
                modbus {
                        label = "eg200:red:modbus";

diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts b/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts
index fe15157f8b9247d6caf980abc93bd69984b3d3f9..ebf4d4485f850eea234936862e707edb3426f08c 100644 (file)
--- a/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts
@@ -17,6 +17,8 @@
 
        leds {
                compatible = "gpio-leds";
+               pinctrl-names = "default";
+               pinctrl-0 = <&switch_led_disable_pins>;
 
                wlan {
                        label = "tp-link:green:wlan";

diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
index 02c647c179cb74ab709d5e5556f67bfd11dcd383..e4b59f1591245c47cd71912622ddaf4d7a1a80eb 100644 (file)
--- a/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
@@ -40,7 +40,7 @@
        leds {
                compatible = "gpio-leds";
                pinctrl-names = "default";
-               pinctrl-0 = <&switch_led_pins>;
+               pinctrl-0 = <&switch_led_disable_pins>;
 
                lan1 {
                        label = "tp-link:green:lan1";