From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on sa.local.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-4.3 required=5.0 tests=ALL_TRUSTED,BAYES_00, RP_MATCHES_RCVD autolearn=unavailable autolearn_force=no version=3.4.1 From: antohami@basealt.ru To: devel-kernel@lists.altlinux.org Date: Fri, 12 May 2023 21:51:42 +0700 Message-Id: <76e25abbf5a98227016200992d34f3a13de64f6d.1683902369.git.antohami@altlinux.org> X-Mailer: git-send-email 2.33.8 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [d-kernel] [PATCH 1/1] rk3568-firefly-roc-pc.dts: fix bluetooth support X-BeenThere: devel-kernel@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux kernel packages development List-Id: ALT Linux kernel packages development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 May 2023 14:52:24 -0000 Archived-At: List-Archive: List-Post: From: Anton Midyukov Update dts from Armbian. Link: https://github.com/150balbes/build/commit/1346fd210af2b00b68b31716a4180c67f8cef0e7 Link: https://github.com/150balbes/build/commit/0a915c15db0dca4eca4f318633f5c461cff94f16 Signed-off-by: Anton Midyukov --- .../dts/rockchip/rk3568-firefly-roc-pc.dts | 74 +++++++------------ 1 file changed, 26 insertions(+), 48 deletions(-) mode change 100644 => 100755 arch/arm64/boot/dts/rockchip/rk3568-firefly-roc-pc.dts diff --git a/arch/arm64/boot/dts/rockchip/rk3568-firefly-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3568-firefly-roc-pc.dts old mode 100644 new mode 100755 index 7a8d0e550f239..f2650d6eacdad --- a/arch/arm64/boot/dts/rockchip/rk3568-firefly-roc-pc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-firefly-roc-pc.dts @@ -7,6 +7,7 @@ /dts-v1/; #include #include +#include #include #include #include "rk3568.dtsi" @@ -262,31 +263,7 @@ sdio_pwrseq: sdio-pwrseq { pinctrl-names = "default"; pinctrl-0 = <&wifi_enable_h>; reset-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>; - }; - - wireless_wlan: wireless-wlan { - compatible = "wlan-platdata"; - rockchip,grf = <&grf>; - wifi_chip_type = "ap6398s"; - pinctrl-names = "default"; - pinctrl-0 = <&wifi_host_wake_irq>; - WIFI,host_wake_irq = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; - status = "okay"; - }; - - wireless_bluetooth: wireless-bluetooth { - compatible = "bluetooth-platdata"; - clocks = <&rk809 1>; - clock-names = "ext_clock"; - //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>; - pinctrl-names = "default", "rts_gpio"; - pinctrl-0 = <&uart8m0_rtsn>; - pinctrl-1 = <&uart8_gpios>; - BT,reset_gpio = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>; - status = "okay"; + post-power-on-delay-ms = <100>; }; flash_led: flash-led { @@ -773,15 +750,17 @@ wifi_enable_h: wifi-enable-h { }; }; - wireless-wlan { - wifi_host_wake_irq: wifi-host-wake-irq { - rockchip,pins = <3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_down>; + bt { + bt_enable_h: bt-enable-h { + rockchip,pins = <3 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; }; - }; - wireless-bluetooth { - uart8_gpios: uart8-gpios { - rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>; + bt_host_wake_l: bt-host-wake-l { + rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_down>; + }; + + bt_wake_l: bt-wake-l { + rockchip,pins = <3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; }; }; @@ -904,21 +883,6 @@ &sdmmc2 { status = "okay"; }; -&sdio_pwrseq { - status = "okay"; - reset-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>; - post-power-on-delay-ms = <100>; -}; - -&wireless_wlan { - wifi_chip_type = "ap6275s"; - status = "okay"; -}; - -&wireless_bluetooth { - status = "okay"; -}; - &tsadc { rockchip,hw-tshut-mode = <1>; rockchip,hw-tshut-polarity = <0>; @@ -942,9 +906,23 @@ &uart4 { }; &uart8 { - status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&uart8m0_xfer &uart8m0_ctsn>; + status = "okay"; + uart-has-rtscts; + + bluetooth { + compatible = "brcm,bcm43438-bt"; + clocks = <&rk809 1>; + clock-names = "lpo"; + device-wakeup-gpios = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>; + host-wakeup-gpios = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>; + shutdown-gpios = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>; + vbat-supply = <&vcc3v3_sys>; + vddio-supply = <&vcca1v8_pmu>; + }; }; &usb_host0_ehci { -- 2.33.8