* [PATCH] ARM64: dts: meson-axg: enable AP6255 wifi module
@ 2018-04-23 14:57 Yixun Lan
2018-04-27 19:09 ` Kevin Hilman
0 siblings, 1 reply; 5+ messages in thread
From: Yixun Lan @ 2018-04-23 14:57 UTC (permalink / raw)
To: Kevin Hilman
Cc: Yixun Lan, Carlo Caione, Jerome Brunet, linux-amlogic,
linux-arm-kernel, linux-kernel, devicetree
The Meson-AXG S400 board is shipped with AP6255 wifi module,
which is actually using the brcmfmac 43455 driver.
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
---
.../arm64/boot/dts/amlogic/meson-axg-s400.dts | 44 ++++++++++++++++++-
1 file changed, 43 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
index f67d4e47e641..b3e1bdca32bb 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
@@ -51,7 +51,16 @@
sdio_pwrseq: sdio-pwrseq {
compatible = "mmc-pwrseq-simple";
- reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>;
+ reset-gpios = <&gpio GPIOX_7 GPIO_ACTIVE_LOW>;
+ clocks = <&wifi32k>;
+ clock-names = "ext_clock";
+ };
+
+ wifi32k: wifi32k {
+ compatible = "pwm-clock";
+ #clock-cells = <0>;
+ clock-frequency = <32768>;
+ pwms = <&pwm_ab 0 30518 0>; /* PWM_A at 32.768KHz */
};
};
@@ -86,6 +95,12 @@
pinctrl-names = "default";
};
+&pwm_ab {
+ status = "okay";
+ pinctrl-0 = <&pwm_a_x20_pins>;
+ pinctrl-names = "default";
+};
+
/* emmc storage */
&sd_emmc_c {
status = "okay";
@@ -105,3 +120,30 @@
vmmc-supply = <&vcc_3v3>;
vqmmc-supply = <&vddio_boot>;
};
+
+/* wifi module */
+&sd_emmc_b {
+ status = "okay";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ pinctrl-0 = <&sdio_pins>;
+ pinctrl-1 = <&sdio_clk_gate_pins>;
+ pinctrl-names = "default", "clk-gate";
+
+ bus-width = <4>;
+ cap-sd-highspeed;
+ max-frequency = <100000000>;
+ non-removable;
+ disable-wp;
+
+ mmc-pwrseq = <&sdio_pwrseq>;
+
+ vmmc-supply = <&vddao_3v3>;
+ vqmmc-supply = <&vddio_boot>;
+
+ brcmf: wifi@1 {
+ reg = <1>;
+ compatible = "brcm,bcm4329-fmac";
+ };
+};
--
2.17.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] ARM64: dts: meson-axg: enable AP6255 wifi module
2018-04-23 14:57 [PATCH] ARM64: dts: meson-axg: enable AP6255 wifi module Yixun Lan
@ 2018-04-27 19:09 ` Kevin Hilman
2018-04-28 1:56 ` Yixun Lan
0 siblings, 1 reply; 5+ messages in thread
From: Kevin Hilman @ 2018-04-27 19:09 UTC (permalink / raw)
To: Yixun Lan
Cc: Carlo Caione, Jerome Brunet, linux-amlogic, linux-arm-kernel,
linux-kernel, devicetree
Yixun Lan <yixun.lan@amlogic.com> writes:
> The Meson-AXG S400 board is shipped with AP6255 wifi module,
> which is actually using the brcmfmac 43455 driver.
>
> Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
> ---
> .../arm64/boot/dts/amlogic/meson-axg-s400.dts | 44 ++++++++++++++++++-
> 1 file changed, 43 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
> index f67d4e47e641..b3e1bdca32bb 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
> @@ -51,7 +51,16 @@
>
> sdio_pwrseq: sdio-pwrseq {
> compatible = "mmc-pwrseq-simple";
> - reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>;
> + reset-gpios = <&gpio GPIOX_7 GPIO_ACTIVE_LOW>;
You didn't mention this GPIO change in the changelog. Is it
intentional?
Kevin
> + clocks = <&wifi32k>;
> + clock-names = "ext_clock";
> + };
> +
> + wifi32k: wifi32k {
> + compatible = "pwm-clock";
> + #clock-cells = <0>;
> + clock-frequency = <32768>;
> + pwms = <&pwm_ab 0 30518 0>; /* PWM_A at 32.768KHz */
> };
> };
>
> @@ -86,6 +95,12 @@
> pinctrl-names = "default";
> };
>
> +&pwm_ab {
> + status = "okay";
> + pinctrl-0 = <&pwm_a_x20_pins>;
> + pinctrl-names = "default";
> +};
> +
> /* emmc storage */
> &sd_emmc_c {
> status = "okay";
> @@ -105,3 +120,30 @@
> vmmc-supply = <&vcc_3v3>;
> vqmmc-supply = <&vddio_boot>;
> };
> +
> +/* wifi module */
> +&sd_emmc_b {
> + status = "okay";
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + pinctrl-0 = <&sdio_pins>;
> + pinctrl-1 = <&sdio_clk_gate_pins>;
> + pinctrl-names = "default", "clk-gate";
> +
> + bus-width = <4>;
> + cap-sd-highspeed;
> + max-frequency = <100000000>;
> + non-removable;
> + disable-wp;
> +
> + mmc-pwrseq = <&sdio_pwrseq>;
> +
> + vmmc-supply = <&vddao_3v3>;
> + vqmmc-supply = <&vddio_boot>;
> +
> + brcmf: wifi@1 {
> + reg = <1>;
> + compatible = "brcm,bcm4329-fmac";
> + };
> +};
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] ARM64: dts: meson-axg: enable AP6255 wifi module
2018-04-27 19:09 ` Kevin Hilman
@ 2018-04-28 1:56 ` Yixun Lan
2018-04-30 15:35 ` Kevin Hilman
0 siblings, 1 reply; 5+ messages in thread
From: Yixun Lan @ 2018-04-28 1:56 UTC (permalink / raw)
To: Kevin Hilman
Cc: yixun.lan, Carlo Caione, Jerome Brunet, linux-amlogic,
linux-arm-kernel, linux-kernel, devicetree
On 04/28/18 03:09, Kevin Hilman wrote:
> Yixun Lan <yixun.lan@amlogic.com> writes:
>
>> The Meson-AXG S400 board is shipped with AP6255 wifi module,
>> which is actually using the brcmfmac 43455 driver.
>>
>> Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
>> ---
>> .../arm64/boot/dts/amlogic/meson-axg-s400.dts | 44 ++++++++++++++++++-
>> 1 file changed, 43 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
>> index f67d4e47e641..b3e1bdca32bb 100644
>> --- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
>> +++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
>> @@ -51,7 +51,16 @@
>>
>> sdio_pwrseq: sdio-pwrseq {
>> compatible = "mmc-pwrseq-simple";
>> - reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>;
>> + reset-gpios = <&gpio GPIOX_7 GPIO_ACTIVE_LOW>;
>
> You didn't mention this GPIO change in the changelog. Is it
> intentional?
Yes, the 'sdio_pwrseq' is used by wifi driver till now
previous the reset-gpio is wrongly configured (copy & paste error),
according to the schematics, it's GPIOX_7 which need to be fixed here.
to be clean, in s400 board
GPIOX_6 is WIFI_WAKE_HOST pin
GPIOX_7 is WIFI_PWREN pin
do you want me to put a note into the commit message? and resend this patch?
Thanks
>
>> + clocks = <&wifi32k>;
>> + clock-names = "ext_clock";
>> + };
>> +
>> + wifi32k: wifi32k {
>> + compatible = "pwm-clock";
>> + #clock-cells = <0>;
>> + clock-frequency = <32768>;
>> + pwms = <&pwm_ab 0 30518 0>; /* PWM_A at 32.768KHz */
>> };
>> };
>>
>> @@ -86,6 +95,12 @@
>> pinctrl-names = "default";
>> };
>>
>> +&pwm_ab {
>> + status = "okay";
>> + pinctrl-0 = <&pwm_a_x20_pins>;
>> + pinctrl-names = "default";
>> +};
>> +
>> /* emmc storage */
>> &sd_emmc_c {
>> status = "okay";
>> @@ -105,3 +120,30 @@
>> vmmc-supply = <&vcc_3v3>;
>> vqmmc-supply = <&vddio_boot>;
>> };
>> +
>> +/* wifi module */
>> +&sd_emmc_b {
>> + status = "okay";
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> +
>> + pinctrl-0 = <&sdio_pins>;
>> + pinctrl-1 = <&sdio_clk_gate_pins>;
>> + pinctrl-names = "default", "clk-gate";
>> +
>> + bus-width = <4>;
>> + cap-sd-highspeed;
>> + max-frequency = <100000000>;
>> + non-removable;
>> + disable-wp;
>> +
>> + mmc-pwrseq = <&sdio_pwrseq>;
>> +
>> + vmmc-supply = <&vddao_3v3>;
>> + vqmmc-supply = <&vddio_boot>;
>> +
>> + brcmf: wifi@1 {
>> + reg = <1>;
>> + compatible = "brcm,bcm4329-fmac";
>> + };
>> +};
>
> .
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] ARM64: dts: meson-axg: enable AP6255 wifi module
2018-04-28 1:56 ` Yixun Lan
@ 2018-04-30 15:35 ` Kevin Hilman
2018-05-04 1:44 ` Yixun Lan
0 siblings, 1 reply; 5+ messages in thread
From: Kevin Hilman @ 2018-04-30 15:35 UTC (permalink / raw)
To: Yixun Lan
Cc: Carlo Caione, Jerome Brunet, linux-amlogic, linux-arm-kernel,
lkml, devicetree
On Fri, Apr 27, 2018 at 6:56 PM, Yixun Lan <yixun.lan@amlogic.com> wrote:
> On 04/28/18 03:09, Kevin Hilman wrote:
>> Yixun Lan <yixun.lan@amlogic.com> writes:
>>
>>> The Meson-AXG S400 board is shipped with AP6255 wifi module,
>>> which is actually using the brcmfmac 43455 driver.
>>>
>>> Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
>>> ---
>>> .../arm64/boot/dts/amlogic/meson-axg-s400.dts | 44 ++++++++++++++++++-
>>> 1 file changed, 43 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
>>> index f67d4e47e641..b3e1bdca32bb 100644
>>> --- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
>>> +++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
>>> @@ -51,7 +51,16 @@
>>>
>>> sdio_pwrseq: sdio-pwrseq {
>>> compatible = "mmc-pwrseq-simple";
>>> - reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>;
>>> + reset-gpios = <&gpio GPIOX_7 GPIO_ACTIVE_LOW>;
>>
>> You didn't mention this GPIO change in the changelog. Is it
>> intentional?
>
> Yes, the 'sdio_pwrseq' is used by wifi driver till now
> previous the reset-gpio is wrongly configured (copy & paste error),
> according to the schematics, it's GPIOX_7 which need to be fixed here.
>
> to be clean, in s400 board
> GPIOX_6 is WIFI_WAKE_HOST pin
> GPIOX_7 is WIFI_PWREN pin
>
> do you want me to put a note into the commit message? and resend this patch?
OK, thanks for the explanation.
I'd prefer the GPIO pin fix as a separate, standalone patch.
Thanks,
Kevin
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] ARM64: dts: meson-axg: enable AP6255 wifi module
2018-04-30 15:35 ` Kevin Hilman
@ 2018-05-04 1:44 ` Yixun Lan
0 siblings, 0 replies; 5+ messages in thread
From: Yixun Lan @ 2018-05-04 1:44 UTC (permalink / raw)
To: Kevin Hilman
Cc: yixun.lan, Carlo Caione, Jerome Brunet, linux-amlogic,
linux-arm-kernel, lkml, devicetree
HI Kevin
On 04/30/18 23:35, Kevin Hilman wrote:
> On Fri, Apr 27, 2018 at 6:56 PM, Yixun Lan <yixun.lan@amlogic.com> wrote:
>> On 04/28/18 03:09, Kevin Hilman wrote:
>>> Yixun Lan <yixun.lan@amlogic.com> writes:
>>>
>>>> The Meson-AXG S400 board is shipped with AP6255 wifi module,
>>>> which is actually using the brcmfmac 43455 driver.
>>>>
>>>> Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
>>>> ---
>>>> .../arm64/boot/dts/amlogic/meson-axg-s400.dts | 44 ++++++++++++++++++-
>>>> 1 file changed, 43 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
>>>> index f67d4e47e641..b3e1bdca32bb 100644
>>>> --- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
>>>> +++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
>>>> @@ -51,7 +51,16 @@
>>>>
>>>> sdio_pwrseq: sdio-pwrseq {
>>>> compatible = "mmc-pwrseq-simple";
>>>> - reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>;
>>>> + reset-gpios = <&gpio GPIOX_7 GPIO_ACTIVE_LOW>;
>>>
>>> You didn't mention this GPIO change in the changelog. Is it
>>> intentional?
>>
>> Yes, the 'sdio_pwrseq' is used by wifi driver till now
>> previous the reset-gpio is wrongly configured (copy & paste error),
>> according to the schematics, it's GPIOX_7 which need to be fixed here.
>>
>> to be clean, in s400 board
>> GPIOX_6 is WIFI_WAKE_HOST pin
>> GPIOX_7 is WIFI_PWREN pin
>>
>> do you want me to put a note into the commit message? and resend this patch?
>
> OK, thanks for the explanation.
>
> I'd prefer the GPIO pin fix as a separate, standalone patch.
>
> Thanks,
>
> Kevin
>
> .
>
As we already talked offline, this error was introduced exactly in the
v4.18 cycle, so I will send a fix which can be squashed into the old commit
Yixun
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-05-04 1:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-23 14:57 [PATCH] ARM64: dts: meson-axg: enable AP6255 wifi module Yixun Lan
2018-04-27 19:09 ` Kevin Hilman
2018-04-28 1:56 ` Yixun Lan
2018-04-30 15:35 ` Kevin Hilman
2018-05-04 1:44 ` Yixun Lan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).