Added dev target support for NanoPi R2S (#1953)

config/kernel/linux-rockchip64-dev.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.6.10 Kernel Configuration
+# Linux/arm64 5.6.11 Kernel Configuration
 #
 
 #
@@ -5433,7 +5433,7 @@ CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-# CONFIG_U_SERIAL_CONSOLE is not set
+CONFIG_U_SERIAL_CONSOLE=y
 
 #
 # USB Peripheral Controller
@@ -5444,8 +5444,7 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_PXA27X is not set
 # CONFIG_USB_MV_UDC is not set
 # CONFIG_USB_MV_U3D is not set
-CONFIG_USB_SNP_CORE=y
-CONFIG_USB_SNP_UDC_PLAT=y
+# CONFIG_USB_SNP_UDC_PLAT is not set
 # CONFIG_USB_M66592 is not set
 # CONFIG_USB_BDC_UDC is not set
 # CONFIG_USB_AMD5536UDC is not set
@@ -5473,7 +5472,6 @@ CONFIG_USB_F_RNDIS=m
 CONFIG_USB_F_MASS_STORAGE=m
 CONFIG_USB_F_FS=m
 CONFIG_USB_F_UAC1=m
-CONFIG_USB_F_UAC1_LEGACY=m
 CONFIG_USB_F_UAC2=m
 CONFIG_USB_F_UVC=m
 CONFIG_USB_F_MIDI=m
@@ -5492,12 +5490,37 @@ CONFIG_USB_CONFIGFS_MASS_STORAGE=y
 CONFIG_USB_CONFIGFS_F_LB_SS=y
 CONFIG_USB_CONFIGFS_F_FS=y
 CONFIG_USB_CONFIGFS_F_UAC1=y
-CONFIG_USB_CONFIGFS_F_UAC1_LEGACY=y
+# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
 CONFIG_USB_CONFIGFS_F_UAC2=y
 CONFIG_USB_CONFIGFS_F_MIDI=y
 CONFIG_USB_CONFIGFS_F_HID=y
 CONFIG_USB_CONFIGFS_F_UVC=y
 CONFIG_USB_CONFIGFS_F_PRINTER=y
+CONFIG_USB_ZERO=m
+# CONFIG_USB_ZERO_HNPTEST is not set
+CONFIG_USB_AUDIO=m
+# CONFIG_GADGET_UAC1 is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_ETH_EEM=y
+CONFIG_USB_G_NCM=m
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FUNCTIONFS=m
+CONFIG_USB_FUNCTIONFS_ETH=y
+CONFIG_USB_FUNCTIONFS_RNDIS=y
+CONFIG_USB_FUNCTIONFS_GENERIC=y
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_G_SERIAL=m
+CONFIG_USB_MIDI_GADGET=m
+CONFIG_USB_G_PRINTER=m
+CONFIG_USB_CDC_COMPOSITE=m
+CONFIG_USB_G_ACM_MS=m
+CONFIG_USB_G_MULTI=m
+CONFIG_USB_G_MULTI_RNDIS=y
+CONFIG_USB_G_MULTI_CDC=y
+CONFIG_USB_G_HID=m
+# CONFIG_USB_G_DBGP is not set
+CONFIG_USB_G_WEBCAM=m
 CONFIG_TYPEC=m
 CONFIG_TYPEC_TCPM=m
 CONFIG_TYPEC_TCPCI=m
@@ -6178,6 +6201,7 @@ CONFIG_DEVFREQ_GOV_PASSIVE=m
 #
 # DEVFREQ Drivers
 #
+CONFIG_ARM_RK3328_DMC_DEVFREQ=y
 CONFIG_ARM_RK3399_DMC_DEVFREQ=y
 CONFIG_PM_DEVFREQ_EVENT=y
 CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=y

config/targets.conf

@@ -248,6 +248,7 @@ nanopi-r2s			current			stretch		cli			stable	yes
 nanopi-r2s			current			bionic		cli			stable	yes
 nanopi-r2s			current			bullseye	minimal			stable	yes
 nanopi-r2s			current			focal	minimal			stable	yes
+nanopi-r2s			dev			focal	minimal			beta	yes
 
 # nanopiair
 

patch/kernel/rockchip64-dev/board-nanopi-r2s-r8152-customise-leds.patch

@@ -0,0 +1,36 @@
+From 2d4f786f94b331904682c24a792462726d474007 Mon Sep 17 00:00:00 2001
+From: hmz007 <hmz007@gmail.com>
+Date: Mon, 23 Dec 2019 13:10:06 +0800
+Subject: [PATCH] r8152: Add module param for customized LEDs
+
+Signed-off-by: hmz007 <hmz007@gmail.com>
+---
+ drivers/net/usb/r8152.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
+index eb78f6d9390c..ec737fffcded 100644
+--- a/drivers/net/usb/r8152.c
++++ b/drivers/net/usb/r8152.c
+@@ -37,6 +37,11 @@
+ #define DRIVER_DESC "Realtek RTL8152/RTL8153 Based USB Ethernet Adapters"
+ #define MODULENAME "r8152"
+ 
++/* LED0: Activity, LED1: Link */
++static int ledsel = 0x78;
++module_param(ledsel, int, 0);
++MODULE_PARM_DESC(ledsel, "Override default LED configuration");
++
+ #define R8152_PHY_ID		32
+ 
+ #define PLA_IDR			0xc000
+@@ -4545,6 +4550,9 @@ static void r8153b_init(struct r8152 *tp)
+ 	ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN);
+ 	ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
+ 
++	/* set customized led */
++	ocp_write_word(tp, MCU_TYPE_PLA, PLA_LEDSEL, ledsel);
++
+ 	rtl_tally_reset(tp);
+ 
+ 	tp->coalesce = 15000;	/* 15 us */

