diff --git a/config/boards/nanopi-r1s-h5.conf b/config/boards/nanopi-r1s-h5.conf new file mode 100644 index 0000000000..dfc64098ec --- /dev/null +++ b/config/boards/nanopi-r1s-h5.conf @@ -0,0 +1,11 @@ +# Allwinner H5 quad core 512MB RAM 2 x GBE USB2 +BOARD_NAME="NanoPi R1S H5" +BOARDFAMILY="sun50iw2" +BOOTCONFIG="nanopi_r1s_h5_defconfig" +MODULES="g_serial" +MODULES_BLACKLIST="lima" +DEFAULT_OVERLAYS="usbhost1 usbhost2" +DEFAULT_CONSOLE="serial" +SERIALCON="ttyS0,ttyGS0" +BUILD_DESKTOP="no" +KERNEL_TARGET="current,edge" diff --git a/config/sources/families/include/sunxi64_common.inc b/config/sources/families/include/sunxi64_common.inc index e84ecf857e..4806eb6c6f 100644 --- a/config/sources/families/include/sunxi64_common.inc +++ b/config/sources/families/include/sunxi64_common.inc @@ -75,6 +75,12 @@ var_origin_kernel () family_tweaks() { + if [[ $BOARD == nanopi-r1s-h5 ]]; then + # rename USB based network to lan0 + mkdir -p $SDCARD/etc/udev/rules.d/ + echo 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="r8152", KERNEL=="eth1", NAME="lan0"' > $SDCARD/etc/udev/rules.d/70-rename-lan.rules + fi + # execute specific tweaks function if present [[ $(type -t family_tweaks_s) == function ]] && family_tweaks_s cp $SRC/packages/blobs/splash/armbian-u-boot-24.bmp $SDCARD/boot/boot.bmp diff --git a/config/targets.conf b/config/targets.conf index bfc93dfd56..20d2dcfa65 100644 --- a/config/targets.conf +++ b/config/targets.conf @@ -251,6 +251,10 @@ nanopi-r1 current bullseye cli s nanopi-r1 current jammy cli stable adv nanopi-r1 edge sid cli stable yes +# nanopi-r1s-h5 +nanopi-r1s-h5 current bullseye cli stable adv +nanopi-r1s-h5 current jammy cli stable adv +nanopi-r1s-h5 edge sid cli stable yes # nanopi-r2s nanopi-r2s current bullseye cli stable adv diff --git a/patch/kernel/archive/sunxi-5.15/disable-debug-rtl8189.patch b/patch/kernel/archive/sunxi-5.15/disable-debug-rtl8189.patch new file mode 100644 index 0000000000..4d093279dd --- /dev/null +++ b/patch/kernel/archive/sunxi-5.15/disable-debug-rtl8189.patch @@ -0,0 +1,23 @@ +--- a/drivers/net/wireless/rtl8189es/Makefile ++++ b/drivers/net/wireless/rtl8189es/Makefile +@@ -88,7 +88,7 @@ CONFIG_RTW_WIFI_HAL = n + # user priority mapping rule : tos, dscp + CONFIG_RTW_UP_MAPPING_RULE = tos + + ########################## Debug ########################### +-CONFIG_RTW_DEBUG = y ++CONFIG_RTW_DEBUG = n + # default log level is _DRV_INFO_ = 4, + # please refer to "How_to_set_driver_debug_log_level.doc" to set the available level. + CONFIG_RTW_LOG_LEVEL = 4 +--- a/drivers/net/wireless/rtl8189fs/Makefile ++++ b/drivers/net/wireless/rtl8189fs/Makefile +@@ -88,7 +88,7 @@ CONFIG_RTW_WIFI_HAL = n + CONFIG_ICMP_VOQ = n + CONFIG_IP_R_MONITOR = n #arp VOQ and high rate + ########################## Debug ########################### +-CONFIG_RTW_DEBUG = y ++CONFIG_RTW_DEBUG = n + # default log level is _DRV_INFO_ = 4, + # please refer to "How_to_set_driver_debug_log_level.doc" to set the available level. + CONFIG_RTW_LOG_LEVEL = 4 diff --git a/patch/kernel/archive/sunxi-5.15/disable-debug-rtl8189fs.patch b/patch/kernel/archive/sunxi-5.15/disable-debug-rtl8189fs.patch deleted file mode 100644 index 6f39370916..0000000000 --- a/patch/kernel/archive/sunxi-5.15/disable-debug-rtl8189fs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/net/wireless/rtl8189fs/Makefile b/drivers/net/wireless/rtl8189fs/Makefile -index dfca305..d56dcfd 100644 ---- a/drivers/net/wireless/rtl8189fs/Makefile -+++ b/drivers/net/wireless/rtl8189fs/Makefile -@@ -88,7 +88,7 @@ CONFIG_RTW_WIFI_HAL = n - CONFIG_ICMP_VOQ = n - CONFIG_IP_R_MONITOR = n #arp VOQ and high rate - ########################## Debug ########################### --CONFIG_RTW_DEBUG = y -+CONFIG_RTW_DEBUG = n - # default log level is _DRV_INFO_ = 4, - # please refer to "How_to_set_driver_debug_log_level.doc" to set the available level. - CONFIG_RTW_LOG_LEVEL = 4 diff --git a/patch/kernel/archive/sunxi-5.15/patches.armbian/0015-nanopi-r1s-h5-add-rtl8153-support.patch b/patch/kernel/archive/sunxi-5.15/patches.armbian/0015-nanopi-r1s-h5-add-rtl8153-support.patch new file mode 100644 index 0000000000..1eadb9c8ef --- /dev/null +++ b/patch/kernel/archive/sunxi-5.15/patches.armbian/0015-nanopi-r1s-h5-add-rtl8153-support.patch @@ -0,0 +1,26 @@ +--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts +@@ -21,7 +21,8 @@ + + aliases { + ethernet0 = &emac; +- ethernet1 = &rtl8189etv; ++ ethernet1 = &rtl8153; ++ ethernet2 = &rtl8189etv; + serial0 = &uart0; + }; + +@@ -116,6 +117,13 @@ + + &ehci1 { + status = "okay"; ++ ++ rtl8153: device@1 { ++ compatible = "usbbda,8153"; ++ reg = <1>; ++ realtek,led-data = <0x87>; ++ local-mac-address = [00 00 00 00 00 00]; ++ }; + }; + + &ehci2 { diff --git a/patch/kernel/archive/sunxi-5.15/patches.armbian/net-usb-r8152-add-LED-configuration-from-OF.patch b/patch/kernel/archive/sunxi-5.15/patches.armbian/net-usb-r8152-add-LED-configuration-from-OF.patch new file mode 100644 index 0000000000..c54332f71c --- /dev/null +++ b/patch/kernel/archive/sunxi-5.15/patches.armbian/net-usb-r8152-add-LED-configuration-from-OF.patch @@ -0,0 +1,74 @@ +From 82985725e071f2a5735052f18e109a32aeac3a0b Mon Sep 17 00:00:00 2001 +From: David Bauer +Date: Sun, 26 Jul 2020 02:38:31 +0200 +Subject: [PATCH] net: usb: r8152: add LED configuration from OF + +This adds the ability to configure the LED configuration register using +OF. This way, the correct value for board specific LED configuration can +be determined. + +Signed-off-by: David Bauer +--- + drivers/net/usb/r8152.c | 23 +++++++++++++++++++++++ + 1 file changed, 23 insertions(+) + +--- a/drivers/net/usb/r8152.c ++++ b/drivers/net/usb/r8152.c +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -6861,6 +6862,22 @@ static void rtl_tally_reset(struct r8152 + ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data); + } + ++static int r8152_led_configuration(struct r8152 *tp) ++{ ++ u32 led_data; ++ int ret; ++ ++ ret = of_property_read_u32(tp->udev->dev.of_node, "realtek,led-data", ++ &led_data); ++ ++ if (ret) ++ return ret; ++ ++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_LEDSEL, led_data); ++ ++ return 0; ++} ++ + static void r8152b_init(struct r8152 *tp) + { + u32 ocp_data; +@@ -6902,6 +6919,8 @@ static void r8152b_init(struct r8152 *tp + ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL); + ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN); + ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); ++ ++ r8152_led_configuration(tp); + } + + static void r8153_init(struct r8152 *tp) +@@ -7042,6 +7061,8 @@ static void r8153_init(struct r8152 *tp) + tp->coalesce = COALESCE_SLOW; + break; + } ++ ++ r8152_led_configuration(tp); + } + + static void r8153b_init(struct r8152 *tp) +@@ -7124,6 +7145,8 @@ static void r8153b_init(struct r8152 *tp + rtl_tally_reset(tp); + + tp->coalesce = 15000; /* 15 us */ ++ ++ r8152_led_configuration(tp); + } + + static void r8153c_init(struct r8152 *tp) diff --git a/patch/kernel/archive/sunxi-5.15/series.armbian b/patch/kernel/archive/sunxi-5.15/series.armbian index c1e116fd6b..327be7e8ec 100644 --- a/patch/kernel/archive/sunxi-5.15/series.armbian +++ b/patch/kernel/archive/sunxi-5.15/series.armbian @@ -197,5 +197,7 @@ patches.armbian/0012-fix-h6-emmc.patch patches.armbian/0013-x-fix-h6-emmc-dts.patch patches.armbian/0014-add-uwe-bsp-to-orangepi3-lts-dts-file.patch + patches.armbian/0015-nanopi-r1s-h5-add-rtl8153-support.patch patches.armbian/999-rollback-rsb.patch + patches.armbian/net-usb-r8152-add-LED-configuration-from-OF.patch patches.armbian/Orangepi_one_plus_Rollback-r_rsb-to-r_i2c.patch diff --git a/patch/kernel/archive/sunxi-5.15/series.conf b/patch/kernel/archive/sunxi-5.15/series.conf index 13c3d225be..e98dd9142c 100644 --- a/patch/kernel/archive/sunxi-5.15/series.conf +++ b/patch/kernel/archive/sunxi-5.15/series.conf @@ -671,7 +671,9 @@ patches.armbian/0012-fix-h6-emmc.patch patches.armbian/0013-x-fix-h6-emmc-dts.patch patches.armbian/0014-add-uwe-bsp-to-orangepi3-lts-dts-file.patch + patches.armbian/0015-nanopi-r1s-h5-add-rtl8153-support.patch patches.armbian/999-rollback-rsb.patch + patches.armbian/net-usb-r8152-add-LED-configuration-from-OF.patch patches.armbian/Orangepi_one_plus_Rollback-r_rsb-to-r_i2c.patch patches.armbian/sound-soc-sunxi-sun4i-codec-add-r40.patch patches.armbian/sound-soc-sunxi-sun8i-codec-analog-add-r40.patch diff --git a/patch/kernel/archive/sunxi-5.16/0015-nanopi-r1s-h5-add-rtl8153-support.patch b/patch/kernel/archive/sunxi-5.16/0015-nanopi-r1s-h5-add-rtl8153-support.patch new file mode 100644 index 0000000000..1eadb9c8ef --- /dev/null +++ b/patch/kernel/archive/sunxi-5.16/0015-nanopi-r1s-h5-add-rtl8153-support.patch @@ -0,0 +1,26 @@ +--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts +@@ -21,7 +21,8 @@ + + aliases { + ethernet0 = &emac; +- ethernet1 = &rtl8189etv; ++ ethernet1 = &rtl8153; ++ ethernet2 = &rtl8189etv; + serial0 = &uart0; + }; + +@@ -116,6 +117,13 @@ + + &ehci1 { + status = "okay"; ++ ++ rtl8153: device@1 { ++ compatible = "usbbda,8153"; ++ reg = <1>; ++ realtek,led-data = <0x87>; ++ local-mac-address = [00 00 00 00 00 00]; ++ }; + }; + + &ehci2 { diff --git a/patch/kernel/archive/sunxi-5.16/disable-debug-rtl8189.patch b/patch/kernel/archive/sunxi-5.16/disable-debug-rtl8189.patch new file mode 100644 index 0000000000..4d093279dd --- /dev/null +++ b/patch/kernel/archive/sunxi-5.16/disable-debug-rtl8189.patch @@ -0,0 +1,23 @@ +--- a/drivers/net/wireless/rtl8189es/Makefile ++++ b/drivers/net/wireless/rtl8189es/Makefile +@@ -88,7 +88,7 @@ CONFIG_RTW_WIFI_HAL = n + # user priority mapping rule : tos, dscp + CONFIG_RTW_UP_MAPPING_RULE = tos + + ########################## Debug ########################### +-CONFIG_RTW_DEBUG = y ++CONFIG_RTW_DEBUG = n + # default log level is _DRV_INFO_ = 4, + # please refer to "How_to_set_driver_debug_log_level.doc" to set the available level. + CONFIG_RTW_LOG_LEVEL = 4 +--- a/drivers/net/wireless/rtl8189fs/Makefile ++++ b/drivers/net/wireless/rtl8189fs/Makefile +@@ -88,7 +88,7 @@ CONFIG_RTW_WIFI_HAL = n + CONFIG_ICMP_VOQ = n + CONFIG_IP_R_MONITOR = n #arp VOQ and high rate + ########################## Debug ########################### +-CONFIG_RTW_DEBUG = y ++CONFIG_RTW_DEBUG = n + # default log level is _DRV_INFO_ = 4, + # please refer to "How_to_set_driver_debug_log_level.doc" to set the available level. + CONFIG_RTW_LOG_LEVEL = 4 diff --git a/patch/kernel/archive/sunxi-5.16/disable-debug-rtl8189fs.patch b/patch/kernel/archive/sunxi-5.16/disable-debug-rtl8189fs.patch deleted file mode 100644 index 6f39370916..0000000000 --- a/patch/kernel/archive/sunxi-5.16/disable-debug-rtl8189fs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/net/wireless/rtl8189fs/Makefile b/drivers/net/wireless/rtl8189fs/Makefile -index dfca305..d56dcfd 100644 ---- a/drivers/net/wireless/rtl8189fs/Makefile -+++ b/drivers/net/wireless/rtl8189fs/Makefile -@@ -88,7 +88,7 @@ CONFIG_RTW_WIFI_HAL = n - CONFIG_ICMP_VOQ = n - CONFIG_IP_R_MONITOR = n #arp VOQ and high rate - ########################## Debug ########################### --CONFIG_RTW_DEBUG = y -+CONFIG_RTW_DEBUG = n - # default log level is _DRV_INFO_ = 4, - # please refer to "How_to_set_driver_debug_log_level.doc" to set the available level. - CONFIG_RTW_LOG_LEVEL = 4 diff --git a/patch/kernel/archive/sunxi-5.17/disable-debug-rtl8189.patch b/patch/kernel/archive/sunxi-5.17/disable-debug-rtl8189.patch new file mode 100644 index 0000000000..4d093279dd --- /dev/null +++ b/patch/kernel/archive/sunxi-5.17/disable-debug-rtl8189.patch @@ -0,0 +1,23 @@ +--- a/drivers/net/wireless/rtl8189es/Makefile ++++ b/drivers/net/wireless/rtl8189es/Makefile +@@ -88,7 +88,7 @@ CONFIG_RTW_WIFI_HAL = n + # user priority mapping rule : tos, dscp + CONFIG_RTW_UP_MAPPING_RULE = tos + + ########################## Debug ########################### +-CONFIG_RTW_DEBUG = y ++CONFIG_RTW_DEBUG = n + # default log level is _DRV_INFO_ = 4, + # please refer to "How_to_set_driver_debug_log_level.doc" to set the available level. + CONFIG_RTW_LOG_LEVEL = 4 +--- a/drivers/net/wireless/rtl8189fs/Makefile ++++ b/drivers/net/wireless/rtl8189fs/Makefile +@@ -88,7 +88,7 @@ CONFIG_RTW_WIFI_HAL = n + CONFIG_ICMP_VOQ = n + CONFIG_IP_R_MONITOR = n #arp VOQ and high rate + ########################## Debug ########################### +-CONFIG_RTW_DEBUG = y ++CONFIG_RTW_DEBUG = n + # default log level is _DRV_INFO_ = 4, + # please refer to "How_to_set_driver_debug_log_level.doc" to set the available level. + CONFIG_RTW_LOG_LEVEL = 4 diff --git a/patch/kernel/archive/sunxi-5.17/disable-debug-rtl8189fs.patch b/patch/kernel/archive/sunxi-5.17/disable-debug-rtl8189fs.patch deleted file mode 100644 index 6f39370916..0000000000 --- a/patch/kernel/archive/sunxi-5.17/disable-debug-rtl8189fs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/net/wireless/rtl8189fs/Makefile b/drivers/net/wireless/rtl8189fs/Makefile -index dfca305..d56dcfd 100644 ---- a/drivers/net/wireless/rtl8189fs/Makefile -+++ b/drivers/net/wireless/rtl8189fs/Makefile -@@ -88,7 +88,7 @@ CONFIG_RTW_WIFI_HAL = n - CONFIG_ICMP_VOQ = n - CONFIG_IP_R_MONITOR = n #arp VOQ and high rate - ########################## Debug ########################### --CONFIG_RTW_DEBUG = y -+CONFIG_RTW_DEBUG = n - # default log level is _DRV_INFO_ = 4, - # please refer to "How_to_set_driver_debug_log_level.doc" to set the available level. - CONFIG_RTW_LOG_LEVEL = 4 diff --git a/patch/kernel/archive/sunxi-5.17/patches.armbian/0015-nanopi-r1s-h5-add-rtl8153-support.patch b/patch/kernel/archive/sunxi-5.17/patches.armbian/0015-nanopi-r1s-h5-add-rtl8153-support.patch new file mode 100644 index 0000000000..1eadb9c8ef --- /dev/null +++ b/patch/kernel/archive/sunxi-5.17/patches.armbian/0015-nanopi-r1s-h5-add-rtl8153-support.patch @@ -0,0 +1,26 @@ +--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts +@@ -21,7 +21,8 @@ + + aliases { + ethernet0 = &emac; +- ethernet1 = &rtl8189etv; ++ ethernet1 = &rtl8153; ++ ethernet2 = &rtl8189etv; + serial0 = &uart0; + }; + +@@ -116,6 +117,13 @@ + + &ehci1 { + status = "okay"; ++ ++ rtl8153: device@1 { ++ compatible = "usbbda,8153"; ++ reg = <1>; ++ realtek,led-data = <0x87>; ++ local-mac-address = [00 00 00 00 00 00]; ++ }; + }; + + &ehci2 { diff --git a/patch/kernel/archive/sunxi-5.17/series.armbian b/patch/kernel/archive/sunxi-5.17/series.armbian index 8dcbd4caef..cf7dab1713 100644 --- a/patch/kernel/archive/sunxi-5.17/series.armbian +++ b/patch/kernel/archive/sunxi-5.17/series.armbian @@ -181,4 +181,5 @@ patches.armbian/0012-fix-h6-emmc.patch patches.armbian/0013-x-fix-h6-emmc-dts.patch patches.armbian/0014-add-uwe-bsp-to-orangepi3-lts-dts-file.patch + patches.armbian/0015-nanopi-r1s-h5-add-rtl8153-support.patch patches.armbian/999-rollback-rsb.patch diff --git a/patch/kernel/archive/sunxi-5.17/series.conf b/patch/kernel/archive/sunxi-5.17/series.conf index 0aae4d1397..6382b9dce4 100644 --- a/patch/kernel/archive/sunxi-5.17/series.conf +++ b/patch/kernel/archive/sunxi-5.17/series.conf @@ -765,4 +765,5 @@ patches.armbian/0012-fix-h6-emmc.patch patches.armbian/0013-x-fix-h6-emmc-dts.patch patches.armbian/0014-add-uwe-bsp-to-orangepi3-lts-dts-file.patch + patches.armbian/0015-nanopi-r1s-h5-add-rtl8153-support.patch patches.armbian/999-rollback-rsb.patch diff --git a/patch/kernel/archive/sunxi-5.18/disable-debug-rtl8189.patch b/patch/kernel/archive/sunxi-5.18/disable-debug-rtl8189.patch new file mode 100644 index 0000000000..4d093279dd --- /dev/null +++ b/patch/kernel/archive/sunxi-5.18/disable-debug-rtl8189.patch @@ -0,0 +1,23 @@ +--- a/drivers/net/wireless/rtl8189es/Makefile ++++ b/drivers/net/wireless/rtl8189es/Makefile +@@ -88,7 +88,7 @@ CONFIG_RTW_WIFI_HAL = n + # user priority mapping rule : tos, dscp + CONFIG_RTW_UP_MAPPING_RULE = tos + + ########################## Debug ########################### +-CONFIG_RTW_DEBUG = y ++CONFIG_RTW_DEBUG = n + # default log level is _DRV_INFO_ = 4, + # please refer to "How_to_set_driver_debug_log_level.doc" to set the available level. + CONFIG_RTW_LOG_LEVEL = 4 +--- a/drivers/net/wireless/rtl8189fs/Makefile ++++ b/drivers/net/wireless/rtl8189fs/Makefile +@@ -88,7 +88,7 @@ CONFIG_RTW_WIFI_HAL = n + CONFIG_ICMP_VOQ = n + CONFIG_IP_R_MONITOR = n #arp VOQ and high rate + ########################## Debug ########################### +-CONFIG_RTW_DEBUG = y ++CONFIG_RTW_DEBUG = n + # default log level is _DRV_INFO_ = 4, + # please refer to "How_to_set_driver_debug_log_level.doc" to set the available level. + CONFIG_RTW_LOG_LEVEL = 4 diff --git a/patch/kernel/archive/sunxi-5.18/disable-debug-rtl8189fs.patch b/patch/kernel/archive/sunxi-5.18/disable-debug-rtl8189fs.patch deleted file mode 100644 index 6f39370916..0000000000 --- a/patch/kernel/archive/sunxi-5.18/disable-debug-rtl8189fs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/net/wireless/rtl8189fs/Makefile b/drivers/net/wireless/rtl8189fs/Makefile -index dfca305..d56dcfd 100644 ---- a/drivers/net/wireless/rtl8189fs/Makefile -+++ b/drivers/net/wireless/rtl8189fs/Makefile -@@ -88,7 +88,7 @@ CONFIG_RTW_WIFI_HAL = n - CONFIG_ICMP_VOQ = n - CONFIG_IP_R_MONITOR = n #arp VOQ and high rate - ########################## Debug ########################### --CONFIG_RTW_DEBUG = y -+CONFIG_RTW_DEBUG = n - # default log level is _DRV_INFO_ = 4, - # please refer to "How_to_set_driver_debug_log_level.doc" to set the available level. - CONFIG_RTW_LOG_LEVEL = 4 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/nanopi-r1s-h5-add-rtl8153-support.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/nanopi-r1s-h5-add-rtl8153-support.patch new file mode 100644 index 0000000000..1eadb9c8ef --- /dev/null +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/nanopi-r1s-h5-add-rtl8153-support.patch @@ -0,0 +1,26 @@ +--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts +@@ -21,7 +21,8 @@ + + aliases { + ethernet0 = &emac; +- ethernet1 = &rtl8189etv; ++ ethernet1 = &rtl8153; ++ ethernet2 = &rtl8189etv; + serial0 = &uart0; + }; + +@@ -116,6 +117,13 @@ + + &ehci1 { + status = "okay"; ++ ++ rtl8153: device@1 { ++ compatible = "usbbda,8153"; ++ reg = <1>; ++ realtek,led-data = <0x87>; ++ local-mac-address = [00 00 00 00 00 00]; ++ }; + }; + + &ehci2 { diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/net-usb-r8152-add-LED-configuration-from-OF.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/net-usb-r8152-add-LED-configuration-from-OF.patch new file mode 100644 index 0000000000..c54332f71c --- /dev/null +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/net-usb-r8152-add-LED-configuration-from-OF.patch @@ -0,0 +1,74 @@ +From 82985725e071f2a5735052f18e109a32aeac3a0b Mon Sep 17 00:00:00 2001 +From: David Bauer +Date: Sun, 26 Jul 2020 02:38:31 +0200 +Subject: [PATCH] net: usb: r8152: add LED configuration from OF + +This adds the ability to configure the LED configuration register using +OF. This way, the correct value for board specific LED configuration can +be determined. + +Signed-off-by: David Bauer +--- + drivers/net/usb/r8152.c | 23 +++++++++++++++++++++++ + 1 file changed, 23 insertions(+) + +--- a/drivers/net/usb/r8152.c ++++ b/drivers/net/usb/r8152.c +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -6861,6 +6862,22 @@ static void rtl_tally_reset(struct r8152 + ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data); + } + ++static int r8152_led_configuration(struct r8152 *tp) ++{ ++ u32 led_data; ++ int ret; ++ ++ ret = of_property_read_u32(tp->udev->dev.of_node, "realtek,led-data", ++ &led_data); ++ ++ if (ret) ++ return ret; ++ ++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_LEDSEL, led_data); ++ ++ return 0; ++} ++ + static void r8152b_init(struct r8152 *tp) + { + u32 ocp_data; +@@ -6902,6 +6919,8 @@ static void r8152b_init(struct r8152 *tp + ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL); + ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN); + ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); ++ ++ r8152_led_configuration(tp); + } + + static void r8153_init(struct r8152 *tp) +@@ -7042,6 +7061,8 @@ static void r8153_init(struct r8152 *tp) + tp->coalesce = COALESCE_SLOW; + break; + } ++ ++ r8152_led_configuration(tp); + } + + static void r8153b_init(struct r8152 *tp) +@@ -7124,6 +7145,8 @@ static void r8153b_init(struct r8152 *tp + rtl_tally_reset(tp); + + tp->coalesce = 15000; /* 15 us */ ++ ++ r8152_led_configuration(tp); + } + + static void r8153c_init(struct r8152 *tp) diff --git a/patch/kernel/archive/sunxi-5.18/series.armbian b/patch/kernel/archive/sunxi-5.18/series.armbian index 4fb7f2ac3a..b32d55c4d6 100644 --- a/patch/kernel/archive/sunxi-5.18/series.armbian +++ b/patch/kernel/archive/sunxi-5.18/series.armbian @@ -178,4 +178,6 @@ patches.armbian/arm64-dts-allwinner-sun50i-h6-Fix-H6-emmc.patch patches.armbian/add-uwe-bsp-to-OPi3-LTS-dts-file.patch patches.armbian/Rollback-r_rsb-to-r_i2c.patch + patches.armbian/nanopi-r1s-h5-add-rtl8153-support.patch + patches.armbian/net-usb-r8152-add-LED-configuration-from-OF.patch patches.armbian/arm64-dts-sun50i-h6-orangepi.dtsi-Rollback-r_rsb-to-r_i2c.patch diff --git a/patch/kernel/archive/sunxi-5.18/series.conf b/patch/kernel/archive/sunxi-5.18/series.conf index a578fd918f..82dd5c3e48 100644 --- a/patch/kernel/archive/sunxi-5.18/series.conf +++ b/patch/kernel/archive/sunxi-5.18/series.conf @@ -732,4 +732,6 @@ patches.armbian/arm64-dts-allwinner-sun50i-h6-Fix-H6-emmc.patch patches.armbian/add-uwe-bsp-to-OPi3-LTS-dts-file.patch patches.armbian/Rollback-r_rsb-to-r_i2c.patch + patches.armbian/nanopi-r1s-h5-add-rtl8153-support.patch + patches.armbian/net-usb-r8152-add-LED-configuration-from-OF.patch patches.armbian/arm64-dts-sun50i-h6-orangepi.dtsi-Rollback-r_rsb-to-r_i2c.patch diff --git a/patch/kernel/archive/sunxi-5.19/disable-debug-rtl8189.patch b/patch/kernel/archive/sunxi-5.19/disable-debug-rtl8189.patch new file mode 100644 index 0000000000..4d093279dd --- /dev/null +++ b/patch/kernel/archive/sunxi-5.19/disable-debug-rtl8189.patch @@ -0,0 +1,23 @@ +--- a/drivers/net/wireless/rtl8189es/Makefile ++++ b/drivers/net/wireless/rtl8189es/Makefile +@@ -88,7 +88,7 @@ CONFIG_RTW_WIFI_HAL = n + # user priority mapping rule : tos, dscp + CONFIG_RTW_UP_MAPPING_RULE = tos + + ########################## Debug ########################### +-CONFIG_RTW_DEBUG = y ++CONFIG_RTW_DEBUG = n + # default log level is _DRV_INFO_ = 4, + # please refer to "How_to_set_driver_debug_log_level.doc" to set the available level. + CONFIG_RTW_LOG_LEVEL = 4 +--- a/drivers/net/wireless/rtl8189fs/Makefile ++++ b/drivers/net/wireless/rtl8189fs/Makefile +@@ -88,7 +88,7 @@ CONFIG_RTW_WIFI_HAL = n + CONFIG_ICMP_VOQ = n + CONFIG_IP_R_MONITOR = n #arp VOQ and high rate + ########################## Debug ########################### +-CONFIG_RTW_DEBUG = y ++CONFIG_RTW_DEBUG = n + # default log level is _DRV_INFO_ = 4, + # please refer to "How_to_set_driver_debug_log_level.doc" to set the available level. + CONFIG_RTW_LOG_LEVEL = 4 diff --git a/patch/kernel/archive/sunxi-5.19/disable-debug-rtl8189fs.patch b/patch/kernel/archive/sunxi-5.19/disable-debug-rtl8189fs.patch deleted file mode 100644 index 6f39370916..0000000000 --- a/patch/kernel/archive/sunxi-5.19/disable-debug-rtl8189fs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/net/wireless/rtl8189fs/Makefile b/drivers/net/wireless/rtl8189fs/Makefile -index dfca305..d56dcfd 100644 ---- a/drivers/net/wireless/rtl8189fs/Makefile -+++ b/drivers/net/wireless/rtl8189fs/Makefile -@@ -88,7 +88,7 @@ CONFIG_RTW_WIFI_HAL = n - CONFIG_ICMP_VOQ = n - CONFIG_IP_R_MONITOR = n #arp VOQ and high rate - ########################## Debug ########################### --CONFIG_RTW_DEBUG = y -+CONFIG_RTW_DEBUG = n - # default log level is _DRV_INFO_ = 4, - # please refer to "How_to_set_driver_debug_log_level.doc" to set the available level. - CONFIG_RTW_LOG_LEVEL = 4 diff --git a/patch/kernel/archive/sunxi-5.19/patches.armbian/nanopi-r1s-h5-add-rtl8153-support.patch b/patch/kernel/archive/sunxi-5.19/patches.armbian/nanopi-r1s-h5-add-rtl8153-support.patch new file mode 100644 index 0000000000..1eadb9c8ef --- /dev/null +++ b/patch/kernel/archive/sunxi-5.19/patches.armbian/nanopi-r1s-h5-add-rtl8153-support.patch @@ -0,0 +1,26 @@ +--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts +@@ -21,7 +21,8 @@ + + aliases { + ethernet0 = &emac; +- ethernet1 = &rtl8189etv; ++ ethernet1 = &rtl8153; ++ ethernet2 = &rtl8189etv; + serial0 = &uart0; + }; + +@@ -116,6 +117,13 @@ + + &ehci1 { + status = "okay"; ++ ++ rtl8153: device@1 { ++ compatible = "usbbda,8153"; ++ reg = <1>; ++ realtek,led-data = <0x87>; ++ local-mac-address = [00 00 00 00 00 00]; ++ }; + }; + + &ehci2 { diff --git a/patch/kernel/archive/sunxi-5.19/patches.armbian/net-usb-r8152-add-LED-configuration-from-OF.patch b/patch/kernel/archive/sunxi-5.19/patches.armbian/net-usb-r8152-add-LED-configuration-from-OF.patch new file mode 100644 index 0000000000..c54332f71c --- /dev/null +++ b/patch/kernel/archive/sunxi-5.19/patches.armbian/net-usb-r8152-add-LED-configuration-from-OF.patch @@ -0,0 +1,74 @@ +From 82985725e071f2a5735052f18e109a32aeac3a0b Mon Sep 17 00:00:00 2001 +From: David Bauer +Date: Sun, 26 Jul 2020 02:38:31 +0200 +Subject: [PATCH] net: usb: r8152: add LED configuration from OF + +This adds the ability to configure the LED configuration register using +OF. This way, the correct value for board specific LED configuration can +be determined. + +Signed-off-by: David Bauer +--- + drivers/net/usb/r8152.c | 23 +++++++++++++++++++++++ + 1 file changed, 23 insertions(+) + +--- a/drivers/net/usb/r8152.c ++++ b/drivers/net/usb/r8152.c +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -6861,6 +6862,22 @@ static void rtl_tally_reset(struct r8152 + ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data); + } + ++static int r8152_led_configuration(struct r8152 *tp) ++{ ++ u32 led_data; ++ int ret; ++ ++ ret = of_property_read_u32(tp->udev->dev.of_node, "realtek,led-data", ++ &led_data); ++ ++ if (ret) ++ return ret; ++ ++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_LEDSEL, led_data); ++ ++ return 0; ++} ++ + static void r8152b_init(struct r8152 *tp) + { + u32 ocp_data; +@@ -6902,6 +6919,8 @@ static void r8152b_init(struct r8152 *tp + ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL); + ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN); + ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); ++ ++ r8152_led_configuration(tp); + } + + static void r8153_init(struct r8152 *tp) +@@ -7042,6 +7061,8 @@ static void r8153_init(struct r8152 *tp) + tp->coalesce = COALESCE_SLOW; + break; + } ++ ++ r8152_led_configuration(tp); + } + + static void r8153b_init(struct r8152 *tp) +@@ -7124,6 +7145,8 @@ static void r8153b_init(struct r8152 *tp + rtl_tally_reset(tp); + + tp->coalesce = 15000; /* 15 us */ ++ ++ r8152_led_configuration(tp); + } + + static void r8153c_init(struct r8152 *tp) diff --git a/patch/kernel/archive/sunxi-5.19/series.armbian b/patch/kernel/archive/sunxi-5.19/series.armbian index f9a552a372..0c56b96590 100644 --- a/patch/kernel/archive/sunxi-5.19/series.armbian +++ b/patch/kernel/archive/sunxi-5.19/series.armbian @@ -171,4 +171,6 @@ patches.armbian/mmc-host-sunxi-mmc-Fix-H6-emmc.patch patches.armbian/arm64-dts-allwinner-sun50i-h6-Fix-H6-emmc.patch patches.armbian/Rollback-r_rsb-to-r_i2c.patch + patches.armbian/nanopi-r1s-h5-add-rtl8153-support.patch + patches.armbian/net-usb-r8152-add-LED-configuration-from-OF.patch patches.armbian/arm64-dts-sun50i-h6-orangepi.dtsi-Rollback-r_rsb-to-r_i2c.patch diff --git a/patch/kernel/archive/sunxi-5.19/series.conf b/patch/kernel/archive/sunxi-5.19/series.conf index 723001d455..80b3d708c2 100644 --- a/patch/kernel/archive/sunxi-5.19/series.conf +++ b/patch/kernel/archive/sunxi-5.19/series.conf @@ -620,4 +620,6 @@ patches.armbian/mmc-host-sunxi-mmc-Fix-H6-emmc.patch patches.armbian/arm64-dts-allwinner-sun50i-h6-Fix-H6-emmc.patch patches.armbian/Rollback-r_rsb-to-r_i2c.patch + patches.armbian/nanopi-r1s-h5-add-rtl8153-support.patch + patches.armbian/net-usb-r8152-add-LED-configuration-from-OF.patch patches.armbian/arm64-dts-sun50i-h6-orangepi.dtsi-Rollback-r_rsb-to-r_i2c.patch