aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2018-11-26 13:26:06 +0100
committerMathias Kresin <dev@kresin.me>2018-11-26 15:54:22 +0100
commite4d9217fe5419364d2fe89e69c2e4f9f47fd30b6 (patch)
treee93978c5c23647a5a3a47900ee5eef0c300f5756
parent71ba834cf1a1c8fcbf345b7efa75de0dcba9db20 (diff)
downloadupstream-e4d9217fe5419364d2fe89e69c2e4f9f47fd30b6.tar.gz
upstream-e4d9217fe5419364d2fe89e69c2e4f9f47fd30b6.tar.bz2
upstream-e4d9217fe5419364d2fe89e69c2e4f9f47fd30b6.zip
ramips: improve BDCOM WAP2100-SK support
Use the generic board detection instead of the target specific one as all recent additions are doing. Setup the USB led via devicetree (a58535771f11) and include the required driver by default. Merge the led userspace setting with an existing identical case. Use the wps led for boot status indication. Move the partitions into a partition table node (6031ab345df8) and drop needless labels. Drop misplaced cells properties (53624c1702e6). Cleanup the pinmux and only switch pins to gpio functions which a referenced as gpio in the dts. Match the maximum image size with the size of the firmware partition. Signed-off-by: Mathias Kresin <dev@kresin.me>
-rwxr-xr-xtarget/linux/ramips/base-files/etc/board.d/01_leds11
-rwxr-xr-xtarget/linux/ramips/base-files/etc/board.d/02_network2
-rwxr-xr-xtarget/linux/ramips/base-files/lib/ramips.sh3
-rwxr-xr-xtarget/linux/ramips/base-files/lib/upgrade/platform.sh2
-rw-r--r--target/linux/ramips/dts/BDCOM-WAP2100-SK.dts66
-rw-r--r--target/linux/ramips/image/mt7620.mk9
6 files changed, 47 insertions, 46 deletions
diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds
index 6d4bca8029..fb288de09b 100755
--- a/target/linux/ramips/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
@@ -56,6 +56,10 @@ asl26555-16M)
ucidef_set_led_netdev "eth" "ETH" "asl26555:green:eth" "eth0"
set_wifi_led "asl26555:green:wlan"
;;
+bdcom,wap2100-sk|\
+hiwifi,hc5861b)
+ set_wifi_led "$boardname:green:wlan2g"
+ ;;
broadway)
set_wifi_led "$boardname:red:wps_active"
;;
@@ -172,9 +176,6 @@ hg255d)
set_wifi_led "$boardname:green:wlan"
ucidef_set_led_netdev "internet" "internet" "$boardname:green:internet" "eth0.2"
;;
-hiwifi,hc5861b)
- set_wifi_led "$boardname:green:wlan2g"
- ;;
hpm)
ucidef_set_led_netdev "eth" "ETH" "$boardname:green:eth" "eth0"
set_wifi_led "$boardname:green:wifi"
@@ -369,10 +370,6 @@ vocore-16M)
w502u)
set_wifi_led "rt2800pci-phy0::radio"
;;
-wap2100-sk)
- set_usb_led "$boardname:green:usb"
- set_wifi_led "$boardname:green:wlan2g"
- ;;
we1026-5g-16m)
ucidef_set_led_netdev "lan" "LAN" "we1026-5g:green:lan" "eth0"
set_wifi_led "we1026-5g:green:wifi"
diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
index 12d7c86e2b..7bb1d32484 100755
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -198,6 +198,7 @@ ramips_setup_interfaces()
atp-52b|\
awm002-evb-4M|\
awm002-evb-8M|\
+ bdcom,wap2100-sk|\
c20i|\
dir-645|\
gl-mt300a|\
@@ -224,7 +225,6 @@ ramips_setup_interfaces()
ubnt-erx|\
ubnt-erx-sfp|\
ur-326n4g|\
- wap2100-sk|\
wrtnode|\
wrtnode2p | \
wrtnode2r | \
diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
index ba6a13b65b..5741cbd2ee 100755
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -553,9 +553,6 @@ ramips_board_detect() {
*"W502U")
name="w502u"
;;
- *"WAP2100-SK")
- name="wap2100-sk"
- ;;
*"WCR-1166DS")
name="wcr-1166ds"
;;
diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index cb6e5c1b5a..e4ddc0eec4 100755
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -31,6 +31,7 @@ platform_check_image() {
awm002-evb-4M|\
awm002-evb-8M|\
bc2|\
+ bdcom,wap2100-sk|\
bocco|\
broadway|\
c108|\
@@ -186,7 +187,6 @@ platform_check_image() {
widora,neo-32m|\
mqmaker,witi-256m|\
mqmaker,witi-512m|\
- wap2100-sk|\
we1026-5g-16m|\
wizfi630a|\
wl-330n|\
diff --git a/target/linux/ramips/dts/BDCOM-WAP2100-SK.dts b/target/linux/ramips/dts/BDCOM-WAP2100-SK.dts
index 7f9cbe74bd..62a87c8444 100644
--- a/target/linux/ramips/dts/BDCOM-WAP2100-SK.dts
+++ b/target/linux/ramips/dts/BDCOM-WAP2100-SK.dts
@@ -6,9 +6,14 @@
#include <dt-bindings/input/input.h>
/ {
- compatible = "bdcom,bdcom-wap2100-sk", "ralink,mt7620a-soc";
+ compatible = "bdcom,wap2100-sk", "ralink,mt7620a-soc";
model = "BDCOM WAP2100-SK";
+ aliases {
+ led-boot = &led_power;
+ led-failsafe = &led_power;
+ };
+
chosen {
bootargs = "console=ttyS0,115200";
};
@@ -19,9 +24,11 @@
usb {
label = "wap2100-sk:green:usb";
gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+ trigger-sources = <&ohci_port1>, <&ehci_port1>;
+ linux,default-trigger = "usbport";
};
- wps {
+ led_power: wps {
label = "wap2100-sk:green:wps";
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
};
@@ -34,8 +41,6 @@
gpio-keys-polled {
compatible = "gpio-keys-polled";
- #address-cells = <1>;
- #size-cells = <0>;
poll-interval = <20>;
wps {
@@ -55,34 +60,37 @@
&spi0 {
status = "okay";
- en25q128@0 {
- #address-cells = <1>;
- #size-cells = <1>;
+ flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <10000000>;
- partition@0 {
- label = "u-boot";
- reg = <0x0 0x30000>;
- read-only;
- };
-
- partition@30000 {
- label = "u-boot-env";
- reg = <0x30000 0x10000>;
- read-only;
- };
-
- factory: partition@40000 {
- label = "factory";
- reg = <0x40000 0x10000>;
- read-only;
- };
-
- firmware: partition@50000 {
- label = "firmware";
- reg = <0x50000 0xf70000>;
+ partitions {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition@0 {
+ label = "u-boot";
+ reg = <0x0 0x30000>;
+ read-only;
+ };
+
+ partition@30000 {
+ label = "u-boot-env";
+ reg = <0x30000 0x10000>;
+ read-only;
+ };
+
+ factory: partition@40000 {
+ label = "factory";
+ reg = <0x40000 0x10000>;
+ read-only;
+ };
+
+ partition@50000 {
+ label = "firmware";
+ reg = <0x50000 0xf70000>;
+ };
};
};
};
@@ -123,7 +131,7 @@
&pinctrl {
state_default: pinctrl0 {
default {
- ralink,group = "wdt", "mdio", "spi refclk", "uartf", "wled";
+ ralink,group = "spi refclk", "uartf", "wled";
ralink,function = "gpio";
};
};
diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk
index 5e3d37b5c8..bf04a75ea1 100644
--- a/target/linux/ramips/image/mt7620.mk
+++ b/target/linux/ramips/image/mt7620.mk
@@ -80,14 +80,13 @@ define Device/ArcherMR200
endef
TARGET_DEVICES += ArcherMR200
-define Device/BDCOM-WAP2100-SK
+define Device/bdcom_wap2100-sk
DTS := BDCOM-WAP2100-SK
- IMAGE_SIZE := $(ralink_default_fw_size_16M)
- SUPPORTED_DEVICES += wap2100-sk
+ IMAGE_SIZE := 15808k
DEVICE_TITLE := BDCOM WAP2100-SK (ZTE ZXECS EBG3130)
- DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76 kmod-sdhci-mt7620
+ DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76 kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport
endef
-TARGET_DEVICES += BDCOM-WAP2100-SK
+TARGET_DEVICES += bdcom_wap2100-sk
define Device/bocco
DTS := BOCCO