From patchwork Thu Jul 31 16:13:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 4657551 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 234E7C0338 for ; Thu, 31 Jul 2014 16:16:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4373420149 for ; Thu, 31 Jul 2014 16:16:33 +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 6A72720145 for ; Thu, 31 Jul 2014 16:16:32 +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 1XCszw-0000WC-K7; Thu, 31 Jul 2014 16:14:32 +0000 Received: from mail-oi0-f74.google.com ([209.85.218.74]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XCszB-000899-DY for linux-arm-kernel@lists.infradead.org; Thu, 31 Jul 2014 16:13:46 +0000 Received: by mail-oi0-f74.google.com with SMTP id a141so841255oig.3 for ; Thu, 31 Jul 2014 09:13:23 -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=hwXDbBCysCw5hCkSd+7OHTUjofmH2/QFJ0VfaQSW6Vs=; b=SgkTVdpyYPrcdovDONBlRrvCQR11c3lh+TV5SbBU2RMXIbi2pdGV5AFk1j2weSOhNf C3xPUdAMZ4Y01vOJdsXF1whZgtBN82ZTNJhWK5bn7fwP6+lBYnk547aalpryMBMIqttm OMwnaKAEVgkK0dAPyZOVxOfLTa3G5JE0IAgyWJDnrgF/tVpIPtR8DXxgMwrUshyoYuec 9ZN6C4hHmzSt/EWU+13Cx35zH8pnHldKJnFJr+RTom3jXc/uYZafmgu6ccn13SsTuky0 Tx0igGgXC2UgDDbUyie+UAmoK4Qekc936bDrAdRdgpHFbdiFz5sdGVPSus866ZqsqtM6 j94g== X-Gm-Message-State: ALoCoQmyiCRoZyFzKWdyM2C5eVdJi0YvF/W2xf8FP5cE2R/K4EyNMyGI6KsvTLSzN7jaurtTX6lQ X-Received: by 10.182.66.234 with SMTP id i10mr2053098obt.12.1406823202785; Thu, 31 Jul 2014 09:13:22 -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 v20si368950yhe.2.2014.07.31.09.13.22 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 31 Jul 2014 09:13:22 -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 9BB7131C48D; Thu, 31 Jul 2014 09:13:22 -0700 (PDT) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 3C77680A77; Thu, 31 Jul 2014 09:13:22 -0700 (PDT) From: Doug Anderson To: Heiko Stuebner , Seungwon Jeon , Jaehoon Chung , Chris Ball , Ulf Hansson Subject: [PATCH v2 2/4] ARM: dts: Enable emmc and sdmmc on the rk3288-evb boards Date: Thu, 31 Jul 2014 09:13:18 -0700 Message-Id: <1406823200-20911-3-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.0.0.526.g5318336 In-Reply-To: <1406823200-20911-1-git-send-email-dianders@chromium.org> References: <1406823200-20911-1-git-send-email-dianders@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140731_091345_523552_2503327B X-CRM114-Status: GOOD ( 12.38 ) 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. Signed-off-by: Doug Anderson Acked-by: Arnd Bergmann --- 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 | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi index 749e20d..ec580fa 100644 --- a/arch/arm/boot/dts/rk3288-evb.dtsi +++ b/arch/arm/boot/dts/rk3288-evb.dtsi @@ -37,6 +37,39 @@ }; }; +&emmc { + broken-cd; + bus-width = <8>; + cap-mmc-highspeed; + mmc-ddr-1_8v; + 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"; };