aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Welz <tw@wiznet.eu>2020-08-04 17:55:40 +0200
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-08-08 16:36:32 +0200
commitd40ce8b32d146b9c7abecaa76fc69c3aa3e252d6 (patch)
treef15766f58dc2734f37ec4e94437e622b07232c35
parentd1985a1be6701c4cd6bb2d81bc42f9e5ed99883a (diff)
downloadupstream-d40ce8b32d146b9c7abecaa76fc69c3aa3e252d6.tar.gz
upstream-d40ce8b32d146b9c7abecaa76fc69c3aa3e252d6.tar.bz2
upstream-d40ce8b32d146b9c7abecaa76fc69c3aa3e252d6.zip
ramips: correct WizFi630S pin mappings
WizFi630S had some pins changed in the release version of the board. The run led, wps button and a slide switch where affected. This patch is correcting this. i2c is removed as it is sharing a pin with the run (system) led. uart2 is enabled as it is also enabled in the OEM firmware. Signed-off-by: Tobias Welz <tw@wiznet.eu> (backported from commit d0b229f553a814b22c16976e40a197f892c0c0df) Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
-rw-r--r--target/linux/ramips/dts/WIZFI630S.dts35
1 files changed, 8 insertions, 27 deletions
diff --git a/target/linux/ramips/dts/WIZFI630S.dts b/target/linux/ramips/dts/WIZFI630S.dts
index bdc8d1e048..f2f9081821 100644
--- a/target/linux/ramips/dts/WIZFI630S.dts
+++ b/target/linux/ramips/dts/WIZFI630S.dts
@@ -33,7 +33,7 @@
led_run: run {
label = "wizfi630s:green:run";
- gpios = <&gpio0 4 GPIO_ACTIVE_LOW>;
+ gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
};
ledwps {
@@ -66,20 +66,22 @@
wps {
label = "wps";
- gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;
+ gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
linux,code = <KEY_WPS_BUTTON>;
};
scm1 {
label = "SCM1";
- gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
+ gpios = <&gpio0 4 GPIO_ACTIVE_LOW>;
linux,code = <BTN_1>;
+ linux,input-type = <EV_SW>;
};
scm2 {
label = "SCM2";
gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
linux,code = <BTN_2>;
+ linux,input-type = <EV_SW>;
};
};
@@ -88,28 +90,7 @@
&pinctrl {
state_default: pinctrl0 {
gpio {
- ralink,group = "gpio";
- ralink,function = "gpio";
- };
-
- i2s {
- ralink,group = "i2s";
- ralink,function = "gpio";
- };
-
- wdt {
- ralink,group = "wdt";
- ralink,function = "gpio";
- };
-
-
- i2c {
- ralink,group = "i2c";
- ralink,function = "gpio";
- };
-
- refclk {
- ralink,group = "refclk";
+ ralink,group = "gpio", "i2s", "i2c", "wdt", "refclk", "p1led_an", "p2led_an";
ralink,function = "gpio";
};
};
@@ -159,11 +140,11 @@
};
};
-&i2c {
+&uart1 {
status = "okay";
};
-&uart1 {
+&uart2 {
status = "okay";
};