patch/kernel/rockchip64-dev/board-nanopi-r2s-r8152-mac-from-dt.patch

@@ -0,0 +1,40 @@
+From 27dfe6f4347e883fd618d5a37500c7f6d3652fb9 Mon Sep 17 00:00:00 2001
+From: hmz007 <hmz007@gmail.com>
+Date: Fri, 22 Nov 2019 19:03:00 +0800
+Subject: [PATCH] r8152: support to get MAC address from device tree
+
+Signed-off-by: hmz007 <hmz007@gmail.com>
+---
+ drivers/net/usb/r8152.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
+index b2507c59ba8b..eb78f6d9390c 100644
+--- a/drivers/net/usb/r8152.c
++++ b/drivers/net/usb/r8152.c
+@@ -6,6 +6,7 @@
+ #include <linux/signal.h>
+ #include <linux/slab.h>
+ #include <linux/module.h>
++#include <linux/of_net.h>
+ #include <linux/netdevice.h>
+ #include <linux/etherdevice.h>
+ #include <linux/mii.h>
+@@ -1298,6 +1299,17 @@ static int determine_ethernet_addr(struct r8152 *tp, struct sockaddr *sa)
+ 	if (ret < 0) {
+ 		netif_err(tp, probe, dev, "Get ether addr fail\n");
+ 	} else if (!is_valid_ether_addr(sa->sa_data)) {
++		/* try to get MAC address from DT */
++		if (tp->udev->dev.of_node) {
++			const u8 *mac = of_get_mac_address(tp->udev->dev.of_node);
++			if (!IS_ERR(mac) && is_valid_ether_addr(mac)) {
++				ether_addr_copy(sa->sa_data, mac);
++				netif_info(tp, probe, dev, "DT mac addr %pM\n",
++					   sa->sa_data);
++				return 0;
++			}
++		}
++
+ 		netif_err(tp, probe, dev, "Invalid ether addr %pM\n",
+ 			  sa->sa_data);
+ 		eth_hw_addr_random(dev);