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: 2872111 Return-Path: X-Original-To: patchwork-linux-omap@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 9A68DBF43F for ; Wed, 11 Sep 2013 11:03:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4D91B2031C for ; Wed, 11 Sep 2013 11:03:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9A70D2031A for ; Wed, 11 Sep 2013 11:03:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754729Ab3IKLDN (ORCPT ); Wed, 11 Sep 2013 07:03:13 -0400 Received: from mail-we0-f175.google.com ([74.125.82.175]:38236 "EHLO mail-we0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753456Ab3IKLCm (ORCPT ); Wed, 11 Sep 2013 07:02:42 -0400 Received: by mail-we0-f175.google.com with SMTP id q59so7768897wes.20 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=dX/Isf/ZKUdx3uj6/5yvHWwPRG/IYcIa/bAt9UKJO7uzApzlm9VzByXcMAhXq6J3Ww fAUUOXES8vzL7rj+TQQLQU3BQY171fMxj9EpEyWj2JkcI3DE8sip9ABD9yCgwRthP6qY /RlFLbrTFsnEFSfr7RvTMh0RQighfuon1cWi7Qa6XEFqf+tI0s3PQZ6ZHKCh2Av1K1GS 20tgdrGnkBeGdhiNeMUmLIGT+0ieQyEsP4+bUkaKJcR6HiKlod5cRvUjiIKGegAC6BL6 2oI1cgpohziFjc14BbaLITtqxkzFxjMNvBQkbZYGtZdNA0Wnzbj9HThMk2TpT0zEqffL i98g== X-Gm-Message-State: ALoCoQmihEoujVjqPxzol1Kce7yiBzw67uFb+hJ+jsEGwDw1KYR9lPD/0PcSH4s1WTE+bi5ixQHl 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 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, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Alexander Holler , Koen Kooi 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> 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.7 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 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>; -};