From bb8a811d9412fdb34433ddf23acccb7d7e615689 Mon Sep 17 00:00:00 2001
From: Florin Sarbu <florin@balena.io>
Date: Fri, 3 Apr 2020 15:25:22 +0200
Subject: [PATCH] linux-mainline_%.bbappend: Rework faulty eMMC patch

This patch needs to be redone for the newer kernel the BSP layer now
has. We'll just make sure we remove the BSP version and add the reworked
one.

Signed-off-by: Florin Sarbu <florin@balena.io>
---
 ...dd-back-eMMC-support-for-Nanopi-Neo-.patch | 35 +++++++++++++++++++
 .../linux/linux-mainline_%.bbappend           |  6 ++++
 2 files changed, 41 insertions(+)
 create mode 100644 layers/meta-balena-allwinner/recipes-kernel/linux/files/0001-linux-mainline-Add-back-eMMC-support-for-Nanopi-Neo-.patch

diff --git a/layers/meta-balena-allwinner/recipes-kernel/linux/files/0001-linux-mainline-Add-back-eMMC-support-for-Nanopi-Neo-.patch b/layers/meta-balena-allwinner/recipes-kernel/linux/files/0001-linux-mainline-Add-back-eMMC-support-for-Nanopi-Neo-.patch
new file mode 100644
index 0000000..3811de0
--- /dev/null
+++ b/layers/meta-balena-allwinner/recipes-kernel/linux/files/0001-linux-mainline-Add-back-eMMC-support-for-Nanopi-Neo-.patch
@@ -0,0 +1,35 @@
+From 7b55d5f6bf7674e237aae44b7c34f34e5e2d9df5 Mon Sep 17 00:00:00 2001
+From: Florin Sarbu <florin@balena.io>
+Date: Fri, 3 Apr 2020 16:26:49 +0200
+Subject: [PATCH] linux-mainline: Add back eMMC support for Nanopi Neo Air
+
+Upstream-Status: Pending
+Signed-off-by: Florin Sarbu <florin@balena.io>
+---
+ arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
+index 07867a0..4d5f615 100644
+--- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
++++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
+@@ -103,6 +103,16 @@
+ 	};
+ };
+ 
++&mmc2 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&mmc2_8bit_pins>;
++	vmmc-supply = <&reg_vcc3v3>;
++	vqmmc-supply = <&reg_vcc3v3>;
++	bus-width = <8>;
++	non-removable;
++	status = "okay";
++};
++
+ &uart0 {
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&uart0_pa_pins>;
+-- 
+2.7.4
+
diff --git a/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline_%.bbappend b/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline_%.bbappend
index 8efabe3..2ca4047 100644
--- a/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline_%.bbappend
+++ b/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline_%.bbappend
@@ -3,6 +3,12 @@ inherit kernel-devicetree
 
 PACKAGES =+ "${PN}-fixup-scr"
 
+SRC_URI_remove = "file://0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI_append_nanopi-neo-air = " file://0001-linux-mainline-Add-back-eMMC-support-for-Nanopi-Neo-.patch"
+
 RESIN_CONFIGS_append = " axp_power"
 RESIN_CONFIGS_DEPS[axp_power] = "\
     CONFIG_TOUCHSCREEN_SUN4I=n \