2022-12-29 12:30:16

by Andy Yan

Subject: [PATCH v2 2/2] arm64: dts: rockchip: Enable wifi module AP6398s for rk3566 box demo

There is a AP6398s wifi/bt module on this board.
Fix the sdmmc1 dt node to make wifi work.

Fixes: 2e0537b16b25 ("arm64: dts: rockchip: Add dts for rockchip rk3566 box demo board")

Signed-off-by: Andy Yan <[email protected]>
---

Changes in v2:
- add vmmc/vqmmc supply back.

.../boot/dts/rockchip/rk3566-box-demo.dts | 24 +++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts b/arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts
index d956496d5221..2671f207cfd1 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts
@@ -324,8 +324,12 @@ wifi_enable_h: wifi-enable-h {
rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
};

+ wifi_host_wake_h: wifi-host-wake-l {
+ rockchip,pins = <2 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
wifi_32k: wifi-32k {
- rockchip,pins = <0 RK_PB0 2 &pcfg_pull_none>;
+ rockchip,pins = <2 RK_PC6 1 &pcfg_pull_none>;
};
};

@@ -391,9 +395,15 @@ &sdmmc0 {
};

&sdmmc1 {
+ /* WiFi & BT combo module AMPAK AP6398S */
+ #address-cells = <1>;
+ #size-cells = <0>;
bus-width = <4>;
+ clock-frequency = <150000000>;
+ cap-sdio-irq;
cap-sd-highspeed;
- disable-wp;
+ sd-uhs-sdr104;
+ keep-power-in-suspend;
mmc-pwrseq = <&sdio_pwrseq>;
non-removable;
pinctrl-names = "default";
@@ -401,6 +411,16 @@ &sdmmc1 {
vmmc-supply = <&vcc_3v3>;
vqmmc-supply = <&vcca_1v8>;
status = "okay";
+
+ brcmf: wifi@1 {
+ compatible = "brcm,bcm4329-fmac";
+ reg = <1>;
+ interrupt-parent = <&gpio2>;
+ interrupts = <RK_PB2 GPIO_ACTIVE_HIGH>;
+ interrupt-names = "host-wake";
+ pinctrl-names = "default";
+ pinctrl-0 = <&wifi_host_wake_h>;
+ };
};

&spdif {
--
2.34.1

2023-01-11 11:07:28

by Heiko Stuebner

Subject: Re: [PATCH v2 2/2] arm64: dts: rockchip: Enable wifi module AP6398s for rk3566 box demo

On Thu, 29 Dec 2022 19:51:11 +0800, Andy Yan wrote:
> There is a AP6398s wifi/bt module on this board.
> Fix the sdmmc1 dt node to make wifi work.
>
> Fixes: 2e0537b16b25 ("arm64: dts: rockchip: Add dts for rockchip rk3566 box demo board")
>
>

Applied, thanks!

[2/2] arm64: dts: rockchip: Enable wifi module AP6398s for rk3566 box demo
commit: 3eb403e4014e2db8b00acb147c0bf0abb2df15e2

Best regards,
--
Heiko Stuebner <[email protected]>