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: 4657491 Return-Path: X-Original-To: patchwork-linux-mmc@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 BE6269F36A for ; Thu, 31 Jul 2014 16:14:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E266120121 for ; Thu, 31 Jul 2014 16:14:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0B99620158 for ; Thu, 31 Jul 2014 16:14:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752151AbaGaQNq (ORCPT ); Thu, 31 Jul 2014 12:13:46 -0400 Received: from mail-oi0-f73.google.com ([209.85.218.73]:54357 "EHLO mail-oi0-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752980AbaGaQNY (ORCPT ); Thu, 31 Jul 2014 12:13:24 -0400 X-Greylist: delayed 635 seconds by postgrey-1.27 at vger.kernel.org; Thu, 31 Jul 2014 12:13:23 EDT Received: by mail-oi0-f73.google.com with SMTP id u20so842126oif.0 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=F76rpWkuu1vI8k+JQRH94NVrQxVtR7FOmIozQ+Oiaxamjn7PO+z7zgMjQhR+TYry1H 8XJvC7sUAg+roeh1mJ1Sc+fYNNMeuZR2KL3CoBcR16jiMLq3qa9+eYiREoSe4m0neX0d GPFoalCzlLFmdMRNbqTpJCcnVrvsKKO3iiCh7PlED7lxj2WC8jHU8nhyckHkHuFnNy6m 2ylkERS2bqjXhZrocheSUbtDAyrGvgj2M9CIDEd3sWNiLFTivPPaLjalOwDclMyfYx/P G+Lc0Oq4noWkf0rSfMpbI+FiKn2w7qQo8EgMzlAZfqs9jQS4eZhnKcGu+eiP/EM/EP4T rkXQ== X-Gm-Message-State: ALoCoQlrW6rLEnt5Z5MKyyH2TvX6wx/bkbAXm7nV0YXQDl1iJj94Lag7m6MB+0TRi6f4wt1vT+ew 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 Cc: Addy Ke , Kever Yang , Sonny Rao , linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org, Arnd Bergmann , Doug Anderson , robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, linux@arm.linux.org.uk, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org 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> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 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"; };