1 files changed, 34 insertions, 25 deletions

diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c
index d5fbac9ff4f..7b46b278702 100644
--- a/arch/arm/mach-at91/at91sam9263_devices.c
+++ b/arch/arm/mach-at91/at91sam9263_devices.c
@@ -70,7 +70,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data)
 
         /* Enable VBus control for UHP ports */
         for (i = 0; i < data->ports; i++) {
-                if (data->vbus_pin[i])
+                if (gpio_is_valid(data->vbus_pin[i]))
                         at91_set_gpio_output(data->vbus_pin[i], 0);
         }
 
@@ -123,7 +123,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data)
         if (!data)
                 return;
 
-        if (data->vbus_pin) {
+        if (gpio_is_valid(data->vbus_pin)) {
                 at91_set_gpio_input(data->vbus_pin, 0);
                 at91_set_deglitch(data->vbus_pin, 1);
         }
@@ -144,7 +144,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data) {}
 
 #if defined(CONFIG_MACB) || defined(CONFIG_MACB_MODULE)
 static u64 eth_dmamask = DMA_BIT_MASK(32);
-static struct at91_eth_data eth_data;
+static struct macb_platform_data eth_data;
 
 static struct resource eth_resources[] = {
         [0] = {
@@ -171,12 +171,12 @@ static struct platform_device at91sam9263_eth_device = {
         .num_resources  = ARRAY_SIZE(eth_resources),
 };
 
-void __init at91_add_device_eth(struct at91_eth_data *data)
+void __init at91_add_device_eth(struct macb_platform_data *data)
 {
         if (!data)
                 return;
 
-        if (data->phy_irq_pin) {
+        if (gpio_is_valid(data->phy_irq_pin)) {
                 at91_set_gpio_input(data->phy_irq_pin, 0);
                 at91_set_deglitch(data->phy_irq_pin, 1);
         }
@@ -208,7 +208,7 @@ void __init at91_add_device_eth(struct at91_eth_data *data)
         platform_device_register(&at91sam9263_eth_device);
 }
 #else
-void __init at91_add_device_eth(struct at91_eth_data *data) {}
+void __init at91_add_device_eth(struct macb_platform_data *data) {}
 #endif
 
 
@@ -276,13 +276,13 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)
                 return;
 
         /* input/irq */
-        if (data->det_pin) {
+        if (gpio_is_valid(data->det_pin)) {
                 at91_set_gpio_input(data->det_pin, 1);
                 at91_set_deglitch(data->det_pin, 1);
         }
-        if (data->wp_pin)
+        if (gpio_is_valid(data->wp_pin))
                 at91_set_gpio_input(data->wp_pin, 1);
-        if (data->vcc_pin)
+        if (gpio_is_valid(data->vcc_pin))
                 at91_set_gpio_output(data->vcc_pin, 0);
 
         if (mmc_id == 0) {              /* MCI0 */
@@ -430,17 +430,17 @@ void __init at91_add_device_cf(struct at91_cf_data *data)
         }
         at91_sys_write(AT91_MATRIX_EBI0CSA, ebi0_csa);
 
-        if (data->det_pin) {
+        if (gpio_is_valid(data->det_pin)) {
                 at91_set_gpio_input(data->det_pin, 1);
                 at91_set_deglitch(data->det_pin, 1);
         }
 
-        if (data->irq_pin) {
+        if (gpio_is_valid(data->irq_pin)) {
                 at91_set_gpio_input(data->irq_pin, 1);
                 at91_set_deglitch(data->irq_pin, 1);
         }
 
-        if (data->vcc_pin)
+        if (gpio_is_valid(data->vcc_pin))
                 /* initially off */
                 at91_set_gpio_output(data->vcc_pin, 0);
 
@@ -473,8 +473,8 @@ static struct resource nand_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = AT91_BASE_SYS + AT91_ECC0,
-                .end    = AT91_BASE_SYS + AT91_ECC0 + SZ_512 - 1,
+                .start  = AT91SAM9263_BASE_ECC0,
+                .end    = AT91SAM9263_BASE_ECC0 + SZ_512 - 1,
                 .flags  = IORESOURCE_MEM,
         }
 };
@@ -500,15 +500,15 @@ void __init at91_add_device_nand(struct atmel_nand_data *data)
         at91_sys_write(AT91_MATRIX_EBI0CSA, csa | AT91_MATRIX_EBI0_CS3A_SMC_SMARTMEDIA);
 
         /* enable pin */
-        if (data->enable_pin)
+        if (gpio_is_valid(data->enable_pin))
                 at91_set_gpio_output(data->enable_pin, 1);
 
         /* ready/busy pin */
-        if (data->rdy_pin)
+        if (gpio_is_valid(data->rdy_pin))
                 at91_set_gpio_input(data->rdy_pin, 1);
 
         /* card detect pin */
-        if (data->det_pin)
+        if (gpio_is_valid(data->det_pin))
                 at91_set_gpio_input(data->det_pin, 1);
 
         nand_data = *data;
@@ -749,7 +749,7 @@ void __init at91_add_device_ac97(struct ac97c_platform_data *data)
         at91_set_A_periph(AT91_PIN_PB3, 0);     /* AC97RX */
 
         /* reset */
-        if (data->reset_pin)
+        if (gpio_is_valid(data->reset_pin))
                 at91_set_gpio_output(data->reset_pin, 0);
 
         ac97_data = *data;
@@ -956,8 +956,8 @@ static void __init at91_add_device_tc(void) { }
 
 static struct resource rtt0_resources[] = {
         {
-                .start  = AT91_BASE_SYS + AT91_RTT0,
-                .end    = AT91_BASE_SYS + AT91_RTT0 + SZ_16 - 1,
+                .start  = AT91SAM9263_BASE_RTT0,
+                .end    = AT91SAM9263_BASE_RTT0 + SZ_16 - 1,
                 .flags  = IORESOURCE_MEM,
         }
 };
@@ -971,8 +971,8 @@ static struct platform_device at91sam9263_rtt0_device = {
 
 static struct resource rtt1_resources[] = {
         {
-                .start  = AT91_BASE_SYS + AT91_RTT1,
-                .end    = AT91_BASE_SYS + AT91_RTT1 + SZ_16 - 1,
+                .start  = AT91SAM9263_BASE_RTT1,
+                .end    = AT91SAM9263_BASE_RTT1 + SZ_16 - 1,
                 .flags  = IORESOURCE_MEM,
         }
 };
@@ -996,10 +996,19 @@ static void __init at91_add_device_rtt(void)
  * -------------------------------------------------------------------- */
 
 #if defined(CONFIG_AT91SAM9X_WATCHDOG) || defined(CONFIG_AT91SAM9X_WATCHDOG_MODULE)
+static struct resource wdt_resources[] = {
+        {
+                .start  = AT91SAM9263_BASE_WDT,
+                .end    = AT91SAM9263_BASE_WDT + SZ_16 - 1,
+                .flags  = IORESOURCE_MEM,
+        }
+};
+
 static struct platform_device at91sam9263_wdt_device = {
         .name           = "at91_wdt",
         .id             = -1,
-        .num_resources  = 0,
+        .resource       = wdt_resources,
+        .num_resources  = ARRAY_SIZE(wdt_resources),
 };
 
 static void __init at91_add_device_watchdog(void)
@@ -1196,8 +1205,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {}
 
 static struct resource dbgu_resources[] = {
         [0] = {
-                .start  = AT91_BASE_SYS + AT91_DBGU,
-                .end    = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,
+                .start  = AT91SAM9263_BASE_DBGU,
+                .end    = AT91SAM9263_BASE_DBGU + SZ_512 - 1,
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {