linux-mainline: Enable bluetooth on NanoPi Neo Air

Also we delete since the changes there are already added by
board-nanopiair-h3-camera-wifi-bluetooth-otg.patch

Changelog-entry: Enable bluetooth on NanoPi Neo Air
Signed-off-by: Florin Sarbu <florin@balena.io>
This commit is contained in:
Florin Sarbu 2020-04-01 11:33:40 +02:00
parent 35cd9df541
commit 82b17bc6bf
3 changed files with 6 additions and 32 deletions

View file

@ -1,31 +0,0 @@
From b093d275ba1bec4d8ee91f18609ef0266fa5cbbb Mon Sep 17 00:00:00 2001
From: Sebastian Panceac <sebastian@balena.io>
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 <sebastian@balena.io>
---
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

View file

@ -88,6 +88,12 @@ RESIN_CONFIGS[configfs] = " \
CONFIG_CONFIGFS_FS=m \ CONFIG_CONFIGFS_FS=m \
" "
RESIN_CONFIGS_append_nanopi-neo-air = " hciuart"
RESIN_CONFIGS[hciuart] = " \
CONFIG_BT_HCIUART=m \
CONFIG_BT_HCIUART_H4=y \
"
FILES_${PN}-fixup-scr = " \ FILES_${PN}-fixup-scr = " \
/boot/sun8i-h3-fixup.scr \ /boot/sun8i-h3-fixup.scr \
" "

View file

@ -264,7 +264,6 @@ SRC_URI_append = " \
file://armbian/board-h6-clock-higher.patch \ file://armbian/board-h6-clock-higher.patch \
file://armbian/board-nanopi-adjust-defaults.patch \ file://armbian/board-nanopi-adjust-defaults.patch \
file://armbian/board-nanopiair-h3-camera-wifi-bluetooth-otg.patch \ file://armbian/board-nanopiair-h3-camera-wifi-bluetooth-otg.patch \
file://0001-Enable-uart3-for-NanoPi-Neo-Air-used-by-BT.patch \
file://armbian/board-olinuxino-A64-add-eMMC.patch \ file://armbian/board-olinuxino-A64-add-eMMC.patch \
file://armbian/board-orangepizeroplus2-missing-otg-bits.patch \ file://armbian/board-orangepizeroplus2-missing-otg-bits.patch \
file://armbian/board-pine-h6-pine-h6-0008-arm64-allwinner-h6-add-missing-mmc-pins.patch \ file://armbian/board-pine-h6-pine-h6-0008-arm64-allwinner-h6-add-missing-mmc-pins.patch \