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: 2880661 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 E4392BFF05 for ; Thu, 12 Sep 2013 18:37:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 824BC20371 for ; Thu, 12 Sep 2013 18:37:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A12D52034F for ; Thu, 12 Sep 2013 18:37:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756097Ab3ILSho (ORCPT ); Thu, 12 Sep 2013 14:37:44 -0400 Received: from mail-wg0-f41.google.com ([74.125.82.41]:35712 "EHLO mail-wg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756060Ab3ILSfo (ORCPT ); Thu, 12 Sep 2013 14:35:44 -0400 Received: by mail-wg0-f41.google.com with SMTP id l18so882549wgh.4 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=Fxe/NLYhoRidawS+FRgcVThkzfm18/+Hv/Zgq16wMiF08JfyWGdpnDgsdo9GpSoh/W WckWs+laXhAk0pfmN0PSoL8j1/Bfi68fRmjQnI4KTh9PDke11RhwXIcHcUQ6gkUHngfT s94N68l9lfSsREQs7s/vzYiC7YBSMnEgVZ1c+dmP92CMYZ2p/pg61XNKXY/Ci8xIHhuT wfEFxJQwkH4mz52/msp+p6IglXuotMNaSVaiFjEe9X2R0xL/NbFpB4sukP6IH0aRmrnu uAvT6q7yFU8XI3XqzVZVPPY68rSt+okr1GwKHKffa+pAsgdpLPkVo8gxDOZ8T9ecw1MK YLag== X-Gm-Message-State: ALoCoQmbjC8O2pp1VSy0toaZpRfYTuVEGFBw3+uTAWq8CDiYiqCGr+pZoR6jTx7iTDMF+Y3P5wxl 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 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, Alexander Holler , Koen Kooi 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> 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=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 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>; };