diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-01-27 09:31:13 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-01-27 09:31:13 +0100 |
| commit | 192d6fe9beb1b8e298806ddd2d81670e578efd7e (patch) | |
| tree | 4c46ae60d19429ffdaf23267a1d1ca1f14afcf63 /arch/arm/boards/at91sam9260ek | |
| parent | 268c531d62a3b7e6c13728feab007e866ed8be84 (diff) | |
| parent | 79c2f03aeed7b232592495f6af5fd94fbd102d25 (diff) | |
| download | barebox-192d6fe9beb1b8e298806ddd2d81670e578efd7e.tar.gz barebox-192d6fe9beb1b8e298806ddd2d81670e578efd7e.tar.xz | |
Merge branch 'pu/debug' into next
Diffstat (limited to 'arch/arm/boards/at91sam9260ek')
| -rw-r--r-- | arch/arm/boards/at91sam9260ek/init.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boards/at91sam9260ek/init.c b/arch/arm/boards/at91sam9260ek/init.c index 4bff35e90f..03abc0e3fc 100644 --- a/arch/arm/boards/at91sam9260ek/init.c +++ b/arch/arm/boards/at91sam9260ek/init.c @@ -172,6 +172,7 @@ static void at91sam9260ek_phy_reset(void) #if defined(CONFIG_MCI_ATMEL) static struct atmel_mci_platform_data __initdata ek_mci_data = { .bus_width = 4, + .slot_b = 1, }; static void ek_usb_add_device_mci(void) @@ -179,7 +180,7 @@ static void ek_usb_add_device_mci(void) if (machine_is_at91sam9g20ek()) ek_mci_data.detect_pin = AT91_PIN_PC9; - at91_add_device_mci(1, &ek_mci_data); + at91_add_device_mci(0, &ek_mci_data); } #else static void ek_usb_add_device_mci(void) {} |