From patchwork Tue Apr 8 13:08:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Lifshitz X-Patchwork-Id: 3948881 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 17CEEBFF02 for ; Tue, 8 Apr 2014 13:10:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CF2492026C for ; Tue, 8 Apr 2014 13:10:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E4564201DD for ; Tue, 8 Apr 2014 13:10:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932133AbaDHNKQ (ORCPT ); Tue, 8 Apr 2014 09:10:16 -0400 Received: from softlayer.compulab.co.il ([50.23.254.55]:35463 "EHLO compulab.co.il" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932125AbaDHNKN (ORCPT ); Tue, 8 Apr 2014 09:10:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=compulab.co.il; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=gmwcYQg0MjxPyi3bPPuAgcdeFRCuWtx3beEVH3wXZWc=; b=xWuhklZuGBnnBUJmL/kRoVA8TnEpd9ea5iDsauZEUryMz2upBu1MVHWEigtbtU0rZOpRIg0T9ws0Is3p6Gc3HwFZKs/HZYYuGkfWCcDlYSHMOdpv8UFfQzXA4cppmKeB8ohyTTwDgFi+RhuzkQ1URXnxPyScMUlH8ge9Vm7Zz9I=; Received: from [82.166.188.245] (port=39667 helo=zimbra-mta.compulab.co.il) by softlayer.compulab.co.il with esmtp (Exim 4.80.1) (envelope-from ) id 1WXVmf-0007I0-JW; Tue, 08 Apr 2014 16:09:49 +0300 Received: from localhost (localhost.localdomain [127.0.0.1]) by zimbra-mta.compulab.co.il (Postfix) with ESMTP id 0242E644195; Tue, 8 Apr 2014 16:09:49 +0300 (IDT) X-Virus-Scanned: amavisd-new at compulab.co.il Received: from zimbra-mta.compulab.co.il ([127.0.0.1]) by localhost (zimbra-mta.compulab.co.il [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KBum73IzcCjD; Tue, 8 Apr 2014 16:09:43 +0300 (IDT) Received: from localhost.localdomain (lifshitz-linux.compulab.local [192.168.11.10]) by zimbra-mta.compulab.co.il (Postfix) with ESMTPSA id B242D644198; Tue, 8 Apr 2014 16:09:43 +0300 (IDT) From: Dmitry Lifshitz To: tony@atomide.com Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, grinberg@compulab.co.il Subject: [PATCH 2/2] ARM: dts: cm-t54: add WiFi/BT support Date: Tue, 8 Apr 2014 16:08:51 +0300 Message-Id: <1396962531-27729-3-git-send-email-lifshitz@compulab.co.il> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1396962531-27729-1-git-send-email-lifshitz@compulab.co.il> References: <1396962531-27729-1-git-send-email-lifshitz@compulab.co.il> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - softlayer.compulab.co.il X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - compulab.co.il X-Get-Message-Sender-Via: softlayer.compulab.co.il: acl_c_relayhosts_text_entry: lifshitz@compulab.co.il|compulab.co.il Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 Add support of AW-NH387 (mwifiex) WiFi/BT chip connected to MMC3. Signed-off-by: Dmitry Lifshitz --- arch/arm/boot/dts/omap5-cm-t54.dts | 27 +++++++++++++++++++++++++++ arch/arm/mach-omap2/pdata-quirks.c | 10 ++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap5-cm-t54.dts b/arch/arm/boot/dts/omap5-cm-t54.dts index c87401f..27f5b7f 100644 --- a/arch/arm/boot/dts/omap5-cm-t54.dts +++ b/arch/arm/boot/dts/omap5-cm-t54.dts @@ -51,6 +51,7 @@ pinctrl-0 = < &led_gpio_pins &usbhost_pins + &wlan_reset_pins >; led_gpio_pins: pinmux_led_gpio_pins { @@ -92,6 +93,24 @@ >; }; + mmc3_pins: pinmux_mmc3_pins { + pinctrl-single,pins = < + 0x164 (PIN_INPUT_PULLUP | MUX_MODE0) /* wlsdio_clk */ + 0x166 (PIN_INPUT_PULLUP | MUX_MODE0) /* wlsdio_cmd */ + 0x168 (PIN_INPUT_PULLUP | MUX_MODE0) /* wlsdio_data0 */ + 0x16a (PIN_INPUT_PULLUP | MUX_MODE0) /* wlsdio_data1 */ + 0x16c (PIN_INPUT_PULLUP | MUX_MODE0) /* wlsdio_data2 */ + 0x16e (PIN_INPUT_PULLUP | MUX_MODE0) /* wlsdio_data3 */ + >; + }; + + wlan_reset_pins: pinmux_wlan_reset_pins { + pinctrl-single,pins = < + 0x15c (PIN_OUTPUT | MUX_MODE6) /* abemcpdm_ul_data.gpio4_109 - WLAN_nPD */ + 0x15e (PIN_OUTPUT | MUX_MODE6) /* abemcpdm_dl_data.gpio4_110 - WLAN_nRESET */ + >; + }; + usbhost_pins: pinmux_usbhost_pins { pinctrl-single,pins = < 0x084 (PIN_INPUT | MUX_MODE0) /* usbb2_hsic_strobe */ @@ -121,6 +140,14 @@ ti,non-removable; }; +&mmc3 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc3_pins>; + vmmc-supply = <&ldo2_reg>; + bus-width = <4>; + ti,non-removable; +}; + &mmc4 { status = "disabled"; }; diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c index a114806..554ab37 100644 --- a/arch/arm/mach-omap2/pdata-quirks.c +++ b/arch/arm/mach-omap2/pdata-quirks.c @@ -205,6 +205,15 @@ static void __init omap5_uevm_legacy_init(void) { legacy_init_ehci_clk("auxclk1_ck"); } + +static void __init omap5_cm_t54_legacy_init(void) +{ + gpio_request_one(109, GPIOF_OUT_INIT_HIGH, "wlan_pdn"); + gpio_export(109, 0); + + gpio_request_one(110, GPIOF_OUT_INIT_HIGH, "wlan_rst"); + gpio_export(110, 0); +} #endif static struct pcs_pdata pcs_pdata; @@ -286,6 +295,7 @@ static struct pdata_init pdata_quirks[] __initdata = { #endif #ifdef CONFIG_SOC_OMAP5 { "ti,omap5-uevm", omap5_uevm_legacy_init, }, + { "compulab,omap5-cm-t54", omap5_cm_t54_legacy_init, }, #endif { /* sentinel */ }, };