fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Official Source

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2023-10-15 11:08:58 +08:00
commit 6164e1f36f
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
6 changed files with 43 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target/linux/ath79/dts/qca9563_compex_wpj563.dts
View File

@ -130,6 +130,14 @@
status = "okay";
};
&usb_phy1 {
status = "okay";
};
&usb1 {
status = "okay";
};
&wmac {
status = "okay";

8
target/linux/realtek/base-files/etc/board.d/02_network
View File

@ -31,7 +31,8 @@ lan_mac_end=""
label_mac=""
case $board in
hpe,1920-8g|\
hpe,1920-8g-poe|\
hpe,1920-8g-poe-65w|\
hpe,1920-8g-poe-180w|\
hpe,1920-16g|\
hpe,1920-24g)
label_mac=$(mtd_get_mac_binary factory 0x68)
@ -67,7 +68,10 @@ done
[ -n "$label_mac" ] && ucidef_set_label_macaddr $label_mac
case $board in
hpe,1920-8g-poe)
hpe,1920-8g-poe-65w)
ucidef_set_poe 65 "$lan_list_rev" "lan9 lan10"
;;
hpe,1920-8g-poe-180w)
ucidef_set_poe 180 "$lan_list_rev" "lan9 lan10"
;;
netgear,gs110tpp-v1)

2
target/linux/realtek/base-files/etc/board.d/03_gpio_switches
View File

@ -6,7 +6,7 @@ board_config_update
board=$(board_name)
case "$board" in
hpe,1920-8g-poe)
hpe,1920-8g-poe-180w)
ucidef_add_gpio_switch "fan_ctrl" "Fan control" "456" "0"
;;
esac

12
target/linux/realtek/dts-5.15/rtl8380_hpe_1920-8g-poe-180w.dts Normal file
View File

@ -0,0 +1,12 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "rtl8380_hpe_1920-8g.dtsi"
/ {
compatible = "hpe,1920-8g-poe-180w", "realtek,rtl838x-soc";
model = "HPE 1920-8G-PoE+ 180W (JG922A)";
};
&uart1 {
status = "okay";
};

4
target/linux/realtek/dts-5.15/rtl8380_hpe_1920-8g-poe.dts → target/linux/realtek/dts-5.15/rtl8380_hpe_1920-8g-poe-65w.dts
View File

@ -3,8 +3,8 @@
#include "rtl8380_hpe_1920-8g.dtsi"
/ {
compatible = "hpe,1920-8g-poe", "realtek,rtl838x-soc";
model = "HPE 1920-8G-PoE+ (JG922A)";
compatible = "hpe,1920-8g-poe-65w", "realtek,rtl838x-soc";
model = "HPE 1920-8G-PoE+ 65W (JG921A)";
};
&uart1 {

18
target/linux/realtek/image/rtl838x.mk
View File

@ -99,13 +99,23 @@ define Device/hpe_1920-8g
endef
TARGET_DEVICES += hpe_1920-8g
define Device/hpe_1920-8g-poe
define Device/hpe_1920-8g-poe-65w
$(Device/hpe_1920)
SOC := rtl8380
DEVICE_MODEL := 1920-8G-PoE+ (JG922A)
H3C_DEVICE_ID := 0x00010025
DEVICE_MODEL := 1920-8G-PoE+ 65W (JG921A)
DEVICE_PACKAGES += realtek-poe
H3C_DEVICE_ID := 0x00010024
endef
TARGET_DEVICES += hpe_1920-8g-poe
TARGET_DEVICES += hpe_1920-8g-poe-65w
define Device/hpe_1920-8g-poe-180w
$(Device/hpe_1920)
SOC := rtl8380
DEVICE_MODEL := 1920-8G-PoE+ 180W (JG922A)
H3C_DEVICE_ID := 0x00010025
SUPPORTED_DEVICES += hpe_1920-8g-poe
endef
TARGET_DEVICES += hpe_1920-8g-poe-180w
define Device/hpe_1920-16g
$(Device/hpe_1920)