mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 01:28:59 +00:00
667f6c7f49
Manually rebased patches:
bcm27xx/patches-5.4/950-0135-spi-spi-bcm2835-Disable-forced-software-CS.patch
generic-backport/744-v5.5-net-sfp-soft-status-and-control-support.patch
layerscape/patches-5.4/819-uart-0005-tty-serial-fsl_lpuart-enable-dma-mode-for-imx8qxp.patch
mvebu/patches-5.4/521-arm64-dts-marvell-espressobin-Add-ethernet-switch-al.patch
Removed:
layerscape/patches-5.4/819-uart-0012-tty-serial-lpuart-add-LS1028A-support.patch
All modifications made by update_kernel.sh
Build system: x86_64
Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711,
lantiq/Easybox 904 xDSL, x86_64
Run-tested: ipq806x/R7800, lantiq/Easybox 904 xDSL, x86_64
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Co-developed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
83 lines
2.0 KiB
Diff
83 lines
2.0 KiB
Diff
From d40edafe80569c5b4d8893c1cdd1060c54ef433c Mon Sep 17 00:00:00 2001
|
|
From: Tim Harvey <tharvey@gateworks.com>
|
|
Date: Tue, 12 May 2020 14:54:15 -0700
|
|
Subject: [PATCH 07/20] ARM: dts: imx6qdl-gw5910: add support for bcm4330-bt
|
|
|
|
The Sterling-LWB has a BCM4330 which has a UART based bluetooth
|
|
HCI. Add support for binding to the bcm_hci driver to take care
|
|
of handling the shutdown gpio and loading firmware.
|
|
|
|
Because the shutdown gpio is more of an enable than a regulator
|
|
go ahead and replace the regulator with a shutdown-gpio.
|
|
|
|
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
|
|
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
|
|
---
|
|
arch/arm/boot/dts/imx6qdl-gw5910.dtsi | 32 ++++++++++++--------------------
|
|
1 file changed, 12 insertions(+), 20 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/imx6qdl-gw5910.dtsi
|
|
+++ b/arch/arm/boot/dts/imx6qdl-gw5910.dtsi
|
|
@@ -81,19 +81,6 @@
|
|
regulator-max-microvolt = <3300000>;
|
|
regulator-always-on;
|
|
};
|
|
-
|
|
- reg_bt: regulator-bt {
|
|
- pinctrl-names = "default";
|
|
- pinctrl-0 = <&pinctrl_reg_bt>;
|
|
- compatible = "regulator-fixed";
|
|
- regulator-name = "bt";
|
|
- gpio = <&gpio1 2 GPIO_ACTIVE_HIGH>;
|
|
- startup-delay-us = <100>;
|
|
- enable-active-high;
|
|
- regulator-min-microvolt = <3300000>;
|
|
- regulator-max-microvolt = <3300000>;
|
|
- regulator-always-on;
|
|
- };
|
|
};
|
|
|
|
|
|
@@ -229,9 +216,14 @@
|
|
/* Sterling-LWB Bluetooth */
|
|
&uart4 {
|
|
pinctrl-names = "default";
|
|
- pinctrl-0 = <&pinctrl_uart4>;
|
|
+ pinctrl-0 = <&pinctrl_uart4>,<&pinctrl_bten>;
|
|
uart-has-rtscts;
|
|
status = "okay";
|
|
+
|
|
+ bluetooth {
|
|
+ compatible = "brcm,bcm4330-bt";
|
|
+ shutdown-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
|
|
+ };
|
|
};
|
|
|
|
/* GPS */
|
|
@@ -286,6 +278,12 @@
|
|
>;
|
|
};
|
|
|
|
+ pinctrl_bten: btengrp {
|
|
+ fsl,pins = <
|
|
+ MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x1b0b1
|
|
+ >;
|
|
+ };
|
|
+
|
|
pinctrl_ecspi3: escpi3grp {
|
|
fsl,pins = <
|
|
MX6QDL_PAD_DISP0_DAT0__ECSPI3_SCLK 0x100b1
|
|
@@ -391,12 +389,6 @@
|
|
>;
|
|
};
|
|
|
|
- pinctrl_reg_bt: regbtgrp {
|
|
- fsl,pins = <
|
|
- MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x1b0b1
|
|
- >;
|
|
- };
|
|
-
|
|
pinctrl_reg_wl: regwlgrp {
|
|
fsl,pins = <
|
|
MX6QDL_PAD_GPIO_5__GPIO1_IO05 0x1b0b1
|