From patchwork Fri Jan 15 13:49:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caesar Wang X-Patchwork-Id: 8041121 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3ED399F859 for ; Fri, 15 Jan 2016 13:53:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5D70B20444 for ; Fri, 15 Jan 2016 13:53:41 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7F939203B4 for ; Fri, 15 Jan 2016 13:53:40 +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 1aK4nX-0005cp-4Q; Fri, 15 Jan 2016 13:52:15 +0000 Received: from mail-pa0-f66.google.com ([209.85.220.66]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aK4me-0004vr-BV; Fri, 15 Jan 2016 13:51:22 +0000 Received: by mail-pa0-f66.google.com with SMTP id a20so24422199pag.3; Fri, 15 Jan 2016 05:51:03 -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=doFQiYXAyE+1sdWExz4UWGOy/+zCoS6FHGuS4m/Im3g=; b=KcA/qSbxXiQi1/bo1Vw3PQotXMLy+XInRrYHjkPzuv7AbGk1kxBeUSNI74XkL0Kk/8 HkjWwXHk7+41SF3Me8Pyd8QNQOuTA3fN8n5nYuxav4YIUgUD12HPaaesqYWoRZjfGXey AbAHbdbHrV8dDTa95K8HHVEsCiO18ARJi8ep8MCwBzNehWvn6k5MvjMstRGqhyAfSjKN 3WKODhx/tltmzW0iMVGMYWP6pN/ApiX0anorf7I20QaMofH8Fj8xgY+AF7fg/J96eGr/ 4dQGJnLptEm8qj2OMTa7a9OedbMSt84yrC0rZYixgYD0+QlcXPSPjCSAen2t48kin3Dd +6kg== X-Gm-Message-State: ALoCoQnW5qkaiZ9jdQuLSXOZigxYmU+CvPdxUhI/9F3t0CiqKU7H//sY8HJQzrlG7MYXPVB2++1J+fCQdbFPn7WdmF1JydpaCQ== X-Received: by 10.66.156.106 with SMTP id wd10mr15078393pab.150.1452865863144; Fri, 15 Jan 2016 05:51:03 -0800 (PST) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id 16sm15811805pfh.48.2016.01.15.05.51.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 15 Jan 2016 05:51:02 -0800 (PST) From: Caesar Wang To: Heiko Stuebner , linux-rockchip@lists.infradead.org Subject: [PATCH v3 7/9] ARM: dts: rockchip: add the sdmmc for kylin board Date: Fri, 15 Jan 2016 21:49:54 +0800 Message-Id: <1452865796-23527-8-git-send-email-wxt@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1452865796-23527-1-git-send-email-wxt@rock-chips.com> References: <1452865796-23527-1-git-send-email-wxt@rock-chips.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160115_055120_635436_BE050CA0 X-CRM114-Status: GOOD ( 10.77 ) X-Spam-Score: -2.4 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, Mark Brown , leozwang@google.com, keescook@google.com, linux-arm-kernel@lists.infradead.org, Caesar Wang 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.2 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 Although We can add the sdmmc node, shouldn't enable it. Since the sdmmc is reusing the same pin with uart2. Unfortunately, the uart2 is used by the debug port, so that will cause the debug information can't display on console if enabling the sdmmc. As we have supported the sdmmc (sd card) on hardware for kylin board. So, maybe we can have the sdmmc node in kylin dts, not to enable it. Anyway, you only need add the okay status if someone want to enable the sdmmc. e.g. if you use the adb to debug with android os. You can add the status = "okay" to enable the sdmmc for sd card working. The defauly status is disabling it. Signed-off-by: Caesar Wang --- Changes in v3: - fix the commit content in sdmmc patch. arch/arm/boot/dts/rk3036-kylin.dts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts index d30a6dd..8bdbb95 100644 --- a/arch/arm/boot/dts/rk3036-kylin.dts +++ b/arch/arm/boot/dts/rk3036-kylin.dts @@ -335,6 +335,17 @@ pinctrl-0 = <&sdio_clk &sdio_cmd &sdio_bus4>; }; +&sdmmc { + bus-width = <4>; + cap-mmc-highspeed; + cap-sd-highspeed; + card-detect-delay = <200>; + disable-wp; + num-slots = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc_clk>, <&sdmmc_cmd>, <&sdmmc_cd>, <&sdmmc_bus4>; +}; + &uart2 { status = "okay"; }; @@ -372,6 +383,12 @@ }; }; + sdmmc { + sdmmc_pwr: sdmmc-pwr { + rockchip,pins = <2 28 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + sleep { global_pwroff: global-pwroff { rockchip,pins = <2 7 RK_FUNC_1 &pcfg_pull_none>;