avr32: some mmc/sd cleanups

Minor cleanups for the MMC/SD support on avr32:

 - Make at32_add_device_mci() properly initialize "missing"
   platform data ... so boards like STK1002 won't try GPIO 0.

 - Switch over to gpio_is_valid() instead of testing for only
   one designated value.

 - Provide STK1002 platform data for the unlikely case that
   switches are set so first Ethernet controller isn't in use.
   (That's the only way to get card detect and writeprotect
   switch sensing on the STK1000.)

And get rid of one "unused variable" warning.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>

1 files changed, 7 insertions, 6 deletions

diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index 5f30b353a27f..1617048c86c5 100644
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -12,6 +12,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
+#include <linux/gpio.h>
 #include <linux/spi/spi.h>
 #include <linux/usb/atmel_usba_udc.h>
 
@@ -1299,7 +1300,7 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
 
         if (!data) {
                 data = &_data;
-                memset(data, 0, sizeof(struct mci_platform_data));
+                memset(data, -1, sizeof(struct mci_platform_data));
                 data->detect_pin = GPIO_PIN_NONE;
                 data->wp_pin = GPIO_PIN_NONE;
         }
@@ -1315,9 +1316,9 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
         select_peripheral(PA(14), PERIPH_A, 0); /* DATA2 */
         select_peripheral(PA(15), PERIPH_A, 0); /* DATA3 */
 
-        if (data->detect_pin != GPIO_PIN_NONE)
+        if (gpio_is_valid(data->detect_pin))
                 at32_select_gpio(data->detect_pin, 0);
-        if (data->wp_pin != GPIO_PIN_NONE)
+        if (gpio_is_valid(data->wp_pin))
                 at32_select_gpio(data->wp_pin, 0);
 
         atmel_mci0_pclk.dev = &pdev->dev;
@@ -1852,11 +1853,11 @@ at32_add_device_cf(unsigned int id, unsigned int extint,
         if (at32_init_ide_or_cf(pdev, data->cs, extint))
                 goto fail;
 
-        if (data->detect_pin != GPIO_PIN_NONE)
+        if (gpio_is_valid(data->detect_pin))
                 at32_select_gpio(data->detect_pin, AT32_GPIOF_DEGLITCH);
-        if (data->reset_pin != GPIO_PIN_NONE)
+        if (gpio_is_valid(data->reset_pin))
                 at32_select_gpio(data->reset_pin, 0);
-        if (data->vcc_pin != GPIO_PIN_NONE)
+        if (gpio_is_valid(data->vcc_pin))
                 at32_select_gpio(data->vcc_pin, 0);
         /* READY is used as extint, so we can't select it as gpio */