From a1297419fed8b19eca18e4f46014f4d2ba2624fc Mon Sep 17 00:00:00 2001 From: Florin Sarbu Date: Wed, 12 Sep 2018 11:57:05 +0200 Subject: [PATCH 1/2] linux-mainline: Add back eMMC support for Nanopi Neo Air Signed-off-by: Florin Sarbu --- ...ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/recipes-kernel/linux/linux-mainline/0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch b/recipes-kernel/linux/linux-mainline/0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch index 34af0e9..5f3e01e 100644 --- a/recipes-kernel/linux/linux-mainline/0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch +++ b/recipes-kernel/linux/linux-mainline/0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch @@ -9,18 +9,22 @@ This patch was originally submitted by Jelle van der Waa. Martin Kelly modified it to compile on the latest kernel, fixed up some review comments from Maxime Ripard, and re-tested the patch. +The patch has been reworked to add back eMMC support which has been left +out at the last backport. + Cc: Maxime Ripard Cc: linux-sunxi@googlegroups.com Cc: devicetree@vger.kernel.org Signed-off-by: Jelle van der Waa Signed-off-by: Martin Kelly Signed-off-by: Maxime Ripard +Signed-off-by: Florin Sarbu --- - arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts | 24 ++++++++++++++++++++++++ - 1 file changed, 24 insertions(+) + arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts | 34 +++++++++++++++++++++++++++ + 1 file changed, 34 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 03ff6f8b93ff..920849092cc8 100644 +index 03ff6f8..a9331fe 100644 --- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts +++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts @@ -72,6 +72,11 @@ @@ -35,7 +39,7 @@ index 03ff6f8b93ff..920849092cc8 100644 }; &mmc0 { -@@ -84,6 +89,25 @@ +@@ -84,6 +89,35 @@ status = "okay"; }; @@ -57,6 +61,16 @@ index 03ff6f8b93ff..920849092cc8 100644 + interrupt-names = "host-wake"; + }; +}; ++ ++&mmc2 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&mmc2_8bit_pins>; ++ vmmc-supply = <®_vcc3v3>; ++ vqmmc-supply = <®_vcc3v3>; ++ bus-width = <8>; ++ non-removable; ++ status = "okay"; ++}; + &uart0 { pinctrl-names = "default"; From 5e1b5a9f86f3c064b65201c1b1909c499f7fb3dd Mon Sep 17 00:00:00 2001 From: Florin Sarbu Date: Wed, 12 Sep 2018 14:50:33 +0200 Subject: [PATCH 2/2] u-boot_2018.03.bb: Enable eMMC support for Nanopi Neo Air Signed-off-by: Florin Sarbu --- ...eo_air_defconfig-Enable-eMMC-support.patch | 26 +++++++++++++++++++ recipes-bsp/u-boot/u-boot_2018.03.bb | 1 + 2 files changed, 27 insertions(+) create mode 100644 recipes-bsp/u-boot/files/0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch diff --git a/recipes-bsp/u-boot/files/0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch b/recipes-bsp/u-boot/files/0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch new file mode 100644 index 0000000..fcef320 --- /dev/null +++ b/recipes-bsp/u-boot/files/0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch @@ -0,0 +1,26 @@ +From f4a77da23b3890b53efab6a927cbe99b76ef3b26 Mon Sep 17 00:00:00 2001 +From: Florin Sarbu +Date: Wed, 12 Sep 2018 14:22:49 +0200 +Subject: [PATCH] nanopi_neo_air_defconfig: Enable eMMC support + +Upstream-status: Pending +Signed-off-by: Florin Sarbu +--- + configs/nanopi_neo_air_defconfig | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configs/nanopi_neo_air_defconfig b/configs/nanopi_neo_air_defconfig +index ca9c2dd..74ce044 100644 +--- a/configs/nanopi_neo_air_defconfig ++++ b/configs/nanopi_neo_air_defconfig +@@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-neo-air" + # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set + CONFIG_CONSOLE_MUX=y + CONFIG_SPL=y ++CONFIG_MMC_SUNXI_SLOT_EXTRA=2 + # CONFIG_CMD_FLASH is not set + # CONFIG_SPL_DOS_PARTITION is not set + # CONFIG_SPL_ISO_PARTITION is not set +-- +2.7.4 + diff --git a/recipes-bsp/u-boot/u-boot_2018.03.bb b/recipes-bsp/u-boot/u-boot_2018.03.bb index f4a675d..cdb3273 100644 --- a/recipes-bsp/u-boot/u-boot_2018.03.bb +++ b/recipes-bsp/u-boot/u-boot_2018.03.bb @@ -18,6 +18,7 @@ DEFAULT_PREFERENCE_sun50i="1" SRC_URI = "git://git.denx.de/u-boot.git;branch=master \ file://u-boot-pylibfdt-native-build.patch \ + file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \ file://boot.cmd \ "