From 35613eccd1affbd7a3939e8b33cd67b4bb0e2158 Mon Sep 17 00:00:00 2001 From: Vicentiu Galanopulo Date: Thu, 10 Oct 2019 11:00:20 +0200 Subject: [PATCH] linux-mainline-4.19: Rework for Enable-uart3-for-NanoPi-Neo-Air patch The 0001-Enable-uart3-for-NanoPi-Neo-Air-used-by-BT.patch fails to apply over the 4.19.76 mainline kernel, so remove it and apply a reworked version of it. Add the correct path for the patches directory, linux-mainline-4.19 instead of linux-4.19 (removed in a previous commit and all it's content has been placed in linux-mainline-4.19). Signed-off-by: Vicentiu Galanopulo --- ...-uart3-for-NanoPi-Neo-Air-used-by-BT.patch | 31 +++++++++++++++++++ .../linux/linux-mainline_4.19.76.bbappend | 8 ++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline-4.19/0001-Enable-uart3-for-NanoPi-Neo-Air-used-by-BT.patch diff --git a/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline-4.19/0001-Enable-uart3-for-NanoPi-Neo-Air-used-by-BT.patch b/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline-4.19/0001-Enable-uart3-for-NanoPi-Neo-Air-used-by-BT.patch new file mode 100644 index 0000000..39b986c --- /dev/null +++ b/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline-4.19/0001-Enable-uart3-for-NanoPi-Neo-Air-used-by-BT.patch @@ -0,0 +1,31 @@ +From b093d275ba1bec4d8ee91f18609ef0266fa5cbbb Mon Sep 17 00:00:00 2001 +From: Sebastian Panceac +Date: Wed, 27 Feb 2019 10:13:31 +0100 +Subject: [PATCH] Enable uart3 for NanoPi Neo Air used by BT + +Upstream-status: Pending +Signed-off-by: Sebastian Panceac +--- + arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts | 6 ++++++ + 1 file changed, 6 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 6246d3eff39d..2fc601a0ec82 100644 +--- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts ++++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts +@@ -109,6 +109,12 @@ + status = "okay"; + }; + ++&uart3 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart3_pins>, <&uart3_rts_cts_pins>; ++ status = "okay"; ++}; ++ + &usbphy { + /* USB VBUS is always on */ + status = "okay"; +-- +2.17.1 + diff --git a/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline_4.19.76.bbappend b/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline_4.19.76.bbappend index 05067ab..0c22d9a 100644 --- a/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline_4.19.76.bbappend +++ b/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline_4.19.76.bbappend @@ -1,7 +1,13 @@ inherit kernel-resin PACKAGES =+ "${PN}-fixup-scr" -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-4.19:" +FILESEXTRAPATHS_prepend := "${THISDIR}/linux-mainline-4.19:" + +SRC_URI_remove = " file://0001-Enable-uart3-for-NanoPi-Neo-Air-used-by-BT.patch \ +" + +SRC_URI_append = " file://0001-Enable-uart3-for-NanoPi-Neo-Air-used-by-BT.patch \ +" # These patches were fetched from the lovely guys at armbian: https://github.com/armbian/build/tree/master/patch/kernel/sunxi-next SRC_URI_append = " \