diff --git a/target/linux/ramips/dts/mt7628an_netgear_r6120.dts b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts index 49ca189645..dc9de9f4bf 100644 --- a/target/linux/ramips/dts/mt7628an_netgear_r6120.dts +++ b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts @@ -40,17 +40,17 @@ gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; }; - wlan { + wlan2g_green { label = "r6120:green:wlan2g"; gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; }; - wlan_orange { + wlan2g_orange { label = "r6120:orange:wlan2g"; gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; }; - wan { + wan_green { label = "r6120:green:wan"; gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts b/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts index ad641f47e4..436743cff3 100644 --- a/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts +++ b/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts @@ -48,7 +48,7 @@ partition@50000 { compatible = "denx,uimage"; label = "firmware"; - reg = <0x50000 0x3b0000>; + reg = <0x50000 0x7b0000>; }; }; }; diff --git a/target/linux/ramips/dts/rt3883_belkin_f9k1109v1.dts b/target/linux/ramips/dts/rt3883_belkin_f9k1109v1.dts index 0b4cf699b5..05afd8af3a 100644 --- a/target/linux/ramips/dts/rt3883_belkin_f9k1109v1.dts +++ b/target/linux/ramips/dts/rt3883_belkin_f9k1109v1.dts @@ -30,11 +30,15 @@ usb1 { label = "f9k1109v1:green:usb1"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; + trigger-sources = <&ohci_port1>, <&ehci_port1>; + linux,default-trigger = "usbport"; }; usb2 { label = "f9k1109v1:green:usb2"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; + trigger-sources = <&ohci_port2>, <&ehci_port2>; + linux,default-trigger = "usbport"; }; wps_amber { @@ -65,3 +69,17 @@ }; }; }; + +&ehci { + ehci_port2: port@2 { + reg = <2>; + #trigger-source-cells = <0>; + }; +}; + +&ohci { + ohci_port2: port@2 { + reg = <2>; + #trigger-source-cells = <0>; + }; +}; diff --git a/target/linux/ramips/image/rt305x.mk b/target/linux/ramips/image/rt305x.mk index f63891ac7c..0c0ee63f14 100644 --- a/target/linux/ramips/image/rt305x.mk +++ b/target/linux/ramips/image/rt305x.mk @@ -1149,7 +1149,7 @@ TARGET_DEVICES += zorlik_zl5900v2 define Device/zyxel_keenetic SOC := rt3052 BLOCKSIZE := 64k - IMAGE_SIZE := 3776k + IMAGE_SIZE := 7872k DEVICE_VENDOR := ZyXEL DEVICE_MODEL := Keenetic DEVICE_PACKAGES := kmod-usb2 kmod-usb-ehci kmod-usb-ledtrig-usbport diff --git a/target/linux/ramips/image/rt3883.mk b/target/linux/ramips/image/rt3883.mk index ca6a713c4d..e01c9710a8 100644 --- a/target/linux/ramips/image/rt3883.mk +++ b/target/linux/ramips/image/rt3883.mk @@ -23,7 +23,7 @@ define Device/belkin_f9k1109v1 DEVICE_VENDOR := Belkin DEVICE_MODEL := F9K1109 DEVICE_VARIANT := Version 1.0 - DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 swconfig + DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport swconfig IMAGE_SIZE := 7808k KERNEL := kernel-bin | append-dtb | lzma -d16 | uImage lzma # Stock firmware checks for this uImage image name during upload. diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network index 2fb1ab23ba..9f33b79881 100755 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network @@ -256,6 +256,7 @@ ramips_setup_macs() wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 0x5)" 1) ;; mikrotik,rb750gr3|\ + mikrotik,rbm11g|\ mikrotik,rbm33g) wan_mac=$(macaddr_add "$(mtd_get_mac_binary hard_config 0x10)" 2) label_mac=$(mtd_get_mac_binary hard_config 0x10) diff --git a/target/linux/ramips/rt3883/base-files/etc/board.d/01_leds b/target/linux/ramips/rt3883/base-files/etc/board.d/01_leds index e7c2cad3d2..1a72112c6f 100755 --- a/target/linux/ramips/rt3883/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/rt3883/base-files/etc/board.d/01_leds @@ -18,7 +18,6 @@ led_wlan="$(get_dt_led wlan)" case $board in belkin,f9k1109v1) - ucidef_set_led_usbport "usb" "USB" "$boardname:green:usb1" "usb1-port1" ucidef_set_led_netdev "lan" "lan" "$boardname:blue:wps" "eth0" ;; edimax,br-6475nd)