From 46f2735c17d215fd76c54d7bfc4d7ca5ec206eb2 Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Mon, 12 Jul 2021 21:59:19 +0800 Subject: [PATCH 1/3] arm64: dts: meson-gxbb: nanopi-k2: Enable Bluetooth The NanoPi K2 has a AP6212 WiFi+BT combo module. The WiFi portion is already enabled. The BT part is connected via UART and I2S. Enable the UART and add a device node describing the Bluetooth portion of the module. Reviewed-by: Martin Blumenstingl Signed-off-by: Chen-Yu Tsai Signed-off-by: Neil Armstrong Link: https://lore.kernel.org/r/20210712135919.32059-1-wens@kernel.org --- .../arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts index 7273eed5292c..7d94160f5802 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts @@ -385,9 +385,20 @@ /* Bluetooth on AP6212 */ &uart_A { - status = "disabled"; + status = "okay"; pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; pinctrl-names = "default"; + uart-has-rtscts; + + bluetooth { + compatible = "brcm,bcm43438-bt"; + clocks = <&wifi_32k>; + clock-names = "lpo"; + vbat-supply = <&vddio_ao3v3>; + vddio-supply = <&vddio_ao18>; + host-wakeup-gpios = <&gpio GPIOX_21 GPIO_ACTIVE_HIGH>; + shutdown-gpios = <&gpio GPIOX_20 GPIO_ACTIVE_HIGH>; + }; }; /* 40-pin CON1 */ From 6b197abe56feeafe9c516dca1b3ca3742200adba Mon Sep 17 00:00:00 2001 From: Artem Lapkin Date: Tue, 22 Jun 2021 12:43:33 +0800 Subject: [PATCH 2/3] arm64: dts: meson: improve gxl-s905x-khadas-vim wifi Improve gxl-s905x-khadas-vim wifi performance * change freq from 60Mhz to 100Mhz 100Mhz works well same as in meson-khadas-vim3.dtsi Signed-off-by: Artem Lapkin Signed-off-by: Neil Armstrong Link: https://lore.kernel.org/r/20210622044334.769791-1-art@khadas.com --- arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts index 60feac0179c0..6ab1cc125b96 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts @@ -218,6 +218,8 @@ }; &sd_emmc_a { + max-frequency = <100000000>; + brcmf: wifi@1 { reg = <1>; compatible = "brcm,bcm4329-fmac"; From 4b5260032ec691b11a9185f7f38f5761e67fab48 Mon Sep 17 00:00:00 2001 From: Artem Lapkin Date: Tue, 22 Jun 2021 12:43:34 +0800 Subject: [PATCH 3/3] arm64: dts: meson: improve gxm-khadas-vim2 wifi Improve gxm-khadas-vim2 wifi performance * change freq from 60Mhz to 100Mhz * add cap-sd-highspeed param 100Mhz works well same as in meson-khadas-vim3.dtsi Signed-off-by: Artem Lapkin Signed-off-by: Neil Armstrong Link: https://lore.kernel.org/r/20210622044334.769791-2-art@khadas.com --- arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts index 18a4b7a6c5df..86bdc0baf032 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts @@ -307,7 +307,8 @@ #size-cells = <0>; bus-width = <4>; - max-frequency = <60000000>; + cap-sd-highspeed; + max-frequency = <100000000>; non-removable; disable-wp;