2022-12-25 12:47:38

by Andy Yan

Subject: [PATCH 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]>
---

.../boot/dts/rockchip/rk3566-box-demo.dts | 26 ++++++++++++++++---
1 file changed, 22 insertions(+), 4 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..6c0c24226b52 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,16 +395,30 @@ &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";
pinctrl-0 = <&sdmmc1_bus4 &sdmmc1_cmd &sdmmc1_clk>;
- 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.25.1

2022-12-28 19:36:37

by Heiko Stuebner

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

Hi Andy,

Am Sonntag, 25. Dezember 2022, 12:49:53 CET schrieb Andy Yan:
> 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]>
> ---
>
> .../boot/dts/rockchip/rk3566-box-demo.dts | 26 ++++++++++++++++---
> 1 file changed, 22 insertions(+), 4 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..6c0c24226b52 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,16 +395,30 @@ &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";
> pinctrl-0 = <&sdmmc1_bus4 &sdmmc1_cmd &sdmmc1_clk>;
> - vmmc-supply = <&vcc_3v3>;
> - vqmmc-supply = <&vcca_1v8>;

why are you removing the mmc-supplies here?
The supplies needed for mmc to work should very much be present
I think, especially to also make sure something else doesn't
turn them off.

Heiko

> 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 {
>

2022-12-29 12:30:37

by Andy Yan

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

Hi Heiko:











At 2022-12-29 03:21:32, "Heiko Stuebner" <[email protected]> wrote:
>Hi Andy,
>
>Am Sonntag, 25. Dezember 2022, 12:49:53 CET schrieb Andy Yan:
>> 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]>
>> ---
>>
>> .../boot/dts/rockchip/rk3566-box-demo.dts | 26 ++++++++++++++++---
>> 1 file changed, 22 insertions(+), 4 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..6c0c24226b52 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,16 +395,30 @@ &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";
>> pinctrl-0 = <&sdmmc1_bus4 &sdmmc1_cmd &sdmmc1_clk>;
>> - vmmc-supply = <&vcc_3v3>;
>> - vqmmc-supply = <&vcca_1v8>;
>
>why are you removing the mmc-supplies here?
>The supplies needed for mmc to work should very much be present
>I think, especially to also make sure something else doesn't
>turn them off.

Thanks for catching this, I will fix it in V2.

>
>Heiko
>
>> 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 {
>>
>
>
>