From 7bc87817a14b7b7d264dedaefc8f142e92cfb37d Mon Sep 17 00:00:00 2001 From: mpromonet Date: Thu, 11 Nov 2021 18:58:01 +0100 Subject: [PATCH] this is integrate in kernel mainline since https://github.com/torvalds/linux/commit/88c23c05ef18f543fad7b26c95a3acc0ffb378cc#diff-9c6eb3684dca738538e1dcb691cb9dd7684d6d5da0e963b5ba5a7e47b8b95e21 and breaks the build Signed-off-by: mpromonet --- recipes-kernel/linux/linux-mainline.inc | 1 - ...ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch | 80 ------------------- recipes-kernel/linux/linux.inc | 4 - 3 files changed, 85 deletions(-) delete mode 100644 recipes-kernel/linux/linux-mainline/0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch diff --git a/recipes-kernel/linux/linux-mainline.inc b/recipes-kernel/linux/linux-mainline.inc index a80597c..cfc7c09 100644 --- a/recipes-kernel/linux/linux-mainline.inc +++ b/recipes-kernel/linux/linux-mainline.inc @@ -21,7 +21,6 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" S = "${WORKDIR}/linux-${PV}" SRC_URI = "https://www.kernel.org/pub/linux/kernel/v5.x/linux-${PV}.tar.xz \ - file://0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch \ file://0001-dts-orange-pi-zero-Add-wifi-support.patch \ file://defconfig \ " 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 deleted file mode 100644 index 5f3e01e..0000000 --- a/recipes-kernel/linux/linux-mainline/0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 4ca766a768e783ee5198f1935b7f46a5df9b4a35 Mon Sep 17 00:00:00 2001 -From: Jelle van der Waa -Date: Tue, 23 Jan 2018 15:58:44 -0800 -Subject: [PATCH] ARM: dts: nanopi-neo-air: Add WiFi / eMMC - -Enable the WiFi (AP6212) chip and eMMC support for the NanoPi NEO Air. - -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 | 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 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 @@ - gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */ - }; - }; -+ -+ wifi_pwrseq: wifi_pwrseq { -+ compatible = "mmc-pwrseq-simple"; -+ reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ -+ }; - }; - - &mmc0 { -@@ -84,6 +89,35 @@ - status = "okay"; - }; - -+&mmc1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&mmc1_pins_a>; -+ vmmc-supply = <®_vcc3v3>; -+ vqmmc-supply = <®_vcc3v3>; -+ mmc-pwrseq = <&wifi_pwrseq>; -+ bus-width = <4>; -+ non-removable; -+ status = "okay"; -+ -+ brcmf: bcrmf@1 { -+ reg = <1>; -+ compatible = "brcm,bcm4329-fmac"; -+ interrupt-parent = <&pio>; -+ interrupts = <6 10 IRQ_TYPE_LEVEL_LOW>; /* PG10 / EINT10 */ -+ 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"; - pinctrl-0 = <&uart0_pins_a>; --- -2.11.0 - diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc index 2faecb0..724ca97 100644 --- a/recipes-kernel/linux/linux.inc +++ b/recipes-kernel/linux/linux.inc @@ -124,9 +124,5 @@ do_configure:append() { fi } -do_install:append() { - oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix}/src/linux-${KERNEL_VERSION} ARCH=$ARCH -} - PACKAGES =+ "kernel-headers" FILES_kernel-headers = "${exec_prefix}/src/linux*"