From patchwork Wed Apr 25 12:54:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kishon Vijay Abraham I X-Patchwork-Id: 134271 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp827881lji; Wed, 25 Apr 2018 05:55:55 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpbNHc/m0PsUlmgvCvWpqWZPYOmQLtPViUyOydUg51WCAHrJSkjgSrNg1VK/lwOVq1/Cc5s X-Received: by 2002:a17:902:5952:: with SMTP id e18-v6mr7590551plj.351.1524660955047; Wed, 25 Apr 2018 05:55:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524660955; cv=none; d=google.com; s=arc-20160816; b=yVPUOcefO8T8wh6k+9ncodnjjP245b/ChoiHxx6GUBIqwiFtMf0ycc9Yq8Dxp++rq+ eHfUnzMZvowFdb1jC5SduqLHs4Rp0I1D101xMN2VQP2PU7BL5TRArQEWORyXqogclxYP Mx/KGPrg0qortQLo5wpBU7V/0H2eUDGhp84renR9xm4iv792/onC3nhTqveAIkS7Zhji 6YCsaeR6B5P+QUlzeFYZ2Ys5v/95yGByNVHs3oGbiCVnpiCZjnOjRc2uf8Zs/P49iTg3 wy6gijLtvQl1CSyfc+Xd6Nhdtb2NTahU0RLdEkKTBd/tyZB3c2cgK3H1QL2M+2C689Oj Z3Xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=EMEvYWpT8m/W2amA2I2JA2yAp8qT3bs4LWuRihWM1sw=; b=vukRmCSo9lulECmsKZxIl4Oh1pc3Pqztrq2notnGhpkhxjzz8i+gn5NjoXwbBv+p1f I8tKVwdPn9Okyfr01wmGhNZxhkWP+ZQT2ZdiaVgO4i04eJiM+Jpv/7nHDgcWL+iBMZC9 Dh0Mhl6Hih8eNJdaGVfO2g+XLP2KuFg1y73jMxYTzAfxngfO783gJL4sbQyzu6xW9IBL bcQBNY5BzXsQwX7hZ1IzNa/pKJreT/Iuce7kww5tc0q/nBtg9vITKeew3FKT7fGpTsC1 u8IeuCJj562XZqLYRbeFbrKN0Zsz6Aafi9ig4ZUzAqxKyjzSjdRv6KAIRTjIBtehFcUB CxMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=lsBtIMLx; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h2si15297992pfb.111.2018.04.25.05.55.54; Wed, 25 Apr 2018 05:55:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=lsBtIMLx; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754099AbeDYMzw (ORCPT + 29 others); Wed, 25 Apr 2018 08:55:52 -0400 Received: from lelnx193.ext.ti.com ([198.47.27.77]:11929 "EHLO lelnx193.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751525AbeDYMzp (ORCPT ); Wed, 25 Apr 2018 08:55:45 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by lelnx193.ext.ti.com (8.15.1/8.15.1) with ESMTP id w3PCtcxF009643; Wed, 25 Apr 2018 07:55:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1524660938; bh=/8Ou7B4dm28U6sJ/5E525V6EKnE/c5mEPDn+8+oiZR8=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=lsBtIMLx7AlMdyPAlO/z2ydORZXFmuTrB3VEtadzScL/rJ5clydTmbwLt8/C3NBlq 1sc0GSwJro/gqjWxHeI+txbd3Ta8je+wadTci6onWlV0+FCvDHwZ4yxFvB7YbNMYpU poRkJw6xUu4213tToHlKVs3ZpV3o1x+EbMhohHEo= Received: from DLEE104.ent.ti.com (dlee104.ent.ti.com [157.170.170.34]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id w3PCtcKJ024305; Wed, 25 Apr 2018 07:55:38 -0500 Received: from DLEE101.ent.ti.com (157.170.170.31) by DLEE104.ent.ti.com (157.170.170.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Wed, 25 Apr 2018 07:55:37 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE101.ent.ti.com (157.170.170.31) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1466.3 via Frontend Transport; Wed, 25 Apr 2018 07:55:37 -0500 Received: from a0393678ub.india.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id w3PCt1SM021671; Wed, 25 Apr 2018 07:55:34 -0500 From: Kishon Vijay Abraham I To: =?utf-8?q?Beno=C3=AEt_Cousson_?= , Tony Lindgren CC: Jonathan Corbet , Rob Herring , Mark Rutland , , , , , , , Hari Nagalla , Eyal Reizer , Sekhar Nori Subject: [PATCH v3 09/15] ARM: dts: dra72-evm-common: Add wilink8 wlan support Date: Wed, 25 Apr 2018 18:24:43 +0530 Message-ID: <20180425125449.19755-10-kishon@ti.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180425125449.19755-1-kishon@ti.com> References: <20180425125449.19755-1-kishon@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hari Nagalla Wilink8 module is a combo wireless connectivity card based on Texas Instrument's wl18xx solution. Add support for the wlan capabilities of this module by muxing the relevant mmc lines, and setting the required device-tree data. Signed-off-by: Eyal Reizer Signed-off-by: Hari Nagalla [nsekhar@ti.com: drop WLAN_EN pinmux. It should be done by bootloader. Also, some commit message adjustments] Signed-off-by: Sekhar Nori Signed-off-by: Kishon Vijay Abraham I --- arch/arm/boot/dts/dra72-evm-common.dtsi | 42 +++++++++++++++++++++++ arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi | 11 ++++++ 2 files changed, 53 insertions(+) -- 2.17.0 diff --git a/arch/arm/boot/dts/dra72-evm-common.dtsi b/arch/arm/boot/dts/dra72-evm-common.dtsi index 8e3b185d864b..1e4d36e33a1b 100644 --- a/arch/arm/boot/dts/dra72-evm-common.dtsi +++ b/arch/arm/boot/dts/dra72-evm-common.dtsi @@ -44,6 +44,16 @@ regulator-boot-on; }; + evm_3v6: fixedregulator-evm_3v6 { + compatible = "regulator-fixed"; + regulator-name = "evm_3v6"; + regulator-min-microvolt = <3600000>; + regulator-max-microvolt = <3600000>; + vin-supply = <&evm_5v0>; + regulator-always-on; + regulator-boot-on; + }; + vsys_3v3: fixedregulator-vsys3v3 { /* Output 2 of TPS43351QDAPRQ1 on dra72-evm */ /* Output 2 of LM5140QRWGTQ1 on dra71-evm */ @@ -171,6 +181,15 @@ clocks = <&atl_clkin2_ck>; }; }; + + vmmcwl_fixed: fixedregulator-mmcwl { + compatible = "regulator-fixed"; + regulator-name = "vmmcwl_fixed"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + gpio = <&gpio5 8 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; }; &dra7_pmx_core { @@ -398,6 +417,29 @@ max-frequency = <192000000>; }; +&mmc4 { + status = "okay"; + vmmc-supply = <&evm_3v6>; + vqmmc-supply = <&vmmcwl_fixed>; + bus-width = <4>; + cap-power-off-card; + keep-power-in-suspend; + non-removable; + pinctrl-names = "default", "hs", "sdr12", "sdr25"; + pinctrl-0 = <&mmc4_pins_default>; + pinctrl-1 = <&mmc4_pins_default>; + pinctrl-2 = <&mmc4_pins_default>; + pinctrl-3 = <&mmc4_pins_default>; + #address-cells = <1>; + #size-cells = <0>; + wlcore: wlcore@2 { + compatible = "ti,wl1835"; + reg = <2>; + interrupt-parent = <&gpio5>; + interrupts = <7 IRQ_TYPE_EDGE_RISING>; + }; +}; + &mac { status = "okay"; }; diff --git a/arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi b/arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi index c9351eaf97f0..4cf5482fbc33 100644 --- a/arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi +++ b/arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi @@ -213,6 +213,17 @@ DRA7XX_CORE_IOPAD(0x3498, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE1) /* gpmc_a22.mmc2_dat7 */ >; }; + + mmc4_pins_default: mmc4_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x37e8, PIN_INPUT_PULLUP | MUX_MODE3) /* uart1_ctsn.mmc4_clk */ + DRA7XX_CORE_IOPAD(0x37ec, PIN_INPUT_PULLUP | MUX_MODE3) /* uart1_rtsn.mmc4_cmd */ + DRA7XX_CORE_IOPAD(0x37f0, PIN_INPUT_PULLUP | MUX_MODE3) /* uart2_rxd.mmc4_dat0 */ + DRA7XX_CORE_IOPAD(0x37f4, PIN_INPUT_PULLUP | MUX_MODE3) /* uart2_txd.mmc4_dat1 */ + DRA7XX_CORE_IOPAD(0x37f8, PIN_INPUT_PULLUP | MUX_MODE3) /* uart2_ctsn.mmc4_dat2 */ + DRA7XX_CORE_IOPAD(0x37fc, PIN_INPUT_PULLUP | MUX_MODE3) /* uart2_rtsn.mmc4_dat3 */ + >; + }; }; &dra7_iodelay_core {