13 files changed, 93 insertions, 204 deletions

diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index 9e3e2a69c03a..fd5475071acc 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -80,12 +80,38 @@ static int amba_resume(struct device *dev)
         return ret;
 }
 
+#define amba_attr_func(name,fmt,arg...)                                 \
+static ssize_t name##_show(struct device *_dev,                         \
+                           struct device_attribute *attr, char *buf)    \
+{                                                                       \
+        struct amba_device *dev = to_amba_device(_dev);                 \
+        return sprintf(buf, fmt, arg);                                  \
+}
+
+#define amba_attr(name,fmt,arg...)      \
+amba_attr_func(name,fmt,arg)            \
+static DEVICE_ATTR(name, S_IRUGO, name##_show, NULL)
+
+amba_attr_func(id, "%08x\n", dev->periphid);
+amba_attr(irq0, "%u\n", dev->irq[0]);
+amba_attr(irq1, "%u\n", dev->irq[1]);
+amba_attr_func(resource, "\t%016llx\t%016llx\t%016lx\n",
+         (unsigned long long)dev->res.start, (unsigned long long)dev->res.end,
+         dev->res.flags);
+
+static struct device_attribute amba_dev_attrs[] = {
+        __ATTR_RO(id),
+        __ATTR_RO(resource),
+        __ATTR_NULL,
+};
+
 /*
  * Primecells are part of the Advanced Microcontroller Bus Architecture,
  * so we call the bus "amba".
  */
 static struct bus_type amba_bustype = {
         .name           = "amba",
+        .dev_attrs      = amba_dev_attrs,
         .match          = amba_match,
         .uevent         = amba_uevent,
         .suspend        = amba_suspend,
@@ -169,21 +195,6 @@ static void amba_device_release(struct device *dev)
         kfree(d);
 }
 
-#define amba_attr(name,fmt,arg...)                              \
-static ssize_t show_##name(struct device *_dev, struct device_attribute *attr, char *buf)       \
-{                                                               \
-        struct amba_device *dev = to_amba_device(_dev);         \
-        return sprintf(buf, fmt, arg);                          \
-}                                                               \
-static DEVICE_ATTR(name, S_IRUGO, show_##name, NULL)
-
-amba_attr(id, "%08x\n", dev->periphid);
-amba_attr(irq0, "%u\n", dev->irq[0]);
-amba_attr(irq1, "%u\n", dev->irq[1]);
-amba_attr(resource, "\t%016llx\t%016llx\t%016lx\n",
-         (unsigned long long)dev->res.start, (unsigned long long)dev->res.end,
-         dev->res.flags);
-
 /**
  *      amba_device_register - register an AMBA device
  *      @dev: AMBA device to register
@@ -208,40 +219,46 @@ int amba_device_register(struct amba_device *dev, struct resource *parent)
                 dev_warn(&dev->dev, "coherent dma mask is unset\n");
 
         ret = request_resource(parent, &dev->res);
-        if (ret == 0) {
-                tmp = ioremap(dev->res.start, SZ_4K);
-                if (!tmp) {
-                        ret = -ENOMEM;
-                        goto out;
-                }
-
-                for (pid = 0, i = 0; i < 4; i++)
-                        pid |= (readl(tmp + 0xfe0 + 4 * i) & 255) << (i * 8);
-                for (cid = 0, i = 0; i < 4; i++)
-                        cid |= (readl(tmp + 0xff0 + 4 * i) & 255) << (i * 8);
-
-                iounmap(tmp);
-
-                if (cid == 0xb105f00d)
-                        dev->periphid = pid;
-
-                if (dev->periphid)
-                        ret = device_register(&dev->dev);
-                else
-                        ret = -ENODEV;
-
-                if (ret == 0) {
-                        device_create_file(&dev->dev, &dev_attr_id);
-                        if (dev->irq[0] != NO_IRQ)
-                                device_create_file(&dev->dev, &dev_attr_irq0);
-                        if (dev->irq[1] != NO_IRQ)
-                                device_create_file(&dev->dev, &dev_attr_irq1);
-                        device_create_file(&dev->dev, &dev_attr_resource);
-                } else {
- out:
-                        release_resource(&dev->res);
-                }
+        if (ret)
+                goto err_out;
+
+        tmp = ioremap(dev->res.start, SZ_4K);
+        if (!tmp) {
+                ret = -ENOMEM;
+                goto err_release;
         }
+
+        for (pid = 0, i = 0; i < 4; i++)
+                pid |= (readl(tmp + 0xfe0 + 4 * i) & 255) << (i * 8);
+        for (cid = 0, i = 0; i < 4; i++)
+                cid |= (readl(tmp + 0xff0 + 4 * i) & 255) << (i * 8);
+
+        iounmap(tmp);
+
+        if (cid == 0xb105f00d)
+                dev->periphid = pid;
+
+        if (!dev->periphid) {
+                ret = -ENODEV;
+                goto err_release;
+        }
+
+        ret = device_register(&dev->dev);
+        if (ret)
+                goto err_release;
+
+        if (dev->irq[0] != NO_IRQ)
+                ret = device_create_file(&dev->dev, &dev_attr_irq0);
+        if (ret == 0 && dev->irq[1] != NO_IRQ)
+                ret = device_create_file(&dev->dev, &dev_attr_irq1);
+        if (ret == 0)
+                return ret;
+
+        device_unregister(&dev->dev);
+
+ err_release:
+        release_resource(&dev->res);
+ err_out:
         return ret;
 }
 
diff --git a/drivers/char/watchdog/at91rm9200_wdt.c b/drivers/char/watchdog/at91rm9200_wdt.c
index 4e7a1145e78f..cb86967e2c5f 100644
--- a/drivers/char/watchdog/at91rm9200_wdt.c
+++ b/drivers/char/watchdog/at91rm9200_wdt.c
@@ -21,6 +21,7 @@
 #include <linux/watchdog.h>
 #include <asm/bitops.h>
 #include <asm/uaccess.h>
+#include <asm/arch/at91_st.h>
 
 
 #define WDT_DEFAULT_TIME        5       /* seconds */
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 510816c16da3..5cbf8b9d5141 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -195,11 +195,11 @@ config I2C_IBM_IIC
           will be called i2c-ibm_iic.
 
 config I2C_IOP3XX
-        tristate "Intel IOP3xx and IXP4xx on-chip I2C interface"
-        depends on (ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX) && I2C
+        tristate "Intel IOPx3xx and IXP4xx on-chip I2C interface"
+        depends on (ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX || ARCH_IOP13XX) && I2C
         help
           Say Y here if you want to use the IIC bus controller on
-          the Intel IOP3xx I/O Processors or IXP4xx Network Processors.
+          the Intel IOPx3xx I/O Processors or IXP4xx Network Processors.
 
           This driver can also be built as a module.  If so, the module
           will be called i2c-iop3xx.
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index c95a6c154165..c3b1567c852a 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -358,133 +358,6 @@ static void i2c_pxa_reset(struct pxa_i2c *i2c)
 
 #ifdef CONFIG_I2C_PXA_SLAVE
 /*
- * I2C EEPROM emulation.
- */
-static struct i2c_eeprom_emu eeprom = {
-        .size = I2C_EEPROM_EMU_SIZE,
-        .watch = LIST_HEAD_INIT(eeprom.watch),
-};
-
-struct i2c_eeprom_emu *i2c_pxa_get_eeprom(void)
-{
-        return &eeprom;
-}
-
-int i2c_eeprom_emu_addwatcher(struct i2c_eeprom_emu *emu, void *data,
-                              unsigned int addr, unsigned int size,
-                              struct i2c_eeprom_emu_watcher *watcher)
-{
-        struct i2c_eeprom_emu_watch *watch;
-        unsigned long flags;
-
-        if (addr + size > emu->size)
-                return -EINVAL;
-
-        watch = kmalloc(sizeof(struct i2c_eeprom_emu_watch), GFP_KERNEL);
-        if (watch) {
-                watch->start = addr;
-                watch->end = addr + size - 1;
-                watch->ops = watcher;
-                watch->data = data;
-
-                local_irq_save(flags);
-                list_add(&watch->node, &emu->watch);
-                local_irq_restore(flags);
-        }
-
-        return watch ? 0 : -ENOMEM;
-}
-
-void i2c_eeprom_emu_delwatcher(struct i2c_eeprom_emu *emu, void *data,
-                               struct i2c_eeprom_emu_watcher *watcher)
-{
-        struct i2c_eeprom_emu_watch *watch, *n;
-        unsigned long flags;
-
-        list_for_each_entry_safe(watch, n, &emu->watch, node) {
-                if (watch->ops == watcher && watch->data == data) {
-                        local_irq_save(flags);
-                        list_del(&watch->node);
-                        local_irq_restore(flags);
-                        kfree(watch);
-                }
-        }
-}
-
-static void i2c_eeprom_emu_event(void *ptr, i2c_slave_event_t event)
-{
-        struct i2c_eeprom_emu *emu = ptr;
-
-        eedbg(3, "i2c_eeprom_emu_event: %d\n", event);
-
-        switch (event) {
-        case I2C_SLAVE_EVENT_START_WRITE:
-                emu->seen_start = 1;
-                eedbg(2, "i2c_eeprom: write initiated\n");
-                break;
-
-        case I2C_SLAVE_EVENT_START_READ:
-                emu->seen_start = 0;
-                eedbg(2, "i2c_eeprom: read initiated\n");
-                break;
-
-        case I2C_SLAVE_EVENT_STOP:
-                emu->seen_start = 0;
-                eedbg(2, "i2c_eeprom: received stop\n");
-                break;
-
-        default:
-                eedbg(0, "i2c_eeprom: unhandled event\n");
-                break;
-        }
-}
-
-static int i2c_eeprom_emu_read(void *ptr)
-{
-        struct i2c_eeprom_emu *emu = ptr;
-        int ret;
-
-        ret = emu->bytes[emu->ptr];
-        emu->ptr = (emu->ptr + 1) % emu->size;
-
-        return ret;
-}
-
-static void i2c_eeprom_emu_write(void *ptr, unsigned int val)
-{
-        struct i2c_eeprom_emu *emu = ptr;
-        struct i2c_eeprom_emu_watch *watch;
-
-        if (emu->seen_start != 0) {
-                eedbg(2, "i2c_eeprom_emu_write: setting ptr %02x\n", val);
-                emu->ptr = val;
-                emu->seen_start = 0;
-                return;
-        }
-
-        emu->bytes[emu->ptr] = val;
-
-        eedbg(1, "i2c_eeprom_emu_write: ptr=0x%02x, val=0x%02x\n",
-              emu->ptr, val);
-
-        list_for_each_entry(watch, &emu->watch, node) {
-                if (!watch->ops || !watch->ops->write)
-                        continue;
-                if (watch->start <= emu->ptr && watch->end >= emu->ptr)
-                        watch->ops->write(watch->data, emu->ptr, val);
-        }
-
-        emu->ptr = (emu->ptr + 1) % emu->size;
-}
-
-struct i2c_slave_client eeprom_client = {
-        .data   = &eeprom,
-        .event  = i2c_eeprom_emu_event,
-        .read   = i2c_eeprom_emu_read,
-        .write  = i2c_eeprom_emu_write
-};
-
-/*
  * PXA I2C Slave mode
  */
 
@@ -963,11 +836,9 @@ static int i2c_pxa_probe(struct platform_device *dev)
         i2c->slave_addr = I2C_PXA_SLAVE_ADDR;
 
 #ifdef CONFIG_I2C_PXA_SLAVE
-        i2c->slave = &eeprom_client;
         if (plat) {
                 i2c->slave_addr = plat->slave_addr;
-                if (plat->slave)
-                        i2c->slave = plat->slave;
+                i2c->slave = plat->slave;
         }
 #endif
 
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index ea41852ec8cd..fbef8da60043 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -91,11 +91,11 @@ config MMC_AU1X
 
           If unsure, say N.
 
-config MMC_AT91RM9200
-        tristate "AT91RM9200 SD/MMC Card Interface support"
-        depends on ARCH_AT91RM9200 && MMC
+config MMC_AT91
+        tristate "AT91 SD/MMC Card Interface support"
+        depends on ARCH_AT91 && MMC
         help
-          This selects the AT91RM9200 MCI controller.
+          This selects the AT91 MCI controller.
 
           If unsure, say N.
 
diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
index acfd4de0aba5..83ffb9326a54 100644
--- a/drivers/mmc/Makefile
+++ b/drivers/mmc/Makefile
@@ -22,7 +22,7 @@ obj-$(CONFIG_MMC_SDHCI)		+= sdhci.o
 obj-$(CONFIG_MMC_WBSD)          += wbsd.o
 obj-$(CONFIG_MMC_AU1X)          += au1xmmc.o
 obj-$(CONFIG_MMC_OMAP)          += omap.o
-obj-$(CONFIG_MMC_AT91RM9200)    += at91_mci.o
+obj-$(CONFIG_MMC_AT91)          += at91_mci.o
 obj-$(CONFIG_MMC_TIFM_SD)       += tifm_sd.o
 
 mmc_core-y := mmc.o mmc_sysfs.o
diff --git a/drivers/mmc/at91_mci.c b/drivers/mmc/at91_mci.c
index 494b23fb0a01..41761f7189a6 100644
--- a/drivers/mmc/at91_mci.c
+++ b/drivers/mmc/at91_mci.c
@@ -73,8 +73,8 @@
 #include <asm/mach/mmc.h>
 #include <asm/arch/board.h>
 #include <asm/arch/gpio.h>
-#include <asm/arch/at91rm9200_mci.h>
-#include <asm/arch/at91rm9200_pdc.h>
+#include <asm/arch/at91_mci.h>
+#include <asm/arch/at91_pdc.h>
 
 #define DRIVER_NAME "at91_mci"
 
diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c
index 3bcb7dc32995..697966703512 100644
--- a/drivers/pcmcia/at91_cf.c
+++ b/drivers/pcmcia/at91_cf.c
@@ -23,9 +23,9 @@
 #include <asm/io.h>
 #include <asm/sizes.h>
 
-#include <asm/arch/at91rm9200.h>
 #include <asm/arch/board.h>
 #include <asm/arch/gpio.h>
+#include <asm/arch/at91rm9200_mc.h>
 
 
 /*
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index 391a1f4167a4..9217ee6c7865 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/char/at91_serial.c
+ *  linux/drivers/char/atmel_serial.c
  *
  *  Driver for Atmel AT91 / AT32 Serial ports
  *  Copyright (C) 2003 Rick Bronson
@@ -36,11 +36,11 @@
 
 #include <asm/io.h>
 
-#include <asm/arch/at91rm9200_pdc.h>
 #include <asm/mach/serial_at91.h>
 #include <asm/arch/board.h>
+#include <asm/arch/at91_pdc.h>
 #ifdef CONFIG_ARM
-#include <asm/arch/system.h>
+#include <asm/arch/cpu.h>
 #include <asm/arch/gpio.h>
 #endif
 
@@ -137,8 +137,8 @@ static void atmel_set_mctrl(struct uart_port *port, u_int mctrl)
         unsigned int control = 0;
         unsigned int mode;
 
-#ifdef CONFIG_ARM
-        if (arch_identify() == ARCH_ID_AT91RM9200) {
+#ifdef CONFIG_ARCH_AT91RM9200
+        if (cpu_is_at91rm9200()) {
                 /*
                  * AT91RM9200 Errata #39: RTS0 is not internally connected to PA21.
                  *  We need to drive the pin manually.
diff --git a/drivers/serial/atmel_serial.h b/drivers/serial/atmel_serial.h
index eced2ad1a8d9..fe1763b2a6d5 100644
--- a/drivers/serial/atmel_serial.h
+++ b/drivers/serial/atmel_serial.h
@@ -31,8 +31,8 @@
 #define         ATMEL_US_RSTIT          (1 << 13)               /* Reset Iterations */
 #define         ATMEL_US_RSTNACK        (1 << 14)               /* Reset Non Acknowledge */
 #define         ATMEL_US_RETTO          (1 << 15)               /* Rearm Time-out */
-#define         ATMEL_US_DTREN          (1 << 16)               /* Data Terminal Ready Enable */
-#define         ATMEL_US_DTRDIS         (1 << 17)               /* Data Terminal Ready Disable */
+#define         ATMEL_US_DTREN          (1 << 16)               /* Data Terminal Ready Enable [AT91RM9200 only] */
+#define         ATMEL_US_DTRDIS         (1 << 17)               /* Data Terminal Ready Disable [AT91RM9200 only] */
 #define         ATMEL_US_RTSEN          (1 << 18)               /* Request To Send Enable */
 #define         ATMEL_US_RTSDIS         (1 << 19)               /* Request To Send Disable */
 
@@ -92,9 +92,9 @@
 #define         ATMEL_US_TXBUFE         (1 << 11)               /* Transmission Buffer Empty */
 #define         ATMEL_US_RXBUFF         (1 << 12)               /* Reception Buffer Full */
 #define         ATMEL_US_NACK           (1 << 13)               /* Non Acknowledge */
-#define         ATMEL_US_RIIC           (1 << 16)               /* Ring Indicator Input Change */
-#define         ATMEL_US_DSRIC          (1 << 17)               /* Data Set Ready Input Change */
-#define         ATMEL_US_DCDIC          (1 << 18)               /* Data Carrier Detect Input Change */
+#define         ATMEL_US_RIIC           (1 << 16)               /* Ring Indicator Input Change [AT91RM9200 only] */
+#define         ATMEL_US_DSRIC          (1 << 17)               /* Data Set Ready Input Change [AT91RM9200 only] */
+#define         ATMEL_US_DCDIC          (1 << 18)               /* Data Carrier Detect Input Change [AT91RM9200 only] */
 #define         ATMEL_US_CTSIC          (1 << 19)               /* Clear to Send Input Change */
 #define         ATMEL_US_RI             (1 << 20)               /* RI */
 #define         ATMEL_US_DSR            (1 << 21)               /* DSR */
@@ -106,6 +106,7 @@
 #define ATMEL_US_CSR            0x14                    /* Channel Status Register */
 #define ATMEL_US_RHR            0x18                    /* Receiver Holding Register */
 #define ATMEL_US_THR            0x1c                    /* Transmitter Holding Register */
+#define         ATMEL_US_SYNH           (1 << 15)               /* Transmit/Receive Sync [SAM9 only] */
 
 #define ATMEL_US_BRGR           0x20                    /* Baud Rate Generator Register */
 #define         ATMEL_US_CD             (0xffff << 0)           /* Clock Divider */
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index f9b1719b9a37..9980a4ddfed9 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -24,7 +24,7 @@ config USB_ARCH_HAS_OHCI
         default y if ARCH_S3C2410
         default y if PXA27x
         default y if ARCH_EP93XX
-        default y if (ARCH_AT91RM9200 || ARCH_AT91SAM9261)
+        default y if ARCH_AT91
         default y if ARCH_PNX4008
         # PPC:
         default y if STB03xxx
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index bbbc82a8336a..4097a86c4b5e 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -189,7 +189,7 @@ config USB_OTG
 
 config USB_GADGET_AT91
         boolean "AT91 USB Device Port"
-        depends on ARCH_AT91RM9200
+        depends on ARCH_AT91
         select USB_GADGET_SELECTED
         help
            Many Atmel AT91 processors (such as the AT91RM2000) have a
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index ea4714e557e4..4776b3bdf9c8 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -935,7 +935,7 @@ MODULE_LICENSE ("GPL");
 #include "ohci-ppc-soc.c"
 #endif
 
-#if defined(CONFIG_ARCH_AT91RM9200) || defined(CONFIG_ARCH_AT91SAM9261)
+#ifdef CONFIG_ARCH_AT91
 #include "ohci-at91.c"
 #endif
 
@@ -952,8 +952,7 @@ MODULE_LICENSE ("GPL");
       || defined (CONFIG_ARCH_EP93XX) \
       || defined (CONFIG_SOC_AU1X00) \
       || defined (CONFIG_USB_OHCI_HCD_PPC_SOC) \
-      || defined (CONFIG_ARCH_AT91RM9200) \
-      || defined (CONFIG_ARCH_AT91SAM9261) \
+      || defined (CONFIG_ARCH_AT91) \
       || defined (CONFIG_ARCH_PNX4008) \
         )
 #error "missing bus glue for ohci-hcd"