git.openwrt.org Git - openwrt/staging/xback.git/blob

   1 From 12c3ec878cbe3709782e85b88124abecc3bb8617 Mon Sep 17 00:00:00 2001
   2 From: Jonas Karlman <jonas@kwiboo.se>
   3 Date: Tue, 21 May 2024 21:10:16 +0000
   4 Subject: [PATCH] arm64: dts: rockchip: Update WIFi/BT related nodes on
   5  rk3308-rock-pi-s
   6
   7 Update WiFi SDIO and BT UART related props to better reflect details
   8 about the optional onboard RTL8723DS WiFi/BT module.
   9
  10 Also correct the compatible used for bluetooth to match the WiFi/BT
  11 module used on the board.
  12
  13 Fixes: bc3753aed81f ("arm64: dts: rockchip: rock-pi-s add more peripherals")
  14 Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
  15 Link: https://lore.kernel.org/r/20240521211029.1236094-14-jonas@kwiboo.se
  16 Signed-off-by: Heiko Stuebner <heiko@sntech.de>
  17 ---
  18  .../boot/dts/rockchip/rk3308-rock-pi-s.dts    | 40 +++++++++++++++++--
  19  1 file changed, 36 insertions(+), 4 deletions(-)
  20
  21 --- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
  22 +++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
  23 @@ -17,6 +17,7 @@
  24                 ethernet0 = &gmac;
  25                 mmc0 = &emmc;
  26                 mmc1 = &sdmmc;
  27 +               mmc2 = &sdio;
  28         };
  29
  30         chosen {
  31 @@ -245,6 +246,20 @@
  32         pinctrl-names = "default";
  33         pinctrl-0 = <&rtc_32k>;
  34
  35 +       bluetooth {
  36 +               bt_reg_on: bt-reg-on {
  37 +                       rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
  38 +               };
  39 +
  40 +               bt_wake_host: bt-wake-host {
  41 +                       rockchip,pins = <4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>;
  42 +               };
  43 +
  44 +               host_wake_bt: host-wake-bt {
  45 +                       rockchip,pins = <4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
  46 +               };
  47 +       };
  48 +
  49         gmac {
  50                 mac_rst: mac-rst {
  51                         rockchip,pins = <0 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>;
  52 @@ -294,11 +309,24 @@
  53         cap-sd-highspeed;
  54         cap-sdio-irq;
  55         keep-power-in-suspend;
  56 -       max-frequency = <1000000>;
  57 +       max-frequency = <100000000>;
  58         mmc-pwrseq = <&sdio_pwrseq>;
  59 +       no-mmc;
  60 +       no-sd;
  61         non-removable;
  62 -       sd-uhs-sdr104;
  63 +       sd-uhs-sdr50;
  64 +       vmmc-supply = <&vcc_io>;
  65 +       vqmmc-supply = <&vcc_1v8>;
  66         status = "okay";
  67 +
  68 +       rtl8723ds: wifi@1 {
  69 +               reg = <1>;
  70 +               interrupt-parent = <&gpio0>;
  71 +               interrupts = <RK_PA0 IRQ_TYPE_LEVEL_HIGH>;
  72 +               interrupt-names = "host-wake";
  73 +               pinctrl-names = "default";
  74 +               pinctrl-0 = <&wifi_host_wake>;
  75 +       };
  76  };
  77
  78  &sdmmc {
  79 @@ -330,12 +358,16 @@
  80  };
  81
  82  &uart4 {
  83 +       uart-has-rtscts;
  84         status = "okay";
  85
  86         bluetooth {
  87 -               compatible = "realtek,rtl8723bs-bt";
  88 -               device-wake-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
  89 +               compatible = "realtek,rtl8723ds-bt";
  90 +               device-wake-gpios = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;
  91 +               enable-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
  92                 host-wake-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>;
  93 +               pinctrl-names = "default";
  94 +               pinctrl-0 = <&bt_reg_on &bt_wake_host &host_wake_bt>;
  95         };
  96  };
  97