From patchwork Wed Aug 6 17:09:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 4687441 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 BAF819F375 for ; Wed, 6 Aug 2014 17:12:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DCB252010C for ; Wed, 6 Aug 2014 17:12:13 +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 0780520103 for ; Wed, 6 Aug 2014 17:12:13 +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 1XF4jX-0002SC-G5; Wed, 06 Aug 2014 17:10:39 +0000 Received: from mail-yk0-f201.google.com ([209.85.160.201]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XF4j4-0000r3-An for linux-arm-kernel@lists.infradead.org; Wed, 06 Aug 2014 17:10:11 +0000 Received: by mail-yk0-f201.google.com with SMTP id 142so369051ykq.4 for ; Wed, 06 Aug 2014 10:09:48 -0700 (PDT) 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=RreTZebrV6uSHXXGwcsyabrD6wdp+seS5vrG9w4lU00=; b=Y4wOMxBWhsbdV/sTeboirnehVWWHXQ18jfE9akUxibqWdq/iLmbhq7PU8LqQV2yMIv JK19zD01VTWVxrIPVK0SbIUqcL8w4Dl61FAGTpMPFuZ11MLpLehDzS/TFBNDwF/MBVWu GSrXIUGAFNPfm4IFtwm1C2dlhMcvxYcfwNqIJ2UZuVKu029FAS74xOQMlGuPnTKnYd5K y2OTgY/1bh6ILAgBrRCjDi16ehAVirYaUh+wJnFIG8TG8p7keynwruc2TOFOMWthVOuy dB+zupoIDOAjNU0edymg6YbDa6qa2dBLDPUms8HGWVcNGW2cLbzlsiONlcbb8t+/4kIZ AxAw== X-Gm-Message-State: ALoCoQl6QoNNyPs1F55L0/ZPYwdrry/2bkJnOYyaypFfcemDjGZ5jitaS2qDVLu0UsvojNV1x3B9 X-Received: by 10.236.209.97 with SMTP id r61mr6260602yho.33.1407344988163; Wed, 06 Aug 2014 10:09:48 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id v20si103429yhe.2.2014.08.06.10.09.48 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Aug 2014 10:09:48 -0700 (PDT) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.162.15]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id 061BC31C441; Wed, 6 Aug 2014 10:09:48 -0700 (PDT) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 9E76080393; Wed, 6 Aug 2014 10:09:47 -0700 (PDT) From: Doug Anderson To: Heiko Stuebner , Seungwon Jeon , Jaehoon Chung , Chris Ball , Ulf Hansson Subject: [PATCH v3 2/4] ARM: dts: Enable emmc and sdmmc on the rk3288-evb boards Date: Wed, 6 Aug 2014 10:09:42 -0700 Message-Id: <1407344984-14176-3-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.0.0.526.g5318336 In-Reply-To: <1407344984-14176-1-git-send-email-dianders@chromium.org> References: <1407344984-14176-1-git-send-email-dianders@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140806_101010_504896_62691B33 X-CRM114-Status: GOOD ( 14.45 ) X-Spam-Score: -1.4 (-) Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, Addy Ke , linux@arm.linux.org.uk, pawel.moll@arm.com, Arnd Bergmann , ijc+devicetree@hellion.org.uk, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Kever Yang , Doug Anderson , robh+dt@kernel.org, galak@codeaurora.org, Sonny Rao , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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=-2.6 required=5.0 tests=BAYES_00,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 support for the sdmmc and emmc ports on the rk3288 using the currently posted driver from Addy at: https://patchwork.kernel.org/patch/4653631/ This enables basic SD and eMMC support. Things are not yet running at the fastest speed and we don't have the regulators specified, but we can at least use the eMMC and SD cards now. A few notes: * This is not baesd on Jaehoon's patch series removing the slot node, but it does use new syntax like putting the bus width at the top level and using the new cap-mmc-highspeed / cap-sd-highspeed. A future patch will modify this one to remove the slot node. * Though MMC DDR50 mode is partially supported in the dw_mmc rk3288-specific code in Addy's patch, Addy's patch doesn't add tuning support. That means DDR50 mode is not reliable. From the 3288 TRM: "Tuning is required for other speed modes-such as DDR50-even though the output delay from the card is less than one cycle." Thus, we don't enable MMC DDR50 mode in this patch. Signed-off-by: Doug Anderson Acked-by: Arnd Bergmann --- Changes in v3: - Removed DDR50 mode since it needs tuning, which isn't there yet. Changes in v2: - Squashed in the DDR50 mode since Addy spun his patch. - New patchwork link for Addy's patch arch/arm/boot/dts/rk3288-evb.dtsi | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi index 4f57209..c2cf72f 100644 --- a/arch/arm/boot/dts/rk3288-evb.dtsi +++ b/arch/arm/boot/dts/rk3288-evb.dtsi @@ -49,6 +49,38 @@ }; }; +&emmc { + broken-cd; + bus-width = <8>; + cap-mmc-highspeed; + non-removable; + num-slots = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>; + status = "okay"; + + slot@0 { + reg = <0>; + disable-wp; + }; +}; + +&sdmmc { + bus-width = <4>; + cap-mmc-highspeed; + cap-sd-highspeed; + card-detect-delay = <200>; + num-slots = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; + status = "okay"; + + slot@0 { + reg = <0>; + disable-wp; /* wp not hooked up */ + }; +}; + &i2c0 { status = "okay"; };