From patchwork Mon Jan 20 03:56:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 3510611 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 20C169F1C3 for ; Mon, 20 Jan 2014 03:57:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4C72B20148 for ; Mon, 20 Jan 2014 03:57:54 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 59774200E5 for ; Mon, 20 Jan 2014 03:57:53 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W55yt-00049f-Fe; Mon, 20 Jan 2014 03:56:59 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W55yf-0002QT-Gb; Mon, 20 Jan 2014 03:56:45 +0000 Received: from mail-pb0-f49.google.com ([209.85.160.49]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W55yK-0002NU-Ci for linux-arm-kernel@lists.infradead.org; Mon, 20 Jan 2014 03:56:25 +0000 Received: by mail-pb0-f49.google.com with SMTP id up15so5869098pbc.8 for ; Sun, 19 Jan 2014 19:56:02 -0800 (PST) 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=igNEkZ2DDSRTUv0faq/uJak6yuPGBknWfOPqJhOBhTk=; b=krscnDsgV3euu244h2B8hwxF3r2nHcu5sjIE3RLGAiOu9mpBwE83bw+L9lAmx1vHmx +jC/Ea7v3O7pm+2OzpDTxVbNSyeLR8/lo6ppOUR++tn2JSLgi417m4LoXz7jA8GtCcSU XO07OnnNHC7dEzOA/kaj3gQUHW9Ji5RvcGMmcUBuZaM+cxdLIJo8F/ZWnEFL1vRQEgTK 3IkiPjOkCcxHUyNP2wr1doNAbqMw3IvnCLyXOc8c3T/sQvq528robCGFw4JOdv8J7/eR PWoXM8yFGQIPnismOnUrWOzE0LhO5GI0tTw/V/uRvE0ulWhJMs1Bzu7XvEjHQzBfiGEs 8x1g== X-Gm-Message-State: ALoCoQlUE1EFIZ+Ieklmlztjrms9C2BkZamcB7AicoVZIciHweKG02s4acRKR6DPIBGRE02vnt+u X-Received: by 10.66.232.7 with SMTP id tk7mr16064769pac.94.1390190162138; Sun, 19 Jan 2014 19:56:02 -0800 (PST) Received: from brutus.lixom.net (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by mx.google.com with ESMTPSA id vf7sm40622917pbc.5.2014.01.19.19.56.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 19 Jan 2014 19:56:01 -0800 (PST) From: Olof Johansson To: linux-mmc@vger.kernel.org Subject: [PATCH 3/3] ARM: dts: exynos5250-snow: Enable wifi power-on Date: Sun, 19 Jan 2014 19:56:55 -0800 Message-Id: <1390190215-22700-4-git-send-email-olof@lixom.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1390190215-22700-1-git-send-email-olof@lixom.net> References: <1390190215-22700-1-git-send-email-olof@lixom.net> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140119_225624_554480_1A96073F X-CRM114-Status: GOOD ( 13.36 ) X-Spam-Score: -2.6 (--) Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, linux@arm.linux.org.uk, pawel.moll@arm.com, chris@printf.net, robh+dt@kernel.org, ijc+devicetree@hellion.org.ok, galak@codeaurora.org, Olof Johansson , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 This adds the required specifications of reset-gpios on snow to enable wifi. The wifi module is always powered, but it has three more signals needed: - Enable line (active high) - Reset line (active low) - 32kHz reference clock The enable and reset lines are in practice quite similar (i.e. both need to be 1 for the module to be enabled), so treat them both as "reset gpios". The clock is specified using the new clock property on MMC, which due to lack of append options right now has to duplicate the first two clocks that are SoC generic. Also, fix the pinctrl setting (that has moved from slot node to host controller node), and add the two gpio lines to the pinctrl setup. Signed-off-by: Olof Johansson --- arch/arm/boot/dts/exynos5250-cros-common.dtsi | 17 ++++++++++++++++- arch/arm/boot/dts/exynos5250-snow.dts | 11 +++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/exynos5250-cros-common.dtsi b/arch/arm/boot/dts/exynos5250-cros-common.dtsi index 2c1560d..b72f342 100644 --- a/arch/arm/boot/dts/exynos5250-cros-common.dtsi +++ b/arch/arm/boot/dts/exynos5250-cros-common.dtsi @@ -34,6 +34,20 @@ samsung,pin-pud = <0>; samsung,pin-drv = <0>; }; + + wifi_en: wifi-en { + samsung,pins = "gpx0-1"; + samsung,pin-function = <1>; + samsung,pin-pud = <0>; + samsung,pin-drv = <0>; + }; + + wifi_rst: wifi-rst { + samsung,pins = "gpx0-2"; + samsung,pin-function = <1>; + samsung,pin-pud = <0>; + samsung,pin-drv = <0>; + }; }; i2c@12C60000 { @@ -41,7 +55,7 @@ samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <378000>; - max77686@09 { + pmic: max77686@09 { compatible = "maxim,max77686"; interrupt-parent = <&gpx3>; interrupts = <2 0>; @@ -284,6 +298,7 @@ num-slots = <1>; supports-highspeed; broken-cd; + cap-sdio-irq; card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-sdr-timing = <2 3>; diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts index 7e45eea..c150483 100644 --- a/arch/arm/boot/dts/exynos5250-snow.dts +++ b/arch/arm/boot/dts/exynos5250-snow.dts @@ -11,6 +11,7 @@ /dts-v1/; #include "exynos5250.dtsi" #include "exynos5250-cros-common.dtsi" +#include / { model = "Google Snow"; @@ -186,9 +187,15 @@ */ mmc@12230000 { status = "okay"; + clocks = <&clock 280>, <&clock 139>, <&pmic 2>; + clock-names = "biu", "ciu", "card_ext_clock"; + card-reset-gpios = <&gpx0 1 GPIO_ACTIVE_LOW>, /* WIFI_EN */ + <&gpx0 2 GPIO_ACTIVE_LOW>; /* WIFI_RSTn */ + pinctrl-names = "default"; + pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4 &wifi_en &wifi_rst>; slot@0 { - pinctrl-names = "default"; - pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>; + reg = <0>; + bus-width = <4>; }; };