From patchwork Wed Mar 11 22:15:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 5988941 Return-Path: X-Original-To: patchwork-linux-rockchip@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 89F149F380 for ; Wed, 11 Mar 2015 22:17:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A6619202FF for ; Wed, 11 Mar 2015 22:17:01 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (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 C9090202EB for ; Wed, 11 Mar 2015 22:17:00 +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 1YVovz-0002rE-DR; Wed, 11 Mar 2015 22:16:59 +0000 Received: from mail-ie0-x229.google.com ([2607:f8b0:4001:c03::229]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YVovP-0002PZ-W8 for linux-rockchip@lists.infradead.org; Wed, 11 Mar 2015 22:16:25 +0000 Received: by ieclw3 with SMTP id lw3so2383028iec.2 for ; Wed, 11 Mar 2015 15:16:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=M7iXaS0blVY/dqIb0CDagsiqlUpRyLRdcpvpZNyxu6U=; b=jfz4y2vU8PLLbD7BoiGjZK599bn4ed6A0xqqRes4ZtNa+1gerBGt6HB0WeI/ekyEVj PxEPeF7lSK1ViFs5d8JqhIcXFst5/pXrZNXeUkf/wVXXanZ86yRyVwynKR+cXci81C9R TuGbFpeXh4fR0/akKqqLhq8GFZIxUUmvUT2ik= 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=M7iXaS0blVY/dqIb0CDagsiqlUpRyLRdcpvpZNyxu6U=; b=HIHnJSdPXGaSHWavi6q4GFksi2slRAqXx0GLstDlEff6qCgYwUVLv78cJQV/bHojkr xOEJnAggDHs4JpZYKxkp9FL02stLVtncQ6hZblxRJvhwK5zdVvkob7IEnrneJnZG52J9 9peuQDB6D+Cm0LaOBKnRrAVVT7hl1IVo4MuS22cJjeR0WPqj5Lui++xWQ9M5evFxr3YY uVNCNwRb+/HleFeAzXzH6Zm0l9FrDCs8kPcFsoKbL4hKi7RYagi/xxmjOtqBnHsT4q9i I1tBJiAxSrd+xvNVCo6CN0OSKuUknlrQYqNYWekePjsZlAInBF4jMRrq9s3lm5UjnULz 7CIQ== X-Gm-Message-State: ALoCoQl5pWnWbUjc9Ve3kMCtQqwH3+nQzlYpRhzfwx57+to9bJrEJb/LfpdDFERhRvy3lO7R0Rvz X-Received: by 10.107.168.146 with SMTP id e18mr57706389ioj.32.1426112140945; Wed, 11 Mar 2015 15:15:40 -0700 (PDT) Received: from tictac.mtv.corp.google.com ([172.22.65.76]) by mx.google.com with ESMTPSA id 192sm3229684ioo.38.2015.03.11.15.15.39 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 Mar 2015 15:15:40 -0700 (PDT) From: Doug Anderson To: Ulf Hansson , Heiko Stuebner , Jaehoon Chung , Seungwon Jeon Subject: [PATCH v4 4/4] ARM: dts: Specify VMMC and VQMMC on rk3288-evb Date: Wed, 11 Mar 2015 15:15:17 -0700 Message-Id: <1426112117-18220-4-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c In-Reply-To: <1426112117-18220-1-git-send-email-dianders@chromium.org> References: <1426112117-18220-1-git-send-email-dianders@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150311_151624_155971_331B12D7 X-CRM114-Status: UNSURE ( 7.16 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.8 (/) Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, Addy Ke , linux@arm.linux.org.uk, Alexandru Stan , pawel.moll@arm.com, ijc+devicetree@hellion.org.uk, Andrew Bresticker , Doug Anderson , robh+dt@kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Mark Brown , Alim Akhtar , galak@codeaurora.org, Sonny Rao , javier.martinez@collabora.co.uk, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 Specifying these rails should eventually let us do UHS. Signed-off-by: Doug Anderson --- Changes in v4: - Add vcc_sd regulator which is present on EVB 2.0 boards Changes in v3: None Changes in v2: - Fix subject line arch/arm/boot/dts/rk3288-evb.dtsi | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi index 5e895a5..6d4ae9f 100644 --- a/arch/arm/boot/dts/rk3288-evb.dtsi +++ b/arch/arm/boot/dts/rk3288-evb.dtsi @@ -103,6 +103,23 @@ regulator-always-on; regulator-boot-on; }; + + /* + * NOTE: vcc_sd isn't hooked up on v1.0 boards where power comes from + * vcc_io directly. Those boards won't be able to power cycle SD cards + * but it shouldn't hurt to toggle this pin there anyway. + */ + vcc_sd: sdmmc-regulator { + compatible = "regulator-fixed"; + gpio = <&gpio7 11 GPIO_ACTIVE_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc_pwr>; + regulator-name = "vcc_sd"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + startup-delay-us = <100000>; + vin-supply = <&vcc_io>; + }; }; &emmc { @@ -132,6 +149,8 @@ pinctrl-names = "default"; pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; status = "okay"; + vmmc-supply = <&vcc_sd>; + vqmmc-supply = <&vccio_sd>; }; &i2c0 { @@ -223,6 +242,10 @@ sdmmc_cmd: sdmmc-cmd { rockchip,pins = <6 21 RK_FUNC_1 &pcfg_pull_up_drv_8ma>; }; + + sdmmc_pwr: sdmmc-pwr { + rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_none>; + }; }; usb {