From cdf6b3fed5278d166d7cabb728b08cccae4af0ec Mon Sep 17 00:00:00 2001 From: Paul Cercueil Date: Sat, 6 Nov 2021 00:29:30 +0000 Subject: [PATCH] main/linux-postmarketos-exynos4: Add support for Bluetooth on i9100 (MR 2661) Add two patches that fixes the Bluetooth node in the Device Tree of the Galaxy S2 (i9100). These two patches are not upstream yet, but were accepted by the maintainer for inclusion in Linux 5.17. Signed-off-by: Paul Cercueil --- ...s-i9100-Fix-BCM4330-Bluetooth-reset-.patch | 33 ++++++++++++++++++ ...s-i9100-Use-interrupt-for-BCM4330-ho.patch | 34 +++++++++++++++++++ main/linux-postmarketos-exynos4/APKBUILD | 4 +++ 3 files changed, 71 insertions(+) create mode 100644 main/linux-postmarketos-exynos4/0011-ARM-dts-exynos-i9100-Fix-BCM4330-Bluetooth-reset-.patch create mode 100644 main/linux-postmarketos-exynos4/0012-ARM-dts-exynos-i9100-Use-interrupt-for-BCM4330-ho.patch diff --git a/main/linux-postmarketos-exynos4/0011-ARM-dts-exynos-i9100-Fix-BCM4330-Bluetooth-reset-.patch b/main/linux-postmarketos-exynos4/0011-ARM-dts-exynos-i9100-Fix-BCM4330-Bluetooth-reset-.patch new file mode 100644 index 000000000..2e773bfdf --- /dev/null +++ b/main/linux-postmarketos-exynos4/0011-ARM-dts-exynos-i9100-Fix-BCM4330-Bluetooth-reset-.patch @@ -0,0 +1,33 @@ +From 0348cfc4fe67d02a12c7c69425aeae6991d90c9a Mon Sep 17 00:00:00 2001 +From: Paul Cercueil +Date: Sun, 31 Oct 2021 23:36:09 +0000 +Subject: [PATCH v2 1/2] ARM: dts: exynos/i9100: Fix BCM4330 Bluetooth reset + polarity + +The reset GPIO was marked active-high, which is against what's specified +in the documentation. Mark the reset GPIO as active-low. With this +change, Bluetooth can now be used on the i9100. + +Fixes: 8620cc2f99b7 ("ARM: dts: exynos: Add devicetree file for the Galaxy S2") +Cc: stable@vger.kernel.org +Signed-off-by: Paul Cercueil +--- + arch/arm/boot/dts/exynos4210-i9100.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/exynos4210-i9100.dts b/arch/arm/boot/dts/exynos4210-i9100.dts +index 55922176807e..5f5d9b135736 100644 +--- a/arch/arm/boot/dts/exynos4210-i9100.dts ++++ b/arch/arm/boot/dts/exynos4210-i9100.dts +@@ -827,7 +827,7 @@ bluetooth { + compatible = "brcm,bcm4330-bt"; + + shutdown-gpios = <&gpl0 4 GPIO_ACTIVE_HIGH>; +- reset-gpios = <&gpl1 0 GPIO_ACTIVE_HIGH>; ++ reset-gpios = <&gpl1 0 GPIO_ACTIVE_LOW>; + device-wakeup-gpios = <&gpx3 1 GPIO_ACTIVE_HIGH>; + host-wakeup-gpios = <&gpx2 6 GPIO_ACTIVE_HIGH>; + }; +-- +2.33.0 + diff --git a/main/linux-postmarketos-exynos4/0012-ARM-dts-exynos-i9100-Use-interrupt-for-BCM4330-ho.patch b/main/linux-postmarketos-exynos4/0012-ARM-dts-exynos-i9100-Use-interrupt-for-BCM4330-ho.patch new file mode 100644 index 000000000..e980092f2 --- /dev/null +++ b/main/linux-postmarketos-exynos4/0012-ARM-dts-exynos-i9100-Use-interrupt-for-BCM4330-ho.patch @@ -0,0 +1,34 @@ +From 7c75fdd8fe77dbc46ec38ec839b35e3e7824d617 Mon Sep 17 00:00:00 2001 +From: Paul Cercueil +Date: Sun, 31 Oct 2021 23:38:45 +0000 +Subject: [PATCH v2 2/2] ARM: dts: exynos/i9100: Use interrupt for BCM4330 host + wakeup + +Switch away from using the deprecated 'host-wakeup-gpios' property, +and use a 'host-wakeup' interrupt instead, as suggested by the binding +documentation. + +Signed-off-by: Paul Cercueil +--- + arch/arm/boot/dts/exynos4210-i9100.dts | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/exynos4210-i9100.dts b/arch/arm/boot/dts/exynos4210-i9100.dts +index 5f5d9b135736..76b1017e05e8 100644 +--- a/arch/arm/boot/dts/exynos4210-i9100.dts ++++ b/arch/arm/boot/dts/exynos4210-i9100.dts +@@ -829,7 +829,10 @@ bluetooth { + shutdown-gpios = <&gpl0 4 GPIO_ACTIVE_HIGH>; + reset-gpios = <&gpl1 0 GPIO_ACTIVE_LOW>; + device-wakeup-gpios = <&gpx3 1 GPIO_ACTIVE_HIGH>; +- host-wakeup-gpios = <&gpx2 6 GPIO_ACTIVE_HIGH>; ++ ++ interrupt-parent = <&gpx2>; ++ interrupts = <6 IRQ_TYPE_EDGE_FALLING>; ++ interrupt-names = "host-wakeup"; + }; + }; + +-- +2.33.0 + diff --git a/main/linux-postmarketos-exynos4/APKBUILD b/main/linux-postmarketos-exynos4/APKBUILD index 84ee32f91..09755b14e 100644 --- a/main/linux-postmarketos-exynos4/APKBUILD +++ b/main/linux-postmarketos-exynos4/APKBUILD @@ -49,6 +49,8 @@ source=" 0008-power-supply-max17042_battery-use-VFSOC-for-capacity.patch 0009-power-supply-max17042_battery-Clear-status-bits-in-i.patch 0010-power-supply-max17042_battery-Prevent-int-underflow-.patch + 0011-ARM-dts-exynos-i9100-Fix-BCM4330-Bluetooth-reset-.patch + 0012-ARM-dts-exynos-i9100-Use-interrupt-for-BCM4330-ho.patch initramfs.list init " @@ -100,6 +102,8 @@ de87e6a6608165cdc35a03bd10dedef1c12a2a9e1f66f500879c05b287bae7181cc95021a3a2aad6 79e28ed7bd5f5f37dccee71455528ef4680aae73f2abe35ea0480bc09da4206bbcb0734d55d9e591676937cd9bb897d4e1ceb4689751ce28a5624d08d165a25e 0008-power-supply-max17042_battery-use-VFSOC-for-capacity.patch 211457806e8735b330511ae68f6b82f7fc653e37aa58b9af8cfd1eae241e80372fdf3b4c93c29e8452a76a888f3282186652980f80ca74a53c557ebf8ebabcca 0009-power-supply-max17042_battery-Clear-status-bits-in-i.patch eeeb338ebe4890abd3c15262ed7bb9fb5b5f3d118f249efb384df2b342f94909146d210704d81346734fd3ce9ae2dd7bf9bd433a1ed02f36e8b595a1922bb6a3 0010-power-supply-max17042_battery-Prevent-int-underflow-.patch +f0824947fbcc05199e10efb1eb5e0c5c8ba552c86fd255682d36c9e00a9257b44f11cf34086a7a85bf69c2307086f5c567c017c9f4dfee7b4880f73dfaf8722a 0011-ARM-dts-exynos-i9100-Fix-BCM4330-Bluetooth-reset-.patch +4ad139898236dd7035ace862c4a9be2d92351977f2d0c38072434c82f2a7f89c224f9b366fcf44755849788f92ed8cdc019cf6c82453b85d5257bf6737a6bb68 0012-ARM-dts-exynos-i9100-Use-interrupt-for-BCM4330-ho.patch aaff0332b90e1f9f62de1128cace934717336e54ab09de46477369fa808302482d97334e43a85ee8597c1bcab64d3484750103559fea2ce8cd51776156bf7591 initramfs.list 09f1f214a24300696809727a7b04378887c06ca6f40803ca51a12bf2176a360b2eb8632139d6a0722094e05cb2038bdb04018a1e3d33fc2697674552ade03bee init "