linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
To: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>,
	Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 3/3] ARM: Dove: add Cubox sdhci card detect gpio
Date: Tue, 18 Dec 2012 01:24:29 +0100	[thread overview]
Message-ID: <1355790269-10596-3-git-send-email-sebastian.hesselbarth@gmail.com> (raw)
In-Reply-To: <1355790269-10596-1-git-send-email-sebastian.hesselbarth@gmail.com>

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 <sebastian.hesselbarth@gmail.com>
---
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
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";
-- 
1.7.10.4


  parent reply	other threads:[~2012-12-18  0:29 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-18  0:24 [PATCH 1/3] ARM: Dove: split legacy and DT setup Sebastian Hesselbarth
2012-12-18  0:24 ` [PATCH 2/3] ARM: Dove: cleanup includes Sebastian Hesselbarth
2013-01-28  2:20   ` Jason Cooper
2012-12-18  0:24 ` Sebastian Hesselbarth [this message]
2012-12-18  0:38   ` [PATCH 3/3] ARM: Dove: add Cubox sdhci card detect gpio Jason Cooper
2012-12-18  0:50     ` Sebastian Hesselbarth
2012-12-18  1:37       ` Jason Cooper
2013-01-10  2:17   ` Jason Cooper
2012-12-18  0:35 ` [PATCH 1/3] ARM: Dove: split legacy and DT setup Jason Cooper
2013-01-28  2:19 ` Jason Cooper
2013-01-29 21:23 ` [PATCH v2 1/2] ARM: dove: cleanup includes Sebastian Hesselbarth
2013-01-29 21:23   ` [PATCH v2 2/2] ARM: dove: split legacy and DT setup Sebastian Hesselbarth
2013-01-29 21:26     ` Jason Cooper
2013-01-29 21:41       ` [PATCH v3 " Sebastian Hesselbarth
2013-01-31  0:52         ` Jason Cooper
2013-01-29 21:36   ` [PATCH v2 1/2] ARM: dove: cleanup includes Jason Cooper

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1355790269-10596-3-git-send-email-sebastian.hesselbarth@gmail.com \
    --to=sebastian.hesselbarth@gmail.com \
    --cc=andrew@lunn.ch \
    --cc=jason@lakedaemon.net \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).