enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sunxi: add nanopi r1s h5 support (#4201)

Browse Source 
* sunxi: add nanopi r1s h5 support

* sunxi: also disable debug log for rtl8189es

* Add nanopi-r1s-h5 to build targets

Co-authored-by: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
This commit is contained in:
aiamadeus 2022-09-20 20:53:11 +08:00 committed by GitHub
parent 0896041664
commit d7ead89cc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 502 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/boards/nanopi-r1s-h5.conf Normal file
View File

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

6
config/sources/families/include/sunxi64_common.inc
View File

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

4
config/targets.conf
View File

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

23
patch/kernel/archive/sunxi-5.15/disable-debug-rtl8189.patch Normal file
View File

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

13
patch/kernel/archive/sunxi-5.15/disable-debug-rtl8189fs.patch
View File

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

26
patch/kernel/archive/sunxi-5.15/patches.armbian/0015-nanopi-r1s-h5-add-rtl8153-support.patch Normal file
View File

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

74
patch/kernel/archive/sunxi-5.15/patches.armbian/net-usb-r8152-add-LED-configuration-from-OF.patch Normal file
View File

@ -0,0 +1,74 @@
From 82985725e071f2a5735052f18e109a32aeac3a0b Mon Sep 17 00:00:00 2001
From: David Bauer <mail@david-bauer.net>
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 <mail@david-bauer.net>
---
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 <linux/mii.h>
#include <linux/ethtool.h>
#include <linux/usb.h>
+#include <linux/of.h>
#include <linux/crc32.h>
#include <linux/if_vlan.h>
#include <linux/uaccess.h>
@@ -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)

2
patch/kernel/archive/sunxi-5.15/series.armbian
View File

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

2
patch/kernel/archive/sunxi-5.15/series.conf
View File

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

26
patch/kernel/archive/sunxi-5.16/0015-nanopi-r1s-h5-add-rtl8153-support.patch Normal file
View File

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

23
patch/kernel/archive/sunxi-5.16/disable-debug-rtl8189.patch Normal file
View File

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

13
patch/kernel/archive/sunxi-5.16/disable-debug-rtl8189fs.patch
View File

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

23
patch/kernel/archive/sunxi-5.17/disable-debug-rtl8189.patch Normal file
View File

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

13
patch/kernel/archive/sunxi-5.17/disable-debug-rtl8189fs.patch
View File

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

26
patch/kernel/archive/sunxi-5.17/patches.armbian/0015-nanopi-r1s-h5-add-rtl8153-support.patch Normal file
View File

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

1
patch/kernel/archive/sunxi-5.17/series.armbian
View File

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

1
patch/kernel/archive/sunxi-5.17/series.conf
View File

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

23
patch/kernel/archive/sunxi-5.18/disable-debug-rtl8189.patch Normal file
View File

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

13
patch/kernel/archive/sunxi-5.18/disable-debug-rtl8189fs.patch
View File

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

26
patch/kernel/archive/sunxi-5.18/patches.armbian/nanopi-r1s-h5-add-rtl8153-support.patch Normal file
View File

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

74
patch/kernel/archive/sunxi-5.18/patches.armbian/net-usb-r8152-add-LED-configuration-from-OF.patch Normal file
View File

@ -0,0 +1,74 @@
From 82985725e071f2a5735052f18e109a32aeac3a0b Mon Sep 17 00:00:00 2001
From: David Bauer <mail@david-bauer.net>
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 <mail@david-bauer.net>
---
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 <linux/mii.h>
#include <linux/ethtool.h>
#include <linux/usb.h>
+#include <linux/of.h>
#include <linux/crc32.h>
#include <linux/if_vlan.h>
#include <linux/uaccess.h>
@@ -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)

2
patch/kernel/archive/sunxi-5.18/series.armbian
View File

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

2
patch/kernel/archive/sunxi-5.18/series.conf
View File

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

23
patch/kernel/archive/sunxi-5.19/disable-debug-rtl8189.patch Normal file
View File

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

13
patch/kernel/archive/sunxi-5.19/disable-debug-rtl8189fs.patch
View File

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

26
patch/kernel/archive/sunxi-5.19/patches.armbian/nanopi-r1s-h5-add-rtl8153-support.patch Normal file
View File

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

74
patch/kernel/archive/sunxi-5.19/patches.armbian/net-usb-r8152-add-LED-configuration-from-OF.patch Normal file
View File

@ -0,0 +1,74 @@
From 82985725e071f2a5735052f18e109a32aeac3a0b Mon Sep 17 00:00:00 2001
From: David Bauer <mail@david-bauer.net>
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 <mail@david-bauer.net>
---
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 <linux/mii.h>
#include <linux/ethtool.h>
#include <linux/usb.h>
+#include <linux/of.h>
#include <linux/crc32.h>
#include <linux/if_vlan.h>
#include <linux/uaccess.h>
@@ -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)

2
patch/kernel/archive/sunxi-5.19/series.armbian
View File

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

2
patch/kernel/archive/sunxi-5.19/series.conf
View File

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