From patchwork Wed Jul 4 09:34:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Ni X-Patchwork-Id: 1155441 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 7687A3FC36 for ; Wed, 4 Jul 2012 09:44:20 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SmM2t-0005GO-Vz; Wed, 04 Jul 2012 09:38:56 +0000 Received: from hqemgate04.nvidia.com ([216.228.121.35]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SmM0p-0004i5-RP for linux-arm-kernel@lists.infradead.org; Wed, 04 Jul 2012 09:37:00 +0000 Received: from hqnvupgp06.nvidia.com (Not Verified[216.228.121.13]) by hqemgate04.nvidia.com id ; Wed, 04 Jul 2012 02:35:57 -0700 Received: from hqemhub01.nvidia.com ([172.17.108.22]) by hqnvupgp06.nvidia.com (PGP Universal service); Wed, 04 Jul 2012 02:36:41 -0700 X-PGP-Universal: processed; by hqnvupgp06.nvidia.com on Wed, 04 Jul 2012 02:36:41 -0700 Received: from hkemhub02.nvidia.com (10.18.67.13) by hqemhub01.nvidia.com (172.20.150.30) with Microsoft SMTP Server (TLS) id 8.3.264.0; Wed, 4 Jul 2012 02:36:41 -0700 Received: from tegra-chromium-2.nvidia.com (10.18.67.5) by hkemhub02.nvidia.com (10.18.67.13) with Microsoft SMTP Server id 8.3.264.0; Wed, 4 Jul 2012 17:36:38 +0800 From: Wei Ni To: , , Subject: [PATCH 3/5] ARM: dt: t20 ventana: add pinmux, gpio for wlan Date: Wed, 4 Jul 2012 17:34:46 +0800 Message-ID: <1341394488-13169-4-git-send-email-wni@nvidia.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1341394488-13169-1-git-send-email-wni@nvidia.com> References: <1341394488-13169-1-git-send-email-wni@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -6.9 (------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-6.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [216.228.121.35 listed in list.dnswl.org] -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Wei Ni , linux@arm.linux.org.uk, arnd@arndb.de, linux-kernel@vger.kernel.org, grant.likely@secretlab.ca, ldewangan@nvidia.com, linux-tegra@vger.kernel.org, cjb@laptop.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This adds wlan pinmux and gpio settings to the Tegra20 Ventana device tree. Signed-off-by: Wei Ni --- arch/arm/boot/dts/tegra20-ventana.dts | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/tegra20-ventana.dts b/arch/arm/boot/dts/tegra20-ventana.dts index be90544..42dbacc 100644 --- a/arch/arm/boot/dts/tegra20-ventana.dts +++ b/arch/arm/boot/dts/tegra20-ventana.dts @@ -198,7 +198,8 @@ nvidia,tristate = <1>; }; conf_dta { - nvidia,pins = "dta", "dtb", "dtc", "dtd"; + nvidia,pins = "dta", "dtb", "dtc", "dtd", + "kbcb"; nvidia,pull = <1>; nvidia,tristate = <0>; }; @@ -213,7 +214,7 @@ nvidia,tristate = <1>; }; conf_kbca { - nvidia,pins = "kbca", "kbcb", "kbcc", "kbcd", + nvidia,pins = "kbca", "kbcc", "kbcd", "kbce", "kbcf", "sdio1", "uaa", "uab"; nvidia,pull = <2>; nvidia,tristate = <0>; @@ -237,6 +238,16 @@ "ld23_22"; nvidia,pull = <1>; }; + drive_sdio1 { + nvidia,pins = "drive_sdio1"; + nvidia,high-speed-mode = <0>; + nvidia,schmitt = <1>; + nvidia,low-power-mode = <3>; + nvidia,pull-down-strength = <31>; + nvidia,pull-up-strength = <31>; + nvidia,slew-rate-rising = <3>; + nvidia,slew-rate-falling = <3>; + }; }; }; @@ -304,6 +315,11 @@ status = "okay"; }; + sdhci@c8000000 { + status = "okay"; + power-gpios = <&gpio 86 0>; /* gpio PK6 */ + }; + sdhci@c8000400 { status = "okay"; cd-gpios = <&gpio 69 0>; /* gpio PI5 */