| Message ID | 1504283401-4263-2-git-send-email-embed3d@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
在 2017-09-02 00:30，Philipp Rossak 写道： > From: Philipp Rossak <embed3d@gmail.com> > > The WiFi side of the AP6212 WiFi/BT combo module is connected to > mmc1. There are also GPIOs for enable and interrupts. > > Enable WiFi on this board by enabling mmc1 and adding the power > sequencing clocks and GPIO, as well as the chip's interrupt line. > > Signed-off-by: Philipp Rossak <embed3d@gmail.com> > --- > arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts | 25 > +++++++++++++++++++++++++ > 1 file changed, 25 insertions(+) > > diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts > b/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts > index 6256f55..7d18c35 100644 > --- a/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts > +++ b/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts > @@ -48,6 +48,13 @@ > > aliases { > serial1 = &uart3; > + ethernet1 = &sdio_wifi; When the Wi-Fi module itself has fixed MAC address, there's no need for such an alias. > + }; > + > + wifi_pwrseq: wifi_pwrseq { > + compatible = "mmc-pwrseq-simple"; > + pinctrl-names = "default"; > + reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ > }; > }; > > @@ -65,6 +72,24 @@ > status = "okay"; > }; > > +&mmc1 { > + pinctrl-names = "default"; > + pinctrl-0 = <&mmc1_pins_a>; > + vmmc-supply = <®_vcc3v3>; > + mmc-pwrseq = <&wifi_pwrseq>; > + bus-width = <4>; > + non-removable; > + status = "okay"; > + > + sdio_wifi: sdio_wifi@1 { > + reg = <1>; > + compatible = "brcm,bcm4329-fmac"; > + interrupt-parent = <&pio>; > + interrupts = <6 10 IRQ_TYPE_LEVEL_LOW>; /* PG10 / EINT10 */ > + interrupt-names = "host-wake"; > + }; > +}; > + > &ohci1 { > status = "okay"; > };
Hi Philipp, On Fri, Sep 01, 2017 at 06:30:00PM +0200, Philipp Rossak wrote: > From: Philipp Rossak <embed3d@gmail.com> > > The WiFi side of the AP6212 WiFi/BT combo module is connected to > mmc1. There are also GPIOs for enable and interrupts. > > Enable WiFi on this board by enabling mmc1 and adding the power > sequencing clocks and GPIO, as well as the chip's interrupt line. > > Signed-off-by: Philipp Rossak <embed3d@gmail.com> > --- > arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts | 25 +++++++++++++++++++++++++ > 1 file changed, 25 insertions(+) > > diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts > index 6256f55..7d18c35 100644 > --- a/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts > +++ b/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts > @@ -48,6 +48,13 @@ > > aliases { > serial1 = &uart3; > + ethernet1 = &sdio_wifi; > + }; > + > + wifi_pwrseq: wifi_pwrseq { > + compatible = "mmc-pwrseq-simple"; > + pinctrl-names = "default"; > + reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ > }; > }; > > @@ -65,6 +72,24 @@ > status = "okay"; > }; > > +&mmc1 { > + pinctrl-names = "default"; > + pinctrl-0 = <&mmc1_pins_a>; > + vmmc-supply = <®_vcc3v3>; I know I told you you weren't needing vqmmc, but Chen-Yu later told me that I was wrong about this. I've added vqmmc back, and applied your patch. Thanks! Maxime
On Sat, Sep 02, 2017 at 03:01:57PM +0800, icenowy@aosc.io wrote: > 在 2017-09-02 00:30，Philipp Rossak 写道： > > From: Philipp Rossak <embed3d@gmail.com> > > > > The WiFi side of the AP6212 WiFi/BT combo module is connected to > > mmc1. There are also GPIOs for enable and interrupts. > > > > Enable WiFi on this board by enabling mmc1 and adding the power > > sequencing clocks and GPIO, as well as the chip's interrupt line. > > > > Signed-off-by: Philipp Rossak <embed3d@gmail.com> > > --- > > arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts | 25 > > +++++++++++++++++++++++++ > > 1 file changed, 25 insertions(+) > > > > diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts > > b/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts > > index 6256f55..7d18c35 100644 > > --- a/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts > > +++ b/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts > > @@ -48,6 +48,13 @@ > > > > aliases { > > serial1 = &uart3; > > + ethernet1 = &sdio_wifi; > > When the Wi-Fi module itself has fixed MAC address, there's > no need for such an alias. But the description is also accurate, which is what matters in the DT. Maxime
diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts index 6256f55..7d18c35 100644 --- a/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts +++ b/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts @@ -48,6 +48,13 @@ aliases { serial1 = &uart3; + ethernet1 = &sdio_wifi; + }; + + wifi_pwrseq: wifi_pwrseq { + compatible = "mmc-pwrseq-simple"; + pinctrl-names = "default"; + reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ }; }; @@ -65,6 +72,24 @@ status = "okay"; }; +&mmc1 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc1_pins_a>; + vmmc-supply = <®_vcc3v3>; + mmc-pwrseq = <&wifi_pwrseq>; + bus-width = <4>; + non-removable; + status = "okay"; + + sdio_wifi: sdio_wifi@1 { + reg = <1>; + compatible = "brcm,bcm4329-fmac"; + interrupt-parent = <&pio>; + interrupts = <6 10 IRQ_TYPE_LEVEL_LOW>; /* PG10 / EINT10 */ + interrupt-names = "host-wake"; + }; +}; + &ohci1 { status = "okay"; };