From patchwork Wed Sep 11 11:02:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 2872121 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 0ACA39F2D6 for ; Wed, 11 Sep 2013 11:03:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D4CA92031C for ; Wed, 11 Sep 2013 11:03:41 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 17CB12031A for ; Wed, 11 Sep 2013 11:03:37 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VJiCc-0005Wp-96; Wed, 11 Sep 2013 11:03:18 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VJiCX-0002Nf-RN; Wed, 11 Sep 2013 11:03:13 +0000 Received: from mail-wg0-f50.google.com ([74.125.82.50]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VJiCN-0002LH-Os for linux-arm-kernel@lists.infradead.org; Wed, 11 Sep 2013 11:03:04 +0000 Received: by mail-wg0-f50.google.com with SMTP id j13so7769834wgh.17 for ; Wed, 11 Sep 2013 04:02:41 -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=KGaa93XQLiPjCMGumQCU7X0JoaKbab91z53HyrNTQYs=; b=l1uUvQ48ky9etp91ID9VOF3lL/9uloiVDMevYWtKr0NXNgjcDUiioD2wUpWWZf+1RV kg0wqgUT1o5z6a2QVHalqUWti16f7X8veURZ9uthW9OSdEJsE2E3do+/GZJVeQxHuMTz WNmgAI4ke2ZNeeFP9uqeGA0KYQAPHs2J3foG5Ne1tgtJxe98C0BbcDGO+4GOsTKw39eN r1DSmFA04MyzSZxv0KXmNxWidmkzCrXSeCO8/PYOA/MXI5iQkhUbw+bfwgr0QUXhkHwx H7Y8LYxqaGzDwbgJsYkbVw28NAvpkBZFMvxKbuee/JWsOM/gywoYhwnxW59ssv6VEzS9 xmMQ== X-Gm-Message-State: ALoCoQmrPl/gjWdnAB7goE9N1ynWSk7/P6nv7/4FhrD2OaUgoQLdTVm5jIL10FvS8I0Xt6bOwGpb X-Received: by 10.180.75.239 with SMTP id f15mr16880518wiw.42.1378897361253; Wed, 11 Sep 2013 04:02:41 -0700 (PDT) Received: from localhost.localdomain (ip4da2a5ae.direct-adsl.nl. [77.162.165.174]) by mx.google.com with ESMTPSA id jf2sm9802462wic.2.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 11 Sep 2013 04:02:40 -0700 (PDT) From: Koen Kooi To: linux-omap@vger.kernel.org Subject: [PATCHv2 1/2] arm: bone: dts: add CD for mmc1 Date: Wed, 11 Sep 2013 13:02:26 +0200 Message-Id: <1378897347-11840-2-git-send-email-koen@dominion.thruhere.net> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1378897347-11840-1-git-send-email-koen@dominion.thruhere.net> References: <1378897347-11840-1-git-send-email-koen@dominion.thruhere.net> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130911_070303_903105_3332D192 X-CRM114-Status: UNSURE ( 9.40 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, linux@arm.linux.org.uk, pawel.moll@arm.com, swarren@wwwdotorg.org, tony@atomide.com, Koen Kooi , ijc+devicetree@hellion.org.uk, linux-kernel@vger.kernel.org, rob.herring@calxeda.com, bcousson@baylibre.com, Alexander Holler , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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=-5.0 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 From: Alexander Holler This enables the use of MMC cards even when no card was inserted at boot. Signed-off-by: Alexander Holler Signed-off-by: Koen Kooi --- Changes since v1: None, simple repost arch/arm/boot/dts/am335x-bone-common.dtsi | 14 ++++++++++++++ arch/arm/boot/dts/am335x-bone.dts | 4 ---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi index 2f66ded..ced256c 100644 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi @@ -107,6 +107,11 @@ 0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7) >; }; + mmc1_pins: pinmux_mmc1_pins { + pinctrl-single,pins = < + 0x160 (PIN_INPUT | MUX_MODE7) /* GPIO0_6 */ + >; + }; }; ocp { @@ -260,3 +265,12 @@ pinctrl-0 = <&davinci_mdio_default>; pinctrl-1 = <&davinci_mdio_sleep>; }; + +&mmc1 { + status = "okay"; + vmmc-supply = <&ldo3_reg>; + pinctrl-names = "default"; + pinctrl-0 = <&mmc1_pins>; + cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; + cd-inverted; +}; diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts index d5f43fe..d34469c 100644 --- a/arch/arm/boot/dts/am335x-bone.dts +++ b/arch/arm/boot/dts/am335x-bone.dts @@ -16,7 +16,3 @@ regulator-always-on; }; -&mmc1 { - status = "okay"; - vmmc-supply = <&ldo3_reg>; -};