From ba8487ed522c9f89920eab6d20259b005c66b26a Mon Sep 17 00:00:00 2001 From: Patrick Yavitz Date: Thu, 3 Jul 2025 16:32:09 -0400 Subject: [PATCH] Gateway GZ80x: `Add bluetooth support` Signed-off-by: Patrick Yavitz --- .../dt/meson-axg-amper-gateway-am-gz80x.dts | 21 ++++++++++++------- .../dt/meson-axg-amper-gateway-gz80x.dtsi | 4 +++- .../dt/meson-axg-amper-gateway-am-gz80x.dts | 21 ++++++++++++------- .../dt/meson-axg-amper-gateway-gz80x.dtsi | 4 +++- 4 files changed, 32 insertions(+), 18 deletions(-) diff --git a/patch/kernel/archive/meson64-6.12/dt/meson-axg-amper-gateway-am-gz80x.dts b/patch/kernel/archive/meson64-6.12/dt/meson-axg-amper-gateway-am-gz80x.dts index 57c9b607f..e6ebe2b57 100644 --- a/patch/kernel/archive/meson64-6.12/dt/meson-axg-amper-gateway-am-gz80x.dts +++ b/patch/kernel/archive/meson64-6.12/dt/meson-axg-amper-gateway-am-gz80x.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* - * Copyright (c) 2024 Patrick Yavitz + * Copyright (c) 2025 Patrick Yavitz */ /dts-v1/; @@ -11,12 +11,6 @@ compatible = "amper,gateway-am-gz80x", "amlogic,a113x", "amlogic,meson-axg"; model = "Amper Gateway AM-GZ80x"; - aliases { - serial1 = &uart_B; - serial2 = &uart_AO_B; - ethernet0 = ðmac; - }; - /* 1024MB RAM */ memory@0 { device_type = "memory"; @@ -30,8 +24,19 @@ }; }; +&spicc1 { + status = "disabled"; +}; + +/* Bluetooth */ &uart_B { status = "okay"; - pinctrl-0 = <&uart_b_z_pins>; + pinctrl-0 = <&uart_b_x_pins>, <&uart_b_x_cts_rts_pins>; pinctrl-names = "default"; + uart-has-rtscts; + + bluetooth { + compatible = "realtek,rtl8723bs-bt"; + enable-gpios = <&gpio GPIOX_11 GPIO_ACTIVE_HIGH>; + }; }; diff --git a/patch/kernel/archive/meson64-6.12/dt/meson-axg-amper-gateway-gz80x.dtsi b/patch/kernel/archive/meson64-6.12/dt/meson-axg-amper-gateway-gz80x.dtsi index 951446925..0f3f8ce09 100644 --- a/patch/kernel/archive/meson64-6.12/dt/meson-axg-amper-gateway-gz80x.dtsi +++ b/patch/kernel/archive/meson64-6.12/dt/meson-axg-amper-gateway-gz80x.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* - * Copyright (c) 2024 Patrick Yavitz + * Copyright (c) 2025 Patrick Yavitz */ /dts-v1/; @@ -13,6 +13,8 @@ / { aliases { serial0 = &uart_AO; + serial2 = &uart_AO_B; + ethernet0 = ðmac; }; chosen { diff --git a/patch/kernel/archive/meson64-6.15/dt/meson-axg-amper-gateway-am-gz80x.dts b/patch/kernel/archive/meson64-6.15/dt/meson-axg-amper-gateway-am-gz80x.dts index 57c9b607f..e6ebe2b57 100644 --- a/patch/kernel/archive/meson64-6.15/dt/meson-axg-amper-gateway-am-gz80x.dts +++ b/patch/kernel/archive/meson64-6.15/dt/meson-axg-amper-gateway-am-gz80x.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* - * Copyright (c) 2024 Patrick Yavitz + * Copyright (c) 2025 Patrick Yavitz */ /dts-v1/; @@ -11,12 +11,6 @@ compatible = "amper,gateway-am-gz80x", "amlogic,a113x", "amlogic,meson-axg"; model = "Amper Gateway AM-GZ80x"; - aliases { - serial1 = &uart_B; - serial2 = &uart_AO_B; - ethernet0 = ðmac; - }; - /* 1024MB RAM */ memory@0 { device_type = "memory"; @@ -30,8 +24,19 @@ }; }; +&spicc1 { + status = "disabled"; +}; + +/* Bluetooth */ &uart_B { status = "okay"; - pinctrl-0 = <&uart_b_z_pins>; + pinctrl-0 = <&uart_b_x_pins>, <&uart_b_x_cts_rts_pins>; pinctrl-names = "default"; + uart-has-rtscts; + + bluetooth { + compatible = "realtek,rtl8723bs-bt"; + enable-gpios = <&gpio GPIOX_11 GPIO_ACTIVE_HIGH>; + }; }; diff --git a/patch/kernel/archive/meson64-6.15/dt/meson-axg-amper-gateway-gz80x.dtsi b/patch/kernel/archive/meson64-6.15/dt/meson-axg-amper-gateway-gz80x.dtsi index 951446925..0f3f8ce09 100644 --- a/patch/kernel/archive/meson64-6.15/dt/meson-axg-amper-gateway-gz80x.dtsi +++ b/patch/kernel/archive/meson64-6.15/dt/meson-axg-amper-gateway-gz80x.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* - * Copyright (c) 2024 Patrick Yavitz + * Copyright (c) 2025 Patrick Yavitz */ /dts-v1/; @@ -13,6 +13,8 @@ / { aliases { serial0 = &uart_AO; + serial2 = &uart_AO_B; + ethernet0 = ðmac; }; chosen {