All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michael Grzeschik <m.grzeschik@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 3/7] at91sam9260_devices: properly set slot id
Date: Fri, 9 Dec 2011 12:28:21 +0100	[thread overview]
Message-ID: <20111209112821.GD8203@pengutronix.de> (raw)
In-Reply-To: <1323187817-28668-1-git-send-email-m.grzeschik@pengutronix.de>

Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
---
 arch/arm/mach-at91/at91sam9260_devices.c |   34 +++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
index 9d1acda..177f770 100644
--- a/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@ -261,18 +261,32 @@ void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data)
 	/* CLK */
 	at91_set_A_periph(AT91_PIN_PA8, 0);
 
-	/* CMD */
-	at91_set_A_periph(AT91_PIN_PA7, 1);
-
-	/* DAT0, maybe DAT1..DAT3 */
-	at91_set_A_periph(AT91_PIN_PA6, 1);
-	if (data->bus_width == 4) {
-		at91_set_A_periph(AT91_PIN_PA9, 1);
-		at91_set_A_periph(AT91_PIN_PA10, 1);
-		at91_set_A_periph(AT91_PIN_PA11, 1);
+
+	if (mmc_id == 0) {
+		/* CMD */
+		at91_set_A_periph(AT91_PIN_PA7, 1);
+
+		/* DAT0, maybe DAT1..DAT3 */
+		at91_set_A_periph(AT91_PIN_PA6, 1);
+		if (data->bus_width == 4) {
+			at91_set_A_periph(AT91_PIN_PA9, 1);
+			at91_set_A_periph(AT91_PIN_PA10, 1);
+			at91_set_A_periph(AT91_PIN_PA11, 1);
+		}
+	} else if (mmc_id == 1) {
+		/* CMD */
+		at91_set_B_periph(AT91_PIN_PA1, 1);
+
+		/* DAT0, maybe DAT1..DAT3 */
+		at91_set_B_periph(AT91_PIN_PA0, 1);
+		if (data->bus_width == 4) {
+			at91_set_B_periph(AT91_PIN_PA3, 1);
+			at91_set_B_periph(AT91_PIN_PA4, 1);
+			at91_set_B_periph(AT91_PIN_PA5, 1);
+		}
 	}
 
-	dev = add_generic_device("atmel_mci", 0, NULL, AT91SAM9260_BASE_MCI, SZ_16K,
+	dev = add_generic_device("atmel_mci", mmc_id, NULL, AT91SAM9260_BASE_MCI, SZ_16K,
 			   IORESOURCE_MEM, data);
 }
 #else
-- 
1.7.7.3



_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2011-12-09 11:28 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1323187817-28668-1-git-send-email-m.grzeschik@pengutronix.de>
2011-12-09 11:28 ` [PATCH v2 1/7] storage/usb.c: fix test_unit_ready Michael Grzeschik
2011-12-09 11:28 ` [PATCH v2 2/7] atmel_mci: check for device id we use to address the right slot Michael Grzeschik
2011-12-09 11:28 ` Michael Grzeschik [this message]
2011-12-09 11:28 ` [PATCH 4/7] at91sam9260_devices: add flag to change ETX{2,3} pincfg on add_device_eth Michael Grzeschik
2011-12-09 14:56   ` *** PROBABLY SPAM *** " Jean-Christophe PLAGNIOL-VILLARD
2011-12-12 12:50     ` Sascha Hauer
2011-12-09 11:28 ` [PATCH v2 5/7] arm: update mach-types Michael Grzeschik
2011-12-09 11:29 ` [PATCH v2 6/7] platform: add support for aizo dSS11 Michael Grzeschik
2011-12-09 15:01   ` *** PROBABLY SPAM *** " Jean-Christophe PLAGNIOL-VILLARD
2011-12-12 12:52     ` Sascha Hauer
2011-12-09 11:29 ` [PATCH v2 7/7] dss11: add defconfig Michael Grzeschik

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=20111209112821.GD8203@pengutronix.de \
    --to=m.grzeschik@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.