From patchwork Thu Sep 12 15:42:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 2878911 Return-Path: X-Original-To: patchwork-linux-omap@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 11A719F1E3 for ; Thu, 12 Sep 2013 15:43:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DF68E2034D for ; Thu, 12 Sep 2013 15:43:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AF57A20284 for ; Thu, 12 Sep 2013 15:43:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754681Ab3ILPm1 (ORCPT ); Thu, 12 Sep 2013 11:42:27 -0400 Received: from mail-wg0-f47.google.com ([74.125.82.47]:47043 "EHLO mail-wg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754646Ab3ILPmX (ORCPT ); Thu, 12 Sep 2013 11:42:23 -0400 Received: by mail-wg0-f47.google.com with SMTP id f12so9181886wgh.26 for ; Thu, 12 Sep 2013 08:42:22 -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=0peUkNd9LcqiLSwisYbTBzo7I2JnOOBYS2edD8igeeY=; b=BGIn/H/WQ+IMncYU6spUTKjAi/qZ1C6yVocC1ySwED87qfDnu/VzvuR0zOLxaCMwdk QV+GYtHiH8OUPDg/A5Qck6l6w99QxiT9qTDhKLuZPOBF7+IdJBbAwLXByW8rKBTgvJ2K +Njse32ieJi0ILGOsA+/k84CPVSXG1SNIOa417DJyD7dgr13ewnvxVkszkNCoDtZ/38Y FXw52ZXTQSoT92nS38XXj2rNZkM3maDbcFGDc5/ZDJvMXw4YEIuFZYion60XchT/OBY4 5W0CnTqtIf8hBGP2KRf42cSyms8HCDzJu9FBx0Db2KKXdet6VB1aoxZnJvRJTUxj5Chv mNvQ== X-Gm-Message-State: ALoCoQk41kFCAyDEaXo3Pkp9v9JurHfdsg2M2FUrHWY0+9iylIFt4SGuMfJqESgfojcaWIIAIfC2 X-Received: by 10.194.123.227 with SMTP id md3mr6750972wjb.17.1379000542798; Thu, 12 Sep 2013 08:42:22 -0700 (PDT) Received: from localhost.localdomain (ip4da2a5ae.direct-adsl.nl. [77.162.165.174]) by mx.google.com with ESMTPSA id ey2sm5362318wib.5.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 12 Sep 2013 08:42:22 -0700 (PDT) From: Koen Kooi To: linux-kernel@vger.kernel.org Cc: bcousson@baylibre.com, tony@atomide.com, rob.herring@calxeda.com, pawel.moll@arm.com, mark.rutland@arm.com, swarren@wwwdotorg.org, ijc+devicetree@hellion.org.uk, linux@arm.linux.org.uk, linux-omap@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Koen Kooi Subject: [PATCH 2/4] am335x-boneblack: add eMMC DT entry Date: Thu, 12 Sep 2013 17:42:10 +0200 Message-Id: <1379000532-27376-3-git-send-email-koen@dominion.thruhere.net> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1379000532-27376-1-git-send-email-koen@dominion.thruhere.net> References: <1379000532-27376-1-git-send-email-koen@dominion.thruhere.net> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, RCVD_IN_DNSWL_HI, 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 The pinmux is specified in am335x-bone-common.dtsi to be reused by the eMMC cape. Signed-off-by: Koen Kooi --- Changes since v2: add missing pinmux entries Changes since v1: dropped the ti,non-removable entry per Sekhars request arch/arm/boot/dts/am335x-bone-common.dtsi | 22 ++++++++++++++++++++++ arch/arm/boot/dts/am335x-boneblack.dts | 14 ++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi index ced256c..cfec441 100644 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi @@ -112,6 +112,21 @@ 0x160 (PIN_INPUT | MUX_MODE7) /* GPIO0_6 */ >; }; + + emmc_pins: pinmux_emmc_pins { + pinctrl-single,pins = < + 0x80 (PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn1.mmc1_clk, INPUT_PULLUP | MODE2 */ + 0x84 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_csn2.mmc1_cmd, INPUT_PULLUP | MODE2 */ + 0x00 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad0.mmc1_dat0, INPUT_PULLUP | MODE1 */ + 0x04 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad1.mmc1_dat1, INPUT_PULLUP | MODE1 */ + 0x08 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad2.mmc1_dat2, INPUT_PULLUP | MODE1 */ + 0x0c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad3.mmc1_dat3, INPUT_PULLUP | MODE1 */ + 0x10 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad4.mmc1_dat4, INPUT_PULLUP | MODE1 */ + 0x14 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad5.mmc1_dat5, INPUT_PULLUP | MODE1 */ + 0x18 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad6.mmc1_dat6, INPUT_PULLUP | MODE1 */ + 0x1c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad7.mmc1_dat7, INPUT_PULLUP | MODE1 */ + >; + }; }; ocp { @@ -241,6 +256,13 @@ regulator-always-on; }; }; + + vmmcsd_fixed: fixedregulator@0 { + compatible = "regulator-fixed"; + regulator-name = "vmmcsd_fixed"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; }; &cpsw_emac0 { diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts index 197cadf..f4703cf 100644 --- a/arch/arm/boot/dts/am335x-boneblack.dts +++ b/arch/arm/boot/dts/am335x-boneblack.dts @@ -15,3 +15,17 @@ regulator-max-microvolt = <1800000>; regulator-always-on; }; + +&mmc1 { + vmmc-supply = <&vmmcsd_fixed>; +}; + +&mmc2 { + vmmc-supply = <&vmmcsd_fixed>; + pinctrl-names = "default"; + pinctrl-0 = <&emmc_pins>; + bus-width = <8>; + status = "okay"; + ti,vcc-aux-disable-is-sleep; +}; +