From patchwork Thu Jan 7 08:25:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caesar Wang X-Patchwork-Id: 7974471 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 BF5C19F3E6 for ; Thu, 7 Jan 2016 08:31:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0885420103 for ; Thu, 7 Jan 2016 08:31:21 +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 1EC02200FE for ; Thu, 7 Jan 2016 08:31:20 +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 1aH5x2-0002WY-AQ; Thu, 07 Jan 2016 08:29:44 +0000 Received: from mail-pa0-f46.google.com ([209.85.220.46]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aH5vT-0000mi-N0; Thu, 07 Jan 2016 08:28:11 +0000 Received: by mail-pa0-f46.google.com with SMTP id uo6so234754524pac.1; Thu, 07 Jan 2016 00:27:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pxhG1Dw0AQFK9/5MKvFgnTSNnO8FcMx8b6OILh9JxyA=; b=nEI5TFETEnvtdLdiEmCJ6u+4ADPtudz5S6HAypUmolRUdxZvel1wUmv29+dT3KD+Ai /72vVtk5IMNJnY5nXuaW4jFYFO+ugKMiDnhKjMF8MrTITbhypLsl5Jnvtk/OLNoEvico 4NzjDzlPvzYALatMWOb/xucYXYQo7unyFqGKNjtLJmIkdWt9DvppvVCZj+XLcw9a1z/I IAWXhrA126mWYnMak+ZlYotZnETFom30EOPPGvJts1QnwGvNiK5MABk74YGVbDjnAS1l c+pqS35Sulei93y5sc+BvqF9Pg/O5wmtCRA7zZtO0DUtoeZUnlt75PVf7can15TUQZmB uU2Q== X-Received: by 10.66.160.100 with SMTP id xj4mr149393255pab.14.1452155266183; Thu, 07 Jan 2016 00:27:46 -0800 (PST) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id qj8sm9945010pac.40.2016.01.07.00.27.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jan 2016 00:27:45 -0800 (PST) From: Caesar Wang To: Heiko Stuebner , Ulf Hansson Subject: [PATCH v2 10/12] ARM: dts: rockchip: add the sdmmc for kylin board Date: Thu, 7 Jan 2016 16:25:53 +0800 Message-Id: <1452155155-16232-11-git-send-email-wxt@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1452155155-16232-1-git-send-email-wxt@rock-chips.com> References: <1452155155-16232-1-git-send-email-wxt@rock-chips.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160107_002808_087208_9A20FBDF X-CRM114-Status: GOOD ( 10.32 ) 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: Mark Rutland , devicetree@vger.kernel.org, Russell King , Pawel Moll , Ian Campbell , Kumar Gala , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Rob Herring , leecam@google.com, linux-arm-kernel@lists.infradead.org, keescook@google.com, leozwang@google.com, 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 We should add the sdmmc but enabling it, since the sdmmc and uart2 ie reusing the same pin. That will cause the debug information can't display on console. Anyway, you only need add the okay status if someone wants to enable the sdmmc. e.g. if you use the adb to debug and run with android os. you can add the status = "okay" to enable the sdmmc for sd card working. Signed-off-by: Caesar Wang --- Changes in v2: None 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 c5e46f9..2dbc7bb 100644 --- a/arch/arm/boot/dts/rk3036-kylin.dts +++ b/arch/arm/boot/dts/rk3036-kylin.dts @@ -357,6 +357,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"; }; @@ -394,6 +405,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>;