2018-05-04 01:47:50

by Yixun Lan

Subject: [PATCH v2 0/2] ARM64: dts: meson-axg: enable wifi driver

These patches try to enable the WIFI module AP6255 in Meson-AXG S400
baord. First patch revert an error which was introduced in early commit.

Hi Kevin
Please squash patch 1 into the commit[1] of your v4.18/dt64 branch,
which was the error introduced there.

Change since v1 at [2]:
- fix wrong reset gpio pin

[1] 7e1eee2ec496 'ARM64: dts: meson-axg: enable the eMMC controller'
[2] https://lkml.kernel.org/r/[email protected]

Yixun Lan (2):
ARM64: dts: meson-axg: drop sdio pwrseq property
ARM64: dts: meson-axg: enable AP6255 wifi module

.../arm64/boot/dts/amlogic/meson-axg-s400.dts | 44 ++++++++++++++++++-
1 file changed, 43 insertions(+), 1 deletion(-)

--
2.17.0

2018-05-04 01:47:54

by Yixun Lan

Subject: [PATCH v2 2/2] ARM64: dts: meson-axg: enable AP6255 wifi module

The Meson-AXG S400 board is shipped with AP6255 wifi module,
which is actually using the brcmfmac 43455 driver.

Signed-off-by: Yixun Lan <[email protected]>
---
.../arm64/boot/dts/amlogic/meson-axg-s400.dts | 47 +++++++++++++++++++
1 file changed, 47 insertions(+)

diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
index 6b6581c513a8..b3e1bdca32bb 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
@@ -48,6 +48,20 @@
compatible = "mmc-pwrseq-emmc";
reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;
};
+
+ sdio_pwrseq: sdio-pwrseq {
+ compatible = "mmc-pwrseq-simple";
+ 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 */
+ };
};

&ethmac {
@@ -81,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";
@@ -100,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

2018-05-04 01:49:23

by Yixun Lan

Subject: [PATCH v2 1/2] ARM64: dts: meson-axg: drop sdio pwrseq property

This sdio-pwrseq property is not used untill wifi driver is merged,
also the gpio reset is GPIOX_7 which need to be fixed.

Signed-off-by: Yixun Lan <[email protected]>
---
arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 5 -----
1 file changed, 5 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
index f67d4e47e641..6b6581c513a8 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
@@ -48,11 +48,6 @@
compatible = "mmc-pwrseq-emmc";
reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;
};
-
- sdio_pwrseq: sdio-pwrseq {
- compatible = "mmc-pwrseq-simple";
- reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>;
- };
};

&ethmac {
--
2.17.0

2018-05-09 22:18:29

by Kevin Hilman

Subject: Re: [PATCH v2 0/2] ARM64: dts: meson-axg: enable wifi driver

Hi Yixun,

Yixun Lan <[email protected]> writes:

> These patches try to enable the WIFI module AP6255 in Meson-AXG S400
> baord. First patch revert an error which was introduced in early commit.
>
> Hi Kevin
> Please squash patch 1 into the commit[1] of your v4.18/dt64 branch,
> which was the error introduced there.

Thanks for the explanation, I've squashed patch 1, and applied patch 2
to v4.18/dt64.

Thanks,

Kevin