diff options
| author | Hubert Feurstein <h.feurstein@gmail.com> | 2011-06-22 00:10:16 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-06-22 00:22:23 +0200 |
| commit | c034843ada2d12caad4f5b874dc24e5dc2a7848f (patch) | |
| tree | 77f3810dfb59a327d4124d3a19233f33f2db5fed | |
| parent | 1ecd192be8d583af2b4f4c98da4abeecac625d91 (diff) | |
| download | barebox-next.tar.gz barebox-next.tar.xz | |
atmel-mci: fix initialization of 8bit-bus-width-mode for at91sam9g45next
When the bus_width was set to 8, then only one data-line has been initialized.
Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/mach-at91/at91sam9g45_devices.c | 4 | ||||
| -rw-r--r-- | drivers/mci/atmel_mci.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c index dc01705e..a474bd74 100644 --- a/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c @@ -285,7 +285,7 @@ void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data) /* DAT0, maybe DAT1..DAT3 and maybe DAT4..DAT7 */ at91_set_A_periph(AT91_PIN_PA2, 1); - if (data->bus_width == 4) { + if (data->bus_width >= 4) { at91_set_A_periph(AT91_PIN_PA3, 1); at91_set_A_periph(AT91_PIN_PA4, 1); at91_set_A_periph(AT91_PIN_PA5, 1); @@ -310,7 +310,7 @@ void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data) /* DAT0, maybe DAT1..DAT3 and maybe DAT4..DAT7 */ at91_set_A_periph(AT91_PIN_PA23, 1); - if (data->bus_width == 4) { + if (data->bus_width >= 4) { at91_set_A_periph(AT91_PIN_PA24, 1); at91_set_A_periph(AT91_PIN_PA25, 1); at91_set_A_periph(AT91_PIN_PA26, 1); diff --git a/drivers/mci/atmel_mci.c b/drivers/mci/atmel_mci.c index 49a78516..d8bcf815 100644 --- a/drivers/mci/atmel_mci.c +++ b/drivers/mci/atmel_mci.c @@ -451,9 +451,9 @@ static int mci_probe(struct device_d *hw_dev) host->mci.init = mci_reset; host->mci.host_caps = pd->host_caps; - if (pd->bus_width == 4) + if (pd->bus_width >= 4) host->mci.host_caps |= MMC_MODE_4BIT; - else if (pd->bus_width == 8) + if (pd->bus_width == 8) host->mci.host_caps |= MMC_MODE_8BIT; host->base = (void __iomem *)hw_dev->map_base; |