From patchwork Thu Sep 12 18:35:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 2880631 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 F04CDBFF05 for ; Thu, 12 Sep 2013 18:37:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DAC7C20371 for ; Thu, 12 Sep 2013 18:37:10 +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 885C42034F for ; Thu, 12 Sep 2013 18:37:09 +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 1VKBko-0007ff-LJ; Thu, 12 Sep 2013 18:36:35 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VKBkf-00034Z-6U; Thu, 12 Sep 2013 18:36:25 +0000 Received: from mail-wi0-f179.google.com ([209.85.212.179]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VKBkL-00030p-4T for linux-arm-kernel@lists.infradead.org; Thu, 12 Sep 2013 18:36:05 +0000 Received: by mail-wi0-f179.google.com with SMTP id hm2so203715wib.12 for ; Thu, 12 Sep 2013 11:35:43 -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=PedJMLFvWNYOIf0pZ4jfyu3Iy+Bl2qVrZb+Z25sX+uc=; b=e7aU8xCyIu6dFq4pPnc0CLHbzr+zhCNRmZe89DIJz2DJAjYC7OUuI6zXld2iwL42tu vCAksRoLmz5/hpmm5O84zHHTeKBW+I6F8IMVkff6fggaa9l7lPuSN6kraUIQBJ9xhTzw ylEKQEA5/D/QcsSNVgzf828rYTFkmjZvRqgRCmXsoiJrXU6yCfV2H1h4Ac/9qgnM0CVe y/0kmUs0J9s5z0nHrCLOX9w313wIz2/Vq+FIT3/9B+Ns78McjtKbo33SkOPzXJbBemm2 5MRLx4cEVhM5/hTRxdAaa2RWBJUlYEdFSklBrUpLSHk46WQNOtrQiRY/zrZfUwydw4Ar DoOw== X-Gm-Message-State: ALoCoQl93OqI+qfA6PIkwx+Tzww4oBDs/pDDFHQOjOmxc6hva23977uoLrU4vGNfCcilzjlcV3Jz X-Received: by 10.180.38.73 with SMTP id e9mr7086122wik.31.1379010943094; Thu, 12 Sep 2013 11:35:43 -0700 (PDT) Received: from localhost.localdomain (ip4da2a5ae.direct-adsl.nl. [77.162.165.174]) by mx.google.com with ESMTPSA id fz8sm19642639wic.0.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 12 Sep 2013 11:35:42 -0700 (PDT) From: Koen Kooi To: linux-kernel@vger.kernel.org Subject: [PATCH v4 1/4] ARM: dts: am335x-bone: add CD for mmc1 Date: Thu, 12 Sep 2013 20:35:32 +0200 Message-Id: <1379010935-25943-2-git-send-email-koen@dominion.thruhere.net> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1379010935-25943-1-git-send-email-koen@dominion.thruhere.net> References: <1379010935-25943-1-git-send-email-koen@dominion.thruhere.net> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130912_143605_328280_4DF245E5 X-CRM114-Status: GOOD ( 10.41 ) 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, rob.herring@calxeda.com, bcousson@baylibre.com, Alexander Holler , linux-omap@vger.kernel.org, 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.1 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, 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 Acked-by: Jason Kridner --- arch/arm/boot/dts/am335x-bone-common.dtsi | 14 ++++++++++++++ arch/arm/boot/dts/am335x-bone.dts | 1 - 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi index 2f66ded..0d95d54 100644 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi @@ -107,6 +107,12 @@ 0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7) >; }; + + mmc1_pins: pinmux_mmc1_pins { + pinctrl-single,pins = < + 0x160 (PIN_INPUT | MUX_MODE7) /* GPIO0_6 */ + >; + }; }; ocp { @@ -260,3 +266,11 @@ pinctrl-0 = <&davinci_mdio_default>; pinctrl-1 = <&davinci_mdio_sleep>; }; + +&mmc1 { + status = "okay"; + 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..0d63348 100644 --- a/arch/arm/boot/dts/am335x-bone.dts +++ b/arch/arm/boot/dts/am335x-bone.dts @@ -17,6 +17,5 @@ }; &mmc1 { - status = "okay"; vmmc-supply = <&ldo3_reg>; };