Patched in Tegra support.

1 files changed, 165 insertions, 274 deletions

diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c
index ed666f5cb01..863e4661409 100644
--- a/arch/arm/mach-at91/at91sam9263_devices.c
+++ b/arch/arm/mach-at91/at91sam9263_devices.c
@@ -13,19 +13,18 @@
 #include <asm/mach/map.h>
 
 #include <linux/dma-mapping.h>
-#include <linux/gpio.h>
 #include <linux/platform_device.h>
 #include <linux/i2c-gpio.h>
 
 #include <linux/fb.h>
 #include <video/atmel_lcdc.h>
 
+#include <mach/board.h>
+#include <mach/gpio.h>
 #include <mach/at91sam9263.h>
 #include <mach/at91sam9263_matrix.h>
-#include <mach/at91_matrix.h>
 #include <mach/at91sam9_smc.h>
 
-#include "board.h"
 #include "generic.h"
 
 
@@ -44,8 +43,8 @@ static struct resource usbh_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = NR_IRQS_LEGACY + AT91SAM9263_ID_UHP,
-                .end    = NR_IRQS_LEGACY + AT91SAM9263_ID_UHP,
+                .start  = AT91SAM9263_ID_UHP,
+                .end    = AT91SAM9263_ID_UHP,
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -71,15 +70,8 @@ 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 (gpio_is_valid(data->vbus_pin[i]))
-                        at91_set_gpio_output(data->vbus_pin[i],
-                                             data->vbus_pin_active_low[i]);
-        }
-
-        /* Enable overcurrent notification */
-        for (i = 0; i < data->ports; i++) {
-                if (gpio_is_valid(data->overcurrent_pin[i]))
-                        at91_set_gpio_input(data->overcurrent_pin[i], 1);
+                if (data->vbus_pin[i])
+                        at91_set_gpio_output(data->vbus_pin[i], 0);
         }
 
         usbh_data = *data;
@@ -94,7 +86,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {}
  *  USB Device (Gadget)
  * -------------------------------------------------------------------- */
 
-#if defined(CONFIG_USB_AT91) || defined(CONFIG_USB_AT91_MODULE)
+#ifdef CONFIG_USB_AT91
 static struct at91_udc_data udc_data;
 
 static struct resource udc_resources[] = {
@@ -104,8 +96,8 @@ static struct resource udc_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = NR_IRQS_LEGACY + AT91SAM9263_ID_UDP,
-                .end    = NR_IRQS_LEGACY + AT91SAM9263_ID_UDP,
+                .start  = AT91SAM9263_ID_UDP,
+                .end    = AT91SAM9263_ID_UDP,
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -125,7 +117,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data)
         if (!data)
                 return;
 
