On 2024/7/30 22:51, Jonas Karlman wrote:
Update WiFi SDIO and BT UART related props to better reflect details about the optional onboard RTL8723DS WiFi/BT module.
Also correct the compatible used for bluetooth to match the WiFi/BT module used on the board.
Fixes: bc3753aed81f ("arm64: dts: rockchip: rock-pi-s add more peripherals") Signed-off-by: Jonas Karlman jonas@kwiboo.se Link: https://lore.kernel.org/r/20240521211029.1236094-14-jonas@kwiboo.se Signed-off-by: Heiko Stuebner heiko@sntech.de
[ upstream commit: 12c3ec878cbe3709782e85b88124abecc3bb8617 ]
(cherry picked from commit caba73747c927b4fdccea3aeb16e077b4e6af006)
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
.../src/arm64/rockchip/rk3308-rock-pi-s.dts | 40 +++++++++++++++++-- 1 file changed, 36 insertions(+), 4 deletions(-)
diff --git a/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts b/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts index 5c702f00b27f..62d18ca769a1 100644 --- a/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts +++ b/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts @@ -17,6 +17,7 @@ ethernet0 = &gmac; mmc0 = &emmc; mmc1 = &sdmmc;
mmc2 = &sdio;};
chosen {
@@ -245,6 +246,20 @@ pinctrl-names = "default"; pinctrl-0 = <&rtc_32k>;
- bluetooth {
bt_reg_on: bt-reg-on {rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;};bt_wake_host: bt-wake-host {rockchip,pins = <4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>;};host_wake_bt: host-wake-bt {rockchip,pins = <4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;};- };
- gmac { mac_rst: mac-rst { rockchip,pins = <0 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -294,11 +309,24 @@ cap-sd-highspeed; cap-sdio-irq; keep-power-in-suspend;
- max-frequency = <1000000>;
- max-frequency = <100000000>; mmc-pwrseq = <&sdio_pwrseq>;
- no-mmc;
- no-sd; non-removable;
- sd-uhs-sdr104;
sd-uhs-sdr50;
vmmc-supply = <&vcc_io>;
vqmmc-supply = <&vcc_1v8>; status = "okay";
rtl8723ds: wifi@1 {
reg = <1>;interrupt-parent = <&gpio0>;interrupts = <RK_PA0 IRQ_TYPE_LEVEL_HIGH>;interrupt-names = "host-wake";pinctrl-names = "default";pinctrl-0 = <&wifi_host_wake>;}; };
&sdmmc {
@@ -330,12 +358,16 @@ };
&uart4 {
uart-has-rtscts; status = "okay";
bluetooth {
compatible = "realtek,rtl8723bs-bt";device-wake-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
compatible = "realtek,rtl8723ds-bt";device-wake-gpios = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;enable-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;pinctrl-names = "default";pinctrl-0 = <&bt_reg_on &bt_wake_host &host_wake_bt>;