devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v3] ARM: dts: sun8i: NanoPi NEO Air add WiFi / eMMC
@ 2018-01-23 23:58 Martin Kelly
       [not found] ` <20180123235844.5511-1-mkelly-s2cxlsp5qxs@public.gmane.org>
  0 siblings, 1 reply; 2+ messages in thread
From: Martin Kelly @ 2018-01-23 23:58 UTC (permalink / raw)
  To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
  Cc: Jelle van der Waa, Maxime Ripard,
	linux-sunxi-/JYPxA39Uh5TLH3MbocFFw,
	devicetree-u79uwXL29TY76Z2rM5mHXA, Martin Kelly

From: Jelle van der Waa <jelle-oJJ1AqDjjO4@public.gmane.org>

Enable the WiFi (AP6212) chip and eMMC support for the NanoPi NEO Air.

This patch was originally submitted by Jelle van der Waa. Martin Kelly
modified it to compile on the latest kernel, fixed up some review
comments from Maxime Ripard, and re-tested the patch.

These are the original patch submissions:

https://patchwork.kernel.org/patch/9581613/
https://patchwork.kernel.org/patch/9642071/

Cc: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
Cc: linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Signed-off-by: Jelle van der Waa <jelle-oJJ1AqDjjO4@public.gmane.org>
Signed-off-by: Martin Kelly <mkelly-s2cxlsp5qxs@public.gmane.org>
---
 arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
index 03ff6f8b93ff..920849092cc8 100644
--- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
@@ -72,6 +72,11 @@
 			gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */
 		};
 	};
+
+	wifi_pwrseq: wifi_pwrseq {
+		compatible = "mmc-pwrseq-simple";
+		reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
+	};
 };
 
 &mmc0 {
@@ -84,6 +89,25 @@
 	status = "okay";
 };
 
+&mmc1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc1_pins_a>;
+	vmmc-supply = <&reg_vcc3v3>;
+	vqmmc-supply = <&reg_vcc3v3>;
+	mmc-pwrseq = <&wifi_pwrseq>;
+	bus-width = <4>;
+	non-removable;
+	status = "okay";
+
+	brcmf: bcrmf@1 {
+		reg = <1>;
+		compatible = "brcm,bcm4329-fmac";
+		interrupt-parent = <&pio>;
+		interrupts = <6 10 IRQ_TYPE_LEVEL_LOW>; /* PG10 / EINT10 */
+		interrupt-names = "host-wake";
+	};
+};
+
 &uart0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart0_pins_a>;
-- 
2.11.0

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH v3] ARM: dts: sun8i: NanoPi NEO Air add WiFi / eMMC
       [not found] ` <20180123235844.5511-1-mkelly-s2cxlsp5qxs@public.gmane.org>
@ 2018-01-25 15:38   ` Maxime Ripard
  0 siblings, 0 replies; 2+ messages in thread
From: Maxime Ripard @ 2018-01-25 15:38 UTC (permalink / raw)
  To: Martin Kelly
  Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	Jelle van der Waa, linux-sunxi-/JYPxA39Uh5TLH3MbocFFw,
	devicetree-u79uwXL29TY76Z2rM5mHXA

[-- Attachment #1: Type: text/plain, Size: 1124 bytes --]

Hi,

On Tue, Jan 23, 2018 at 03:58:44PM -0800, Martin Kelly wrote:
> From: Jelle van der Waa <jelle-oJJ1AqDjjO4@public.gmane.org>
> 
> Enable the WiFi (AP6212) chip and eMMC support for the NanoPi NEO Air.
> 
> This patch was originally submitted by Jelle van der Waa. Martin Kelly
> modified it to compile on the latest kernel, fixed up some review
> comments from Maxime Ripard, and re-tested the patch.
> 
> These are the original patch submissions:
> 
> https://patchwork.kernel.org/patch/9581613/
> https://patchwork.kernel.org/patch/9642071/
> 
> Cc: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
> Cc: linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org
> Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Signed-off-by: Jelle van der Waa <jelle-oJJ1AqDjjO4@public.gmane.org>
> Signed-off-by: Martin Kelly <mkelly-s2cxlsp5qxs@public.gmane.org>

I've reworked a bit the commit title and removed the links, and queued
it for 4.17.

Thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-01-25 15:38 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-23 23:58 [PATCH v3] ARM: dts: sun8i: NanoPi NEO Air add WiFi / eMMC Martin Kelly
     [not found] ` <20180123235844.5511-1-mkelly-s2cxlsp5qxs@public.gmane.org>
2018-01-25 15:38   ` Maxime Ripard

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).