-        if (gpio_is_valid(data->vbus_pin)) {
+        if (data->vbus_pin) {
                 at91_set_gpio_input(data->vbus_pin, 0);
                 at91_set_deglitch(data->vbus_pin, 1);
         }
@@ -146,7 +138,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 macb_platform_data eth_data;
+static struct at91_eth_data eth_data;
 
 static struct resource eth_resources[] = {
         [0] = {
@@ -155,8 +147,8 @@ static struct resource eth_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = NR_IRQS_LEGACY + AT91SAM9263_ID_EMAC,
-                .end    = NR_IRQS_LEGACY + AT91SAM9263_ID_EMAC,
+                .start  = AT91SAM9263_ID_EMAC,
+                .end    = AT91SAM9263_ID_EMAC,
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -173,12 +165,12 @@ static struct platform_device at91sam9263_eth_device = {
         .num_resources  = ARRAY_SIZE(eth_resources),
 };
 
-void __init at91_add_device_eth(struct macb_platform_data *data)
+void __init at91_add_device_eth(struct at91_eth_data *data)
 {
         if (!data)
                 return;
 
-        if (gpio_is_valid(data->phy_irq_pin)) {
+        if (data->phy_irq_pin) {
                 at91_set_gpio_input(data->phy_irq_pin, 0);
                 at91_set_deglitch(data->phy_irq_pin, 1);
         }
@@ -210,7 +202,7 @@ void __init at91_add_device_eth(struct macb_platform_data *data)
         platform_device_register(&at91sam9263_eth_device);
 }
 #else
-void __init at91_add_device_eth(struct macb_platform_data *data) {}
+void __init at91_add_device_eth(struct at91_eth_data *data) {}
 #endif
 
 
@@ -218,9 +210,9 @@ void __init at91_add_device_eth(struct macb_platform_data *data) {}
  *  MMC / SD
  * -------------------------------------------------------------------- */
 
-#if IS_ENABLED(CONFIG_MMC_ATMELMCI)
+#if defined(CONFIG_MMC_AT91) || defined(CONFIG_MMC_AT91_MODULE)
 static u64 mmc_dmamask = DMA_BIT_MASK(32);
-static struct mci_platform_data mmc0_data, mmc1_data;
+static struct at91_mmc_data mmc0_data, mmc1_data;
 
 static struct resource mmc0_resources[] = {
         [0] = {
@@ -229,14 +221,14 @@ static struct resource mmc0_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = NR_IRQS_LEGACY + AT91SAM9263_ID_MCI0,
-                .end    = NR_IRQS_LEGACY + AT91SAM9263_ID_MCI0,
+                .start  = AT91SAM9263_ID_MCI0,
+                .end    = AT91SAM9263_ID_MCI0,
                 .flags  = IORESOURCE_IRQ,
         },
 };
 
 static struct platform_device at91sam9263_mmc0_device = {
-        .name           = "atmel_mci",
+        .name           = "at91_mci",
         .id             = 0,
         .dev            = {
                                 .dma_mask               = &mmc_dmamask,
@@ -254,14 +246,14 @@ static struct resource mmc1_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = NR_IRQS_LEGACY + AT91SAM9263_ID_MCI1,
-                .end    = NR_IRQS_LEGACY + AT91SAM9263_ID_MCI1,
+                .start  = AT91SAM9263_ID_MCI1,
+                .end    = AT91SAM9263_ID_MCI1,
                 .flags  = IORESOURCE_IRQ,
         },
 };
 
 static struct platform_device at91sam9263_mmc1_device = {
-        .name           = "atmel_mci",
+        .name           = "at91_mci",
         .id             = 1,
         .dev            = {
                                 .dma_mask               = &mmc_dmamask,
@@ -272,118 +264,93 @@ static struct platform_device at91sam9263_mmc1_device = {
         .num_resources  = ARRAY_SIZE(mmc1_resources),
 };
 
-void __init at91_add_device_mci(short mmc_id, struct mci_platform_data *data)
+void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)
 {
-        unsigned int i;
-        unsigned int slot_count = 0;
-
         if (!data)
                 return;
 
-        for (i = 0; i < ATMCI_MAX_NR_SLOTS; i++) {
+        /* input/irq */
+        if (data->det_pin) {
+                at91_set_gpio_input(data->det_pin, 1);
+                at91_set_deglitch(data->det_pin, 1);
+        }
+        if (data->wp_pin)
+                at91_set_gpio_input(data->wp_pin, 1);
+        if (data->vcc_pin)
+                at91_set_gpio_output(data->vcc_pin, 0);
 
-                if (!data->slot[i].bus_width)
-                        continue;
+        if (mmc_id == 0) {              /* MCI0 */
+                /* CLK */
+                at91_set_A_periph(AT91_PIN_PA12, 0);
 
-                /* input/irq */
-                if (gpio_is_valid(data->slot[i].detect_pin)) {
-                        at91_set_gpio_input(data->slot[i].detect_pin,
-                                        1);
-                        at91_set_deglitch(data->slot[i].detect_pin,
-                                        1);
-                }
-                if (gpio_is_valid(data->slot[i].wp_pin))
-                        at91_set_gpio_input(data->slot[i].wp_pin, 1);
-
-                if (mmc_id == 0) {                              /* MCI0 */
-                        switch (i) {
-                        case 0:                                 /* slot A */
-                                /* CMD */
-                                at91_set_A_periph(AT91_PIN_PA1, 1);
-                                /* DAT0, maybe DAT1..DAT3 */
-                                at91_set_A_periph(AT91_PIN_PA0, 1);
-                                if (data->slot[i].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);
-                                }
-                                slot_count++;
-                                break;
-                        case 1:                                 /* slot B */
-                                /* CMD */
-                                at91_set_A_periph(AT91_PIN_PA16, 1);
-                                /* DAT0, maybe DAT1..DAT3 */
-                                at91_set_A_periph(AT91_PIN_PA17, 1);
-                                if (data->slot[i].bus_width == 4) {
-                                        at91_set_A_periph(AT91_PIN_PA18, 1);
-                                        at91_set_A_periph(AT91_PIN_PA19, 1);
-                                        at91_set_A_periph(AT91_PIN_PA20, 1);
-                                }
-                                slot_count++;
-                                break;
-                        default:
-                                printk(KERN_ERR
-                                       "AT91: SD/MMC slot %d not available\n", i);
-                                break;
-                        }
-                        if (slot_count) {
-                                /* CLK */
-                                at91_set_A_periph(AT91_PIN_PA12, 0);
+                if (data->slot_b) {
+                        /* CMD */
+                        at91_set_A_periph(AT91_PIN_PA16, 1);
 
-                                mmc0_data = *data;
-                                platform_device_register(&at91sam9263_mmc0_device);
+                        /* DAT0, maybe DAT1..DAT3 */
+                        at91_set_A_periph(AT91_PIN_PA17, 1);
+                        if (data->wire4) {
+                                at91_set_A_periph(AT91_PIN_PA18, 1);
+                                at91_set_A_periph(AT91_PIN_PA19, 1);
+                                at91_set_A_periph(AT91_PIN_PA20, 1);
                         }
-                } else if (mmc_id == 1) {                       /* MCI1 */
-                        switch (i) {
-                        case 0:                                 /* slot A */
-                                /* CMD */
-                                at91_set_A_periph(AT91_PIN_PA7, 1);
-                                /* DAT0, maybe DAT1..DAT3 */
-                                at91_set_A_periph(AT91_PIN_PA8, 1);
-                                if (data->slot[i].bus_width == 4) {
-                                        at91_set_A_periph(AT91_PIN_PA9, 1);
-                                        at91_set_A_periph(AT91_PIN_PA10, 1);
-                                        at91_set_A_periph(AT91_PIN_PA11, 1);
-                                }
-                                slot_count++;
-                                break;
-                        case 1:                                 /* slot B */
-                                /* CMD */
-                                at91_set_A_periph(AT91_PIN_PA21, 1);
-                                /* DAT0, maybe DAT1..DAT3 */
-                                at91_set_A_periph(AT91_PIN_PA22, 1);
-                                if (data->slot[i].bus_width == 4) {
-                                        at91_set_A_periph(AT91_PIN_PA23, 1);
-                                        at91_set_A_periph(AT91_PIN_PA24, 1);
-                                        at91_set_A_periph(AT91_PIN_PA25, 1);
-                                }
-                                slot_count++;
-                                break;
-                        default:
-                                printk(KERN_ERR
-                                       "AT91: SD/MMC slot %d not available\n", i);
-                                break;
+                } else {
+                        /* CMD */
+                        at91_set_A_periph(AT91_PIN_PA1, 1);
+
+                        /* DAT0, maybe DAT1..DAT3 */
+                        at91_set_A_periph(AT91_PIN_PA0, 1);
+                        if (data->wire4) {
+                                at91_set_A_periph(AT91_PIN_PA3, 1);
+                                at91_set_A_periph(AT91_PIN_PA4, 1);
+                                at91_set_A_periph(AT91_PIN_PA5, 1);
                         }
-                        if (slot_count) {
-                                /* CLK */
-                                at91_set_A_periph(AT91_PIN_PA6, 0);
+                }
 
-                                mmc1_data = *data;
-                                platform_device_register(&at91sam9263_mmc1_device);
+                mmc0_data = *data;
+                platform_device_register(&at91sam9263_mmc0_device);
+        } else {                        /* MCI1 */
+                /* CLK */
+                at91_set_A_periph(AT91_PIN_PA6, 0);
+
+                if (data->slot_b) {
+                        /* CMD */
+                        at91_set_A_periph(AT91_PIN_PA21, 1);
+
+                        /* DAT0, maybe DAT1..DAT3 */
+                        at91_set_A_periph(AT91_PIN_PA22, 1);
+                        if (data->wire4) {
+                                at91_set_A_periph(AT91_PIN_PA23, 1);
+                                at91_set_A_periph(AT91_PIN_PA24, 1);
+                                at91_set_A_periph(AT91_PIN_PA25, 1);
+                        }
+                } else {
+                        /* CMD */
+                        at91_set_A_periph(AT91_PIN_PA7, 1);
+
+                        /* DAT0, maybe DAT1..DAT3 */
+                        at91_set_A_periph(AT91_PIN_PA8, 1);
+                        if (data->wire4) {
+                                at91_set_A_periph(AT91_PIN_PA9, 1);
+                                at91_set_A_periph(AT91_PIN_PA10, 1);
+                                at91_set_A_periph(AT91_PIN_PA11, 1);
                         }
                 }
+
+                mmc1_data = *data;
+                platform_device_register(&at91sam9263_mmc1_device);
         }
 }
 #else
-void __init at91_add_device_mci(short mmc_id, struct mci_platform_data *data) {}
+void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {}
 #endif
 
 /* --------------------------------------------------------------------
  *  Compact Flash (PCMCIA or IDE)
  * -------------------------------------------------------------------- */
 
-#if defined(CONFIG_PATA_AT91) || defined(CONFIG_PATA_AT91_MODULE) || \
-        defined(CONFIG_AT91_CF) || defined(CONFIG_AT91_CF_MODULE)
+#if defined(CONFIG_AT91_CF) || defined(CONFIG_AT91_CF_MODULE) || \
+    defined(CONFIG_BLK_DEV_IDE_AT91) || defined(CONFIG_BLK_DEV_IDE_AT91_MODULE)
 
 static struct at91_cf_data cf0_data;
 
@@ -436,7 +403,7 @@ void __init at91_add_device_cf(struct at91_cf_data *data)
          * we assume SMC timings are configured by board code,
          * except True IDE where timings are controlled by driver
          */
-        ebi0_csa = at91_matrix_read(AT91_MATRIX_EBI0CSA);
+        ebi0_csa = at91_sys_read(AT91_MATRIX_EBI0CSA);
         switch (data->chipselect) {
         case 4:
                 at91_set_A_periph(AT91_PIN_PD6, 0);  /* EBI0_NCS4/CFCS0 */
@@ -455,19 +422,19 @@ void __init at91_add_device_cf(struct at91_cf_data *data)
                        data->chipselect);
                 return;
         }
-        at91_matrix_write(AT91_MATRIX_EBI0CSA, ebi0_csa);
+        at91_sys_write(AT91_MATRIX_EBI0CSA, ebi0_csa);
 
-        if (gpio_is_valid(data->det_pin)) {
+        if (data->det_pin) {
                 at91_set_gpio_input(data->det_pin, 1);
                 at91_set_deglitch(data->det_pin, 1);
         }
 
-        if (gpio_is_valid(data->irq_pin)) {
+        if (data->irq_pin) {
                 at91_set_gpio_input(data->irq_pin, 1);
                 at91_set_deglitch(data->irq_pin, 1);
         }
 
-        if (gpio_is_valid(data->vcc_pin))
+        if (data->vcc_pin)
                 /* initially off */
                 at91_set_gpio_output(data->vcc_pin, 0);
 
@@ -477,7 +444,7 @@ void __init at91_add_device_cf(struct at91_cf_data *data)
         at91_set_A_periph(AT91_PIN_PD9, 0);  /* CFCE2 */
         at91_set_A_periph(AT91_PIN_PD14, 0); /* CFNRW */
 
-        pdev->name = (data->flags & AT91_CF_TRUE_IDE) ? "pata_at91" : "at91_cf";
+        pdev->name = (data->flags & AT91_CF_TRUE_IDE) ? "at91_ide" : "at91_cf";
         platform_device_register(pdev);
 }
 #else
@@ -500,8 +467,8 @@ static struct resource nand_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = AT91SAM9263_BASE_ECC0,
-                .end    = AT91SAM9263_BASE_ECC0 + SZ_512 - 1,
+                .start  = AT91_BASE_SYS + AT91_ECC0,
+                .end    = AT91_BASE_SYS + AT91_ECC0 + SZ_512 - 1,
                 .flags  = IORESOURCE_MEM,
         }
 };
@@ -523,19 +490,19 @@ void __init at91_add_device_nand(struct atmel_nand_data *data)
         if (!data)
                 return;
 
-        csa = at91_matrix_read(AT91_MATRIX_EBI0CSA);
-        at91_matrix_write(AT91_MATRIX_EBI0CSA, csa | AT91_MATRIX_EBI0_CS3A_SMC_SMARTMEDIA);
+        csa = at91_sys_read(AT91_MATRIX_EBI0CSA);
+        at91_sys_write(AT91_MATRIX_EBI0CSA, csa | AT91_MATRIX_EBI0_CS3A_SMC_SMARTMEDIA);
 
         /* enable pin */
-        if (gpio_is_valid(data->enable_pin))
+        if (data->enable_pin)
                 at91_set_gpio_output(data->enable_pin, 1);
 
         /* ready/busy pin */
-        if (gpio_is_valid(data->rdy_pin))
+        if (data->rdy_pin)
                 at91_set_gpio_input(data->rdy_pin, 1);
 
         /* card detect pin */
-        if (gpio_is_valid(data->det_pin))
+        if (data->det_pin)
                 at91_set_gpio_input(data->det_pin, 1);
 
         nand_data = *data;
@@ -567,7 +534,7 @@ static struct i2c_gpio_platform_data pdata = {
 
 static struct platform_device at91sam9263_twi_device = {
         .name                   = "i2c-gpio",
-        .id                     = 0,
+        .id                     = -1,
         .dev.platform_data      = &pdata,
 };
 
@@ -592,15 +559,15 @@ static struct resource twi_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = NR_IRQS_LEGACY + AT91SAM9263_ID_TWI,
-                .end    = NR_IRQS_LEGACY + AT91SAM9263_ID_TWI,
+                .start  = AT91SAM9263_ID_TWI,
+                .end    = AT91SAM9263_ID_TWI,
                 .flags  = IORESOURCE_IRQ,
         },
 };
 
 static struct platform_device at91sam9263_twi_device = {
-        .name           = "i2c-at91sam9260",
-        .id             = 0,
+        .name           = "at91_i2c",
+        .id             = -1,
         .resource       = twi_resources,
         .num_resources  = ARRAY_SIZE(twi_resources),
 };
@@ -636,8 +603,8 @@ static struct resource spi0_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = NR_IRQS_LEGACY + AT91SAM9263_ID_SPI0,
-                .end    = NR_IRQS_LEGACY + AT91SAM9263_ID_SPI0,
+                .start  = AT91SAM9263_ID_SPI0,
+                .end    = AT91SAM9263_ID_SPI0,
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -662,8 +629,8 @@ static struct resource spi1_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = NR_IRQS_LEGACY + AT91SAM9263_ID_SPI1,
-                .end    = NR_IRQS_LEGACY + AT91SAM9263_ID_SPI1,
+                .start  = AT91SAM9263_ID_SPI1,
+                .end    = AT91SAM9263_ID_SPI1,
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -697,9 +664,6 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
                 else
                         cs_pin = spi1_standard_cs[devices[i].chip_select];
 
-                if (!gpio_is_valid(cs_pin))
-                        continue;
-
                 if (devices[i].bus_num == 0)
                         enable_spi0 = 1;
                 else
@@ -750,8 +714,8 @@ static struct resource ac97_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = NR_IRQS_LEGACY + AT91SAM9263_ID_AC97C,
-                .end    = NR_IRQS_LEGACY + AT91SAM9263_ID_AC97C,
+                .start  = AT91SAM9263_ID_AC97C,
+                .end    = AT91SAM9263_ID_AC97C,
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -779,7 +743,7 @@ void __init at91_add_device_ac97(struct ac97c_platform_data *data)
         at91_set_A_periph(AT91_PIN_PB3, 0);     /* AC97RX */
 
         /* reset */
-        if (gpio_is_valid(data->reset_pin))
+        if (data->reset_pin)
                 at91_set_gpio_output(data->reset_pin, 0);
 
         ac97_data = *data;
@@ -801,8 +765,8 @@ static struct resource can_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = NR_IRQS_LEGACY + AT91SAM9263_ID_CAN,
-                .end    = NR_IRQS_LEGACY + AT91SAM9263_ID_CAN,
+                .start  = AT91SAM9263_ID_CAN,
+                .end    = AT91SAM9263_ID_CAN,
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -841,8 +805,8 @@ static struct resource lcdc_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = NR_IRQS_LEGACY + AT91SAM9263_ID_LCDC,
-                .end    = NR_IRQS_LEGACY + AT91SAM9263_ID_LCDC,
+                .start  = AT91SAM9263_ID_LCDC,
+                .end    = AT91SAM9263_ID_LCDC,
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -908,8 +872,8 @@ struct resource isi_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = NR_IRQS_LEGACY + AT91SAM9263_ID_ISI,
-                .end    = NR_IRQS_LEGACY + AT91SAM9263_ID_ISI,
+                .start  = AT91SAM9263_ID_ISI,
+                .end    = AT91SAM9263_ID_ISI,
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -921,8 +885,7 @@ static struct platform_device at91sam9263_isi_device = {
         .num_resources  = ARRAY_SIZE(isi_resources),
 };
 
-void __init at91_add_device_isi(struct isi_platform_data *data,
-                bool use_pck_as_mck)
+void __init at91_add_device_isi(void)
 {
         at91_set_A_periph(AT91_PIN_PE0, 0);     /* ISI_D0 */
         at91_set_A_periph(AT91_PIN_PE1, 0);     /* ISI_D1 */
@@ -935,20 +898,14 @@ void __init at91_add_device_isi(struct isi_platform_data *data,
         at91_set_A_periph(AT91_PIN_PE8, 0);     /* ISI_PCK */
         at91_set_A_periph(AT91_PIN_PE9, 0);     /* ISI_HSYNC */
         at91_set_A_periph(AT91_PIN_PE10, 0);    /* ISI_VSYNC */
+        at91_set_B_periph(AT91_PIN_PE11, 0);    /* ISI_MCK (PCK3) */
         at91_set_B_periph(AT91_PIN_PE12, 0);    /* ISI_PD8 */
         at91_set_B_periph(AT91_PIN_PE13, 0);    /* ISI_PD9 */
         at91_set_B_periph(AT91_PIN_PE14, 0);    /* ISI_PD10 */
         at91_set_B_periph(AT91_PIN_PE15, 0);    /* ISI_PD11 */
-
-        if (use_pck_as_mck) {
-                at91_set_B_periph(AT91_PIN_PE11, 0);    /* ISI_MCK (PCK3) */
-
-                /* TODO: register the PCK for ISI_MCK and set its parent */
-        }
 }
 #else
-void __init at91_add_device_isi(struct isi_platform_data *data,
-                bool use_pck_as_mck) {}
+void __init at91_add_device_isi(void) {}
 #endif
 
 
@@ -965,8 +922,8 @@ static struct resource tcb_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = NR_IRQS_LEGACY + AT91SAM9263_ID_TCB,
-                .end    = NR_IRQS_LEGACY + AT91SAM9263_ID_TCB,
+                .start  = AT91SAM9263_ID_TCB,
+                .end    = AT91SAM9263_ID_TCB,
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -978,25 +935,8 @@ static struct platform_device at91sam9263_tcb_device = {
         .num_resources  = ARRAY_SIZE(tcb_resources),
 };
 
-#if defined(CONFIG_OF)
-static struct of_device_id tcb_ids[] = {
-        { .compatible = "atmel,at91rm9200-tcb" },
-        { /*sentinel*/ }
-};
-#endif
-
 static void __init at91_add_device_tc(void)
 {
-#if defined(CONFIG_OF)
-        struct device_node *np;
-
-        np = of_find_matching_node(NULL, tcb_ids);
-        if (np) {
-                of_node_put(np);
-                return;
-        }
-#endif
-
         platform_device_register(&at91sam9263_tcb_device);
 }
 #else
@@ -1010,13 +950,9 @@ static void __init at91_add_device_tc(void) { }
 
 static struct resource rtt0_resources[] = {
         {
-                .start  = AT91SAM9263_BASE_RTT0,
-                .end    = AT91SAM9263_BASE_RTT0 + SZ_16 - 1,
+                .start  = AT91_BASE_SYS + AT91_RTT0,
+                .end    = AT91_BASE_SYS + AT91_RTT0 + SZ_16 - 1,
                 .flags  = IORESOURCE_MEM,
-        }, {
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .flags  = IORESOURCE_IRQ,
         }
 };
 
@@ -1024,17 +960,14 @@ static struct platform_device at91sam9263_rtt0_device = {
         .name           = "at91_rtt",
         .id             = 0,
         .resource       = rtt0_resources,
+        .num_resources  = ARRAY_SIZE(rtt0_resources),
 };
 
 static struct resource rtt1_resources[] = {
         {
-                .start  = AT91SAM9263_BASE_RTT1,
-                .end    = AT91SAM9263_BASE_RTT1 + SZ_16 - 1,
-                .flags  = IORESOURCE_MEM,
-        }, {
+                .start  = AT91_BASE_SYS + AT91_RTT1,
+                .end    = AT91_BASE_SYS + AT91_RTT1 + SZ_16 - 1,
                 .flags  = IORESOURCE_MEM,
-        }, {
-                .flags  = IORESOURCE_IRQ,
         }
 };
 
@@ -1042,55 +975,11 @@ static struct platform_device at91sam9263_rtt1_device = {
         .name           = "at91_rtt",
         .id             = 1,
         .resource       = rtt1_resources,
+        .num_resources  = ARRAY_SIZE(rtt1_resources),
 };
 
-#if IS_ENABLED(CONFIG_RTC_DRV_AT91SAM9)
-static void __init at91_add_device_rtt_rtc(void)
-{
-        struct platform_device *pdev;
-        struct resource *r;
-
-        switch (CONFIG_RTC_DRV_AT91SAM9_RTT) {
-        case 0:
-                /*
-                 * The second resource is needed only for the chosen RTT:
-                 * GPBR will serve as the storage for RTC time offset
-                 */
-                at91sam9263_rtt0_device.num_resources = 3;
-                at91sam9263_rtt1_device.num_resources = 1;
-                pdev = &at91sam9263_rtt0_device;
-                r = rtt0_resources;
-                break;
-        case 1:
-                at91sam9263_rtt0_device.num_resources = 1;
-                at91sam9263_rtt1_device.num_resources = 3;
-                pdev = &at91sam9263_rtt1_device;
-                r = rtt1_resources;
-                break;
-        default:
-                pr_err("at91sam9263: only supports 2 RTT (%d)\n",
-                       CONFIG_RTC_DRV_AT91SAM9_RTT);
-                return;
-        }
-
-        pdev->name = "rtc-at91sam9";
-        r[1].start = AT91SAM9263_BASE_GPBR + 4 * CONFIG_RTC_DRV_AT91SAM9_GPBR;
-        r[1].end = r[1].start + 3;
-        r[2].start = NR_IRQS_LEGACY + AT91_ID_SYS;
-        r[2].end = NR_IRQS_LEGACY + AT91_ID_SYS;
-}
-#else
-static void __init at91_add_device_rtt_rtc(void)
-{
-        /* Only one resource is needed: RTT not used as RTC */
-        at91sam9263_rtt0_device.num_resources = 1;
-        at91sam9263_rtt1_device.num_resources = 1;
-}
-#endif
-
 static void __init at91_add_device_rtt(void)
 {
-        at91_add_device_rtt_rtc();
         platform_device_register(&at91sam9263_rtt0_device);
         platform_device_register(&at91sam9263_rtt1_device);
 }
@@ -1101,19 +990,10 @@ 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,
-        .resource       = wdt_resources,
-        .num_resources  = ARRAY_SIZE(wdt_resources),
+        .num_resources  = 0,
 };
 
 static void __init at91_add_device_watchdog(void)
@@ -1139,8 +1019,8 @@ static struct resource pwm_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = NR_IRQS_LEGACY + AT91SAM9263_ID_PWMC,
-                .end    = NR_IRQS_LEGACY + AT91SAM9263_ID_PWMC,
+                .start  = AT91SAM9263_ID_PWMC,
+                .end    = AT91SAM9263_ID_PWMC,
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -1192,14 +1072,14 @@ static struct resource ssc0_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = NR_IRQS_LEGACY + AT91SAM9263_ID_SSC0,
-                .end    = NR_IRQS_LEGACY + AT91SAM9263_ID_SSC0,
+                .start  = AT91SAM9263_ID_SSC0,
+                .end    = AT91SAM9263_ID_SSC0,
                 .flags  = IORESOURCE_IRQ,
         },
 };
 
 static struct platform_device at91sam9263_ssc0_device = {
-        .name   = "at91rm9200_ssc",
+        .name   = "ssc",
         .id     = 0,
         .dev    = {
                 .dma_mask               = &ssc0_dmamask,
@@ -1234,14 +1114,14 @@ static struct resource ssc1_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = NR_IRQS_LEGACY + AT91SAM9263_ID_SSC1,
-                .end    = NR_IRQS_LEGACY + AT91SAM9263_ID_SSC1,
+                .start  = AT91SAM9263_ID_SSC1,
+                .end    = AT91SAM9263_ID_SSC1,
                 .flags  = IORESOURCE_IRQ,
         },
 };
 
 static struct platform_device at91sam9263_ssc1_device = {
-        .name   = "at91rm9200_ssc",
+        .name   = "ssc",
         .id     = 1,
         .dev    = {
                 .dma_mask               = &ssc1_dmamask,
@@ -1310,13 +1190,13 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {}
 
 static struct resource dbgu_resources[] = {
         [0] = {
-                .start  = AT91SAM9263_BASE_DBGU,
-                .end    = AT91SAM9263_BASE_DBGU + SZ_512 - 1,
+                .start  = AT91_VA_BASE_SYS + AT91_DBGU,
+                .end    = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1,
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = NR_IRQS_LEGACY + AT91_ID_SYS,
-                .end    = NR_IRQS_LEGACY + AT91_ID_SYS,
+                .start  = AT91_ID_SYS,
+                .end    = AT91_ID_SYS,
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -1324,6 +1204,7 @@ static struct resource dbgu_resources[] = {
 static struct atmel_uart_data dbgu_data = {
         .use_dma_tx     = 0,
         .use_dma_rx     = 0,            /* DBGU not capable of receive DMA */
+        .regs           = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),
 };
 
 static u64 dbgu_dmamask = DMA_BIT_MASK(32);
@@ -1353,8 +1234,8 @@ static struct resource uart0_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = NR_IRQS_LEGACY + AT91SAM9263_ID_US0,
-                .end    = NR_IRQS_LEGACY + AT91SAM9263_ID_US0,
+                .start  = AT91SAM9263_ID_US0,
+                .end    = AT91SAM9263_ID_US0,
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -1396,8 +1277,8 @@ static struct resource uart1_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = NR_IRQS_LEGACY + AT91SAM9263_ID_US1,
-                .end    = NR_IRQS_LEGACY + AT91SAM9263_ID_US1,
+                .start  = AT91SAM9263_ID_US1,
+                .end    = AT91SAM9263_ID_US1,
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -1439,8 +1320,8 @@ static struct resource uart2_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = NR_IRQS_LEGACY + AT91SAM9263_ID_US2,
-                .end    = NR_IRQS_LEGACY + AT91SAM9263_ID_US2,
+                .start  = AT91SAM9263_ID_US2,
+                .end    = AT91SAM9263_ID_US2,
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -1476,6 +1357,7 @@ static inline void configure_usart2_pins(unsigned pins)
 }
 
 static struct platform_device *__initdata at91_uarts[ATMEL_MAX_UART];   /* the UARTs to use */
+struct platform_device *atmel_default_console_device;   /* the serial console device */
 
 void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
 {
@@ -1509,6 +1391,14 @@ void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
                 at91_uarts[portnr] = pdev;
 }
 
+void __init at91_set_serial_console(unsigned portnr)
+{
+        if (portnr < ATMEL_MAX_UART) {
+                atmel_default_console_device = at91_uarts[portnr];
+                at91sam9263_set_console_clock(at91_uarts[portnr]->id);
+        }
+}
+
 void __init at91_add_device_serial(void)
 {
         int i;
@@ -1517,9 +1407,13 @@ void __init at91_add_device_serial(void)
                 if (at91_uarts[i])
                         platform_device_register(at91_uarts[i]);
         }
+
+        if (!atmel_default_console_device)
+                printk(KERN_INFO "AT91: No default serial console defined.\n");
 }
 #else
 void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) {}
+void __init at91_set_serial_console(unsigned portnr) {}
 void __init at91_add_device_serial(void) {}
 #endif
 
@@ -1531,9 +1425,6 @@ void __init at91_add_device_serial(void) {}
  */
 static int __init at91_add_standard_devices(void)
 {
-        if (of_have_populated_dt())
-                return 0;
-
         at91_add_device_rtt();
         at91_add_device_watchdog();
         at91_add_device_tc();