From patchwork Tue Dec 18 00:24:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 1889331 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 863D5DF266 for ; Tue, 18 Dec 2012 00:28:50 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Tkkzg-0006qo-9I; Tue, 18 Dec 2012 00:25:12 +0000 Received: from mail-bk0-f44.google.com ([209.85.214.44]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TkkzJ-0006p3-Lf for linux-arm-kernel@lists.infradead.org; Tue, 18 Dec 2012 00:24:51 +0000 Received: by mail-bk0-f44.google.com with SMTP id w11so3614bku.31 for ; Mon, 17 Dec 2012 16:24:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=kRK7PgsYvfvCVmy5uURp8tSocX+YbarL1PeItlKFkvk=; b=cvAfLdR98/JrWy8GY9SXXECENzXX86e7evicFajdr5RWT4OUOjSeOvHXmHqWwgn0BX A9IFAql/41eX61uYHuLVZcjQfkhLVE4sQeCMT1uQPJPtKYtSy/MnzVrtdumoDhQT85Qx +yzQAB/zlDyoenLCiQVltHnhrYhQ5Pd8oIla1aatHOh4RnwakDVgXHbERS9E40SWlOXY 4nkdETUwqSEWT5b5ikVbf1nGtqJ8ZVpSze/MlGLv3caxL4w0slZk49ONAPBzlcXMtvGW zMHXYl8DVOtB1N+rzyLlAO3rdE4hFq25japx9/KhH4Oep38aAql5iEmTK1F2w8xQVjh1 snPg== X-Received: by 10.204.11.78 with SMTP id s14mr30443bks.118.1355790287769; Mon, 17 Dec 2012 16:24:47 -0800 (PST) Received: from nijin.lan (dslc-082-083-192-039.pools.arcor-ip.net. [82.83.192.39]) by mx.google.com with ESMTPS id e22sm5936bke.14.2012.12.17.16.24.45 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 17 Dec 2012 16:24:46 -0800 (PST) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Subject: [PATCH 3/3] ARM: Dove: add Cubox sdhci card detect gpio Date: Tue, 18 Dec 2012 01:24:29 +0100 Message-Id: <1355790269-10596-3-git-send-email-sebastian.hesselbarth@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1355790269-10596-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <1355790269-10596-1-git-send-email-sebastian.hesselbarth@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121217_192449_994649_AE5A559C X-CRM114-Status: GOOD ( 12.58 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.214.44 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (sebastian.hesselbarth[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Andrew Lunn , Russell King , Jason Cooper , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Card detect for sdhci on Cubox is connected to the wrong pin (sdio1_cd instead of sdio0_cd). With support for cd-gpios and pinctrl add the corresponding properties to DT for Cubox. Signed-off-by: Sebastian Hesselbarth --- Cc: Russell King Cc: Jason Cooper Cc: Andrew Lunn Cc: Sebastian Hesselbarth Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- arch/arm/boot/dts/dove-cubox.dts | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts index fed7d3f..cdee96f 100644 --- a/arch/arm/boot/dts/dove-cubox.dts +++ b/arch/arm/boot/dts/dove-cubox.dts @@ -26,10 +26,15 @@ }; &uart0 { status = "okay"; }; -&sdio0 { status = "okay"; }; &sata0 { status = "okay"; }; &i2c0 { status = "okay"; }; +&sdio0 { + status = "okay"; + /* sdio0 card detect is connected to wrong pin on CuBox */ + cd-gpios = <&gpio0 12 1>; +}; + &spi0 { status = "okay"; @@ -42,9 +47,14 @@ }; &pinctrl { - pinctrl-0 = <&pmx_gpio_18>; + pinctrl-0 = <&pmx_gpio_12 &pmx_gpio_18>; pinctrl-names = "default"; + pmx_gpio_12: pmx-gpio-12 { + marvell,pins = "mpp12"; + marvell,function = "gpio"; + }; + pmx_gpio_18: pmx-gpio-18 { marvell,pins = "mpp18"; marvell,function = "gpio";