From f148c4137809525d95ef4fcf1f92c80484d52543 Mon Sep 17 00:00:00 2001 From: Caesar Wang Date: Tue, 23 Jul 2024 10:32:59 +0800 Subject: [PATCH] arm64: dts: rockchip: rk3566/rk3568 boards: Fix pinctrl configuration for wireless-bluetooth The Linux OS uses the device tree to detect the wifibt module, particularly the Bluetooth module's UART, identified via `/sys/firmware/devicetree/base/pinctrl/wireless-bluetooth`. Some RK3566/RK3568 board configurations redundantly register the pinctrl for wireless-bluetooth, causing script failures in UART identification. This commit removes the redundant node to resolve conflicts and ensure correct UART identification for Bluetooth communication. Change-Id: Id55c48bda38275c04a365b0ede1f740baf767da2 Signed-off-by: Caesar Wang --- arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dtsi | 1 + arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dtsi | 1 + arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi | 1 + arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi | 1 + arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi | 1 + arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts | 1 + arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts | 1 + arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts | 1 + arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts | 1 + arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts | 1 + arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts | 1 + arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts | 1 + arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi | 1 + arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi | 1 + arch/arm64/boot/dts/rockchip/rk3568-toybrick-sd0.dtsi | 1 + arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0.dtsi | 1 + 16 files changed, 16 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dtsi index 41ac0af11188..b81f91d1b4e8 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-box-demo-v10.dtsi @@ -520,6 +520,7 @@ }; }; + /delete-node/ wireless-bluetooth; wireless-bluetooth { uart1_gpios: uart1-gpios { rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dtsi index 6ebad295cbfc..243eb085e9a4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dtsi @@ -499,6 +499,7 @@ }; }; + /delete-node/ wireless-bluetooth; wireless-bluetooth { uart1_gpios: uart1-gpios { rockchip,pins = <4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi index d981c7e2c938..15f878d85fde 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi @@ -460,6 +460,7 @@ }; }; + /delete-node/ wireless-bluetooth; wireless-bluetooth { uart1_gpios: uart1-gpios { rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi index f06073647d3c..7e99bf7b464f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi @@ -360,6 +360,7 @@ }; }; + /delete-node/ wireless-bluetooth; wireless-bluetooth { uart1_gpios: uart1-gpios { rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi index 936d6fdfe715..82e4775c1a2f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi @@ -322,6 +322,7 @@ }; }; + /delete-node/ wireless-bluetooth; wireless-bluetooth { uart1_gpios: uart1-gpios { rockchip,pins = <4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts index 6878d9095323..3e5f82852660 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts @@ -924,6 +924,7 @@ }; }; + /delete-node/ wireless-bluetooth; wireless-bluetooth { uart1_gpios: uart1-gpios { rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts index 63289bd49976..97c4d225103a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts @@ -795,6 +795,7 @@ }; }; + /delete-node/ wireless-bluetooth; wireless-bluetooth { uart1_gpios: uart1-gpios { rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts index c67db6d3f304..e483e0cc34aa 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts @@ -813,6 +813,7 @@ }; }; + /delete-node/ wireless-bluetooth; wireless-bluetooth { uart1_gpios: uart1-gpios { rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts index fedb6ce90e47..f00714e39511 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts @@ -1118,6 +1118,7 @@ }; }; + /delete-node/ wireless-bluetooth; wireless-bluetooth { uart1_gpios: uart1-gpios { rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts index d492ef8925c7..323471509afd 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts @@ -1019,6 +1019,7 @@ }; }; + /delete-node/ wireless-bluetooth; wireless-bluetooth { uart1_gpios: uart1-gpios { rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts index 063cf7eba795..8336b51f5aae 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts @@ -1035,6 +1035,7 @@ }; }; + /delete-node/ wireless-bluetooth; wireless-bluetooth { uart1_gpios: uart1-gpios { rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts index c6d4a97afd82..b1629d722493 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts @@ -1045,6 +1045,7 @@ }; }; + /delete-node/ wireless-bluetooth; wireless-bluetooth { uart1_gpios: uart1-gpios { rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi index 187607ec03d0..81b2de38a5a3 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi @@ -379,6 +379,7 @@ }; }; + /delete-node/ wireless-bluetooth; wireless-bluetooth { uart1_gpios: uart1-gpios { rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi index cd98ca1e97f1..7163f3815272 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi @@ -343,6 +343,7 @@ }; }; + /delete-node/ wireless-bluetooth; wireless-bluetooth { uart1_gpios: uart1-gpios { rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-sd0.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-sd0.dtsi index 3214b2119c10..0c8275502435 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-sd0.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-sd0.dtsi @@ -599,6 +599,7 @@ }; }; + /delete-node/ wireless-bluetooth; wireless-bluetooth { uart1_pin: uart1-pin { rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0.dtsi index 82347f51484a..cb43e52f429a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-toybrick-x0.dtsi @@ -717,6 +717,7 @@ }; }; + /delete-node/ wireless-bluetooth; wireless-bluetooth { uart8_pin: uart8-pin { rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;