aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Wassi <p.wassi@gmx.at>2018-12-31 21:51:47 +0100
committerPetr Štetiar <ynezz@true.cz>2019-05-15 13:34:24 +0200
commite9652e1696d94e57f96a06658da931fbac7c44c4 (patch)
tree1f3d51cb554166185a34cc82ae6c8d12c674f866
parent0aa59e81b349cf9eab7280485a0521de2be44adb (diff)
downloadupstream-e9652e1696d94e57f96a06658da931fbac7c44c4.tar.gz
upstream-e9652e1696d94e57f96a06658da931fbac7c44c4.tar.bz2
upstream-e9652e1696d94e57f96a06658da931fbac7c44c4.zip
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>
-rw-r--r--target/linux/ath79/dts/ar9330.dtsi4
-rw-r--r--target/linux/ath79/dts/ar9331_dragino_ms14.dts2
-rw-r--r--target/linux/ath79/dts/ar9331_etactica_eg200.dts2
-rw-r--r--target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts2
-rw-r--r--target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi2
5 files changed, 9 insertions, 3 deletions
diff --git a/target/linux/ath79/dts/ar9330.dtsi b/target/linux/ath79/dts/ar9330.dtsi
index 49c6f69859..ca8d69c371 100644
--- 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 713fe4103a..6d0fcbcedd 100644
--- 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 d566647a05..d18a239d32 100644
--- 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 fe15157f8b..ebf4d4485f 100644
--- 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 02c647c179..e4b59f1591 100644
--- 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";