Merge pull request #1672 from armbian/AR-89

Tinkerboard S: fix booting from eMMC.

config/kernel/linux-rockchip-current.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.3.7 Kernel Configuration
+# Linux/arm 5.3.15 Kernel Configuration
 #
 
 #
@@ -1770,6 +1770,7 @@ CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
 # CONFIG_BLK_DEV_NBD is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=1
@@ -2311,7 +2312,7 @@ CONFIG_WLAN_VENDOR_TI=y
 # CONFIG_WL18XX is not set
 # CONFIG_WLCORE is not set
 CONFIG_RTL8822BU=m
-CONFIG_RTL8188EU=m
+CONFIG_RTL8188EUS=m
 CONFIG_RTL8812AU=m
 CONFIG_WLAN_VENDOR_ZYDAS=y
 CONFIG_USB_ZD1201=m
@@ -6693,6 +6694,7 @@ CONFIG_DQL=y
 CONFIG_GLOB=y
 # CONFIG_GLOB_SELFTEST is not set
 CONFIG_NLATTR=y
+CONFIG_LRU_CACHE=m
 CONFIG_CLZ_TAB=y
 # CONFIG_IRQ_POLL is not set
 CONFIG_MPILIB=y

lib/compilation-prepare.sh

@@ -35,12 +35,18 @@ compilation_prepare()
 		process_patch_file "${SRC}/patch/misc/general-packaging-4.14.y.patch"                "applying"
 	fi
 
-	if [[ $version == "4.4."* || $version == "4.9."* ]] && [[ "$LINUXFAMILY" == rock* || "$LINUXFAMILY" == rk3399 ]]; then
+	if [[ $version == "4.4."* || $version == "4.9."* ]] && [[ "$LINUXFAMILY" == rockchip64 || "$LINUXFAMILY" == rk3399 ]]; then
 		display_alert "Adjustin" "packaging" "info"
 		cd ${SRC}/cache/sources/${LINUXSOURCEDIR}
 		process_patch_file "${SRC}/patch/misc/general-packaging-4.4.y-rk3399.patch"                "applying"
 	fi
 
+	if [[ $version == "4.4."* ]] && [[ "$LINUXFAMILY" == rockchip ]]; then
+                display_alert "Adjustin" "packaging" "info"
+                cd ${SRC}/cache/sources/${LINUXSOURCEDIR}
+                process_patch_file "${SRC}/patch/misc/general-packaging-4.4.y.patch"                "applying"
+        fi
+
 	if [[ $version == "4.9."* ]] && [[ "$LINUXFAMILY" == meson64 ]]; then
 		display_alert "Adjustin" "packaging" "info"
 		cd ${SRC}/cache/sources/${LINUXSOURCEDIR}
@@ -153,7 +159,7 @@ compilation_prepare()
 	fi
 
 	# Wireless drivers for Xradio XR819 chipsets
-	if linux-version compare $version ge 3.14 && [ "$EXTRAWIFI" == yes ]; then
+	if linux-version compare $version ge 4.19 && [ "$LINUXFAMILY" == sunxi ] && [ "$EXTRAWIFI" == yes ]; then
 
 		display_alert "Adding" "Wireless drivers for Xradio XR819 chipsets" "info"
 
@@ -179,7 +185,7 @@ compilation_prepare()
 
 	# Wireless drivers for Realtek 8188EU 8188EUS and 8188ETV chipsets
 
-	if linux-version compare $version ge 3.14 && [ "$LINUXFAMILY" == sunxi ] && [ "$EXTRAWIFI" == yes ]; then
+	if linux-version compare $version ge 3.14 && [ "$EXTRAWIFI" == yes ]; then
 
 		# attach to specifics tag or branch
 		local rtl8811euver="branch:v5.3.9"

patch/kernel/rockchip-current/board-tinkerboard-enable-emmc-support.patch

@@ -0,0 +1,25 @@
+diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
+index f88c913ff..7f04ccbdf 100644
+--- a/arch/arm/boot/dts/rk3288-tinker.dtsi
++++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
+@@ -547,3 +547,20 @@
+ &gpiomem {
+     status = "okay";
+ };
++
++&emmc {
++    bus-width = <8>;
++    cap-mmc-highspeed;
++    non-removable;
++    pinctrl-names = "default";
++    pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>;
++    max-frequency = <150000000>;
++    mmc-hs200-1_8v;
++    mmc-ddr-1_8v;
++    status = "okay";
++};
++
++&hdmi {
++    pinctrl-names = "default";
++    pinctrl-0 = <&hdmi_cec_c0>;
++};

patch/kernel/rockchip-current/general-fixup-dw-hdmi.patch.disabled

@@ -1,12 +0,0 @@
-diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
-index f108ffa92..76555b4c8 100644
---- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
-+++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
-@@ -477,7 +477,6 @@ static struct rockchip_hdmi_chip_data rk3328_chip_data = {
- };
- 
- static const struct dw_hdmi_plat_data rk3328_hdmi_drv_data = {
--	.mode_valid = dw_hdmi_rockchip_mode_valid,
- 	.mpll_cfg = rockchip_mpll_cfg,
- 	.cur_ctr = rockchip_cur_ctr,
- 	.phy_config = rockchip_phy_config,

patch/kernel/rockchip-current/need_to_be_checked/board-tinkerboard-enable-emmc-support.patch

@@ -1,25 +0,0 @@
-diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
-index 77554262..57cce114 100644
---- a/arch/arm/boot/dts/rk3288-tinker.dts
-+++ b/arch/arm/boot/dts/rk3288-tinker.dts
-@@ -612,6 +612,20 @@
- 	vqmmc-supply = <&vccio_sd>;
- };
- 
-+&emmc {
-+	bus-width = <8>;
-+	cap-mmc-highspeed;
-+	disable-wp;
-+	non-removable;
-+	num-slots = <1>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>;
-+	max-frequency = <150000000>;
-+	mmc-hs200-1_8v;
-+	mmc-ddr-1_8v;
-+	status = "okay";
-+};
-+
- &tsadc {
- 	rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */
- 	rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */

patch/kernel/rockchip-current/need_to_be_checked/wifi-2001-01-rtl8188eu-kconfig-makefile.patch

@@ -1,24 +0,0 @@
-diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
-index 95cdb48fad061..db9ee74578012 100644
---- a/drivers/net/wireless/Kconfig
-+++ b/drivers/net/wireless/Kconfig
-@@ -32,6 +32,7 @@ config WIRELESS_WDS
-
- source "drivers/net/wireless/admtek/Kconfig"
- source "drivers/net/wireless/ath/Kconfig"
-+source "drivers/net/wireless/rtl8188eu/Kconfig"
- source "drivers/net/wireless/atmel/Kconfig"
- source "drivers/net/wireless/broadcom/Kconfig"
- source "drivers/net/wireless/cisco/Kconfig"
-diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
-index edeb51f6fa551..2c4d8522929bf 100644
---- a/drivers/net/wireless/Makefile
-+++ b/drivers/net/wireless/Makefile
-@@ -5,6 +5,7 @@
-
- obj-$(CONFIG_WLAN_VENDOR_ADMTEK) += admtek/
- obj-$(CONFIG_WLAN_VENDOR_ATH) += ath/
-+obj-$(CONFIG_RTL8188EU) += rtl8188eu/
- obj-$(CONFIG_WLAN_VENDOR_ATMEL) += atmel/
- obj-$(CONFIG_WLAN_VENDOR_BROADCOM) += broadcom/
- obj-$(CONFIG_WLAN_VENDOR_CISCO) += cisco/