From patchwork Wed Sep 30 13:46:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Bisson X-Patchwork-Id: 7298111 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B23FBBEEA4 for ; Wed, 30 Sep 2015 13:52:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E3CD2205B4 for ; Wed, 30 Sep 2015 13:52:09 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1CA142056C for ; Wed, 30 Sep 2015 13:52:09 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZhHm7-0001ag-14; Wed, 30 Sep 2015 13:50:27 +0000 Received: from mail-wi0-f177.google.com ([209.85.212.177]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZhHj3-0007Y9-3n for linux-arm-kernel@lists.infradead.org; Wed, 30 Sep 2015 13:47:17 +0000 Received: by wiclk2 with SMTP id lk2so199237014wic.0 for ; Wed, 30 Sep 2015 06:46:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KbB4U13nKum6dnFPegYJR7rUsGVyTtZO3k4LNAIwJtw=; b=Rrrq58d35Y4Tf5oy02nu5mt7RXevyBnXE4UTUzGm0XNbhDKhhkLmgF85zmfaxSZYBk DUkEdjsJeFFQwp2+7kIs4jlMLKJJXUKGZMI+F5LssxsJkjtSykN2le7s4Ur0hFl2REyp /BX2XYNfGyTFsbK/ACgxgr7DrJzG/T52Yj1C4uXq6HrGlna4lzJQon7cDlDRgDFiOM2w NPAgQrhN1jdTSIsKeBcWiefT951XXwdjuvvqlcLPEk4wX/hhQYHBcCe2JC/M0dZksIY6 d9g89KWNVYovlUb4oWhmuMiMS3+lFg2WxSz5y9tXjir3abeLAT8Uye18DfRcEJNmeDcY eUnw== X-Gm-Message-State: ALoCoQmzhdMNAYAWOAUR0kgXxGtmjdUB+fskV+HgqDcXcHYn3ct+9P3ZqVrXu0a+NFocXcA4i+le X-Received: by 10.180.88.164 with SMTP id bh4mr4789879wib.18.1443620815471; Wed, 30 Sep 2015 06:46:55 -0700 (PDT) Received: from x240.lan ([89.202.203.52]) by smtp.googlemail.com with ESMTPSA id bf8sm770617wjc.22.2015.09.30.06.46.54 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Sep 2015 06:46:55 -0700 (PDT) From: Gary Bisson To: devicetree@vger.kernel.org Subject: [RESEND][PATCH v3 2/9] ARM: dts: imx6qdl-nitrogen6x: add wifi wl1271 support Date: Wed, 30 Sep 2015 15:46:39 +0200 Message-Id: <1443620806-14792-3-git-send-email-gary.bisson@boundarydevices.com> X-Mailer: git-send-email 2.5.3 In-Reply-To: <1443620806-14792-1-git-send-email-gary.bisson@boundarydevices.com> References: <1441645069-27263-1-git-send-email-gary.bisson@boundarydevices.com> <1443620806-14792-1-git-send-email-gary.bisson@boundarydevices.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150930_064717_356448_D9AC4B2A X-CRM114-Status: GOOD ( 10.33 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fabio.estevam@freescale.com, linux@arm.linux.org.uk, p.zabel@pengutronix.de, Gary Bisson , robh+dt@kernel.org, kernel@pengutronix.de, shawnguo@kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Gary Bisson --- arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 55 +++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi index dadc01a..24e2d3c 100644 --- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi +++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi @@ -65,6 +65,19 @@ pinctrl-0 = <&pinctrl_can_xcvr>; gpio = <&gpio1 2 GPIO_ACTIVE_LOW>; }; + + reg_wlan_vmmc: regulator@4 { + compatible = "regulator-fixed"; + reg = <4>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_wlan_vmmc>; + regulator-name = "reg_wlan_vmmc"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpio6 15 GPIO_ACTIVE_HIGH>; + startup-delay-us = <70000>; + enable-active-high; + }; }; gpio-keys { @@ -411,6 +424,18 @@ >; }; + pinctrl_usdhc2: usdhc2grp { + fsl,pins = < + MX6QDL_PAD_SD2_CMD__SD2_CMD 0x17071 + MX6QDL_PAD_SD2_CLK__SD2_CLK 0x10071 + MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17071 + MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17071 + MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17071 + MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x17071 + MX6QDL_PAD_NANDF_CS2__GPIO6_IO15 0x000b0 + >; + }; + pinctrl_usdhc3: usdhc3grp { fsl,pins = < MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059 @@ -434,6 +459,15 @@ MX6QDL_PAD_NANDF_D6__GPIO2_IO06 0x1b0b0 /* CD */ >; }; + + pinctrl_wlan_vmmc: wlan_vmmcgrp { + fsl,pins = < + MX6QDL_PAD_NANDF_CS0__GPIO6_IO11 0x100b0 + MX6QDL_PAD_NANDF_CS2__GPIO6_IO15 0x000b0 + MX6QDL_PAD_NANDF_CS3__GPIO6_IO16 0x000b0 + MX6QDL_PAD_SD1_CLK__OSC32K_32K_OUT 0x000b0 + >; + }; }; }; @@ -505,6 +539,27 @@ status = "okay"; }; +&usdhc2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc2>; + bus-width = <4>; + non-removable; + vmmc-supply = <®_wlan_vmmc>; + cap-power-off-card; + keep-power-in-suspend; + status = "okay"; + + #address-cells = <1>; + #size-cells = <0>; + wlcore: wlcore@2 { + compatible = "ti,wl1271"; + reg = <2>; + interrupt-parent = <&gpio6>; + interrupts = <14 IRQ_TYPE_LEVEL_HIGH>; + ref-clock-frequency = <38400000>; + }; +}; + &usdhc3 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc3>;