mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 16:31:13 +00:00
e5aa498acb
Fixes CVE-2020-10757 via upstream commit df4988aa1c96 ("mm: Fix mremap
not considering huge pmd devmap").
Resolved merge conflict in the following patches:
bcm27xx: 950-0128-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch
Refreshed patches, removed upstreamed patch:
generic: 751-v5.8-net-dsa-mt7530-set-CPU-port-to-fallback-mode.patch
generic: 754-v5.7-net-dsa-mt7530-fix-roaming-from-DSA-user-ports.patch
Run tested: qemu-x86-64
Build tested: x86/64, imx6, sunxi/a53
Signed-off-by: Petr Štetiar <ynezz@true.cz>
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
|
|
@@ -83,19 +83,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;
|
|
- };
|
|
};
|
|
|
|
|
|
@@ -231,9 +218,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 */
|
|
@@ -288,6 +280,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
|
|
@@ -393,12 +391,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
|