From a1297419fed8b19eca18e4f46014f4d2ba2624fc Mon Sep 17 00:00:00 2001 From: Florin Sarbu Date: Wed, 12 Sep 2018 11:57:05 +0200 Subject: [PATCH] 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";