Merge branch 'at91-5.4-trunk/wilc_pwrseq' into linux-5.4-at91

Author: cristibirsan

drivers/mmc/core/Kconfig

@@ -36,7 +36,7 @@ config PWRSEQ_SIMPLE
 
 config PWRSEQ_WILC
 	tristate "HW reset support for Microchip WILC BT + WiFi devices"
-	depends on OF && WILC1000
+	depends on OF && WILC
 	help
 	  This selects hardware reset support for Microchip WILC BT + WiFi
 	  devices. By default this option is set to n.

drivers/mmc/host/atmel-mci.c

@@ -39,6 +39,7 @@
 #include <asm/cacheflush.h>
 #include <asm/io.h>
 #include <asm/unaligned.h>
+#include "../core/pwrseq.h"
 
 /*
  * Superset of MCI IP registers integrated in Atmel AT91 Processor
@@ -2300,6 +2301,7 @@ static int atmci_init_slot(struct atmel_mci *host,
 
 	host->slot[id] = slot;
 	mmc_regulator_get_supply(mmc);
+	mmc_pwrseq_alloc(slot->mmc);
 	mmc_add_host(mmc);
 
 	if (gpio_is_valid(slot->detect_pin)) {