ramips: sync upstream source code

This commit is contained in:
AmadeusGhost 2020-04-10 16:18:43 +08:00
parent f6fb7f14be
commit dd4357ebf3
7 changed files with 25 additions and 7 deletions

View File

@ -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>;
};

View File

@ -48,7 +48,7 @@
partition@50000 {
compatible = "denx,uimage";
label = "firmware";
reg = <0x50000 0x3b0000>;
reg = <0x50000 0x7b0000>;
};
};
};

View File

@ -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>;
};
};

View File

@ -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

View File

@ -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.

View File

@ -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)

View File

@ -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)