diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c
index dc01705..a474bd7 100644
--- a/arch/arm/mach-at91/at91sam9g45_devices.c
+++ b/arch/arm/mach-at91/at91sam9g45_devices.c
@@ -285,7 +285,7 @@
 
 		/* 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 @@
 
 		/* 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 49a7851..d8bcf81 100644
--- a/drivers/mci/atmel_mci.c
+++ b/drivers/mci/atmel_mci.c
@@ -451,9 +451,9 @@
 	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;