pomfi/balena-allwinner
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

linux-mainline_%.bbappend: Rework faulty eMMC patch

Browse source 
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>
This commit is contained in:
Florin Sarbu 2020-04-03 15:25:22 +02:00
parent f6f47fd2aa
commit bb8a811d94
2 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
layers/meta-balena-allwinner/recipes-kernel/linux/files/0001-linux-mainline-Add-back-eMMC-support-for-Nanopi-Neo-.patch Normal file
View file

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

6
layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline_%.bbappend
View file

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