From patchwork Thu Dec 10 20:32:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karsten Merker X-Patchwork-Id: 7822221 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A6AE7BEEE1 for ; Thu, 10 Dec 2015 20:34:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DCDC120532 for ; Thu, 10 Dec 2015 20:34:42 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 15512204E7 for ; Thu, 10 Dec 2015 20:34:42 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1a77tk-0004Gt-Hy; Thu, 10 Dec 2015 20:33:08 +0000 Received: from mout.kundenserver.de ([212.227.126.135]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a77tZ-0004Cx-70 for linux-arm-kernel@lists.infradead.org; Thu, 10 Dec 2015 20:32:58 +0000 Received: from excalibur.cnev.de ([78.34.114.210]) by mrelayeu.kundenserver.de (mreue005) with ESMTPSA (Nemesis) id 0MhPmw-1ZuQYM0jly-00MZ1E; Thu, 10 Dec 2015 21:32:24 +0100 Received: from localhost ([127.0.0.1] helo=excalibur.cnev.de) by excalibur.cnev.de with esmtp (Exim 4.84) (envelope-from ) id 1a77sw-0000Cs-CU; Thu, 10 Dec 2015 21:32:18 +0100 From: Karsten Merker To: Maxime Ripard , Chen-Yu Tsai , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, dev@linux-sunxi.org Subject: [PATCH 2/3] ARM: dts: sun7i: Olimex A20-SOM-EVB: Enable mmc3 (baseboard SD socket) Date: Thu, 10 Dec 2015 21:32:00 +0100 Message-Id: <1449779521-754-3-git-send-email-merker@debian.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1449779521-754-1-git-send-email-merker@debian.org> References: <1449779521-754-1-git-send-email-merker@debian.org> X-Provags-ID: V03:K0:eTKiEdZosGBaNGEZjzU3UOc852/iu2SIVvmtWJMp1I6MsXqLJZr 0HrXHUI9Qua9lhp/Ul7F+OuQyQglEJPvEBy4nsCyIFBO/KEkqRYvaQq/QX7z7KORMNM5XIl Xbg7wwW4dhI5PdTvnWJbfNjBdovt6a+IQ2sGjdeWKaMp5yoVUpH/uXsblRe8kSp48qD7PHd N5v3ImZDc3EOpIGAp9oAw== X-UI-Out-Filterresults: notjunk:1; V01:K0:HN7AloRslOs=:hQae0C2iDbACbkN9nYblwJ AWNT05vxivau1nIlUKUQAg1QGS5sIKlHaTvlZ9fIZRyOJxgpNKobsQieYWuF1+wXMNOlM2HhT 0jO+sNbS8j2IaPVvwE+TpThUfu9EphtVlhryVjeyRT2S7YJzKO5liDtfCk01Wl7H+iltl7/Ax z69WhON8tnsOZ2UH0LylQ93QHmLfk9OirqSErNgmihElgG/KsZNQKc7sMAEsTdn3dr9jpITXR gNuZho0FbyutgjCPYGQLx8CCyOCBxv6morOERqbrlF99Eye1L3V5mRj3wmppE79ooJLIc7g7U BjXbOeiheJ/BYsrjzzYDholqqjefGrLvz6ZQ4zUxtDjrd6Sr6M3FvaQpSWF2pKCxcdjpvnQTL lWVgd8pODFDzsWtNNlUk3guQOVYktG/phIrpbmi7YEFeHTMp6qt+lqiIrXFiLiBm1Gl2AwdyH J3E6PZ27lDL97ZpzCP+8Z80raDeea462lLHmJAlxucojxvAtajLoEId+bF2KoXWLeXntyZily rTxueDSfMs+nhWD9QalAdk/UNYeG9NQvo0YQrImkst2PseuDHKdhOPwzQfuElufcgygrDBrDA zufnXmnJmNmjzUqRnVbKy/tfLTi0VXirPwOe6iGi2CJBJtjvqQVTG7NuKseXr5usD4Zq5Riev mH0WTtskDswsRwRfcqv+cV8Z9xuOkGVDP1vtY+d+NpReXWYygJcbhZpvk9qfibrFKBbA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151210_123257_657910_363B8484 X-CRM114-Status: UNSURE ( 9.19 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Karsten Merker , Hans de Goede , Rob Herring , linux-kernel@vger.kernel.org, Ian Campbell 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=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 Olimex A20-SOM-EVB is an evaluation board for the Olimex A20-SOM system-on-module. The baseboard provides a full-size SD socket (connected to mmc3) in addition to the micro-SD socket on the SOM itself (which is connected to mmc0). Enable the mmc3 controller in the dts. Signed-off-by: Karsten Merker Acked-by: Chen-Yu Tsai --- arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts index 6562a6bc..6a3d95d 100644 --- a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts +++ b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts @@ -176,6 +176,16 @@ status = "okay"; }; +&mmc3 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc3_pins_a>, <&mmc3_cd_pin_olimex_som_evb>; + vmmc-supply = <®_vcc3v3>; + bus-width = <4>; + cd-gpios = <&pio 7 0 GPIO_ACTIVE_HIGH>; /* PH0 */ + cd-inverted; + status = "okay"; +}; + &ohci0 { status = "okay"; }; @@ -198,6 +208,13 @@ allwinner,drive = ; allwinner,pull = ; }; + + mmc3_cd_pin_olimex_som_evb: mmc3_cd_pin@0 { + allwinner,pins = "PH0"; + allwinner,function = "gpio_in"; + allwinner,drive = ; + allwinner,pull = ; + }; }; ®_ahci_5v {