209 files changed, 5324 insertions, 3631 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 475950c8a8..45462714ca 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -67,10 +67,6 @@ config GENERIC_BUST_SPINLOCK
 config GENERIC_ISA_DMA
        bool
-config GENERIC_IOMAP
-        bool
-        default y
 config FIQ
        bool
@@ -161,7 +157,7 @@ config ARCH_RPC
 config ARCH_SA1100
        bool "SA1100-based"
        select ISA
-        select DISCONTIGMEM
+        select ARCH_DISCONTIGMEM_ENABLE
 config ARCH_S3C2410
        bool "Samsung S3C2410"
@@ -202,6 +198,11 @@ config ARCH_H720X
        help
          This enables support for systems based on the Hynix HMS720x
+config ARCH_AAEC2000
+        bool "Agilent AAEC-2000 based"
+        help
+          This enables support for systems based on the Agilent AAEC-2000
 endchoice
 source "arch/arm/mach-clps711x/Kconfig"
@@ -222,7 +223,9 @@ source "arch/arm/mach-pxa/Kconfig"
 source "arch/arm/mach-sa1100/Kconfig"
-source "arch/arm/mach-omap/Kconfig"
+source "arch/arm/plat-omap/Kconfig"
+source "arch/arm/mach-omap1/Kconfig"
 source "arch/arm/mach-s3c2410/Kconfig"
@@ -234,6 +237,8 @@ source "arch/arm/mach-h720x/Kconfig"
 source "arch/arm/mach-versatile/Kconfig"
+source "arch/arm/mach-aaec2000/Kconfig"
 # Definitions to make life easier
 config ARCH_ACORN
        bool
@@ -277,7 +282,7 @@ config ISA_DMA_API
        default y
 config PCI
-        bool "PCI support" if ARCH_INTEGRATOR_AP
+        bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB
        help
          Find out whether you have a PCI motherboard. PCI is the name of a
          bus system, i.e. the way the CPU talks to the other stuff inside
@@ -343,7 +348,27 @@ config PREEMPT
          Say Y here if you are building a kernel for a desktop, embedded
          or real-time system.  Say N if you are unsure.
-config DISCONTIGMEM
+config NO_IDLE_HZ
+        bool "Dynamic tick timer"
+        help
+          Select this option if you want to disable continuous timer ticks
+          and have them programmed to occur as required. This option saves
+          power as the system can remain in idle state for longer.
+          By default dynamic tick is disabled during the boot, and can be
+          manually enabled with:
+            echo 1 > /sys/devices/system/timer/timer0/dyn_tick
+          Alternatively, if you want dynamic tick automatically enabled
+          during boot, pass "dyntick=enable" via the kernel command string.
+          Please note that dynamic tick may affect the accuracy of
+          timekeeping on some platforms depending on the implementation.
+          Currently at least OMAP platform is known to have accurate
+          timekeeping with dynamic tick.
+config ARCH_DISCONTIGMEM_ENABLE
        bool
        default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)
        help
@@ -352,6 +377,8 @@ config DISCONTIGMEM
          or have huge holes in the physical address space for other reasons.
          See <file:Documentation/vm/numa> for more.
+source "mm/Kconfig"
 config LEDS
        bool "Timer and CPU usage LEDs"
        depends on ARCH_CDB89712 || ARCH_CO285 || ARCH_EBSA110 || \
@@ -489,7 +516,7 @@ config XIP_PHYS_ADDR
 endmenu
-if (ARCH_SA1100 || ARCH_INTEGRATOR)
+if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP1)
 menu "CPU Frequency scaling"
@@ -673,6 +700,8 @@ config APM
 endmenu
+source "net/Kconfig"
 menu "Device Drivers"
 source "drivers/base/Kconfig"
@@ -705,7 +734,7 @@ source "drivers/ieee1394/Kconfig"
 source "drivers/message/i2o/Kconfig"
-source "net/Kconfig"
+source "drivers/net/Kconfig"
 source "drivers/isdn/Kconfig"
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 2277e3d179..67f1453ade 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -56,7 +56,7 @@ tune-$(CONFIG_CPU_XSCALE)	:=$(call cc-option,-mtune=xscale,-mtune=strongarm110)
 tune-$(CONFIG_CPU_V6)           :=-mtune=strongarm
 # Need -Uarm for gcc < 3.x
-CFLAGS_ABI      :=$(call cc-option,-mapcs-32,-mabi=apcs-gnu)
+CFLAGS_ABI      :=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,)
 CFLAGS          +=$(CFLAGS_ABI) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm
 AFLAGS          +=$(CFLAGS_ABI) $(arch-y) $(tune-y) -msoft-float
@@ -91,12 +91,14 @@ textaddr-$(CONFIG_ARCH_FORTUNET)   := 0xc0008000
 machine-$(CONFIG_ARCH_IOP3XX)     := iop3xx
 machine-$(CONFIG_ARCH_IXP4XX)     := ixp4xx
 machine-$(CONFIG_ARCH_IXP2000)    := ixp2000
- machine-$(CONFIG_ARCH_OMAP)       := omap
+ machine-$(CONFIG_ARCH_OMAP1)      := omap1
+  incdir-$(CONFIG_ARCH_OMAP)       := omap
 machine-$(CONFIG_ARCH_S3C2410)    := s3c2410
 machine-$(CONFIG_ARCH_LH7A40X)    := lh7a40x
 machine-$(CONFIG_ARCH_VERSATILE)  := versatile
 machine-$(CONFIG_ARCH_IMX)        := imx
 machine-$(CONFIG_ARCH_H720X)      := h720x
+ machine-$(CONFIG_ARCH_AAEC2000)   := aaec2000
 ifeq ($(CONFIG_ARCH_EBSA110),y)
 # This is what happens if you forget the IOCS16 line.
@@ -141,6 +143,9 @@ core-$(CONFIG_FPE_NWFPE)	+= arch/arm/nwfpe/
 core-$(CONFIG_FPE_FASTFPE)      += $(FASTFPE_OBJ)
 core-$(CONFIG_VFP)              += arch/arm/vfp/
+# If we have a common platform directory, then include it in the build.
+core-$(CONFIG_ARCH_OMAP)        += arch/arm/plat-omap/
 drivers-$(CONFIG_OPROFILE)      += arch/arm/oprofile/
 drivers-$(CONFIG_ARCH_CLPS7500) += drivers/acorn/char/
 drivers-$(CONFIG_ARCH_L7200)    += drivers/acorn/char/
diff --git a/arch/arm/boot/install.sh b/arch/arm/boot/install.sh
index 935bb27369..9f9bed2073 100644
--- a/arch/arm/boot/install.sh
+++ b/arch/arm/boot/install.sh
@@ -21,8 +21,8 @@
 #
 # User may have a custom install script
-if [ -x ~/bin/installkernel ]; then exec ~/bin/installkernel "$@"; fi
+if [ -x ~/bin/${CROSS_COMPILE}installkernel ]; then exec ~/bin/${CROSS_COMPILE}installkernel "$@"; fi
-if [ -x /sbin/installkernel ]; then exec /sbin/installkernel "$@"; fi
+if [ -x /sbin/${CROSS_COMPILE}installkernel ]; then exec /sbin/${CROSS_COMPILE}installkernel "$@"; fi
 if [ "$(basename $2)" = "zImage" ]; then
 # Compressed install
diff --git a/arch/arm/common/amba.c b/arch/arm/common/amba.c
index a0507f8c33..c6beb751f2 100644
--- a/arch/arm/common/amba.c
+++ b/arch/arm/common/amba.c
@@ -169,7 +169,7 @@ static void amba_device_release(struct device *dev)
 }
 #define amba_attr(name,fmt,arg...)                              \
-static ssize_t show_##name(struct device *_dev, char *buf)      \
+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);                          \
diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c
index 5797b1b100..cbf2165476 100644
--- a/arch/arm/common/dmabounce.c
+++ b/arch/arm/common/dmabounce.c
@@ -30,6 +30,8 @@
 #include <linux/dmapool.h>
 #include <linux/list.h>
+#include <asm/cacheflush.h>
 #undef DEBUG
 #undef STATS
@@ -91,15 +93,12 @@ static void print_alloc_stats(struct dmabounce_device_info *device_info)
 static inline struct dmabounce_device_info *
 find_dmabounce_dev(struct device *dev)
 {
-        struct list_head *entry;
+        struct dmabounce_device_info *d;
-        list_for_each(entry, &dmabounce_devs) {
-                struct dmabounce_device_info *d =
-                        list_entry(entry, struct dmabounce_device_info, node);
+        list_for_each_entry(d, &dmabounce_devs, node)
                if (d->dev == dev)
                        return d;
-        }
        return NULL;
 }
@@ -170,15 +169,11 @@ alloc_safe_buffer(struct dmabounce_device_info *device_info, void *ptr,
 static inline struct safe_buffer *
 find_safe_buffer(struct dmabounce_device_info *device_info, dma_addr_t safe_dma_addr)
 {
-        struct list_head *entry;
+        struct safe_buffer *b;
-        list_for_each(entry, &device_info->safe_buffers) {
-                struct safe_buffer *b =
-                        list_entry(entry, struct safe_buffer, node);
+        list_for_each_entry(b, &device_info->safe_buffers, node)
                if (b->safe_dma_addr == safe_dma_addr)
                        return b;
-        }
        return NULL;
 }
@@ -299,15 +294,26 @@ unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
                        __func__, buf->ptr, (void *) virt_to_dma(dev, buf->ptr),
                        buf->safe, (void *) buf->safe_dma_addr);
                DO_STATS ( device_info->bounce_count++ );
-                if ((dir == DMA_FROM_DEVICE) ||
+                if (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL) {
-                    (dir == DMA_BIDIRECTIONAL)) {
+                        unsigned long ptr;
                        dev_dbg(dev,
                                "%s: copy back safe %p to unsafe %p size %d\n",
                                __func__, buf->safe, buf->ptr, size);
                        memcpy(buf->ptr, buf->safe, size);
+                        /*
+                         * DMA buffers must have the same cache properties
+                         * as if they were really used for DMA - which means
+                         * data must be written back to RAM.  Note that
+                         * we don't use dmac_flush_range() here for the
+                         * bidirectional case because we know the cache
+                         * lines will be coherent with the data written.
+                         */
+                        ptr = (unsigned long)buf->ptr;
+                        dmac_clean_range(ptr, ptr + size);
                }
                free_safe_buffer(device_info, buf);
        }
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 21fce3414e..38c2eb667e 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -721,16 +721,17 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq)
        return ret;
 }
+static int sa1111_remove_one(struct device *dev, void *data)
+{
+        device_unregister(dev);
+        return 0;
+}
 static void __sa1111_remove(struct sa1111 *sachip)
 {
-        struct list_head *l, *n;
        void __iomem *irqbase = sachip->base + SA1111_INTC;
-        list_for_each_safe(l, n, &sachip->dev->children) {
+        device_for_each_child(sachip->dev, NULL, sa1111_remove_one);
-                struct device *d = list_to_dev(l);
-                device_unregister(d);
-        }
        /* disable all IRQs */
        sa1111_writel(0, irqbase + SA1111_INTEN0);
diff --git a/arch/arm/common/sharpsl_param.c b/arch/arm/common/sharpsl_param.c
index c2c557a224..c94864c5b1 100644
--- a/arch/arm/common/sharpsl_param.c
+++ b/arch/arm/common/sharpsl_param.c
@@ -22,7 +22,7 @@
 * them early in the boot process, then pass them to the appropriate drivers.
 * Not all devices use all paramaters but the format is common to all.
 */
-#ifdef ARCH_SA1100
+#ifdef CONFIG_ARCH_SA1100
 #define PARAM_BASE      0xe8ffc000
 #else
 #define PARAM_BASE      0xa0000a00
diff --git a/arch/arm/configs/enp2611_defconfig b/arch/arm/configs/enp2611_defconfig
index e8f9fccffe..f67ca01b49 100644
--- a/arch/arm/configs/enp2611_defconfig
+++ b/arch/arm/configs/enp2611_defconfig
@@ -1,14 +1,13 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-rc1-bk2
+# Linux kernel version: 2.6.13-rc2
-# Sun Mar 27 22:08:24 2005
+# Thu Jul  7 16:41:21 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
 CONFIG_UID16=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_IOMAP=y
 #
 # Code maturity level options
@@ -16,6 +15,7 @@ CONFIG_GENERIC_IOMAP=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_CLEAN_COMPILE=y
 CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
 #
 # General setup
@@ -35,6 +35,8 @@ CONFIG_EMBEDDED=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_PRINTK=y
+CONFIG_BUG=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
@@ -50,7 +52,13 @@ CONFIG_BASE_SMALL=0
 #
 # Loadable module support
 #
-# CONFIG_MODULES is not set
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_OBSOLETE_MODPARM=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
 #
 # System Type
@@ -76,6 +84,7 @@ CONFIG_ARCH_IXP2000=y
 # CONFIG_ARCH_VERSATILE is not set
 # CONFIG_ARCH_IMX is not set
 # CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_AAEC2000 is not set
 CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
 #
@@ -90,6 +99,7 @@ CONFIG_ARCH_ENP2611=y
 # CONFIG_ARCH_IXDP2800 is not set
 # CONFIG_ARCH_IXDP2401 is not set
 # CONFIG_ARCH_IXDP2801 is not set
+# CONFIG_IXP2000_SUPPORT_BROKEN_PCI_IO is not set
 #
 # Processor Type
@@ -100,7 +110,6 @@ CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_TLB_V4WBI=y
-CONFIG_CPU_MINICACHE=y
 #
 # Processor Features
@@ -112,9 +121,11 @@ CONFIG_XSCALE_PMU=y
 #
 # Bus support
 #
+CONFIG_ISA_DMA_API=y
 CONFIG_PCI=y
 CONFIG_PCI_LEGACY_PROC=y
 CONFIG_PCI_NAMES=y
+# CONFIG_PCI_DEBUG is not set
 #
 # PCCARD (PCMCIA/CardBus) support
@@ -124,7 +135,16 @@ CONFIG_PCI_NAMES=y
 #
 # Kernel Features
 #
+# CONFIG_SMP is not set
 # CONFIG_PREEMPT is not set
+# CONFIG_NO_IDLE_HZ is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_ALIGNMENT_TRAP=y
 #
@@ -263,7 +283,6 @@ CONFIG_MTD_IXP2000=y
 #
 # Block devices
 #
-# CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
@@ -302,6 +321,7 @@ CONFIG_IOSCHED_CFQ=y
 #
 # Fusion MPT device support
 #
+# CONFIG_FUSION is not set
 #
 # IEEE 1394 (FireWire) support
@@ -323,12 +343,12 @@ CONFIG_NET=y
 #
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
-# CONFIG_NETLINK_DEV is not set
 CONFIG_UNIX=y
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
@@ -343,6 +363,8 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_TUNNEL is not set
 # CONFIG_IP_TCPDIAG is not set
 # CONFIG_IP_TCPDIAG_IPV6 is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
 # CONFIG_IPV6 is not set
 # CONFIG_NETFILTER is not set
@@ -398,6 +420,7 @@ CONFIG_MII=y
 # CONFIG_SUNGEM is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_SMC91X is not set
+# CONFIG_DM9000 is not set
 #
 # Tulip family network device support
@@ -434,9 +457,11 @@ CONFIG_EEPRO100=y
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set
 # CONFIG_R8169 is not set
+# CONFIG_SKGE is not set
 # CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
 #
 # Ethernet (10000 Mbit)
@@ -458,6 +483,7 @@ CONFIG_EEPRO100=y
 # Wan interfaces
 #
 CONFIG_WAN=y
+# CONFIG_DSCC4 is not set
 # CONFIG_LANMEDIA is not set
 # CONFIG_SYNCLINK_SYNCPPP is not set
 CONFIG_HDLC=y
@@ -520,7 +546,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 #
 # CONFIG_SERIO is not set
 # CONFIG_GAMEPORT is not set
-CONFIG_SOUND_GAMEPORT=y
 #
 # Character devices
@@ -541,6 +566,7 @@ CONFIG_SERIAL_8250_NR_UARTS=2
 #
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
@@ -607,17 +633,18 @@ CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_AMD8111 is not set
 # CONFIG_I2C_I801 is not set
 # CONFIG_I2C_I810 is not set
+# CONFIG_I2C_PIIX4 is not set
 # CONFIG_I2C_ISA is not set
 # CONFIG_I2C_IXP2000 is not set
 # CONFIG_I2C_NFORCE2 is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PIIX4 is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
 # CONFIG_SCx200_ACB is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_STUB is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
 # CONFIG_I2C_VOODOO3 is not set
@@ -631,7 +658,9 @@ CONFIG_I2C_SENSOR=y
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
 # CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
 # CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_DS1621 is not set
 # CONFIG_SENSORS_FSCHER is not set
 # CONFIG_SENSORS_FSCPOS is not set
@@ -647,6 +676,7 @@ CONFIG_I2C_SENSOR=y
 # CONFIG_SENSORS_LM85 is not set
 # CONFIG_SENSORS_LM87 is not set
 # CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
@@ -656,14 +686,19 @@ CONFIG_I2C_SENSOR=y
 # CONFIG_SENSORS_W83781D is not set
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
 #
 # Other I2C Chip support
 #
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
 CONFIG_SENSORS_EEPROM=y
 # CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_RTC8564 is not set
+# CONFIG_SENSORS_MAX6875 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -717,6 +752,7 @@ CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 # CONFIG_EXT2_FS_SECURITY is not set
+# CONFIG_EXT2_FS_XIP is not set
 CONFIG_EXT3_FS=y
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
@@ -757,7 +793,6 @@ CONFIG_DNOTIFY=y
 #
 CONFIG_PROC_FS=y
 CONFIG_SYSFS=y
-# CONFIG_DEVFS_FS is not set
 # CONFIG_DEVPTS_FS_XATTR is not set
 CONFIG_TMPFS=y
 # CONFIG_TMPFS_XATTR is not set
@@ -795,12 +830,14 @@ CONFIG_JFFS2_RTIME=y
 #
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
 # CONFIG_NFS_V4 is not set
 # CONFIG_NFS_DIRECTIO is not set
 # CONFIG_NFSD is not set
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
diff --git a/arch/arm/configs/ixdp2400_defconfig b/arch/arm/configs/ixdp2400_defconfig
index 4fd663ecbe..5c6c928215 100644
--- a/arch/arm/configs/ixdp2400_defconfig
+++ b/arch/arm/configs/ixdp2400_defconfig
@@ -1,14 +1,13 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-rc1-bk2
+# Linux kernel version: 2.6.13-rc2
-# Sun Mar 27 21:13:38 2005
+# Thu Jul  7 16:49:01 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
 CONFIG_UID16=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_IOMAP=y
 #
 # Code maturity level options
@@ -16,6 +15,7 @@ CONFIG_GENERIC_IOMAP=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_CLEAN_COMPILE=y
 CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
 #
 # General setup
@@ -35,6 +35,8 @@ CONFIG_EMBEDDED=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_PRINTK=y
+CONFIG_BUG=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
@@ -50,7 +52,13 @@ CONFIG_BASE_SMALL=0
 #
 # Loadable module support
 #
-# CONFIG_MODULES is not set
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_OBSOLETE_MODPARM=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
 #
 # System Type
@@ -76,6 +84,7 @@ CONFIG_ARCH_IXP2000=y
 # CONFIG_ARCH_VERSATILE is not set
 # CONFIG_ARCH_IMX is not set
 # CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_AAEC2000 is not set
 CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
 #
@@ -91,6 +100,7 @@ CONFIG_ARCH_IXDP2400=y
 CONFIG_ARCH_IXDP2X00=y
 # CONFIG_ARCH_IXDP2401 is not set
 # CONFIG_ARCH_IXDP2801 is not set
+# CONFIG_IXP2000_SUPPORT_BROKEN_PCI_IO is not set
 #
 # Processor Type
@@ -101,7 +111,6 @@ CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_TLB_V4WBI=y
-CONFIG_CPU_MINICACHE=y
 #
 # Processor Features
@@ -113,9 +122,11 @@ CONFIG_XSCALE_PMU=y
 #
 # Bus support
 #
+CONFIG_ISA_DMA_API=y
 CONFIG_PCI=y
 CONFIG_PCI_LEGACY_PROC=y
 CONFIG_PCI_NAMES=y
+# CONFIG_PCI_DEBUG is not set
 #
 # PCCARD (PCMCIA/CardBus) support
@@ -125,7 +136,16 @@ CONFIG_PCI_NAMES=y
 #
 # Kernel Features
 #
+# CONFIG_SMP is not set
 # CONFIG_PREEMPT is not set
+# CONFIG_NO_IDLE_HZ is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_ALIGNMENT_TRAP=y
 #
@@ -264,7 +284,6 @@ CONFIG_MTD_IXP2000=y
 #
 # Block devices
 #
-# CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
@@ -303,6 +322,7 @@ CONFIG_IOSCHED_CFQ=y
 #
 # Fusion MPT device support
 #
+# CONFIG_FUSION is not set
 #
 # IEEE 1394 (FireWire) support
@@ -324,12 +344,12 @@ CONFIG_NET=y
 #
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
-# CONFIG_NETLINK_DEV is not set
 CONFIG_UNIX=y
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
@@ -344,6 +364,8 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_TUNNEL is not set
 # CONFIG_IP_TCPDIAG is not set
 # CONFIG_IP_TCPDIAG_IPV6 is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
 # CONFIG_IPV6 is not set
 # CONFIG_NETFILTER is not set
@@ -399,6 +421,7 @@ CONFIG_MII=y
 # CONFIG_SUNGEM is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_SMC91X is not set
+# CONFIG_DM9000 is not set
 #
 # Tulip family network device support
@@ -435,9 +458,11 @@ CONFIG_EEPRO100=y
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set
 # CONFIG_R8169 is not set
+# CONFIG_SKGE is not set
 # CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
 #
 # Ethernet (10000 Mbit)
@@ -459,6 +484,7 @@ CONFIG_EEPRO100=y
 # Wan interfaces
 #
 CONFIG_WAN=y
+# CONFIG_DSCC4 is not set
 # CONFIG_LANMEDIA is not set
 # CONFIG_SYNCLINK_SYNCPPP is not set
 CONFIG_HDLC=y
@@ -521,7 +547,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 #
 # CONFIG_SERIO is not set
 # CONFIG_GAMEPORT is not set
-CONFIG_SOUND_GAMEPORT=y
 #
 # Character devices
@@ -542,6 +567,7 @@ CONFIG_SERIAL_8250_NR_UARTS=2
 #
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
@@ -608,17 +634,18 @@ CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_AMD8111 is not set
 # CONFIG_I2C_I801 is not set
 # CONFIG_I2C_I810 is not set
+# CONFIG_I2C_PIIX4 is not set
 # CONFIG_I2C_ISA is not set
 # CONFIG_I2C_IXP2000 is not set
 # CONFIG_I2C_NFORCE2 is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PIIX4 is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
 # CONFIG_SCx200_ACB is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_STUB is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
 # CONFIG_I2C_VOODOO3 is not set
@@ -632,7 +659,9 @@ CONFIG_I2C_SENSOR=y
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
 # CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
 # CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_DS1621 is not set
 # CONFIG_SENSORS_FSCHER is not set
 # CONFIG_SENSORS_FSCPOS is not set
@@ -648,6 +677,7 @@ CONFIG_I2C_SENSOR=y
 # CONFIG_SENSORS_LM85 is not set
 # CONFIG_SENSORS_LM87 is not set
 # CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
@@ -657,14 +687,19 @@ CONFIG_I2C_SENSOR=y
 # CONFIG_SENSORS_W83781D is not set
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
 #
 # Other I2C Chip support
 #
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
 CONFIG_SENSORS_EEPROM=y
 # CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_RTC8564 is not set
+# CONFIG_SENSORS_MAX6875 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -718,6 +753,7 @@ CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 # CONFIG_EXT2_FS_SECURITY is not set
+# CONFIG_EXT2_FS_XIP is not set
 CONFIG_EXT3_FS=y
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
@@ -758,7 +794,6 @@ CONFIG_DNOTIFY=y
 #
 CONFIG_PROC_FS=y
 CONFIG_SYSFS=y
-# CONFIG_DEVFS_FS is not set
 # CONFIG_DEVPTS_FS_XATTR is not set
 CONFIG_TMPFS=y
 # CONFIG_TMPFS_XATTR is not set
@@ -796,12 +831,14 @@ CONFIG_JFFS2_RTIME=y
 #
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
 # CONFIG_NFS_V4 is not set
 # CONFIG_NFS_DIRECTIO is not set
 # CONFIG_NFSD is not set
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
diff --git a/arch/arm/configs/ixdp2401_defconfig b/arch/arm/configs/ixdp2401_defconfig
index 6f51c98084..6dc40f6be0 100644
--- a/arch/arm/configs/ixdp2401_defconfig
+++ b/arch/arm/configs/ixdp2401_defconfig
@@ -1,14 +1,13 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-rc1-bk2
+# Linux kernel version: 2.6.13-rc2
-# Sun Mar 27 21:53:55 2005
+# Thu Jul  7 16:49:08 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
 CONFIG_UID16=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_IOMAP=y
 #
 # Code maturity level options
@@ -16,6 +15,7 @@ CONFIG_GENERIC_IOMAP=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_CLEAN_COMPILE=y
 CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
 #
 # General setup
@@ -35,6 +35,8 @@ CONFIG_EMBEDDED=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_PRINTK=y
+CONFIG_BUG=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
@@ -50,7 +52,13 @@ CONFIG_BASE_SMALL=0
 #
 # Loadable module support
 #
-# CONFIG_MODULES is not set
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_OBSOLETE_MODPARM=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
 #
 # System Type
@@ -76,6 +84,7 @@ CONFIG_ARCH_IXP2000=y
 # CONFIG_ARCH_VERSATILE is not set
 # CONFIG_ARCH_IMX is not set
 # CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_AAEC2000 is not set
 CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
 #
@@ -91,6 +100,7 @@ CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
 CONFIG_ARCH_IXDP2401=y
 # CONFIG_ARCH_IXDP2801 is not set
 CONFIG_ARCH_IXDP2X01=y
+# CONFIG_IXP2000_SUPPORT_BROKEN_PCI_IO is not set
 #
 # Processor Type
@@ -101,7 +111,6 @@ CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_TLB_V4WBI=y
-CONFIG_CPU_MINICACHE=y
 #
 # Processor Features
@@ -113,9 +122,11 @@ CONFIG_XSCALE_PMU=y
 #
 # Bus support
 #
+CONFIG_ISA_DMA_API=y
 CONFIG_PCI=y
 CONFIG_PCI_LEGACY_PROC=y
 CONFIG_PCI_NAMES=y
+# CONFIG_PCI_DEBUG is not set
 #
 # PCCARD (PCMCIA/CardBus) support
@@ -125,7 +136,16 @@ CONFIG_PCI_NAMES=y
 #
 # Kernel Features
 #
+# CONFIG_SMP is not set
 # CONFIG_PREEMPT is not set
+# CONFIG_NO_IDLE_HZ is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_ALIGNMENT_TRAP=y
 #
@@ -264,7 +284,6 @@ CONFIG_MTD_IXP2000=y
 #
 # Block devices
 #
-# CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
@@ -303,6 +322,7 @@ CONFIG_IOSCHED_CFQ=y
 #
 # Fusion MPT device support
 #
+# CONFIG_FUSION is not set
 #
 # IEEE 1394 (FireWire) support
@@ -324,12 +344,12 @@ CONFIG_NET=y
 #
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
-# CONFIG_NETLINK_DEV is not set
 CONFIG_UNIX=y
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
@@ -344,6 +364,8 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_TUNNEL is not set
 CONFIG_IP_TCPDIAG=y
 # CONFIG_IP_TCPDIAG_IPV6 is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
 # CONFIG_IPV6 is not set
 # CONFIG_NETFILTER is not set
@@ -399,6 +421,7 @@ CONFIG_MII=y
 # CONFIG_SUNGEM is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_SMC91X is not set
+# CONFIG_DM9000 is not set
 #
 # Tulip family network device support
@@ -436,9 +459,11 @@ CONFIG_EEPRO100=y
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set
 # CONFIG_R8169 is not set
+# CONFIG_SKGE is not set
 # CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
 #
 # Ethernet (10000 Mbit)
@@ -460,6 +485,7 @@ CONFIG_EEPRO100=y
 # Wan interfaces
 #
 CONFIG_WAN=y
+# CONFIG_DSCC4 is not set
 # CONFIG_LANMEDIA is not set
 # CONFIG_SYNCLINK_SYNCPPP is not set
 CONFIG_HDLC=y
@@ -522,7 +548,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 #
 # CONFIG_SERIO is not set
 # CONFIG_GAMEPORT is not set
-CONFIG_SOUND_GAMEPORT=y
 #
 # Character devices
@@ -543,6 +568,7 @@ CONFIG_SERIAL_8250_NR_UARTS=2
 #
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
@@ -609,17 +635,18 @@ CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_AMD8111 is not set
 # CONFIG_I2C_I801 is not set
 # CONFIG_I2C_I810 is not set
+# CONFIG_I2C_PIIX4 is not set
 # CONFIG_I2C_ISA is not set
 # CONFIG_I2C_IXP2000 is not set
 # CONFIG_I2C_NFORCE2 is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PIIX4 is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
 # CONFIG_SCx200_ACB is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_STUB is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
 # CONFIG_I2C_VOODOO3 is not set
@@ -633,7 +660,9 @@ CONFIG_I2C_SENSOR=y
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
 # CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
 # CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_DS1621 is not set
 # CONFIG_SENSORS_FSCHER is not set
 # CONFIG_SENSORS_FSCPOS is not set
@@ -649,6 +678,7 @@ CONFIG_I2C_SENSOR=y
 # CONFIG_SENSORS_LM85 is not set
 # CONFIG_SENSORS_LM87 is not set
 # CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
@@ -658,14 +688,19 @@ CONFIG_I2C_SENSOR=y
 # CONFIG_SENSORS_W83781D is not set
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
 #
 # Other I2C Chip support
 #
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
 CONFIG_SENSORS_EEPROM=y
 # CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_RTC8564 is not set
+# CONFIG_SENSORS_MAX6875 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -719,6 +754,7 @@ CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 # CONFIG_EXT2_FS_SECURITY is not set
+# CONFIG_EXT2_FS_XIP is not set
 CONFIG_EXT3_FS=y
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
@@ -759,7 +795,6 @@ CONFIG_DNOTIFY=y
 #
 CONFIG_PROC_FS=y
 CONFIG_SYSFS=y
-# CONFIG_DEVFS_FS is not set
 # CONFIG_DEVPTS_FS_XATTR is not set
 CONFIG_TMPFS=y
 # CONFIG_TMPFS_XATTR is not set
@@ -797,12 +832,14 @@ CONFIG_JFFS2_RTIME=y
 #
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
 # CONFIG_NFS_V4 is not set
 # CONFIG_NFS_DIRECTIO is not set
 # CONFIG_NFSD is not set
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
diff --git a/arch/arm/configs/ixdp2800_defconfig b/arch/arm/configs/ixdp2800_defconfig
index 7be3521f91..d2bb0b7153 100644
--- a/arch/arm/configs/ixdp2800_defconfig
+++ b/arch/arm/configs/ixdp2800_defconfig
@@ -1,14 +1,13 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-rc1-bk2
+# Linux kernel version: 2.6.13-rc2
-# Sun Mar 27 22:15:23 2005
+# Thu Jul  7 16:49:20 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
 CONFIG_UID16=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_IOMAP=y
 #
 # Code maturity level options
@@ -16,6 +15,7 @@ CONFIG_GENERIC_IOMAP=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_CLEAN_COMPILE=y
 CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
 #
 # General setup
@@ -35,6 +35,8 @@ CONFIG_EMBEDDED=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_PRINTK=y
+CONFIG_BUG=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
@@ -50,7 +52,13 @@ CONFIG_BASE_SMALL=0
 #
 # Loadable module support
 #
-# CONFIG_MODULES is not set
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_OBSOLETE_MODPARM=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
 #
 # System Type
@@ -76,6 +84,7 @@ CONFIG_ARCH_IXP2000=y
 # CONFIG_ARCH_VERSATILE is not set
 # CONFIG_ARCH_IMX is not set
 # CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_AAEC2000 is not set
 CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
 #
@@ -91,6 +100,7 @@ CONFIG_ARCH_IXDP2800=y
 CONFIG_ARCH_IXDP2X00=y
 # CONFIG_ARCH_IXDP2401 is not set
 # CONFIG_ARCH_IXDP2801 is not set
+# CONFIG_IXP2000_SUPPORT_BROKEN_PCI_IO is not set
 #
 # Processor Type
@@ -101,7 +111,6 @@ CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_TLB_V4WBI=y
-CONFIG_CPU_MINICACHE=y
 #
 # Processor Features
@@ -113,9 +122,11 @@ CONFIG_XSCALE_PMU=y
 #
 # Bus support
 #
+CONFIG_ISA_DMA_API=y
 CONFIG_PCI=y
 CONFIG_PCI_LEGACY_PROC=y
 CONFIG_PCI_NAMES=y
+# CONFIG_PCI_DEBUG is not set
 #
 # PCCARD (PCMCIA/CardBus) support
@@ -125,7 +136,16 @@ CONFIG_PCI_NAMES=y
 #
 # Kernel Features
 #
+# CONFIG_SMP is not set
 # CONFIG_PREEMPT is not set
+# CONFIG_NO_IDLE_HZ is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_ALIGNMENT_TRAP=y
 #
@@ -264,7 +284,6 @@ CONFIG_MTD_IXP2000=y
 #
 # Block devices
 #
-# CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
@@ -303,6 +322,7 @@ CONFIG_IOSCHED_CFQ=y
 #
 # Fusion MPT device support
 #
+# CONFIG_FUSION is not set
 #
 # IEEE 1394 (FireWire) support
@@ -324,12 +344,12 @@ CONFIG_NET=y
 #
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
-# CONFIG_NETLINK_DEV is not set
 CONFIG_UNIX=y
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
@@ -344,6 +364,8 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_TUNNEL is not set
 # CONFIG_IP_TCPDIAG is not set
 # CONFIG_IP_TCPDIAG_IPV6 is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
 # CONFIG_IPV6 is not set
 # CONFIG_NETFILTER is not set
@@ -399,6 +421,7 @@ CONFIG_MII=y
 # CONFIG_SUNGEM is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_SMC91X is not set
+# CONFIG_DM9000 is not set
 #
 # Tulip family network device support
@@ -435,9 +458,11 @@ CONFIG_EEPRO100=y
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set
 # CONFIG_R8169 is not set
+# CONFIG_SKGE is not set
 # CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
 #
 # Ethernet (10000 Mbit)
@@ -459,6 +484,7 @@ CONFIG_EEPRO100=y
 # Wan interfaces
 #
 CONFIG_WAN=y
+# CONFIG_DSCC4 is not set
 # CONFIG_LANMEDIA is not set
 # CONFIG_SYNCLINK_SYNCPPP is not set
 CONFIG_HDLC=y
@@ -521,7 +547,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 #
 # CONFIG_SERIO is not set
 # CONFIG_GAMEPORT is not set
-CONFIG_SOUND_GAMEPORT=y
 #
 # Character devices
@@ -542,6 +567,7 @@ CONFIG_SERIAL_8250_NR_UARTS=2
 #
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
@@ -608,17 +634,18 @@ CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_AMD8111 is not set
 # CONFIG_I2C_I801 is not set
 # CONFIG_I2C_I810 is not set
+# CONFIG_I2C_PIIX4 is not set
 # CONFIG_I2C_ISA is not set
 # CONFIG_I2C_IXP2000 is not set
 # CONFIG_I2C_NFORCE2 is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PIIX4 is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
 # CONFIG_SCx200_ACB is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_STUB is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
 # CONFIG_I2C_VOODOO3 is not set
@@ -632,7 +659,9 @@ CONFIG_I2C_SENSOR=y
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
 # CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
 # CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_DS1621 is not set
 # CONFIG_SENSORS_FSCHER is not set
 # CONFIG_SENSORS_FSCPOS is not set
@@ -648,6 +677,7 @@ CONFIG_I2C_SENSOR=y
 # CONFIG_SENSORS_LM85 is not set
 # CONFIG_SENSORS_LM87 is not set
 # CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
@@ -657,14 +687,19 @@ CONFIG_I2C_SENSOR=y
 # CONFIG_SENSORS_W83781D is not set
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
 #
 # Other I2C Chip support
 #
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
 CONFIG_SENSORS_EEPROM=y
 # CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_RTC8564 is not set
+# CONFIG_SENSORS_MAX6875 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -718,6 +753,7 @@ CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 # CONFIG_EXT2_FS_SECURITY is not set
+# CONFIG_EXT2_FS_XIP is not set
 CONFIG_EXT3_FS=y
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
@@ -758,7 +794,6 @@ CONFIG_DNOTIFY=y
 #
 CONFIG_PROC_FS=y
 CONFIG_SYSFS=y
-# CONFIG_DEVFS_FS is not set
 # CONFIG_DEVPTS_FS_XATTR is not set
 CONFIG_TMPFS=y
 # CONFIG_TMPFS_XATTR is not set
@@ -796,12 +831,14 @@ CONFIG_JFFS2_RTIME=y
 #
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
 # CONFIG_NFS_V4 is not set
 # CONFIG_NFS_DIRECTIO is not set
 # CONFIG_NFSD is not set
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
diff --git a/arch/arm/configs/ixdp2801_defconfig b/arch/arm/configs/ixdp2801_defconfig
index cd84a20f30..2d6f960e33 100644
--- a/arch/arm/configs/ixdp2801_defconfig
+++ b/arch/arm/configs/ixdp2801_defconfig
@@ -1,14 +1,13 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-rc1-bk2
+# Linux kernel version: 2.6.13-rc2
-# Sun Mar 27 22:39:19 2005
+# Thu Jul  7 16:49:13 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
 CONFIG_UID16=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_IOMAP=y
 #
 # Code maturity level options
@@ -16,6 +15,7 @@ CONFIG_GENERIC_IOMAP=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_CLEAN_COMPILE=y
 CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
 #
 # General setup
@@ -35,6 +35,8 @@ CONFIG_EMBEDDED=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_PRINTK=y
+CONFIG_BUG=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
@@ -50,7 +52,13 @@ CONFIG_BASE_SMALL=0
 #
 # Loadable module support
 #
-# CONFIG_MODULES is not set
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_OBSOLETE_MODPARM=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
 #
 # System Type
@@ -76,6 +84,7 @@ CONFIG_ARCH_IXP2000=y
 # CONFIG_ARCH_VERSATILE is not set
 # CONFIG_ARCH_IMX is not set
 # CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_AAEC2000 is not set
 CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
 #
@@ -91,6 +100,7 @@ CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
 # CONFIG_ARCH_IXDP2401 is not set
 CONFIG_ARCH_IXDP2801=y
 CONFIG_ARCH_IXDP2X01=y
+# CONFIG_IXP2000_SUPPORT_BROKEN_PCI_IO is not set
 #
 # Processor Type
@@ -101,7 +111,6 @@ CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_TLB_V4WBI=y
-CONFIG_CPU_MINICACHE=y
 #
 # Processor Features
@@ -113,9 +122,11 @@ CONFIG_XSCALE_PMU=y
 #
 # Bus support
 #
+CONFIG_ISA_DMA_API=y
 CONFIG_PCI=y
 CONFIG_PCI_LEGACY_PROC=y
 CONFIG_PCI_NAMES=y
+# CONFIG_PCI_DEBUG is not set
 #
 # PCCARD (PCMCIA/CardBus) support
@@ -125,7 +136,16 @@ CONFIG_PCI_NAMES=y
 #
 # Kernel Features
 #
+# CONFIG_SMP is not set
 # CONFIG_PREEMPT is not set
+# CONFIG_NO_IDLE_HZ is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_ALIGNMENT_TRAP=y
 #
@@ -264,7 +284,6 @@ CONFIG_MTD_IXP2000=y
 #
 # Block devices
 #
-# CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
@@ -303,6 +322,7 @@ CONFIG_IOSCHED_CFQ=y
 #
 # Fusion MPT device support
 #
+# CONFIG_FUSION is not set
 #
 # IEEE 1394 (FireWire) support
@@ -324,12 +344,12 @@ CONFIG_NET=y
 #
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
-# CONFIG_NETLINK_DEV is not set
 CONFIG_UNIX=y
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
@@ -344,6 +364,8 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_TUNNEL is not set
 # CONFIG_IP_TCPDIAG is not set
 # CONFIG_IP_TCPDIAG_IPV6 is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
 # CONFIG_IPV6 is not set
 # CONFIG_NETFILTER is not set
@@ -399,6 +421,7 @@ CONFIG_MII=y
 # CONFIG_SUNGEM is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_SMC91X is not set
+# CONFIG_DM9000 is not set
 #
 # Tulip family network device support
@@ -436,9 +459,11 @@ CONFIG_EEPRO100=y
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set
 # CONFIG_R8169 is not set
+# CONFIG_SKGE is not set
 # CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
 #
 # Ethernet (10000 Mbit)
@@ -460,6 +485,7 @@ CONFIG_EEPRO100=y
 # Wan interfaces
 #
 CONFIG_WAN=y
+# CONFIG_DSCC4 is not set
 # CONFIG_LANMEDIA is not set
 # CONFIG_SYNCLINK_SYNCPPP is not set
 CONFIG_HDLC=y
@@ -522,7 +548,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 #
 # CONFIG_SERIO is not set
 # CONFIG_GAMEPORT is not set
-CONFIG_SOUND_GAMEPORT=y
 #
 # Character devices
@@ -543,6 +568,7 @@ CONFIG_SERIAL_8250_NR_UARTS=2
 #
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
@@ -609,17 +635,18 @@ CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_AMD8111 is not set
 # CONFIG_I2C_I801 is not set
 # CONFIG_I2C_I810 is not set
+# CONFIG_I2C_PIIX4 is not set
 # CONFIG_I2C_ISA is not set
 # CONFIG_I2C_IXP2000 is not set
 # CONFIG_I2C_NFORCE2 is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PIIX4 is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
 # CONFIG_SCx200_ACB is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_STUB is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
 # CONFIG_I2C_VOODOO3 is not set
@@ -633,7 +660,9 @@ CONFIG_I2C_SENSOR=y
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
 # CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
 # CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_DS1621 is not set
 # CONFIG_SENSORS_FSCHER is not set
 # CONFIG_SENSORS_FSCPOS is not set
@@ -649,6 +678,7 @@ CONFIG_I2C_SENSOR=y
 # CONFIG_SENSORS_LM85 is not set
 # CONFIG_SENSORS_LM87 is not set
 # CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
@@ -658,14 +688,19 @@ CONFIG_I2C_SENSOR=y
 # CONFIG_SENSORS_W83781D is not set
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
 #
 # Other I2C Chip support
 #
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
 CONFIG_SENSORS_EEPROM=y
 # CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_RTC8564 is not set
+# CONFIG_SENSORS_MAX6875 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -719,6 +754,7 @@ CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 # CONFIG_EXT2_FS_SECURITY is not set
+# CONFIG_EXT2_FS_XIP is not set
 CONFIG_EXT3_FS=y
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
@@ -759,7 +795,6 @@ CONFIG_DNOTIFY=y
 #
 CONFIG_PROC_FS=y
 CONFIG_SYSFS=y
-# CONFIG_DEVFS_FS is not set
 # CONFIG_DEVPTS_FS_XATTR is not set
 CONFIG_TMPFS=y
 # CONFIG_TMPFS_XATTR is not set
@@ -797,12 +832,14 @@ CONFIG_JFFS2_RTIME=y
 #
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
 # CONFIG_NFS_V4 is not set
 # CONFIG_NFS_DIRECTIO is not set
 # CONFIG_NFSD is not set
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
diff --git a/arch/arm/configs/omap_h2_1610_defconfig b/arch/arm/configs/omap_h2_1610_defconfig
index 4e58d9341b..24955263b0 100644
--- a/arch/arm/configs/omap_h2_1610_defconfig
+++ b/arch/arm/configs/omap_h2_1610_defconfig
@@ -1,14 +1,13 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-rc1-bk2
+# Linux kernel version: 2.6.13-rc2
-# Sun Mar 27 17:52:41 2005
+# Fri Jul  8 04:49:34 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
 CONFIG_UID16=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_IOMAP=y
 #
 # Code maturity level options
@@ -17,6 +16,7 @@ CONFIG_EXPERIMENTAL=y
 CONFIG_CLEAN_COMPILE=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
 #
 # General setup
@@ -33,8 +33,9 @@ CONFIG_KOBJECT_UEVENT=y
 # CONFIG_IKCONFIG is not set
 # CONFIG_EMBEDDED is not set
 CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_PRINTK=y
+CONFIG_BUG=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
@@ -82,10 +83,28 @@ CONFIG_ARCH_OMAP=y
 # CONFIG_ARCH_VERSATILE is not set
 # CONFIG_ARCH_IMX is not set
 # CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_AAEC2000 is not set
 #
 # TI OMAP Implementations
 #
+CONFIG_ARCH_OMAP_OTG=y
+CONFIG_ARCH_OMAP1=y
+# CONFIG_ARCH_OMAP2 is not set
+#
+# OMAP Feature Selections
+#
+# CONFIG_OMAP_RESET_CLOCKS is not set
+CONFIG_OMAP_MUX=y
+# CONFIG_OMAP_MUX_DEBUG is not set
+CONFIG_OMAP_MUX_WARNINGS=y
+# CONFIG_OMAP_MPU_TIMER is not set
+CONFIG_OMAP_32K_TIMER=y
+CONFIG_OMAP_32K_TIMER_HZ=128
+CONFIG_OMAP_LL_DEBUG_UART1=y
+# CONFIG_OMAP_LL_DEBUG_UART2 is not set
+# CONFIG_OMAP_LL_DEBUG_UART3 is not set
 #
 # OMAP Core Type
@@ -93,7 +112,6 @@ CONFIG_ARCH_OMAP=y
 # CONFIG_ARCH_OMAP730 is not set
 # CONFIG_ARCH_OMAP1510 is not set
 CONFIG_ARCH_OMAP16XX=y
-CONFIG_ARCH_OMAP_OTG=y
 #
 # OMAP Board Type
@@ -101,21 +119,14 @@ CONFIG_ARCH_OMAP_OTG=y
 # CONFIG_MACH_OMAP_INNOVATOR is not set
 CONFIG_MACH_OMAP_H2=y
 # CONFIG_MACH_OMAP_H3 is not set
-# CONFIG_MACH_OMAP_H4 is not set
 # CONFIG_MACH_OMAP_OSK is not set
 # CONFIG_MACH_OMAP_GENERIC is not set
 #
-# OMAP Feature Selections
+# OMAP CPU Speed
 #
-CONFIG_OMAP_MUX=y
+# CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set
-# CONFIG_OMAP_MUX_DEBUG is not set
+# CONFIG_OMAP_ARM_216MHZ is not set
-CONFIG_OMAP_MUX_WARNINGS=y
-CONFIG_OMAP_MPU_TIMER=y
-# CONFIG_OMAP_32K_TIMER is not set
-CONFIG_OMAP_LL_DEBUG_UART1=y
-# CONFIG_OMAP_LL_DEBUG_UART2 is not set
-# CONFIG_OMAP_LL_DEBUG_UART3 is not set
 CONFIG_OMAP_ARM_192MHZ=y
 # CONFIG_OMAP_ARM_168MHZ is not set
 # CONFIG_OMAP_ARM_120MHZ is not set
@@ -145,6 +156,7 @@ CONFIG_ARM_THUMB=y
 #
 # Bus support
 #
+CONFIG_ISA_DMA_API=y
 #
 # PCCARD (PCMCIA/CardBus) support
@@ -154,7 +166,16 @@ CONFIG_ARM_THUMB=y
 #
 # Kernel Features
 #
+# CONFIG_SMP is not set
 CONFIG_PREEMPT=y
+CONFIG_NO_IDLE_HZ=y
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_LEDS is not set
 CONFIG_ALIGNMENT_TRAP=y
@@ -167,6 +188,22 @@ CONFIG_CMDLINE="mem=32M console=ttyS0,115200n8 root=0801 ro init=/bin/sh"
 # CONFIG_XIP_KERNEL is not set
 #
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+# CONFIG_CPU_FREQ_DEBUG is not set
+CONFIG_CPU_FREQ_STAT=y
+# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
+#
 # Floating point emulation
 #
@@ -202,7 +239,6 @@ CONFIG_PM=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_FW_LOADER is not set
-CONFIG_DEBUG_DRIVER=y
 #
 # Memory Technology Devices (MTD)
@@ -292,7 +328,6 @@ CONFIG_MTD_CFI_UTIL=y
 #
 # Block devices
 #
-# CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -327,6 +362,7 @@ CONFIG_SCSI_PROC_FS=y
 # CONFIG_CHR_DEV_OSST is not set
 # CONFIG_BLK_DEV_SR is not set
 # CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -356,6 +392,7 @@ CONFIG_SCSI_PROC_FS=y
 #
 # Fusion MPT device support
 #
+# CONFIG_FUSION is not set
 #
 # IEEE 1394 (FireWire) support
@@ -375,12 +412,12 @@ CONFIG_NET=y
 #
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
-# CONFIG_NETLINK_DEV is not set
 CONFIG_UNIX=y
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
@@ -395,6 +432,8 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_TUNNEL is not set
 CONFIG_IP_TCPDIAG=y
 # CONFIG_IP_TCPDIAG_IPV6 is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
 # CONFIG_IPV6 is not set
 # CONFIG_NETFILTER is not set
@@ -442,6 +481,7 @@ CONFIG_NETDEVICES=y
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 CONFIG_SMC91X=y
+# CONFIG_DM9000 is not set
 #
 # Ethernet (1000 Mbit)
@@ -518,7 +558,6 @@ CONFIG_SERIO=y
 CONFIG_SERIO_SERPORT=y
 # CONFIG_SERIO_RAW is not set
 # CONFIG_GAMEPORT is not set
-CONFIG_SOUND_GAMEPORT=y
 #
 # Character devices
@@ -567,13 +606,11 @@ CONFIG_WATCHDOG_NOWAYOUT=y
 #
 # Ftape, the floppy tape device driver
 #
-# CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
 #
 # TPM devices
 #
-# CONFIG_TCG_TPM is not set
 #
 # I2C support
@@ -604,7 +641,9 @@ CONFIG_I2C_CHARDEV=y
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
 # CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
 # CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_DS1621 is not set
 # CONFIG_SENSORS_FSCHER is not set
 # CONFIG_SENSORS_FSCPOS is not set
@@ -620,6 +659,7 @@ CONFIG_I2C_CHARDEV=y
 # CONFIG_SENSORS_LM85 is not set
 # CONFIG_SENSORS_LM87 is not set
 # CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
@@ -627,15 +667,21 @@ CONFIG_I2C_CHARDEV=y
 # CONFIG_SENSORS_W83781D is not set
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
 #
 # Other I2C Chip support
 #
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_RTC8564 is not set
 CONFIG_ISP1301_OMAP=y
+CONFIG_TPS65010=y
+# CONFIG_SENSORS_MAX6875 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -663,8 +709,10 @@ CONFIG_FB=y
 # CONFIG_FB_CFB_COPYAREA is not set
 # CONFIG_FB_CFB_IMAGEBLIT is not set
 # CONFIG_FB_SOFT_CURSOR is not set
+# CONFIG_FB_MACMODES is not set
 CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_TILEBLITTING is not set
+# CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_VIRTUAL is not set
 #
@@ -677,11 +725,13 @@ CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
 # CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
 # CONFIG_FONT_PEARL_8x8 is not set
 # CONFIG_FONT_ACORN_8x8 is not set
 # CONFIG_FONT_MINI_4x6 is not set
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
 #
 # Logo configuration
@@ -729,14 +779,14 @@ CONFIG_USB_ARCH_HAS_OHCI=y
 #
 CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
+CONFIG_USB_GADGET_SELECTED=y
 # CONFIG_USB_GADGET_NET2280 is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
 # CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_SA1100 is not set
 # CONFIG_USB_GADGET_LH7A40X is not set
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
 CONFIG_USB_GADGET_OMAP=y
 CONFIG_USB_OMAP=y
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
 # CONFIG_USB_GADGET_DUALSPEED is not set
 # CONFIG_USB_ZERO is not set
 CONFIG_USB_ETH=y
@@ -755,6 +805,7 @@ CONFIG_USB_ETH_RNDIS=y
 #
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
 # CONFIG_EXT3_FS is not set
 # CONFIG_JBD is not set
 # CONFIG_REISERFS_FS is not set
@@ -791,7 +842,6 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 #
 CONFIG_PROC_FS=y
 CONFIG_SYSFS=y
-# CONFIG_DEVFS_FS is not set
 # CONFIG_DEVPTS_FS_XATTR is not set
 # CONFIG_TMPFS is not set
 # CONFIG_HUGETLB_PAGE is not set
@@ -828,12 +878,14 @@ CONFIG_CRAMFS=y
 #
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
 CONFIG_NFS_V4=y
 # CONFIG_NFS_DIRECTIO is not set
 # CONFIG_NFSD is not set
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
 CONFIG_RPCSEC_GSS_KRB5=y
@@ -903,24 +955,11 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
-CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_KERNEL is not set
-# CONFIG_MAGIC_SYSRQ is not set
 CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_DEBUG_SLAB is not set
-CONFIG_DEBUG_PREEMPT=y
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_FS is not set
 CONFIG_FRAME_POINTER=y
-CONFIG_DEBUG_USER=y
+# CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_WAITQ is not set
-CONFIG_DEBUG_ERRORS=y
-CONFIG_DEBUG_LL=y
-# CONFIG_DEBUG_ICEDCC is not set
 #
 # Security options
diff --git a/arch/arm/configs/omnimeter_defconfig b/arch/arm/configs/omnimeter_defconfig
deleted file mode 100644
index 78fdb4a428..0000000000
--- a/arch/arm/configs/omnimeter_defconfig
+++ /dev/null
@@ -1,803 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-rc1-bk2
-# Sun Mar 27 21:31:45 2005
-#
-CONFIG_ARM=y
-CONFIG_MMU=y
-CONFIG_UID16=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_IOMAP=y
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_CLEAN_COMPILE=y
-CONFIG_BROKEN_ON_SMP=y
-#
-# General setup
-#
-CONFIG_LOCALVERSION=""
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
-# CONFIG_AUDIT is not set
-CONFIG_HOTPLUG=y
-CONFIG_KOBJECT_UEVENT=y
-# CONFIG_IKCONFIG is not set
-# CONFIG_EMBEDDED is not set
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_SHMEM=y
-CONFIG_CC_ALIGN_FUNCTIONS=0
-CONFIG_CC_ALIGN_LABELS=0
-CONFIG_CC_ALIGN_LOOPS=0
-CONFIG_CC_ALIGN_JUMPS=0
-# CONFIG_TINY_SHMEM is not set
-CONFIG_BASE_SMALL=0
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-# CONFIG_MODULE_UNLOAD is not set
-CONFIG_OBSOLETE_MODPARM=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_KMOD=y
-#
-# System Type
-#
-# CONFIG_ARCH_CLPS7500 is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_CO285 is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_CAMELOT is not set
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP3XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_RPC is not set
-CONFIG_ARCH_SA1100=y
-# CONFIG_ARCH_S3C2410 is not set
-# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_H720X is not set
-#
-# SA11x0 Implementations
-#
-# CONFIG_SA1100_ASSABET is not set
-# CONFIG_SA1100_CERF is not set
-# CONFIG_SA1100_COLLIE is not set
-# CONFIG_SA1100_H3100 is not set
-# CONFIG_SA1100_H3600 is not set
-# CONFIG_SA1100_H3800 is not set
-# CONFIG_SA1100_BADGE4 is not set
-# CONFIG_SA1100_JORNADA720 is not set
-# CONFIG_SA1100_HACKKIT is not set
-# CONFIG_SA1100_LART is not set
-# CONFIG_SA1100_PLEB is not set
-# CONFIG_SA1100_SHANNON is not set
-# CONFIG_SA1100_SIMPAD is not set
-# CONFIG_SA1100_SSP is not set
-#
-# Processor Type
-#
-CONFIG_CPU_32=y
-CONFIG_CPU_SA1100=y
-CONFIG_CPU_32v4=y
-CONFIG_CPU_ABRT_EV4=y
-CONFIG_CPU_CACHE_V4WB=y
-CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_TLB_V4WB=y
-CONFIG_CPU_MINICACHE=y
-#
-# Processor Features
-#
-#
-# Bus support
-#
-CONFIG_ISA=y
-#
-# PCCARD (PCMCIA/CardBus) support
-#
-CONFIG_PCCARD=y
-# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_PCMCIA=y
-#
-# PC-card bridges
-#
-CONFIG_I82365=y
-# CONFIG_TCIC is not set
-CONFIG_PCMCIA_SA1100=y
-CONFIG_PCCARD_NONSTATIC=y
-#
-# Kernel Features
-#
-# CONFIG_PREEMPT is not set
-CONFIG_DISCONTIGMEM=y
-# CONFIG_LEDS is not set
-CONFIG_ALIGNMENT_TRAP=y
-#
-# Boot options
-#
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="keepinitrd mem=16M root=/dev/ram ramdisk=8192 initrd=0xd0000000,4M"
-# CONFIG_XIP_KERNEL is not set
-#
-# CPU Frequency scaling
-#
-# CONFIG_CPU_FREQ is not set
-#
-# Floating point emulation
-#
-#
-# At least one emulation must be selected
-#
-# CONFIG_FPE_NWFPE is not set
-# CONFIG_FPE_FASTFPE is not set
-#
-# Userspace binary formats
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_AOUT=y
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_ARTHUR is not set
-#
-# Power management options
-#
-# CONFIG_PM is not set
-#
-# Device Drivers
-#
-#
-# Generic Driver Options
-#
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_FW_LOADER is not set
-#
-# Memory Technology Devices (MTD)
-#
-# CONFIG_MTD is not set
-#
-# Parallel port support
-#
-# CONFIG_PARPORT is not set
-#
-# Plug and Play support
-#
-# CONFIG_PNP is not set
-#
-# Block devices
-#
-# CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_XD is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=m
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-CONFIG_BLK_DEV_NBD=m
-# CONFIG_BLK_DEV_RAM is not set
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_CDROM_PKTCDVD is not set
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_ATA_OVER_ETH is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
-# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_BLK_DEV_IDECS is not set
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=y
-# CONFIG_IDE_ARM is not set
-# CONFIG_IDE_CHIPSETS is not set
-# CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
-# CONFIG_BLK_DEV_HD is not set
-#
-# SCSI device support
-#
-# CONFIG_SCSI is not set
-#
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-#
-# Fusion MPT device support
-#
-#
-# IEEE 1394 (FireWire) support
-#
-#
-# I2O device support
-#
-#
-# Networking support
-#
-CONFIG_NET=y
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-# CONFIG_NETLINK_DEV is not set
-CONFIG_UNIX=y
-# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-# CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_MROUTE is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_TUNNEL is not set
-CONFIG_IP_TCPDIAG=y
-# CONFIG_IP_TCPDIAG_IPV6 is not set
-#
-# IP: Virtual Server Configuration
-#
-# CONFIG_IP_VS is not set
-# CONFIG_IPV6 is not set
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-#
-# IP: Netfilter Configuration
-#
-# CONFIG_IP_NF_CONNTRACK is not set
-# CONFIG_IP_NF_CONNTRACK_MARK is not set
-# CONFIG_IP_NF_QUEUE is not set
-# CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_ARPTABLES is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_SCTP is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-# CONFIG_NET_CLS_ROUTE is not set
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
-CONFIG_NETDEVICES=y
-# CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
-#
-# ARCnet devices
-#
-# CONFIG_ARCNET is not set
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-# CONFIG_MII is not set
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_LANCE is not set
-# CONFIG_NET_VENDOR_SMC is not set
-# CONFIG_SMC91X is not set
-# CONFIG_NET_VENDOR_RACAL is not set
-# CONFIG_AT1700 is not set
-# CONFIG_DEPCA is not set
-# CONFIG_HP100 is not set
-# CONFIG_NET_ISA is not set
-# CONFIG_NET_PCI is not set
-# CONFIG_NET_POCKET is not set
-#
-# Ethernet (1000 Mbit)
-#
-#
-# Ethernet (10000 Mbit)
-#
-#
-# Token Ring devices
-#
-# CONFIG_TR is not set
-#
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-#
-# Obsolete Wireless cards support (pre-802.11)
-#
-# CONFIG_STRIP is not set
-# CONFIG_ARLAN is not set
-# CONFIG_WAVELAN is not set
-CONFIG_PCMCIA_WAVELAN=y
-# CONFIG_PCMCIA_NETWAVE is not set
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
-# CONFIG_PCMCIA_RAYCS is not set
-#
-# Wireless 802.11b ISA/PCI cards support
-#
-# CONFIG_HERMES is not set
-# CONFIG_ATMEL is not set
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
-CONFIG_AIRO_CS=y
-CONFIG_PCMCIA_WL3501=y
-CONFIG_NET_WIRELESS=y
-#
-# PCMCIA network device support
-#
-CONFIG_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=y
-# CONFIG_PCMCIA_3C574 is not set
-# CONFIG_PCMCIA_FMVJ18X is not set
-CONFIG_PCMCIA_PCNET=y
-# CONFIG_PCMCIA_NMCLAN is not set
-# CONFIG_PCMCIA_SMC91C92 is not set
-# CONFIG_PCMCIA_XIRC2PS is not set
-# CONFIG_PCMCIA_AXNET is not set
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
-#
-# ISDN subsystem
-#
-# CONFIG_ISDN is not set
-#
-# Input device support
-#
-CONFIG_INPUT=y
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_EVBUG is not set
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=y
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_INPORT is not set
-# CONFIG_MOUSE_LOGIBM is not set
-# CONFIG_MOUSE_PC110PAD is not set
-# CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_SERIO_SERPORT=y
-CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_RAW is not set
-# CONFIG_GAMEPORT is not set
-CONFIG_SOUND_GAMEPORT=y
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_SERIAL_NONSTANDARD is not set
-#
-# Serial drivers
-#
-# CONFIG_SERIAL_8250 is not set
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_SA1100=y
-CONFIG_SERIAL_SA1100_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
-#
-# IPMI
-#
-# CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-# CONFIG_NVRAM is not set
-# CONFIG_RTC is not set
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-#
-# Ftape, the floppy tape device driver
-#
-# CONFIG_DRM is not set
-#
-# PCMCIA character devices
-#
-# CONFIG_SYNCLINK_CS is not set
-# CONFIG_RAW_DRIVER is not set
-#
-# TPM devices
-#
-# CONFIG_TCG_TPM is not set
-#
-# I2C support
-#
-# CONFIG_I2C is not set
-#
-# Misc devices
-#
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-#
-# Graphics support
-#
-CONFIG_FB=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SOFT_CURSOR=y
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-CONFIG_FB_SA1100=y
-# CONFIG_FB_VIRTUAL is not set
-#
-# Console display driver support
-#
-# CONFIG_VGA_CONSOLE is not set
-# CONFIG_MDA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-# CONFIG_FONT_8x16 is not set
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-#
-# Logo configuration
-#
-# CONFIG_LOGO is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-#
-# USB support
-#
-CONFIG_USB_ARCH_HAS_HCD=y
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-# CONFIG_USB is not set
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
-# CONFIG_MMC is not set
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_JBD is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-#
-# XFS support
-#
-# CONFIG_XFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_QUOTA is not set
-CONFIG_DNOTIFY=y
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-#
-# CD-ROM/DVD Filesystems
-#
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=y
-CONFIG_MSDOS_FS=y
-# CONFIG_VFAT_FS is not set
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-# CONFIG_NTFS_FS is not set
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_SYSFS=y
-# CONFIG_DEVFS_FS is not set
-# CONFIG_DEVPTS_FS_XATTR is not set
-# CONFIG_TMPFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-#
-# Network File Systems
-#
-CONFIG_NFS_FS=y
-# CONFIG_NFS_V3 is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
-# CONFIG_NFSD is not set
-CONFIG_LOCKD=y
-CONFIG_SUNRPC=y
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_CIFS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-#
-# Native Language Support
-#
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS_CODEPAGE_437 is not set
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ASCII is not set
-# CONFIG_NLS_ISO8859_1 is not set
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-#
-# Kernel hacking
-#
-# CONFIG_PRINTK_TIME is not set
-# CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_DEBUG_USER is not set
-#
-# Security options
-#
-# CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
-#
-# Cryptographic options
-#
-# CONFIG_CRYPTO is not set
-#
-# Hardware crypto devices
-#
-#
-# Library routines
-#
-# CONFIG_CRC_CCITT is not set
-CONFIG_CRC32=y
-# CONFIG_LIBCRC32C is not set
diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig
index 2a63fb2771..98b72ff388 100644
--- a/arch/arm/configs/s3c2410_defconfig
+++ b/arch/arm/configs/s3c2410_defconfig
@@ -1,14 +1,13 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-rc1-bk2
+# Linux kernel version: 2.6.12-git4
-# Sun Mar 27 17:47:45 2005
+# Wed Jun 22 15:56:42 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
 CONFIG_UID16=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_IOMAP=y
 #
 # Code maturity level options
@@ -17,6 +16,7 @@ CONFIG_EXPERIMENTAL=y
 # CONFIG_CLEAN_COMPILE is not set
 CONFIG_BROKEN=y
 CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
 #
 # General setup
@@ -35,6 +35,8 @@ CONFIG_KOBJECT_UEVENT=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_PRINTK=y
+CONFIG_BUG=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
@@ -81,6 +83,7 @@ CONFIG_ARCH_S3C2410=y
 # CONFIG_ARCH_VERSATILE is not set
 # CONFIG_ARCH_IMX is not set
 # CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_AAEC2000 is not set
 #
 # S3C24XX Implementations
@@ -134,6 +137,7 @@ CONFIG_CPU_TLB_V4WBI=y
 #
 # Bus support
 #
+CONFIG_ISA_DMA_API=y
 #
 # PCCARD (PCMCIA/CardBus) support
@@ -143,7 +147,9 @@ CONFIG_CPU_TLB_V4WBI=y
 #
 # Kernel Features
 #
+# CONFIG_SMP is not set
 # CONFIG_PREEMPT is not set
+# CONFIG_DISCONTIGMEM is not set
 CONFIG_ALIGNMENT_TRAP=y
 #
@@ -297,7 +303,6 @@ CONFIG_PARPORT_1284=y
 #
 # Block devices
 #
-# CONFIG_BLK_DEV_FD is not set
 # CONFIG_PARIDE is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
@@ -359,6 +364,7 @@ CONFIG_BLK_DEV_IDE_BAST=y
 #
 # Fusion MPT device support
 #
+# CONFIG_FUSION is not set
 #
 # IEEE 1394 (FireWire) support
@@ -378,10 +384,11 @@ CONFIG_NET=y
 # Networking options
 #
 # CONFIG_PACKET is not set
-# CONFIG_NETLINK_DEV is not set
 CONFIG_UNIX=y
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IP_PNP=y
@@ -443,8 +450,9 @@ CONFIG_NETDEVICES=y
 # Ethernet (10 or 100Mbit)
 #
 CONFIG_NET_ETHERNET=y
-# CONFIG_MII is not set
+CONFIG_MII=m
 # CONFIG_SMC91X is not set
+CONFIG_DM9000=m
 #
 # Ethernet (1000 Mbit)
@@ -521,7 +529,6 @@ CONFIG_SERIO_SERPORT=y
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_RAW is not set
 # CONFIG_GAMEPORT is not set
-CONFIG_SOUND_GAMEPORT=y
 #
 # Character devices
@@ -605,7 +612,6 @@ CONFIG_S3C2410_RTC=y
 #
 # TPM devices
 #
-# CONFIG_TCG_TPM is not set
 #
 # I2C support
@@ -654,6 +660,7 @@ CONFIG_SENSORS_LM78=m
 CONFIG_SENSORS_LM85=m
 # CONFIG_SENSORS_LM87 is not set
 # CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
@@ -665,6 +672,7 @@ CONFIG_SENSORS_LM85=m
 #
 # Other I2C Chip support
 #
+# CONFIG_SENSORS_DS1337 is not set
 CONFIG_SENSORS_EEPROM=m
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCF8591 is not set
@@ -696,8 +704,10 @@ CONFIG_FB=y
 # CONFIG_FB_CFB_COPYAREA is not set
 # CONFIG_FB_CFB_IMAGEBLIT is not set
 # CONFIG_FB_SOFT_CURSOR is not set
+# CONFIG_FB_MACMODES is not set
 CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_TILEBLITTING is not set
+# CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_VIRTUAL is not set
 #
@@ -782,7 +792,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 #
 CONFIG_PROC_FS=y
 CONFIG_SYSFS=y
-# CONFIG_DEVFS_FS is not set
 # CONFIG_DEVPTS_FS_XATTR is not set
 # CONFIG_TMPFS is not set
 # CONFIG_HUGETLBFS is not set
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index 4a2af55e13..3e1b0327e4 100644
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -6,7 +6,7 @@ AFLAGS_head.o := -DTEXTADDR=$(TEXTADDR) -DDATAADDR=$(DATAADDR)
 # Object file lists.
-obj-y           := arch.o compat.o dma.o entry-armv.o entry-common.o irq.o   \
+obj-y           := compat.o dma.o entry-armv.o entry-common.o irq.o \
                   process.o ptrace.o semaphore.o setup.o signal.o sys_arm.o \
                   time.o traps.o
diff --git a/arch/arm/kernel/arch.c b/arch/arm/kernel/arch.c
deleted file mode 100644
index 4e02fbeb10..0000000000
--- a/arch/arm/kernel/arch.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  linux/arch/arm/kernel/arch.c
- *
- *  Architecture specific fixups.
- */
-#include <linux/config.h>
-#include <linux/init.h>
-#include <linux/types.h>
-#include <asm/elf.h>
-#include <asm/page.h>
-#include <asm/setup.h>
-#include <asm/mach/arch.h>
-unsigned int vram_size;
-#ifdef CONFIG_ARCH_ACORN
-unsigned int memc_ctrl_reg;
-unsigned int number_mfm_drives;
-static int __init parse_tag_acorn(const struct tag *tag)
-{
-        memc_ctrl_reg = tag->u.acorn.memc_control_reg;
-        number_mfm_drives = tag->u.acorn.adfsdrives;
-        switch (tag->u.acorn.vram_pages) {
-        case 512:
-                vram_size += PAGE_SIZE * 256;
-        case 256:
-                vram_size += PAGE_SIZE * 256;
-        default:
-                break;
-        }
-#if 0
-        if (vram_size) {
-                desc->video_start = 0x02000000;
-                desc->video_end   = 0x02000000 + vram_size;
-        }
-#endif
-        return 0;
-}
-__tagtable(ATAG_ACORN, parse_tag_acorn);
-#endif
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
index 4c38bd8bc2..835d450797 100644
--- a/arch/arm/kernel/armksyms.c
+++ b/arch/arm/kernel/armksyms.c
@@ -30,9 +30,6 @@ extern void __lshrdi3(void);
 extern void __modsi3(void);
 extern void __muldi3(void);
 extern void __ucmpdi2(void);
-extern void __udivdi3(void);
-extern void __umoddi3(void);
-extern void __udivmoddi4(void);
 extern void __udivsi3(void);
 extern void __umodsi3(void);
 extern void __do_div64(void);
@@ -44,7 +41,10 @@ extern void fp_enter(void);
 * This has a special calling convention; it doesn't
 * modify any of the usual registers, except for LR.
 */
+#define EXPORT_CRC_ALIAS(sym) __CRC_SYMBOL(sym, "")
 #define EXPORT_SYMBOL_ALIAS(sym,orig)           \
+ EXPORT_CRC_ALIAS(sym)                          \
 const struct kernel_symbol __ksymtab_##sym     \
  __attribute__((section("__ksymtab"))) =       \
    { (unsigned long)&orig, #sym };
@@ -134,9 +134,6 @@ EXPORT_SYMBOL(__lshrdi3);
 EXPORT_SYMBOL(__modsi3);
 EXPORT_SYMBOL(__muldi3);
 EXPORT_SYMBOL(__ucmpdi2);
-EXPORT_SYMBOL(__udivdi3);
-EXPORT_SYMBOL(__umoddi3);
-EXPORT_SYMBOL(__udivmoddi4);
 EXPORT_SYMBOL(__udivsi3);
 EXPORT_SYMBOL(__umodsi3);
 EXPORT_SYMBOL(__do_div64);
diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c
index 3dc15b131f..6540db6913 100644
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
@@ -866,19 +866,19 @@ static struct expansion_card *__init ecard_alloc_card(int type, int slot)
        return ec;
 }
-static ssize_t ecard_show_irq(struct device *dev, char *buf)
+static ssize_t ecard_show_irq(struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct expansion_card *ec = ECARD_DEV(dev);
        return sprintf(buf, "%u\n", ec->irq);
 }
-static ssize_t ecard_show_dma(struct device *dev, char *buf)
+static ssize_t ecard_show_dma(struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct expansion_card *ec = ECARD_DEV(dev);
        return sprintf(buf, "%u\n", ec->dma);
 }
-static ssize_t ecard_show_resources(struct device *dev, char *buf)
+static ssize_t ecard_show_resources(struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct expansion_card *ec = ECARD_DEV(dev);
        char *str = buf;
@@ -893,19 +893,19 @@ static ssize_t ecard_show_resources(struct device *dev, char *buf)
        return str - buf;
 }
-static ssize_t ecard_show_vendor(struct device *dev, char *buf)
+static ssize_t ecard_show_vendor(struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct expansion_card *ec = ECARD_DEV(dev);
        return sprintf(buf, "%u\n", ec->cid.manufacturer);
 }
-static ssize_t ecard_show_device(struct device *dev, char *buf)
+static ssize_t ecard_show_device(struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct expansion_card *ec = ECARD_DEV(dev);
        return sprintf(buf, "%u\n", ec->cid.product);
 }
-static ssize_t ecard_show_type(struct device *dev, char *buf)
+static ssize_t ecard_show_type(struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct expansion_card *ec = ECARD_DEV(dev);
        return sprintf(buf, "%s\n", ec->type == ECARD_EASI ? "EASI" : "IOC");
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index e14278d598..39a6c1b0b9 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -24,48 +24,91 @@
 #include "entry-header.S"
 /*
+ * Interrupt handling.  Preserves r7, r8, r9
+ */
+        .macro  irq_handler
+1:      get_irqnr_and_base r0, r6, r5, lr
+        movne   r1, sp
+        @
+        @ routine called with r0 = irq number, r1 = struct pt_regs *
+        @
+        adrne   lr, 1b
+        bne     asm_do_IRQ
+#ifdef CONFIG_SMP
+        /*
+         * XXX
+         *
+         * this macro assumes that irqstat (r6) and base (r5) are
+         * preserved from get_irqnr_and_base above
+         */
+        test_for_ipi r0, r6, r5, lr
+        movne   r0, sp
+        adrne   lr, 1b
+        bne     do_IPI
+#endif
+        .endm
+/*
 * Invalid mode handlers
 */
-        .macro  inv_entry, sym, reason
+        .macro  inv_entry, reason
-        sub     sp, sp, #S_FRAME_SIZE           @ Allocate frame size in one go
+        sub     sp, sp, #S_FRAME_SIZE
-        stmia   sp, {r0 - lr}                   @ Save XXX r0 - lr
+        stmib   sp, {r1 - lr}
-        ldr     r4, .LC\sym
        mov     r1, #\reason
        .endm
 __pabt_invalid:
-        inv_entry abt, BAD_PREFETCH
+        inv_entry BAD_PREFETCH
-        b       1f
+        b       common_invalid
 __dabt_invalid:
-        inv_entry abt, BAD_DATA
+        inv_entry BAD_DATA
-        b       1f
+        b       common_invalid
 __irq_invalid:
-        inv_entry irq, BAD_IRQ
+        inv_entry BAD_IRQ
-        b       1f
+        b       common_invalid
 __und_invalid:
-        inv_entry und, BAD_UNDEFINSTR
+        inv_entry BAD_UNDEFINSTR
+        @
+        @ XXX fall through to common_invalid
+        @
+@
+@ common_invalid - generic code for failed exception (re-entrant version of handlers)
+@
+common_invalid:
+        zero_fp
+        ldmia   r0, {r4 - r6}
+        add     r0, sp, #S_PC           @ here for interlock avoidance
+        mov     r7, #-1                 @  ""   ""    ""        ""
+        str     r4, [sp]                @ save preserved r0
+        stmia   r0, {r5 - r7}           @ lr_<exception>,
+                                        @ cpsr_<exception>, "old_r0"
-1:      zero_fp
-        ldmia   r4, {r5 - r7}                   @ Get XXX pc, cpsr, old_r0
-        add     r4, sp, #S_PC
-        stmia   r4, {r5 - r7}                   @ Save XXX pc, cpsr, old_r0
        mov     r0, sp
-        and     r2, r6, #31                     @ int mode
+        and     r2, r6, #0x1f
        b       bad_mode
 /*
 * SVC mode handlers
 */
-        .macro  svc_entry, sym
+        .macro  svc_entry
        sub     sp, sp, #S_FRAME_SIZE
-        stmia   sp, {r0 - r12}                  @ save r0 - r12
+        stmib   sp, {r1 - r12}
-        ldr     r2, .LC\sym
-        add     r0, sp, #S_FRAME_SIZE
+        ldmia   r0, {r1 - r3}
-        ldmia   r2, {r2 - r4}                   @ get pc, cpsr
+        add     r5, sp, #S_SP           @ here for interlock avoidance
-        add     r5, sp, #S_SP
+        mov     r4, #-1                 @  ""  ""      ""       ""
+        add     r0, sp, #S_FRAME_SIZE   @  ""  ""      ""       ""
+        str     r1, [sp]                @ save the "real" r0 copied
+                                        @ from the exception stack
        mov     r1, lr
        @
@@ -82,7 +125,7 @@ __und_invalid:
        .align  5
 __dabt_svc:
-        svc_entry abt
+        svc_entry
        @
        @ get ready to re-enable interrupts if appropriate
@@ -129,28 +172,24 @@ __dabt_svc:
        .align  5
 __irq_svc:
-        svc_entry irq
+        svc_entry
 #ifdef CONFIG_PREEMPT
-        get_thread_info r8
+        get_thread_info tsk
-        ldr     r9, [r8, #TI_PREEMPT]           @ get preempt count
+        ldr     r8, [tsk, #TI_PREEMPT]          @ get preempt count
-        add     r7, r9, #1                      @ increment it
+        add     r7, r8, #1                      @ increment it
-        str     r7, [r8, #TI_PREEMPT]
+        str     r7, [tsk, #TI_PREEMPT]
 #endif
-1:      get_irqnr_and_base r0, r6, r5, lr
-        movne   r1, sp
+        irq_handler
-        @
-        @ routine called with r0 = irq number, r1 = struct pt_regs *
-        @
-        adrne   lr, 1b
-        bne     asm_do_IRQ
 #ifdef CONFIG_PREEMPT
-        ldr     r0, [r8, #TI_FLAGS]             @ get flags
+        ldr     r0, [tsk, #TI_FLAGS]            @ get flags
        tst     r0, #_TIF_NEED_RESCHED
        blne    svc_preempt
 preempt_return:
-        ldr     r0, [r8, #TI_PREEMPT]           @ read preempt value
+        ldr     r0, [tsk, #TI_PREEMPT]          @ read preempt value
+        str     r8, [tsk, #TI_PREEMPT]          @ restore preempt count
        teq     r0, r7
-        str     r9, [r8, #TI_PREEMPT]           @ restore preempt count
        strne   r0, [r0, -r0]                   @ bug()
 #endif
        ldr     r0, [sp, #S_PSR]                @ irqs are already disabled
@@ -161,7 +200,7 @@ preempt_return:
 #ifdef CONFIG_PREEMPT
 svc_preempt:
-        teq     r9, #0                          @ was preempt count = 0
+        teq     r8, #0                          @ was preempt count = 0
        ldreq   r6, .LCirq_stat
        movne   pc, lr                          @ no
        ldr     r0, [r6, #4]                    @ local_irq_count
@@ -169,9 +208,9 @@ svc_preempt:
        adds    r0, r0, r1
        movne   pc, lr
        mov     r7, #0                          @ preempt_schedule_irq
-        str     r7, [r8, #TI_PREEMPT]           @ expects preempt_count == 0
+        str     r7, [tsk, #TI_PREEMPT]          @ expects preempt_count == 0
 1:      bl      preempt_schedule_irq            @ irq en/disable is done inside
-        ldr     r0, [r8, #TI_FLAGS]             @ get new tasks TI_FLAGS
+        ldr     r0, [tsk, #TI_FLAGS]            @ get new tasks TI_FLAGS
        tst     r0, #_TIF_NEED_RESCHED
        beq     preempt_return                  @ go again
        b       1b
@@ -179,7 +218,7 @@ svc_preempt:
        .align  5
 __und_svc:
-        svc_entry und
+        svc_entry
        @
        @ call emulation code, which returns using r9 if it has emulated
@@ -209,7 +248,7 @@ __und_svc:
        .align  5
 __pabt_svc:
-        svc_entry abt
+        svc_entry
        @
        @ re-enable interrupts if appropriate
@@ -242,12 +281,8 @@ __pabt_svc:
        ldmia   sp, {r0 - pc}^                  @ load r0 - pc, cpsr
        .align  5
-.LCirq:
+.LCcralign:
-        .word   __temp_irq
+        .word   cr_alignment
-.LCund:
-        .word   __temp_und
-.LCabt:
-        .word   __temp_abt
 #ifdef MULTI_ABORT
 .LCprocfns:
        .word   processor
@@ -262,12 +297,16 @@ __pabt_svc:
 /*
 * User mode handlers
 */
-        .macro  usr_entry, sym
+        .macro  usr_entry
-        sub     sp, sp, #S_FRAME_SIZE           @ Allocate frame size in one go
+        sub     sp, sp, #S_FRAME_SIZE
-        stmia   sp, {r0 - r12}                  @ save r0 - r12
+        stmib   sp, {r1 - r12}
-        ldr     r7, .LC\sym
-        add     r5, sp, #S_PC
+        ldmia   r0, {r1 - r3}
-        ldmia   r7, {r2 - r4}                   @ Get USR pc, cpsr
+        add     r0, sp, #S_PC           @ here for interlock avoidance
+        mov     r4, #-1                 @  ""  ""     ""        ""
+        str     r1, [sp]                @ save the "real" r0 copied
+                                        @ from the exception stack
 #if __LINUX_ARM_ARCH__ < 6 && !defined(CONFIG_NEEDS_SYSCALL_FOR_CMPXCHG)
        @ make sure our user space atomic helper is aborted
@@ -284,13 +323,13 @@ __pabt_svc:
        @
        @ Also, separately save sp_usr and lr_usr
        @
-        stmia   r5, {r2 - r4}
+        stmia   r0, {r2 - r4}
-        stmdb   r5, {sp, lr}^
+        stmdb   r0, {sp, lr}^
        @
        @ Enable the alignment trap while in kernel mode
        @
-        alignment_trap r7, r0, __temp_\sym
+        alignment_trap r0
        @
        @ Clear FP to mark the first stack frame
@@ -300,7 +339,7 @@ __pabt_svc:
        .align  5
 __dabt_usr:
-        usr_entry abt
+        usr_entry
        @
        @ Call the processor-specific abort handler:
@@ -329,30 +368,23 @@ __dabt_usr:
        .align  5
 __irq_usr:
-        usr_entry irq
+        usr_entry
+        get_thread_info tsk
 #ifdef CONFIG_PREEMPT
-        get_thread_info r8
+        ldr     r8, [tsk, #TI_PREEMPT]          @ get preempt count
-        ldr     r9, [r8, #TI_PREEMPT]           @ get preempt count
+        add     r7, r8, #1                      @ increment it
-        add     r7, r9, #1                      @ increment it
+        str     r7, [tsk, #TI_PREEMPT]
-        str     r7, [r8, #TI_PREEMPT]
 #endif
-1:      get_irqnr_and_base r0, r6, r5, lr
-        movne   r1, sp
+        irq_handler
-        adrne   lr, 1b
-        @
-        @ routine called with r0 = irq number, r1 = struct pt_regs *
-        @
-        bne     asm_do_IRQ
 #ifdef CONFIG_PREEMPT
-        ldr     r0, [r8, #TI_PREEMPT]
+        ldr     r0, [tsk, #TI_PREEMPT]
+        str     r8, [tsk, #TI_PREEMPT]
        teq     r0, r7
-        str     r9, [r8, #TI_PREEMPT]
        strne   r0, [r0, -r0]
-        mov     tsk, r8
-#else
-        get_thread_info tsk
 #endif
        mov     why, #0
        b       ret_to_user
@@ -360,7 +392,7 @@ __irq_usr:
        .align  5
 __und_usr:
-        usr_entry und
+        usr_entry
        tst     r3, #PSR_T_BIT                  @ Thumb mode?
        bne     fpundefinstr                    @ ignore FP
@@ -476,7 +508,7 @@ fpundefinstr:
        .align  5
 __pabt_usr:
-        usr_entry abt
+        usr_entry
        enable_irq                              @ Enable interrupts
        mov     r0, r2                          @ address (pc)
@@ -741,29 +773,41 @@ __kuser_helper_end:
 *
 * Common stub entry macro:
 *   Enter in IRQ mode, spsr = SVC/USR CPSR, lr = SVC/USR PC
+ *
+ * SP points to a minimal amount of processor-private memory, the address
+ * of which is copied into r0 for the mode specific abort handler.
 */
-        .macro  vector_stub, name, sym, correction=0
+        .macro  vector_stub, name, correction=0
        .align  5
 vector_\name:
-        ldr     r13, .LCs\sym
        .if \correction
        sub     lr, lr, #\correction
        .endif
-        str     lr, [r13]                       @ save lr_IRQ
+        @
+        @ Save r0, lr_<exception> (parent PC) and spsr_<exception>
+        @ (parent CPSR)
+        @
+        stmia   sp, {r0, lr}            @ save r0, lr
        mrs     lr, spsr
-        str     lr, [r13, #4]                   @ save spsr_IRQ
+        str     lr, [sp, #8]            @ save spsr
        @
-        @ now branch to the relevant MODE handling routine
+        @ Prepare for SVC32 mode.  IRQs remain disabled.
        @
-        mrs     r13, cpsr
+        mrs     r0, cpsr
-        bic     r13, r13, #MODE_MASK
+        bic     r0, r0, #MODE_MASK
-        orr     r13, r13, #SVC_MODE
+        orr     r0, r0, #SVC_MODE
-        msr     spsr_cxsf, r13                  @ switch to SVC_32 mode
+        msr     spsr_cxsf, r0
-        and     lr, lr, #15
+        @
+        @ the branch table must immediately follow this code
+        @
+        mov     r0, sp
+        and     lr, lr, #0x0f
        ldr     lr, [pc, lr, lsl #2]
-        movs    pc, lr                          @ Changes mode and branches
+        movs    pc, lr                  @ branch to handler in SVC mode
        .endm
        .globl  __stubs_start
@@ -771,7 +815,7 @@ __stubs_start:
 /*
 * Interrupt dispatcher
 */
-        vector_stub     irq, irq, 4
+        vector_stub     irq, 4
        .long   __irq_usr                       @  0  (USR_26 / USR_32)
        .long   __irq_invalid                   @  1  (FIQ_26 / FIQ_32)
@@ -794,7 +838,7 @@ __stubs_start:
 * Data abort dispatcher
 * Enter in ABT mode, spsr = USR CPSR, lr = USR PC
 */
-        vector_stub     dabt, abt, 8
+        vector_stub     dabt, 8
        .long   __dabt_usr                      @  0  (USR_26 / USR_32)
        .long   __dabt_invalid                  @  1  (FIQ_26 / FIQ_32)
@@ -817,7 +861,7 @@ __stubs_start:
 * Prefetch abort dispatcher
 * Enter in ABT mode, spsr = USR CPSR, lr = USR PC
 */
-        vector_stub     pabt, abt, 4
+        vector_stub     pabt, 4
        .long   __pabt_usr                      @  0 (USR_26 / USR_32)
        .long   __pabt_invalid                  @  1 (FIQ_26 / FIQ_32)
@@ -840,7 +884,7 @@ __stubs_start:
 * Undef instr entry dispatcher
 * Enter in UND mode, spsr = SVC/USR CPSR, lr = SVC/USR PC
 */
-        vector_stub     und, und
+        vector_stub     und
        .long   __und_usr                       @  0 (USR_26 / USR_32)
        .long   __und_invalid                   @  1 (FIQ_26 / FIQ_32)
@@ -894,13 +938,6 @@ vector_addrexcptn:
 .LCvswi:
        .word   vector_swi
-.LCsirq:
-        .word   __temp_irq
-.LCsund:
-        .word   __temp_und
-.LCsabt:
-        .word   __temp_abt
        .globl  __stubs_end
 __stubs_end:
@@ -922,23 +959,6 @@ __vectors_end:
        .data
-/*
- * Do not reorder these, and do not insert extra data between...
- */
-__temp_irq:
-        .word   0                               @ saved lr_irq
-        .word   0                               @ saved spsr_irq
-        .word   -1                              @ old_r0
-__temp_und:
-        .word   0                               @ Saved lr_und
-        .word   0                               @ Saved spsr_und
-        .word   -1                              @ old_r0
-__temp_abt:
-        .word   0                               @ Saved lr_abt
-        .word   0                               @ Saved spsr_abt
-        .word   -1                              @ old_r0
        .globl  cr_alignment
        .globl  cr_no_alignment
 cr_alignment:
diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
index a3d40a0e2b..afef212739 100644
--- a/arch/arm/kernel/entry-header.S
+++ b/arch/arm/kernel/entry-header.S
@@ -59,11 +59,10 @@
        mov     \rd, \rd, lsl #13
        .endm
-        .macro  alignment_trap, rbase, rtemp, sym
+        .macro  alignment_trap, rtemp
 #ifdef CONFIG_ALIGNMENT_TRAP
-#define OFF_CR_ALIGNMENT(x)     cr_alignment - x
+        ldr     \rtemp, .LCcralign
+        ldr     \rtemp, [\rtemp]
-        ldr     \rtemp, [\rbase, #OFF_CR_ALIGNMENT(\sym)]
        mcr     p15, 0, \rtemp, c1, c0
 #endif
        .endm
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 4733877296..1155cf07c8 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -2,6 +2,8 @@
 *  linux/arch/arm/kernel/head.S
 *
 *  Copyright (C) 1994-2002 Russell King
+ *  Copyright (c) 2003 ARM Limited
+ *  All Rights Reserved
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
@@ -165,6 +167,48 @@ __mmap_switched:
        stmia   r6, {r0, r4}                    @ Save control register values
        b       start_kernel
+#if defined(CONFIG_SMP)
+        .type   secondary_startup, #function
+ENTRY(secondary_startup)
+        /*
+         * Common entry point for secondary CPUs.
+         *
+         * Ensure that we're in SVC mode, and IRQs are disabled.  Lookup
+         * the processor type - there is no need to check the machine type
+         * as it has already been validated by the primary processor.
+         */
+        msr     cpsr_c, #PSR_F_BIT | PSR_I_BIT | MODE_SVC
+        bl      __lookup_processor_type
+        movs    r10, r5                         @ invalid processor?
+        moveq   r0, #'p'                        @ yes, error 'p'
+        beq     __error
+        /*
+         * Use the page tables supplied from  __cpu_up.
+         */
+        adr     r4, __secondary_data
+        ldmia   r4, {r5, r6, r13}               @ address to jump to after
+        sub     r4, r4, r5                      @ mmu has been enabled
+        ldr     r4, [r6, r4]                    @ get secondary_data.pgdir
+        adr     lr, __enable_mmu                @ return address
+        add     pc, r10, #12                    @ initialise processor
+                                                @ (return control reg)
+        /*
+         * r6  = &secondary_data
+         */
+ENTRY(__secondary_switched)
+        ldr     sp, [r6, #4]                    @ get secondary_data.stack
+        mov     fp, #0
+        b       secondary_start_kernel
+        .type   __secondary_data, %object
+__secondary_data:
+        .long   .
+        .long   secondary_data
+        .long   __secondary_switched
+#endif /* defined(CONFIG_SMP) */
 /*
@@ -300,9 +344,9 @@ __create_page_tables:
        str     r6, [r0]
 #endif
+#ifdef CONFIG_DEBUG_LL
        bic     r7, r7, #0x0c                   @ turn off cacheable
                                                @ and bufferable bits
-#ifdef CONFIG_DEBUG_LL
        /*
         * Map in IO space for serial debugging.
         * This allows debug messages to be output
@@ -328,28 +372,24 @@ __create_page_tables:
        teq     r1, #MACH_TYPE_NETWINDER
        teqne   r1, #MACH_TYPE_CATS
        bne     1f
-        add     r0, r4, #0x3fc0                 @ ff000000
+        add     r0, r4, #0xff000000 >> 18
-        mov     r3, #0x7c000000
+        orr     r3, r7, #0x7c000000
-        orr     r3, r3, r7
+        str     r3, [r0]
-        str     r3, [r0], #4
-        add     r3, r3, #1 << 20
-        str     r3, [r0], #4
 1:
 #endif
-#endif
 #ifdef CONFIG_ARCH_RPC
        /*
         * Map in screen at 0x02000000 & SCREEN2_BASE
         * Similar reasons here - for debug.  This is
         * only for Acorn RiscPC architectures.
         */
-        add     r0, r4, #0x80                   @ 02000000
+        add     r0, r4, #0x02000000 >> 18
-        mov     r3, #0x02000000
+        orr     r3, r7, #0x02000000
-        orr     r3, r3, r7
        str     r3, [r0]
-        add     r0, r4, #0x3600                 @ d8000000
+        add     r0, r4, #0xd8000000 >> 18
        str     r3, [r0]
 #endif
+#endif
        mov     pc, lr
        .ltorg
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index ff187f4308..395137a8fa 100644
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
@@ -4,6 +4,10 @@
 *  Copyright (C) 1992 Linus Torvalds
 *  Modifications for ARM processor Copyright (C) 1995-2000 Russell King.
 *
+ *  Support for Dynamic Tick Timer Copyright (C) 2004-2005 Nokia Corporation.
+ *  Dynamic Tick Timer written by Tony Lindgren <tony@atomide.com> and
+ *  Tuukka Tikkanen <tuukka.tikkanen@elektrobit.com>.
+ *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation.
@@ -37,6 +41,7 @@
 #include <asm/irq.h>
 #include <asm/system.h>
 #include <asm/mach/irq.h>
+#include <asm/mach/time.h>
 /*
 * Maximum IRQ count.  Currently, this is arbitary.  However, it should
@@ -329,6 +334,15 @@ __do_irq(unsigned int irq, struct irqaction *action, struct pt_regs *regs)
        spin_unlock(&irq_controller_lock);
+#ifdef CONFIG_NO_IDLE_HZ
+        if (!(action->flags & SA_TIMER) && system_timer->dyn_tick != NULL) {
+                write_seqlock(&xtime_lock);
+                if (system_timer->dyn_tick->state & DYN_TICK_ENABLED)
+                        system_timer->dyn_tick->handler(irq, 0, regs);
+                write_sequnlock(&xtime_lock);
+        }
+#endif
        if (!(action->flags & SA_INTERRUPT))
                local_irq_enable();
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 8f146a4b47..bbea636ff6 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -32,6 +32,7 @@
 #include <asm/leds.h>
 #include <asm/processor.h>
 #include <asm/uaccess.h>
+#include <asm/mach/time.h>
 extern const char *processor_modes[];
 extern void setup_mm_for_reboot(char mode);
@@ -85,8 +86,10 @@ EXPORT_SYMBOL(pm_power_off);
 void default_idle(void)
 {
        local_irq_disable();
-        if (!need_resched() && !hlt_counter)
+        if (!need_resched() && !hlt_counter) {
+                timer_dyn_reprogram();
                arch_idle();
+        }
        local_irq_enable();
 }
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index c2a7da3ac0..c9b69771f9 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -92,6 +92,14 @@ struct cpu_user_fns cpu_user;
 struct cpu_cache_fns cpu_cache;
 #endif
+struct stack {
+        u32 irq[3];
+        u32 abt[3];
+        u32 und[3];
+} ____cacheline_aligned;
+static struct stack stacks[NR_CPUS];
 char elf_platform[ELF_PLATFORM_SIZE];
 EXPORT_SYMBOL(elf_platform);
@@ -307,8 +315,6 @@ static void __init setup_processor(void)
               cpu_name, processor_id, (int)processor_id & 15,
               proc_arch[cpu_architecture()]);
-        dump_cpu_info(smp_processor_id());
        sprintf(system_utsname.machine, "%s%c", list->arch_name, ENDIANNESS);
        sprintf(elf_platform, "%s%c", list->elf_name, ENDIANNESS);
        elf_hwcap = list->elf_hwcap;
@@ -316,6 +322,47 @@ static void __init setup_processor(void)
        cpu_proc_init();
 }
+/*
+ * cpu_init - initialise one CPU.
+ *
+ * cpu_init dumps the cache information, initialises SMP specific
+ * information, and sets up the per-CPU stacks.
+ */
+void cpu_init(void)
+{
+        unsigned int cpu = smp_processor_id();
+        struct stack *stk = &stacks[cpu];
+        if (cpu >= NR_CPUS) {
+                printk(KERN_CRIT "CPU%u: bad primary CPU number\n", cpu);
+                BUG();
+        }
+        dump_cpu_info(cpu);
+        /*
+         * setup stacks for re-entrant exception handlers
+         */
+        __asm__ (
+        "msr    cpsr_c, %1\n\t"
+        "add    sp, %0, %2\n\t"
+        "msr    cpsr_c, %3\n\t"
+        "add    sp, %0, %4\n\t"
+        "msr    cpsr_c, %5\n\t"
+        "add    sp, %0, %6\n\t"
+        "msr    cpsr_c, %7"
+            :
+            : "r" (stk),
+              "I" (PSR_F_BIT | PSR_I_BIT | IRQ_MODE),
+              "I" (offsetof(struct stack, irq[0])),
+              "I" (PSR_F_BIT | PSR_I_BIT | ABT_MODE),
+              "I" (offsetof(struct stack, abt[0])),
+              "I" (PSR_F_BIT | PSR_I_BIT | UND_MODE),
+              "I" (offsetof(struct stack, und[0])),
+              "I" (PSR_F_BIT | PSR_I_BIT | SVC_MODE)
+            : "r14");
+}
 static struct machine_desc * __init setup_machine(unsigned int nr)
 {
        struct machine_desc *list;
@@ -349,6 +396,20 @@ static void __init early_initrd(char **p)
 }
 __early_param("initrd=", early_initrd);
+static void __init add_memory(unsigned long start, unsigned long size)
+{
+        /*
+         * Ensure that start/size are aligned to a page boundary.
+         * Size is appropriately rounded down, start is rounded up.
+         */
+        size -= start & ~PAGE_MASK;
+        meminfo.bank[meminfo.nr_banks].start = PAGE_ALIGN(start);
+        meminfo.bank[meminfo.nr_banks].size  = size & PAGE_MASK;
+        meminfo.bank[meminfo.nr_banks].node  = PHYS_TO_NID(start);
+        meminfo.nr_banks += 1;
+}
 /*
 * Pick out the memory size.  We look for mem=size@start,
 * where start and size are "size[KkMm]"
@@ -373,10 +434,7 @@ static void __init early_mem(char **p)
        if (**p == '@')
                start = memparse(*p + 1, p);
-        meminfo.bank[meminfo.nr_banks].start = start;
+        add_memory(start, size);
-        meminfo.bank[meminfo.nr_banks].size  = size;
-        meminfo.bank[meminfo.nr_banks].node  = PHYS_TO_NID(start);
-        meminfo.nr_banks += 1;
 }
 __early_param("mem=", early_mem);
@@ -518,11 +576,7 @@ static int __init parse_tag_mem32(const struct tag *tag)
                        tag->u.mem.start, tag->u.mem.size / 1024);
                return -EINVAL;
        }
-        meminfo.bank[meminfo.nr_banks].start = tag->u.mem.start;
+        add_memory(tag->u.mem.start, tag->u.mem.size);
-        meminfo.bank[meminfo.nr_banks].size  = tag->u.mem.size;
-        meminfo.bank[meminfo.nr_banks].node  = PHYS_TO_NID(tag->u.mem.start);
-        meminfo.nr_banks += 1;
        return 0;
 }
@@ -683,8 +737,8 @@ void __init setup_arch(char **cmdline_p)
        if (mdesc->soft_reboot)
                reboot_setup("s");
-        if (mdesc->param_offset)
+        if (mdesc->boot_params)
-                tags = phys_to_virt(mdesc->param_offset);
+                tags = phys_to_virt(mdesc->boot_params);
        /*
         * If we have the old style parameters, convert them to
@@ -715,6 +769,8 @@ void __init setup_arch(char **cmdline_p)
        paging_init(&meminfo, mdesc);
        request_standard_resources(&meminfo, mdesc);
+        cpu_init();
        /*
         * Set up various architecture-specific pointers
         */
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index 931919fd51..5e435e42da 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -19,6 +19,7 @@
 #include <asm/unistd.h>
 #include "ptrace.h"
+#include "signal.h"
 #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
@@ -35,7 +36,7 @@
 #define SWI_THUMB_SIGRETURN     (0xdf00 << 16 | 0x2700 | (__NR_sigreturn - __NR_SYSCALL_BASE))
 #define SWI_THUMB_RT_SIGRETURN  (0xdf00 << 16 | 0x2700 | (__NR_rt_sigreturn - __NR_SYSCALL_BASE))
-static const unsigned long retcodes[4] = {
+const unsigned long sigreturn_codes[4] = {
        SWI_SYS_SIGRETURN,      SWI_THUMB_SIGRETURN,
        SWI_SYS_RT_SIGRETURN,   SWI_THUMB_RT_SIGRETURN
 };
@@ -500,17 +501,25 @@ setup_return(struct pt_regs *regs, struct k_sigaction *ka,
                if (ka->sa.sa_flags & SA_SIGINFO)
                        idx += 2;
-                if (__put_user(retcodes[idx], rc))
+                if (__put_user(sigreturn_codes[idx], rc))
                        return 1;
-                /*
+                if (cpsr & MODE32_BIT) {
-                 * Ensure that the instruction cache sees
+                        /*
-                 * the return code written onto the stack.
+                         * 32-bit code can use the new high-page
-                 */
+                         * signal return code support.
-                flush_icache_range((unsigned long)rc,
+                         */
-                                   (unsigned long)(rc + 1));
+                        retcode = KERN_SIGRETURN_CODE + (idx << 2) + thumb;
+                } else {
-                retcode = ((unsigned long)rc) + thumb;
+                        /*
+                         * Ensure that the instruction cache sees
+                         * the return code written onto the stack.
+                         */
+                        flush_icache_range((unsigned long)rc,
+                                           (unsigned long)(rc + 1));
+                        retcode = ((unsigned long)rc) + thumb;
+                }
        }
        regs->ARM_r0 = usig;
@@ -688,7 +697,7 @@ static int do_signal(sigset_t *oldset, struct pt_regs *regs, int syscall)
        if (!user_mode(regs))
                return 0;
-        if (try_to_freeze(0))
+        if (try_to_freeze())
                goto no_signal;
        if (current->ptrace & PT_SINGLESTEP)
diff --git a/arch/arm/kernel/signal.h b/arch/arm/kernel/signal.h
new file mode 100644
index 0000000000..91d26faca6
--- /dev/null
+++ b/arch/arm/kernel/signal.h
@@ -0,0 +1,12 @@
+/*
+ *  linux/arch/arm/kernel/signal.h
+ *
+ *  Copyright (C) 2005 Russell King.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#define KERN_SIGRETURN_CODE     0xffff0500
+extern const unsigned long sigreturn_codes[4];
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index ecc8c33324..a931409c8f 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -24,6 +24,9 @@
 #include <asm/atomic.h>
 #include <asm/cacheflush.h>
 #include <asm/cpu.h>
+#include <asm/mmu_context.h>
+#include <asm/pgtable.h>
+#include <asm/pgalloc.h>
 #include <asm/processor.h>
 #include <asm/tlbflush.h>
 #include <asm/ptrace.h>
@@ -37,6 +40,13 @@ cpumask_t cpu_present_mask;
 cpumask_t cpu_online_map;
 /*
+ * as from 2.5, kernels no longer have an init_tasks structure
+ * so we need some other way of telling a new secondary core
+ * where to place its SVC stack
+ */
+struct secondary_data secondary_data;
+/*
 * structures for inter-processor calls
 * - A collection of single bit ipi messages.
 */
@@ -71,6 +81,8 @@ static DEFINE_SPINLOCK(smp_call_function_lock);
 int __init __cpu_up(unsigned int cpu)
 {
        struct task_struct *idle;
+        pgd_t *pgd;
+        pmd_t *pmd;
        int ret;
        /*
@@ -84,11 +96,57 @@ int __init __cpu_up(unsigned int cpu)
        }
        /*
+         * Allocate initial page tables to allow the new CPU to
+         * enable the MMU safely.  This essentially means a set
+         * of our "standard" page tables, with the addition of
+         * a 1:1 mapping for the physical address of the kernel.
+         */
+        pgd = pgd_alloc(&init_mm);
+        pmd = pmd_offset(pgd, PHYS_OFFSET);
+        *pmd = __pmd((PHYS_OFFSET & PGDIR_MASK) |
+                     PMD_TYPE_SECT | PMD_SECT_AP_WRITE);
+        /*
+         * We need to tell the secondary core where to find
+         * its stack and the page tables.
+         */
+        secondary_data.stack = (void *)idle->thread_info + THREAD_SIZE - 8;
+        secondary_data.pgdir = virt_to_phys(pgd);
+        wmb();
+        /*
         * Now bring the CPU into our world.
         */
        ret = boot_secondary(cpu, idle);
+        if (ret == 0) {
+                unsigned long timeout;
+                /*
+                 * CPU was successfully started, wait for it
+                 * to come online or time out.
+                 */
+                timeout = jiffies + HZ;
+                while (time_before(jiffies, timeout)) {
+                        if (cpu_online(cpu))
+                                break;
+                        udelay(10);
+                        barrier();
+                }
+                if (!cpu_online(cpu))
+                        ret = -EIO;
+        }
+        secondary_data.stack = 0;
+        secondary_data.pgdir = 0;
+        *pmd_offset(pgd, PHYS_OFFSET) = __pmd(0);
+        pgd_free(pgd);
        if (ret) {
-                printk(KERN_CRIT "cpu_up: processor %d failed to boot\n", cpu);
+                printk(KERN_CRIT "CPU%u: processor failed to boot\n", cpu);
                /*
                 * FIXME: We need to clean up the new idle thread. --rmk
                 */
@@ -98,6 +156,56 @@ int __init __cpu_up(unsigned int cpu)
 }
 /*
+ * This is the secondary CPU boot entry.  We're using this CPUs
+ * idle thread stack, but a set of temporary page tables.
+ */
+asmlinkage void __init secondary_start_kernel(void)
+{
+        struct mm_struct *mm = &init_mm;
+        unsigned int cpu = smp_processor_id();
+        printk("CPU%u: Booted secondary processor\n", cpu);
+        /*
+         * All kernel threads share the same mm context; grab a
+         * reference and switch to it.
+         */
+        atomic_inc(&mm->mm_users);
+        atomic_inc(&mm->mm_count);
+        current->active_mm = mm;
+        cpu_set(cpu, mm->cpu_vm_mask);
+        cpu_switch_mm(mm->pgd, mm);
+        enter_lazy_tlb(mm, current);
+        cpu_init();
+        /*
+         * Give the platform a chance to do its own initialisation.
+         */
+        platform_secondary_init(cpu);
+        /*
+         * Enable local interrupts.
+         */
+        local_irq_enable();
+        local_fiq_enable();
+        calibrate_delay();
+        smp_store_cpu_info(cpu);
+        /*
+         * OK, now it's safe to let the boot CPU continue
+         */
+        cpu_set(cpu, cpu_online_map);
+        /*
+         * OK, it's off to the idle thread for us
+         */
+        cpu_idle();
+}
+/*
 * Called by both boot and secondaries to move global data into
 * per-processor storage.
 */
@@ -394,3 +502,126 @@ int __init setup_profiling_timer(unsigned int multiplier)
 {
        return -EINVAL;
 }
+static int
+on_each_cpu_mask(void (*func)(void *), void *info, int retry, int wait,
+                 cpumask_t mask)
+{
+        int ret = 0;
+        preempt_disable();
+        ret = smp_call_function_on_cpu(func, info, retry, wait, mask);
+        if (cpu_isset(smp_processor_id(), mask))
+                func(info);
+        preempt_enable();
+        return ret;
+}
+/**********************************************************************/
+/*
+ * TLB operations
+ */
+struct tlb_args {
+        struct vm_area_struct *ta_vma;
+        unsigned long ta_start;
+        unsigned long ta_end;
+};
+static inline void ipi_flush_tlb_all(void *ignored)
+{
+        local_flush_tlb_all();
+}
+static inline void ipi_flush_tlb_mm(void *arg)
+{
+        struct mm_struct *mm = (struct mm_struct *)arg;
+        local_flush_tlb_mm(mm);
+}
+static inline void ipi_flush_tlb_page(void *arg)
+{
+        struct tlb_args *ta = (struct tlb_args *)arg;
+        local_flush_tlb_page(ta->ta_vma, ta->ta_start);
+}
+static inline void ipi_flush_tlb_kernel_page(void *arg)
+{
+        struct tlb_args *ta = (struct tlb_args *)arg;
+        local_flush_tlb_kernel_page(ta->ta_start);
+}
+static inline void ipi_flush_tlb_range(void *arg)
+{
+        struct tlb_args *ta = (struct tlb_args *)arg;
+        local_flush_tlb_range(ta->ta_vma, ta->ta_start, ta->ta_end);
+}
+static inline void ipi_flush_tlb_kernel_range(void *arg)
+{
+        struct tlb_args *ta = (struct tlb_args *)arg;
+        local_flush_tlb_kernel_range(ta->ta_start, ta->ta_end);
+}
+void flush_tlb_all(void)
+{
+        on_each_cpu(ipi_flush_tlb_all, NULL, 1, 1);
+}
+void flush_tlb_mm(struct mm_struct *mm)
+{
+        cpumask_t mask = mm->cpu_vm_mask;
+        on_each_cpu_mask(ipi_flush_tlb_mm, mm, 1, 1, mask);
+}
+void flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr)
+{
+        cpumask_t mask = vma->vm_mm->cpu_vm_mask;
+        struct tlb_args ta;
+        ta.ta_vma = vma;
+        ta.ta_start = uaddr;
+        on_each_cpu_mask(ipi_flush_tlb_page, &ta, 1, 1, mask);
+}
+void flush_tlb_kernel_page(unsigned long kaddr)
+{
+        struct tlb_args ta;
+        ta.ta_start = kaddr;
+        on_each_cpu(ipi_flush_tlb_kernel_page, &ta, 1, 1);
+}
+void flush_tlb_range(struct vm_area_struct *vma,
+                     unsigned long start, unsigned long end)
+{
+        cpumask_t mask = vma->vm_mm->cpu_vm_mask;
+        struct tlb_args ta;
+        ta.ta_vma = vma;
+        ta.ta_start = start;
+        ta.ta_end = end;
+        on_each_cpu_mask(ipi_flush_tlb_range, &ta, 1, 1, mask);
+}
+void flush_tlb_kernel_range(unsigned long start, unsigned long end)
+{
+        struct tlb_args ta;
+        ta.ta_start = start;
+        ta.ta_end = end;
+        on_each_cpu(ipi_flush_tlb_kernel_range, &ta, 1, 1);
+}
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index c232f24f4a..1b7fcd50c3 100644
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -381,6 +381,99 @@ static struct sysdev_class timer_sysclass = {
        .resume         = timer_resume,
 };
+#ifdef CONFIG_NO_IDLE_HZ
+static int timer_dyn_tick_enable(void)
+{
+        struct dyn_tick_timer *dyn_tick = system_timer->dyn_tick;
+        unsigned long flags;
+        int ret = -ENODEV;
+        if (dyn_tick) {
+                write_seqlock_irqsave(&xtime_lock, flags);
+                ret = 0;
+                if (!(dyn_tick->state & DYN_TICK_ENABLED)) {
+                        ret = dyn_tick->enable();
+                        if (ret == 0)
+                                dyn_tick->state |= DYN_TICK_ENABLED;
+                }
+                write_sequnlock_irqrestore(&xtime_lock, flags);
+        }
+        return ret;
+}
+static int timer_dyn_tick_disable(void)
+{
+        struct dyn_tick_timer *dyn_tick = system_timer->dyn_tick;
+        unsigned long flags;
+        int ret = -ENODEV;
+        if (dyn_tick) {
+                write_seqlock_irqsave(&xtime_lock, flags);
+                ret = 0;
+                if (dyn_tick->state & DYN_TICK_ENABLED) {
+                        ret = dyn_tick->disable();
+                        if (ret == 0)
+                                dyn_tick->state &= ~DYN_TICK_ENABLED;
+                }
+                write_sequnlock_irqrestore(&xtime_lock, flags);
+        }
+        return ret;
+}
+/*
+ * Reprogram the system timer for at least the calculated time interval.
+ * This function should be called from the idle thread with IRQs disabled,
+ * immediately before sleeping.
+ */
+void timer_dyn_reprogram(void)
+{
+        struct dyn_tick_timer *dyn_tick = system_timer->dyn_tick;
+        write_seqlock(&xtime_lock);
+        if (dyn_tick->state & DYN_TICK_ENABLED)
+                dyn_tick->reprogram(next_timer_interrupt() - jiffies);
+        write_sequnlock(&xtime_lock);
+}
+static ssize_t timer_show_dyn_tick(struct sys_device *dev, char *buf)
+{
+        return sprintf(buf, "%i\n",
+                       (system_timer->dyn_tick->state & DYN_TICK_ENABLED) >> 1);
+}
+static ssize_t timer_set_dyn_tick(struct sys_device *dev, const char *buf,
+                                  size_t count)
+{
+        unsigned int enable = simple_strtoul(buf, NULL, 2);
+        if (enable)
+                timer_dyn_tick_enable();
+        else
+                timer_dyn_tick_disable();
+        return count;
+}
+static SYSDEV_ATTR(dyn_tick, 0644, timer_show_dyn_tick, timer_set_dyn_tick);
+/*
+ * dyntick=enable|disable
+ */
+static char dyntick_str[4] __initdata = "";
+static int __init dyntick_setup(char *str)
+{
+        if (str)
+                strlcpy(dyntick_str, str, sizeof(dyntick_str));
+        return 1;
+}
+__setup("dyntick=", dyntick_setup);
+#endif
 static int __init timer_init_sysfs(void)
 {
        int ret = sysdev_class_register(&timer_sysclass);
@@ -388,6 +481,20 @@ static int __init timer_init_sysfs(void)
                system_timer->dev.cls = &timer_sysclass;
                ret = sysdev_register(&system_timer->dev);
        }
+#ifdef CONFIG_NO_IDLE_HZ
+        if (ret == 0 && system_timer->dyn_tick) {
+                ret = sysdev_create_file(&system_timer->dev, &attr_dyn_tick);
+                /*
+                 * Turn on dynamic tick after calibrate delay
+                 * for correct bogomips
+                 */
+                if (ret == 0 && dyntick_str[0] == 'e')
+                        ret = timer_dyn_tick_enable();
+        }
+#endif
        return ret;
 }
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 45d2a032d8..df2cb06ce4 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -30,6 +30,7 @@
 #include <asm/traps.h>
 #include "ptrace.h"
+#include "signal.h"
 const char *processor_modes[]=
 { "USER_26", "FIQ_26" , "IRQ_26" , "SVC_26" , "UK4_26" , "UK5_26" , "UK6_26" , "UK7_26" ,
@@ -229,16 +230,8 @@ NORET_TYPE void die(const char *str, struct pt_regs *regs, int err)
        do_exit(SIGSEGV);
 }
-void die_if_kernel(const char *str, struct pt_regs *regs, int err)
+void notify_die(const char *str, struct pt_regs *regs, struct siginfo *info,
-{
+                unsigned long err, unsigned long trap)
-        if (user_mode(regs))
-                return;
-        die(str, regs, err);
-}
-static void notify_die(const char *str, struct pt_regs *regs, siginfo_t *info,
-                       unsigned long err, unsigned long trap)
 {
        if (user_mode(regs)) {
                current->thread.error_code = err;
@@ -683,6 +676,14 @@ void __init trap_init(void)
        memcpy((void *)0xffff0000, __vectors_start, __vectors_end - __vectors_start);
        memcpy((void *)0xffff0200, __stubs_start, __stubs_end - __stubs_start);
        memcpy((void *)0xffff1000 - kuser_sz, __kuser_helper_start, kuser_sz);
+        /*
+         * Copy signal return handlers into the vector page, and
+         * set sigreturn to be a pointer to these.
+         */
+        memcpy((void *)KERN_SIGRETURN_CODE, sigreturn_codes,
+               sizeof(sigreturn_codes));
        flush_icache_range(0xffff0000, 0xffff0000 + PAGE_SIZE);
        modify_domain(DOMAIN_USER, DOMAIN_CLIENT);
 }
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
index c0e65833ff..8725d63e42 100644
--- a/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
@@ -11,7 +11,7 @@ lib-y		:= backtrace.o changebit.o csumipv6.o csumpartial.o   \
                   strnlen_user.o strchr.o strrchr.o testchangebit.o  \
                   testclearbit.o testsetbit.o uaccess.o getuser.o    \
                   putuser.o ashldi3.o ashrdi3.o lshrdi3.o muldi3.o   \
-                   ucmpdi2.o udivdi3.o lib1funcs.o div64.o            \
+                   ucmpdi2.o lib1funcs.o div64.o                      \
                   io-readsb.o io-writesb.o io-readsl.o io-writesl.o
 ifeq ($(CONFIG_CPU_32v3),y)
diff --git a/arch/arm/lib/ashldi3.c b/arch/arm/lib/ashldi3.c
index 130f5a8396..b62875cfd8 100644
--- a/arch/arm/lib/ashldi3.c
+++ b/arch/arm/lib/ashldi3.c
@@ -31,31 +31,26 @@ Boston, MA 02111-1307, USA.  */
 #include "gcclib.h"
-DItype
+s64 __ashldi3(s64 u, int b)
-__ashldi3 (DItype u, word_type b)
 {
-  DIunion w;
+        DIunion w;
-  word_type bm;
+        int bm;
-  DIunion uu;
+        DIunion uu;
-  if (b == 0)
+        if (b == 0)
-    return u;
+                return u;
-  uu.ll = u;
+        uu.ll = u;
-  bm = (sizeof (SItype) * BITS_PER_UNIT) - b;
+        bm = (sizeof(s32) * BITS_PER_UNIT) - b;
-  if (bm <= 0)
+        if (bm <= 0) {
-    {
+                w.s.low = 0;
-      w.s.low = 0;
+                w.s.high = (u32) uu.s.low << -bm;
-      w.s.high = (USItype)uu.s.low << -bm;
+        } else {
-    }
+                u32 carries = (u32) uu.s.low >> bm;
-  else
+                w.s.low = (u32) uu.s.low << b;
-    {
+                w.s.high = ((u32) uu.s.high << b) | carries;
-      USItype carries = (USItype)uu.s.low >> bm;
+        }
-      w.s.low = (USItype)uu.s.low << b;
-      w.s.high = ((USItype)uu.s.high << b) | carries;
+        return w.ll;
-    }
-  return w.ll;
 }
diff --git a/arch/arm/lib/ashrdi3.c b/arch/arm/lib/ashrdi3.c
index 71625d218f..9a8600a754 100644
--- a/arch/arm/lib/ashrdi3.c
+++ b/arch/arm/lib/ashrdi3.c
@@ -31,31 +31,27 @@ Boston, MA 02111-1307, USA.  */
 #include "gcclib.h"
-DItype
+s64 __ashrdi3(s64 u, int b)
-__ashrdi3 (DItype u, word_type b)
 {
-  DIunion w;
+        DIunion w;
-  word_type bm;
+        int bm;
-  DIunion uu;
+        DIunion uu;
-  if (b == 0)
+        if (b == 0)
-    return u;
+                return u;
-  uu.ll = u;
+        uu.ll = u;
-  bm = (sizeof (SItype) * BITS_PER_UNIT) - b;
+        bm = (sizeof(s32) * BITS_PER_UNIT) - b;
-  if (bm <= 0)
+        if (bm <= 0) {
-    {
+                /* w.s.high = 1..1 or 0..0 */
-      /* w.s.high = 1..1 or 0..0 */
+                w.s.high = uu.s.high >> (sizeof(s32) * BITS_PER_UNIT - 1);
-      w.s.high = uu.s.high >> (sizeof (SItype) * BITS_PER_UNIT - 1);
+                w.s.low = uu.s.high >> -bm;
-      w.s.low = uu.s.high >> -bm;
+        } else {
-    }
+                u32 carries = (u32) uu.s.high << bm;
-  else
+                w.s.high = uu.s.high >> b;
-    {
+                w.s.low = ((u32) uu.s.low >> b) | carries;
-      USItype carries = (USItype)uu.s.high << bm;
+        }
-      w.s.high = uu.s.high >> b;
-      w.s.low = ((USItype)uu.s.low >> b) | carries;
+        return w.ll;
-    }
-  return w.ll;
 }
diff --git a/arch/arm/lib/gcclib.h b/arch/arm/lib/gcclib.h
index 65314a3d9e..8b6dcc656d 100644
--- a/arch/arm/lib/gcclib.h
+++ b/arch/arm/lib/gcclib.h
@@ -1,25 +1,22 @@
 /* gcclib.h -- definitions for various functions 'borrowed' from gcc-2.95.3 */
 /* I Molton     29/07/01 */
-#define BITS_PER_UNIT  8
+#include <linux/types.h>
-#define SI_TYPE_SIZE (sizeof (SItype) * BITS_PER_UNIT)
-typedef unsigned int UQItype    __attribute__ ((mode (QI)));
+#define BITS_PER_UNIT   8
-typedef          int SItype     __attribute__ ((mode (SI)));
+#define SI_TYPE_SIZE    (sizeof(s32) * BITS_PER_UNIT)
-typedef unsigned int USItype    __attribute__ ((mode (SI)));
-typedef          int DItype     __attribute__ ((mode (DI)));
-typedef          int word_type  __attribute__ ((mode (__word__)));
-typedef unsigned int UDItype    __attribute__ ((mode (DI)));
 #ifdef __ARMEB__
-  struct DIstruct {SItype high, low;};
+struct DIstruct {
+        s32 high, low;
+};
 #else
-  struct DIstruct {SItype low, high;};
+struct DIstruct {
+        s32 low, high;
+};
 #endif
-typedef union
+typedef union {
-{
+        struct DIstruct s;
-  struct DIstruct s;
+        s64 ll;
-  DItype ll;
 } DIunion;
diff --git a/arch/arm/lib/longlong.h b/arch/arm/lib/longlong.h
deleted file mode 100644
index 179eea4edc..0000000000
--- a/arch/arm/lib/longlong.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/* longlong.h -- based on code from gcc-2.95.3
-   definitions for mixed size 32/64 bit arithmetic.
-   Copyright (C) 1991, 92, 94, 95, 96, 1997, 1998 Free Software Foundation, Inc.
-   This definition file is free software; you can redistribute it
-   and/or modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2, or (at your option) any later version.
-   This definition file is distributed in the hope that it will be
-   useful, but WITHOUT ANY WARRANTY; without even the implied
-   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-   See the GNU General Public License for more details.
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-/* Borrowed from GCC 2.95.3, I Molton 29/07/01 */
-#ifndef SI_TYPE_SIZE
-#define SI_TYPE_SIZE 32
-#endif
-#define __BITS4 (SI_TYPE_SIZE / 4)
-#define __ll_B (1L << (SI_TYPE_SIZE / 2))
-#define __ll_lowpart(t) ((USItype) (t) % __ll_B)
-#define __ll_highpart(t) ((USItype) (t) / __ll_B)
-/* Define auxiliary asm macros.
-   1) umul_ppmm(high_prod, low_prod, multipler, multiplicand)
-   multiplies two USItype integers MULTIPLER and MULTIPLICAND,
-   and generates a two-part USItype product in HIGH_PROD and
-   LOW_PROD.
-   2) __umulsidi3(a,b) multiplies two USItype integers A and B,
-   and returns a UDItype product.  This is just a variant of umul_ppmm.
-   3) udiv_qrnnd(quotient, remainder, high_numerator, low_numerator,
-   denominator) divides a two-word unsigned integer, composed by the
-   integers HIGH_NUMERATOR and LOW_NUMERATOR, by DENOMINATOR and
-   places the quotient in QUOTIENT and the remainder in REMAINDER.
-   HIGH_NUMERATOR must be less than DENOMINATOR for correct operation.
-   If, in addition, the most significant bit of DENOMINATOR must be 1,
-   then the pre-processor symbol UDIV_NEEDS_NORMALIZATION is defined to 1.
-   4) sdiv_qrnnd(quotient, remainder, high_numerator, low_numerator,
-   denominator).  Like udiv_qrnnd but the numbers are signed.  The
-   quotient is rounded towards 0.
-   5) count_leading_zeros(count, x) counts the number of zero-bits from
-   the msb to the first non-zero bit.  This is the number of steps X
-   needs to be shifted left to set the msb.  Undefined for X == 0.
-   6) add_ssaaaa(high_sum, low_sum, high_addend_1, low_addend_1,
-   high_addend_2, low_addend_2) adds two two-word unsigned integers,
-   composed by HIGH_ADDEND_1 and LOW_ADDEND_1, and HIGH_ADDEND_2 and
-   LOW_ADDEND_2 respectively.  The result is placed in HIGH_SUM and
-   LOW_SUM.  Overflow (i.e. carry out) is not stored anywhere, and is
-   lost.
-   7) sub_ddmmss(high_difference, low_difference, high_minuend,
-   low_minuend, high_subtrahend, low_subtrahend) subtracts two
-   two-word unsigned integers, composed by HIGH_MINUEND_1 and
-   LOW_MINUEND_1, and HIGH_SUBTRAHEND_2 and LOW_SUBTRAHEND_2
-   respectively.  The result is placed in HIGH_DIFFERENCE and
-   LOW_DIFFERENCE.  Overflow (i.e. carry out) is not stored anywhere,
-   and is lost.
-   If any of these macros are left undefined for a particular CPU,
-   C macros are used.  */
-#if defined (__arm__)
-#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-  __asm__ ("adds        %1, %4, %5                                      \n\
-        adc     %0, %2, %3"                                             \
-           : "=r" ((USItype) (sh)),                                     \
-             "=&r" ((USItype) (sl))                                     \
-           : "%r" ((USItype) (ah)),                                     \
-             "rI" ((USItype) (bh)),                                     \
-             "%r" ((USItype) (al)),                                     \
-             "rI" ((USItype) (bl)))
-#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-  __asm__ ("subs        %1, %4, %5                                      \n\
-        sbc     %0, %2, %3"                                             \
-           : "=r" ((USItype) (sh)),                                     \
-             "=&r" ((USItype) (sl))                                     \
-           : "r" ((USItype) (ah)),                                      \
-             "rI" ((USItype) (bh)),                                     \
-             "r" ((USItype) (al)),                                      \
-             "rI" ((USItype) (bl)))
-#define umul_ppmm(xh, xl, a, b) \
-{register USItype __t0, __t1, __t2;                                     \
-  __asm__ ("%@ Inlined umul_ppmm                                        \n\
-        mov     %2, %5, lsr #16                                         \n\
-        mov     %0, %6, lsr #16                                         \n\
-        bic     %3, %5, %2, lsl #16                                     \n\
-        bic     %4, %6, %0, lsl #16                                     \n\
-        mul     %1, %3, %4                                              \n\
-        mul     %4, %2, %4                                              \n\
-        mul     %3, %0, %3                                              \n\
-        mul     %0, %2, %0                                              \n\
-        adds    %3, %4, %3                                              \n\
-        addcs   %0, %0, #65536                                          \n\
-        adds    %1, %1, %3, lsl #16                                     \n\
-        adc     %0, %0, %3, lsr #16"                                    \
-           : "=&r" ((USItype) (xh)),                                    \
-             "=r" ((USItype) (xl)),                                     \
-             "=&r" (__t0), "=&r" (__t1), "=r" (__t2)                    \
-           : "r" ((USItype) (a)),                                       \
-             "r" ((USItype) (b)));}
-#define UMUL_TIME 20
-#define UDIV_TIME 100
-#endif /* __arm__ */
-#define __umulsidi3(u, v) \
-  ({DIunion __w;                                                        \
-    umul_ppmm (__w.s.high, __w.s.low, u, v);                            \
-    __w.ll; })
-#define __udiv_qrnnd_c(q, r, n1, n0, d) \
-  do {                                                                  \
-    USItype __d1, __d0, __q1, __q0;                                     \
-    USItype __r1, __r0, __m;                                            \
-    __d1 = __ll_highpart (d);                                           \
-    __d0 = __ll_lowpart (d);                                            \
-                                                                        \
-    __r1 = (n1) % __d1;                                                 \
-    __q1 = (n1) / __d1;                                                 \
-    __m = (USItype) __q1 * __d0;                                        \
-    __r1 = __r1 * __ll_B | __ll_highpart (n0);                          \
-    if (__r1 < __m)                                                     \
-      {                                                                 \
-        __q1--, __r1 += (d);                                            \
-        if (__r1 >= (d)) /* i.e. we didn't get carry when adding to __r1 */\
-          if (__r1 < __m)                                               \
-            __q1--, __r1 += (d);                                        \
-      }                                                                 \
-    __r1 -= __m;                                                        \
-                                                                        \
-    __r0 = __r1 % __d1;                                                 \
-    __q0 = __r1 / __d1;                                                 \
-    __m = (USItype) __q0 * __d0;                                        \
-    __r0 = __r0 * __ll_B | __ll_lowpart (n0);                           \
-    if (__r0 < __m)                                                     \
-      {                                                                 \
-        __q0--, __r0 += (d);                                            \
-        if (__r0 >= (d))                                                \
-          if (__r0 < __m)                                               \
-            __q0--, __r0 += (d);                                        \
-      }                                                                 \
-    __r0 -= __m;                                                        \
-                                                                        \
-    (q) = (USItype) __q1 * __ll_B | __q0;                               \
-    (r) = __r0;                                                         \
-  } while (0)
-#define UDIV_NEEDS_NORMALIZATION 1
-#define udiv_qrnnd __udiv_qrnnd_c
-#define count_leading_zeros(count, x) \
-  do {                                                                  \
-    USItype __xr = (x);                                                 \
-    USItype __a;                                                        \
-                                                                        \
-    if (SI_TYPE_SIZE <= 32)                                             \
-      {                                                                 \
-        __a = __xr < ((USItype)1<<2*__BITS4)                            \
-          ? (__xr < ((USItype)1<<__BITS4) ? 0 : __BITS4)                \
-          : (__xr < ((USItype)1<<3*__BITS4) ?  2*__BITS4 : 3*__BITS4);  \
-      }                                                                 \
-    else                                                                \
-      {                                                                 \
-        for (__a = SI_TYPE_SIZE - 8; __a > 0; __a -= 8)                 \
-          if (((__xr >> __a) & 0xff) != 0)                              \
-            break;                                                      \
-      }                                                                 \
-                                                                        \
-    (count) = SI_TYPE_SIZE - (__clz_tab[__xr >> __a] + __a);            \
-  } while (0)
diff --git a/arch/arm/lib/lshrdi3.c b/arch/arm/lib/lshrdi3.c
index b666f1bad4..3681f49d2b 100644
--- a/arch/arm/lib/lshrdi3.c
+++ b/arch/arm/lib/lshrdi3.c
@@ -31,31 +31,26 @@ Boston, MA 02111-1307, USA.  */
 #include "gcclib.h"
-DItype
+s64 __lshrdi3(s64 u, int b)
-__lshrdi3 (DItype u, word_type b)
 {
-  DIunion w;
+        DIunion w;
-  word_type bm;
+        int bm;
-  DIunion uu;
+        DIunion uu;
-  if (b == 0)
+        if (b == 0)
-    return u;
+                return u;
-  uu.ll = u;
+        uu.ll = u;
-  bm = (sizeof (SItype) * BITS_PER_UNIT) - b;
+        bm = (sizeof(s32) * BITS_PER_UNIT) - b;
-  if (bm <= 0)
+        if (bm <= 0) {
-    {
+                w.s.high = 0;
-      w.s.high = 0;
+                w.s.low = (u32) uu.s.high >> -bm;
-      w.s.low = (USItype)uu.s.high >> -bm;
+        } else {
-    }
+                u32 carries = (u32) uu.s.high << bm;
-  else
+                w.s.high = (u32) uu.s.high >> b;
-    {
+                w.s.low = ((u32) uu.s.low >> b) | carries;
-      USItype carries = (USItype)uu.s.high << bm;
+        }
-      w.s.high = (USItype)uu.s.high >> b;
-      w.s.low = ((USItype)uu.s.low >> b) | carries;
+        return w.ll;
-    }
-  return w.ll;
 }
diff --git a/arch/arm/lib/muldi3.c b/arch/arm/lib/muldi3.c
index 44d611b1cf..0a3b93313f 100644
--- a/arch/arm/lib/muldi3.c
+++ b/arch/arm/lib/muldi3.c
@@ -32,7 +32,7 @@ Boston, MA 02111-1307, USA.  */
 #include "gcclib.h"
 #define umul_ppmm(xh, xl, a, b) \
-{register USItype __t0, __t1, __t2;                                     \
+{register u32 __t0, __t1, __t2;                                     \
  __asm__ ("%@ Inlined umul_ppmm                                        \n\
        mov     %2, %5, lsr #16                                         \n\
        mov     %0, %6, lsr #16                                         \n\
@@ -46,32 +46,27 @@ Boston, MA 02111-1307, USA.  */
        addcs   %0, %0, #65536                                          \n\
        adds    %1, %1, %3, lsl #16                                     \n\
        adc     %0, %0, %3, lsr #16"                                    \
-           : "=&r" ((USItype) (xh)),                                    \
+           : "=&r" ((u32) (xh)),                                    \
-             "=r" ((USItype) (xl)),                                     \
+             "=r" ((u32) (xl)),                                     \
             "=&r" (__t0), "=&r" (__t1), "=r" (__t2)                    \
-           : "r" ((USItype) (a)),                                       \
+           : "r" ((u32) (a)),                                       \
-             "r" ((USItype) (b)));}
+             "r" ((u32) (b)));}
 #define __umulsidi3(u, v) \
  ({DIunion __w;                                                        \
    umul_ppmm (__w.s.high, __w.s.low, u, v);                            \
    __w.ll; })
+s64 __muldi3(s64 u, s64 v)
-DItype
-__muldi3 (DItype u, DItype v)
 {
-  DIunion w;
+        DIunion w;
-  DIunion uu, vv;
+        DIunion uu, vv;
-  uu.ll = u,
+        uu.ll = u, vv.ll = v;
-  vv.ll = v;
-  w.ll = __umulsidi3 (uu.s.low, vv.s.low);
+        w.ll = __umulsidi3(uu.s.low, vv.s.low);
-  w.s.high += ((USItype) uu.s.low * (USItype) vv.s.high
+        w.s.high += ((u32) uu.s.low * (u32) vv.s.high
-               + (USItype) uu.s.high * (USItype) vv.s.low);
+                     + (u32) uu.s.high * (u32) vv.s.low);
-  return w.ll;
+        return w.ll;
 }
diff --git a/arch/arm/lib/ucmpdi2.c b/arch/arm/lib/ucmpdi2.c
index 6c6ae63efa..57f3f2df38 100644
--- a/arch/arm/lib/ucmpdi2.c
+++ b/arch/arm/lib/ucmpdi2.c
@@ -31,21 +31,19 @@ Boston, MA 02111-1307, USA.  */
 #include "gcclib.h"
-word_type
+int __ucmpdi2(s64 a, s64 b)
-__ucmpdi2 (DItype a, DItype b)
 {
-  DIunion au, bu;
+        DIunion au, bu;
-  au.ll = a, bu.ll = b;
+        au.ll = a, bu.ll = b;
-  if ((USItype) au.s.high < (USItype) bu.s.high)
+        if ((u32) au.s.high < (u32) bu.s.high)
-    return 0;
+                return 0;
-  else if ((USItype) au.s.high > (USItype) bu.s.high)
+        else if ((u32) au.s.high > (u32) bu.s.high)
-    return 2;
+                return 2;
-  if ((USItype) au.s.low < (USItype) bu.s.low)
+        if ((u32) au.s.low < (u32) bu.s.low)
-    return 0;
+                return 0;
-  else if ((USItype) au.s.low > (USItype) bu.s.low)
+        else if ((u32) au.s.low > (u32) bu.s.low)
-    return 2;
+                return 2;
-  return 1;
+        return 1;
 }
diff --git a/arch/arm/lib/udivdi3.c b/arch/arm/lib/udivdi3.c
deleted file mode 100644
index d25195f673..0000000000
--- a/arch/arm/lib/udivdi3.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/* More subroutines needed by GCC output code on some machines.  */
-/* Compile this one with gcc.  */
-/* Copyright (C) 1989, 92-98, 1999 Free Software Foundation, Inc.
-This file is part of GNU CC.
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-/* As a special exception, if you link this library with other files,
-   some of which are compiled with GCC, to produce an executable,
-   this library does not by itself cause the resulting executable
-   to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.
- */
-/* support functions required by the kernel. based on code from gcc-2.95.3 */
-/* I Molton     29/07/01 */
-#include "gcclib.h"
-#include "longlong.h"
-static const UQItype __clz_tab[] =
-{
-  0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
-  6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
-  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-  8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-  8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-  8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-  8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-};
-UDItype
-__udivmoddi4 (UDItype n, UDItype d, UDItype *rp)
-{
-  DIunion ww;
-  DIunion nn, dd;
-  DIunion rr;
-  USItype d0, d1, n0, n1, n2;
-  USItype q0, q1;
-  USItype b, bm;
-  nn.ll = n;
-  dd.ll = d;
-  d0 = dd.s.low;
-  d1 = dd.s.high;
-  n0 = nn.s.low;
-  n1 = nn.s.high;
-  if (d1 == 0)
-    {
-      if (d0 > n1)
-        {
-          /* 0q = nn / 0D */
-          count_leading_zeros (bm, d0);
-          if (bm != 0)
-            {
-              /* Normalize, i.e. make the most significant bit of the
-                 denominator set.  */
-              d0 = d0 << bm;
-              n1 = (n1 << bm) | (n0 >> (SI_TYPE_SIZE - bm));
-              n0 = n0 << bm;
-            }
-          udiv_qrnnd (q0, n0, n1, n0, d0);
-          q1 = 0;
-          /* Remainder in n0 >> bm.  */
-        }
-      else
-        {
-          /* qq = NN / 0d */
-          if (d0 == 0)
-            d0 = 1 / d0;        /* Divide intentionally by zero.  */
-          count_leading_zeros (bm, d0);
-          if (bm == 0)
-            {
-              /* From (n1 >= d0) /\ (the most significant bit of d0 is set),
-                 conclude (the most significant bit of n1 is set) /\ (the
-                 leading quotient digit q1 = 1).
-                 This special case is necessary, not an optimization.
-                 (Shifts counts of SI_TYPE_SIZE are undefined.)  */
-              n1 -= d0;
-              q1 = 1;
-            }
-          else
-            {
-              /* Normalize.  */
-              b = SI_TYPE_SIZE - bm;
-              d0 = d0 << bm;
-              n2 = n1 >> b;
-              n1 = (n1 << bm) | (n0 >> b);
-              n0 = n0 << bm;
-              udiv_qrnnd (q1, n1, n2, n1, d0);
-            }
-          /* n1 != d0...  */
-          udiv_qrnnd (q0, n0, n1, n0, d0);
-          /* Remainder in n0 >> bm.  */
-        }
-      if (rp != 0)
-        {
-          rr.s.low = n0 >> bm;
-          rr.s.high = 0;
-          *rp = rr.ll;
-        }
-    }
-  else
-    {
-      if (d1 > n1)
-        {
-          /* 00 = nn / DD */
-          q0 = 0;
-          q1 = 0;
-          /* Remainder in n1n0.  */
-          if (rp != 0)
-            {
-              rr.s.low = n0;
-              rr.s.high = n1;
-              *rp = rr.ll;
-            }
-        }
-      else
-        {
-          /* 0q = NN / dd */
-          count_leading_zeros (bm, d1);
-          if (bm == 0)
-            {
-              /* From (n1 >= d1) /\ (the most significant bit of d1 is set),
-                 conclude (the most significant bit of n1 is set) /\ (the
-                 quotient digit q0 = 0 or 1).
-                 This special case is necessary, not an optimization.  */
-              /* The condition on the next line takes advantage of that
-                 n1 >= d1 (true due to program flow).  */
-              if (n1 > d1 || n0 >= d0)
-                {
-                  q0 = 1;
-                  sub_ddmmss (n1, n0, n1, n0, d1, d0);
-                }
-              else
-                q0 = 0;
-              q1 = 0;
-              if (rp != 0)
-                {
-                  rr.s.low = n0;
-                  rr.s.high = n1;
-                  *rp = rr.ll;
-                }
-            }
-          else
-            {
-              USItype m1, m0;
-              /* Normalize.  */
-              b = SI_TYPE_SIZE - bm;
-              d1 = (d1 << bm) | (d0 >> b);
-              d0 = d0 << bm;
-              n2 = n1 >> b;
-              n1 = (n1 << bm) | (n0 >> b);
-              n0 = n0 << bm;
-              udiv_qrnnd (q0, n1, n2, n1, d1);
-              umul_ppmm (m1, m0, q0, d0);
-              if (m1 > n1 || (m1 == n1 && m0 > n0))
-                {
-                  q0--;
-                  sub_ddmmss (m1, m0, m1, m0, d1, d0);
-                }
-              q1 = 0;
-              /* Remainder in (n1n0 - m1m0) >> bm.  */
-              if (rp != 0)
-                {
-                  sub_ddmmss (n1, n0, n1, n0, m1, m0);
-                  rr.s.low = (n1 << b) | (n0 >> bm);
-                  rr.s.high = n1 >> bm;
-                  *rp = rr.ll;
-                }
-            }
-        }
-    }
-  ww.s.low = q0;
-  ww.s.high = q1;
-  return ww.ll;
-}
-UDItype
-__udivdi3 (UDItype n, UDItype d)
-{
-  return __udivmoddi4 (n, d, (UDItype *) 0);
-}
-UDItype
-__umoddi3 (UDItype u, UDItype v)
-{
-  UDItype w;
-  (void) __udivmoddi4 (u ,v, &w);
-  return w;
-}
diff --git a/arch/arm/mach-aaec2000/Kconfig b/arch/arm/mach-aaec2000/Kconfig
new file mode 100644
index 0000000000..5e4bef9375
--- /dev/null
+++ b/arch/arm/mach-aaec2000/Kconfig
@@ -0,0 +1,11 @@
+if ARCH_AAEC2000
+menu "Agilent AAEC-2000 Implementations"
+config MACH_AAED2000
+        bool "Agilent AAED-2000 Development Platform"
+        select CPU_ARM920T
+endmenu
+endif
diff --git a/arch/arm/mach-aaec2000/Makefile b/arch/arm/mach-aaec2000/Makefile
new file mode 100644
index 0000000000..20ec83896c
--- /dev/null
+++ b/arch/arm/mach-aaec2000/Makefile
@@ -0,0 +1,9 @@
+#
+# Makefile for the linux kernel.
+#
+# Common support (must be linked before board specific support)
+obj-y += core.o
+# Specific board support
+obj-$(CONFIG_MACH_AAED2000) += aaed2000.o
diff --git a/arch/arm/mach-aaec2000/Makefile.boot b/arch/arm/mach-aaec2000/Makefile.boot
new file mode 100644
index 0000000000..8f5a8b7c53
--- /dev/null
+++ b/arch/arm/mach-aaec2000/Makefile.boot
@@ -0,0 +1 @@
+        zreladdr-y := 0xf0008000
diff --git a/arch/arm/mach-aaec2000/aaed2000.c b/arch/arm/mach-aaec2000/aaed2000.c
new file mode 100644
index 0000000000..c9d8998866
--- /dev/null
+++ b/arch/arm/mach-aaec2000/aaed2000.c
@@ -0,0 +1,50 @@
+/*
+ *  linux/arch/arm/mach-aaec2000/aaed2000.c
+ *
+ *  Support for the Agilent AAED-2000 Development Platform.
+ *
+ *  Copyright (c) 2005 Nicolas Bellido Y Ortega
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ */
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/major.h>
+#include <linux/interrupt.h>
+#include <asm/setup.h>
+#include <asm/memory.h>
+#include <asm/mach-types.h>
+#include <asm/hardware.h>
+#include <asm/irq.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/irq.h>
+#include "core.h"
+static void __init aaed2000_init_irq(void)
+{
+        aaec2000_init_irq();
+}
+static void __init aaed2000_map_io(void)
+{
+        aaec2000_map_io();
+}
+MACHINE_START(AAED2000, "Agilent AAED-2000 Development Platform")
+        /* Maintainer: Nicolas Bellido Y Ortega */
+        .phys_ram       = 0xf0000000,
+        .phys_io        = PIO_BASE,
+        .io_pg_offst    = ((VIO_BASE) >> 18) & 0xfffc,
+        .map_io         = aaed2000_map_io,
+        .init_irq       = aaed2000_init_irq,
+        .timer          = &aaec2000_timer,
+MACHINE_END
diff --git a/arch/arm/mach-aaec2000/core.c b/arch/arm/mach-aaec2000/core.c
new file mode 100644
index 0000000000..aece0cd4f0
--- /dev/null
+++ b/arch/arm/mach-aaec2000/core.c
@@ -0,0 +1,157 @@
+/*
+ *  linux/arch/arm/mach-aaec2000/core.c
+ *
+ *  Code common to all AAEC-2000 machines
+ *
+ *  Copyright (c) 2005 Nicolas Bellido Y Ortega
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ */
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/errno.h>
+#include <linux/interrupt.h>
+#include <linux/timex.h>
+#include <linux/signal.h>
+#include <asm/hardware.h>
+#include <asm/irq.h>
+#include <asm/mach/irq.h>
+#include <asm/mach/time.h>
+#include <asm/mach/map.h>
+/*
+ * Common I/O mapping:
+ *
+ * Static virtual address mappings are as follow:
+ *
+ * 0xf8000000-0xf8001ffff: Devices connected to APB bus
+ * 0xf8002000-0xf8003ffff: Devices connected to AHB bus
+ *
+ * Below 0xe8000000 is reserved for vm allocation.
+ *
+ * The machine specific code must provide the extra mapping beside the
+ * default mapping provided here.
+ */
+static struct map_desc standard_io_desc[] __initdata = {
+ /* virtual         physical       length           type */
+  { VIO_APB_BASE,   PIO_APB_BASE,  IO_APB_LENGTH,   MT_DEVICE },
+  { VIO_AHB_BASE,   PIO_AHB_BASE,  IO_AHB_LENGTH,   MT_DEVICE }
+};
+void __init aaec2000_map_io(void)
+{
+        iotable_init(standard_io_desc, ARRAY_SIZE(standard_io_desc));
+}
+/*
+ * Interrupt handling routines
+ */
+static void aaec2000_int_ack(unsigned int irq)
+{
+        IRQ_INTSR = 1 << irq;
+}
+static void aaec2000_int_mask(unsigned int irq)
+{
+        IRQ_INTENC |= (1 << irq);
+}
+static void aaec2000_int_unmask(unsigned int irq)
+{
+        IRQ_INTENS |= (1 << irq);
+}
+static struct irqchip aaec2000_irq_chip = {
+        .ack    = aaec2000_int_ack,
+        .mask   = aaec2000_int_mask,
+        .unmask = aaec2000_int_unmask,
+};
+void __init aaec2000_init_irq(void)
+{
+        unsigned int i;
+        for (i = 0; i < NR_IRQS; i++) {
+                set_irq_handler(i, do_level_IRQ);
+                set_irq_chip(i, &aaec2000_irq_chip);
+                set_irq_flags(i, IRQF_VALID);
+        }
+        /* Disable all interrupts */
+        IRQ_INTENC = 0xffffffff;
+        /* Clear any pending interrupts */
+        IRQ_INTSR = IRQ_INTSR;
+}
+/*
+ * Time keeping
+ */
+/* IRQs are disabled before entering here from do_gettimeofday() */
+static unsigned long aaec2000_gettimeoffset(void)
+{
+        unsigned long ticks_to_match, elapsed, usec;
+        /* Get ticks before next timer match */
+        ticks_to_match = TIMER1_LOAD - TIMER1_VAL;
+        /* We need elapsed ticks since last match */
+        elapsed = LATCH - ticks_to_match;
+        /* Now, convert them to usec */
+        usec = (unsigned long)(elapsed * (tick_nsec / 1000))/LATCH;
+        return usec;
+}
+/* We enter here with IRQs enabled */
+static irqreturn_t
+aaec2000_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+        /* TODO: Check timer accuracy */
+        write_seqlock(&xtime_lock);
+        timer_tick(regs);
+        TIMER1_CLEAR = 1;
+        write_sequnlock(&xtime_lock);
+        return IRQ_HANDLED;
+}
+static struct irqaction aaec2000_timer_irq = {
+        .name           = "AAEC-2000 Timer Tick",
+        .flags          = SA_INTERRUPT | SA_TIMER,
+        .handler        = aaec2000_timer_interrupt,
+};
+static void __init aaec2000_timer_init(void)
+{
+        /* Disable timer 1 */
+        TIMER1_CTRL = 0;
+        /* We have somehow to generate a 100Hz clock.
+         * We then use the 508KHz timer in periodic mode.
+         */
+        TIMER1_LOAD = LATCH;
+        TIMER1_CLEAR = 1; /* Clear interrupt */
+        setup_irq(INT_TMR1_OFL, &aaec2000_timer_irq);
+        TIMER1_CTRL = TIMER_CTRL_ENABLE |
+                        TIMER_CTRL_PERIODIC |
+                        TIMER_CTRL_CLKSEL_508K;
+}
+struct sys_timer aaec2000_timer = {
+        .init           = aaec2000_timer_init,
+        .offset         = aaec2000_gettimeoffset,
+};
diff --git a/arch/arm/mach-aaec2000/core.h b/arch/arm/mach-aaec2000/core.h
new file mode 100644
index 0000000000..91893d848c
--- /dev/null
+++ b/arch/arm/mach-aaec2000/core.h
@@ -0,0 +1,16 @@
+/*
+ *  linux/arch/arm/mach-aaec2000/core.h
+ *
+ *  Copyright (c) 2005 Nicolas Bellido Y Ortega
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ */
+struct sys_timer;
+extern struct sys_timer aaec2000_timer;
+extern void __init aaec2000_map_io(void);
+extern void __init aaec2000_init_irq(void);
diff --git a/arch/arm/mach-clps711x/Kconfig b/arch/arm/mach-clps711x/Kconfig
index 45c930ccd0..0793dcf54f 100644
--- a/arch/arm/mach-clps711x/Kconfig
+++ b/arch/arm/mach-clps711x/Kconfig
@@ -28,7 +28,7 @@ config ARCH_CLEP7312
 config ARCH_EDB7211
        bool "EDB7211"
        select ISA
-        select DISCONTIGMEM
+        select ARCH_DISCONTIGMEM_ENABLE
        help
          Say Y here if you intend to run this kernel on a Cirrus Logic EDB-7211
          evaluation board.
diff --git a/arch/arm/mach-clps711x/autcpu12.c b/arch/arm/mach-clps711x/autcpu12.c
index c106704a2c..dc73feb1ff 100644
--- a/arch/arm/mach-clps711x/autcpu12.c
+++ b/arch/arm/mach-clps711x/autcpu12.c
@@ -59,11 +59,13 @@ void __init autcpu12_map_io(void)
 }
 MACHINE_START(AUTCPU12, "autronix autcpu12")
-        MAINTAINER("Thomas Gleixner")
+        /* Maintainer: Thomas Gleixner */
-        BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0020000)
+        .phys_io        = 0x80000000,
-        MAPIO(autcpu12_map_io)
+        .io_pg_offst    = ((0xff000000) >> 18) & 0xfffc,
-        INITIRQ(clps711x_init_irq)
+        .boot_params    = 0xc0020000,
+        .map_io         = autcpu12_map_io,
+        .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END
diff --git a/arch/arm/mach-clps711x/cdb89712.c b/arch/arm/mach-clps711x/cdb89712.c
index 7664f9cf83..a46c82cd27 100644
--- a/arch/arm/mach-clps711x/cdb89712.c
+++ b/arch/arm/mach-clps711x/cdb89712.c
@@ -49,10 +49,12 @@ static void __init cdb89712_map_io(void)
 }
 MACHINE_START(CDB89712, "Cirrus-CDB89712")
-        MAINTAINER("Ray Lehtiniemi")
+        /* Maintainer: Ray Lehtiniemi */
-        BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO(cdb89712_map_io)
+        .io_pg_offst    = ((0xff000000) >> 18) & 0xfffc,
-        INITIRQ(clps711x_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = cdb89712_map_io,
+        .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END
diff --git a/arch/arm/mach-clps711x/ceiva.c b/arch/arm/mach-clps711x/ceiva.c
index e4093be3c4..780d918059 100644
--- a/arch/arm/mach-clps711x/ceiva.c
+++ b/arch/arm/mach-clps711x/ceiva.c
@@ -53,10 +53,12 @@ static void __init ceiva_map_io(void)
 MACHINE_START(CEIVA, "CEIVA/Polaroid Photo MAX Digital Picture Frame")
-        MAINTAINER("Rob Scott")
+        /* Maintainer: Rob Scott */
-        BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO(ceiva_map_io)
+        .io_pg_offst    = ((0xff000000) >> 18) & 0xfffc,
-        INITIRQ(clps711x_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = ceiva_map_io,
+        .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END
diff --git a/arch/arm/mach-clps711x/clep7312.c b/arch/arm/mach-clps711x/clep7312.c
index 9ca21cb481..c83f3fd68f 100644
--- a/arch/arm/mach-clps711x/clep7312.c
+++ b/arch/arm/mach-clps711x/clep7312.c
@@ -37,12 +37,14 @@ fixup_clep7312(struct machine_desc *desc, struct tag *tags,
 MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312")
-        MAINTAINER("Nobody")
+        /* Maintainer: Nobody */
-        BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        FIXUP(fixup_clep7312)
+        .io_pg_offst    = ((0xff000000) >> 18) & 0xfffc,
-        MAPIO(clps711x_map_io)
+        .boot_params    = 0xc0000100,
-        INITIRQ(clps711x_init_irq)
+        .fixup          = fixup_clep7312,
+        .map_io         = clps711x_map_io,
+        .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END
diff --git a/arch/arm/mach-clps711x/edb7211-arch.c b/arch/arm/mach-clps711x/edb7211-arch.c
index c6c46324a2..255c98b63e 100644
--- a/arch/arm/mach-clps711x/edb7211-arch.c
+++ b/arch/arm/mach-clps711x/edb7211-arch.c
@@ -51,11 +51,13 @@ fixup_edb7211(struct machine_desc *desc, struct tag *tags,
 }
 MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)")
-        MAINTAINER("Jon McClintock")
+        /* Maintainer: Jon McClintock */
-        BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0020100) /* 0xc0000000 - 0xc001ffff can be video RAM */
+        .phys_io        = 0x80000000,
-        FIXUP(fixup_edb7211)
+        .io_pg_offst    = ((0xff000000) >> 18) & 0xfffc,
-        MAPIO(edb7211_map_io)
+        .boot_params    = 0xc0020100,   /* 0xc0000000 - 0xc001ffff can be video RAM */
-        INITIRQ(clps711x_init_irq)
+        .fixup          = fixup_edb7211,
+        .map_io         = edb7211_map_io,
+        .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END
diff --git a/arch/arm/mach-clps711x/fortunet.c b/arch/arm/mach-clps711x/fortunet.c
index c1c5b8e015..f83a59761e 100644
--- a/arch/arm/mach-clps711x/fortunet.c
+++ b/arch/arm/mach-clps711x/fortunet.c
@@ -75,11 +75,13 @@ fortunet_fixup(struct machine_desc *desc, struct tag *tags,
 }
 MACHINE_START(FORTUNET, "ARM-FortuNet")
-        MAINTAINER("FortuNet Inc.")
+        /* Maintainer: FortuNet Inc. */
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf0000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0x00000000)
+        .phys_io        = 0x80000000,
-        FIXUP(fortunet_fixup)
+        .io_pg_offst    = ((0xf0000000) >> 18) & 0xfffc,
-        MAPIO(clps711x_map_io)
+        .boot_params    = 0x00000000,
-        INITIRQ(clps711x_init_irq)
+        .fixup          = fortunet_fixup,
+        .map_io         = clps711x_map_io,
+        .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END
diff --git a/arch/arm/mach-clps711x/p720t.c b/arch/arm/mach-clps711x/p720t.c
index 29269df054..5bdb90edf9 100644
--- a/arch/arm/mach-clps711x/p720t.c
+++ b/arch/arm/mach-clps711x/p720t.c
@@ -79,12 +79,14 @@ static void __init p720t_map_io(void)
 }
 MACHINE_START(P720T, "ARM-Prospector720T")
-        MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
+        /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
-        BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        FIXUP(fixup_p720t)
+        .io_pg_offst    = ((0xff000000) >> 18) & 0xfffc,
-        MAPIO(p720t_map_io)
+        .boot_params    = 0xc0000100,
-        INITIRQ(clps711x_init_irq)
+        .fixup          = fixup_p720t,
+        .map_io         = p720t_map_io,
+        .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END
diff --git a/arch/arm/mach-clps711x/time.c b/arch/arm/mach-clps711x/time.c
index 383d4e0c6e..1a23f0dcd4 100644
--- a/arch/arm/mach-clps711x/time.c
+++ b/arch/arm/mach-clps711x/time.c
@@ -57,8 +57,8 @@ p720t_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 static struct irqaction clps711x_timer_irq = {
        .name           = "CLPS711x Timer Tick",
-        .flags          = SA_INTERRUPT,
+        .flags          = SA_INTERRUPT | SA_TIMER,
-        .handler        = p720t_timer_interrupt
+        .handler        = p720t_timer_interrupt,
 };
 static void __init clps711x_timer_init(void)
diff --git a/arch/arm/mach-clps7500/core.c b/arch/arm/mach-clps7500/core.c
index fdfededfd9..112f1d68fb 100644
--- a/arch/arm/mach-clps7500/core.c
+++ b/arch/arm/mach-clps7500/core.c
@@ -26,6 +26,8 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
+unsigned int vram_size;
 static void cl7500_ack_irq_a(unsigned int irq)
 {
        unsigned int val, mask;
@@ -296,8 +298,8 @@ clps7500_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 static struct irqaction clps7500_timer_irq = {
        .name           = "CLPS7500 Timer Tick",
-        .flags          = SA_INTERRUPT,
+        .flags          = SA_INTERRUPT | SA_TIMER,
-        .handler        = clps7500_timer_interrupt
+        .handler        = clps7500_timer_interrupt,
 };
 /*
@@ -364,11 +366,13 @@ static void __init clps7500_init(void)
 }
 MACHINE_START(CLPS7500, "CL-PS7500")
-        MAINTAINER("Philip Blundell")
+        /* Maintainer: Philip Blundell */
-        BOOT_MEM(0x10000000, 0x03000000, 0xe0000000)
+        .phys_ram       = 0x10000000,
-        MAPIO(clps7500_map_io)
+        .phys_io        = 0x03000000,
-        INITIRQ(clps7500_init_irq)
+        .io_pg_offst    = ((0xe0000000) >> 18) & 0xfffc,
-                .init_machine   = clps7500_init,
+        .map_io         = clps7500_map_io,
-                .timer          = &clps7500_timer,
+        .init_irq       = clps7500_init_irq,
+        .init_machine   = clps7500_init,
+        .timer          = &clps7500_timer,
 MACHINE_END
diff --git a/arch/arm/mach-ebsa110/core.c b/arch/arm/mach-ebsa110/core.c
index ef362d4494..23c4da1010 100644
--- a/arch/arm/mach-ebsa110/core.c
+++ b/arch/arm/mach-ebsa110/core.c
@@ -173,8 +173,8 @@ ebsa110_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 static struct irqaction ebsa110_timer_irq = {
        .name           = "EBSA110 Timer Tick",
-        .flags          = SA_INTERRUPT,
+        .flags          = SA_INTERRUPT | SA_TIMER,
-        .handler        = ebsa110_timer_interrupt
+        .handler        = ebsa110_timer_interrupt,
 };
 /*
@@ -233,13 +233,15 @@ static int __init ebsa110_init(void)
 arch_initcall(ebsa110_init);
 MACHINE_START(EBSA110, "EBSA110")
-        MAINTAINER("Russell King")
+        /* Maintainer: Russell King */
-        BOOT_MEM(0x00000000, 0xe0000000, 0xe0000000)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000400)
+        .phys_io        = 0xe0000000,
-        DISABLE_PARPORT(0)
+        .io_pg_offst    = ((0xe0000000) >> 18) & 0xfffc,
-        DISABLE_PARPORT(2)
+        .boot_params    = 0x00000400,
-        SOFT_REBOOT
+        .reserve_lp0    = 1,
-        MAPIO(ebsa110_map_io)
+        .reserve_lp2    = 1,
-        INITIRQ(ebsa110_init_irq)
+        .soft_reboot    = 1,
+        .map_io         = ebsa110_map_io,
+        .init_irq       = ebsa110_init_irq,
        .timer          = &ebsa110_timer,
 MACHINE_END
diff --git a/arch/arm/mach-epxa10db/arch.c b/arch/arm/mach-epxa10db/arch.c
index 1b40340e8a..7daa021676 100644
--- a/arch/arm/mach-epxa10db/arch.c
+++ b/arch/arm/mach-epxa10db/arch.c
@@ -63,10 +63,12 @@ extern void epxa10db_init_irq(void);
 extern struct sys_timer epxa10db_timer;
 MACHINE_START(CAMELOT, "Altera Epxa10db")
-        MAINTAINER("Altera Corporation")
+        /* Maintainer: Altera Corporation */
-        BOOT_MEM(0x00000000, 0x7fffc000, 0xffffc000)
+        .phys_ram       = 0x00000000,
-        MAPIO(epxa10db_map_io)
+        .phys_io        = 0x7fffc000,
-        INITIRQ(epxa10db_init_irq)
+        .io_pg_offst    = ((0xffffc000) >> 18) & 0xfffc,
+        .map_io         = epxa10db_map_io,
+        .init_irq       = epxa10db_init_irq,
        .timer          = &epxa10db_timer,
 MACHINE_END
diff --git a/arch/arm/mach-epxa10db/time.c b/arch/arm/mach-epxa10db/time.c
index 1b991f3cc3..4b1084dde8 100644
--- a/arch/arm/mach-epxa10db/time.c
+++ b/arch/arm/mach-epxa10db/time.c
@@ -56,8 +56,8 @@ epxa10db_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 static struct irqaction epxa10db_timer_irq = {
        .name           = "Excalibur Timer Tick",
-        .flags          = SA_INTERRUPT,
+        .flags          = SA_INTERRUPT | SA_TIMER,
-        .handler        = epxa10db_timer_interrupt
+        .handler        = epxa10db_timer_interrupt,
 };
 /*
diff --git a/arch/arm/mach-footbridge/cats-hw.c b/arch/arm/mach-footbridge/cats-hw.c
index d1ced86c37..49b898af00 100644
--- a/arch/arm/mach-footbridge/cats-hw.c
+++ b/arch/arm/mach-footbridge/cats-hw.c
@@ -84,12 +84,14 @@ fixup_cats(struct machine_desc *desc, struct tag *tags,
 }
 MACHINE_START(CATS, "Chalice-CATS")
-        MAINTAINER("Philip Blundell")
+        /* Maintainer: Philip Blundell */
-        BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = DC21285_ARMCSR_BASE,
-        SOFT_REBOOT
+        .io_pg_offst    = ((0xfe000000) >> 18) & 0xfffc,
-        FIXUP(fixup_cats)
+        .boot_params    = 0x00000100,
-        MAPIO(footbridge_map_io)
+        .soft_reboot    = 1,
-        INITIRQ(footbridge_init_irq)
+        .fixup          = fixup_cats,
+        .map_io         = footbridge_map_io,
+        .init_irq       = footbridge_init_irq,
        .timer          = &isa_timer,
 MACHINE_END
diff --git a/arch/arm/mach-footbridge/co285.c b/arch/arm/mach-footbridge/co285.c
index e1541914fd..548a790816 100644
--- a/arch/arm/mach-footbridge/co285.c
+++ b/arch/arm/mach-footbridge/co285.c
@@ -28,11 +28,13 @@ fixup_coebsa285(struct machine_desc *desc, struct tag *tags,
 }
 MACHINE_START(CO285, "co-EBSA285")
-        MAINTAINER("Mark van Doesburg")
+        /* Maintainer: Mark van Doesburg */
-        BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0x7cf00000)
+        .phys_ram       = 0x00000000,
-        FIXUP(fixup_coebsa285)
+        .phys_io        = DC21285_ARMCSR_BASE,
-        MAPIO(footbridge_map_io)
+        .io_pg_offst    = ((0x7cf00000) >> 18) & 0xfffc,
-        INITIRQ(footbridge_init_irq)
+        .fixup          = fixup_coebsa285,
+        .map_io         = footbridge_map_io,
+        .init_irq       = footbridge_init_irq,
        .timer          = &footbridge_timer,
 MACHINE_END
diff --git a/arch/arm/mach-footbridge/dc21285-timer.c b/arch/arm/mach-footbridge/dc21285-timer.c
index da5b9b7623..14a62d6008 100644
--- a/arch/arm/mach-footbridge/dc21285-timer.c
+++ b/arch/arm/mach-footbridge/dc21285-timer.c
@@ -43,7 +43,7 @@ timer1_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 static struct irqaction footbridge_timer_irq = {
        .name           = "Timer1 timer tick",
        .handler        = timer1_interrupt,
-        .flags          = SA_INTERRUPT,
+        .flags          = SA_INTERRUPT | SA_TIMER,
 };
 /*
diff --git a/arch/arm/mach-footbridge/ebsa285.c b/arch/arm/mach-footbridge/ebsa285.c
index d0931f5a63..1c37605268 100644
--- a/arch/arm/mach-footbridge/ebsa285.c
+++ b/arch/arm/mach-footbridge/ebsa285.c
@@ -13,12 +13,15 @@
 #include "common.h"
 MACHINE_START(EBSA285, "EBSA285")
-        MAINTAINER("Russell King")
+        /* Maintainer: Russell King */
-        BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = DC21285_ARMCSR_BASE,
-        VIDEO(0x000a0000, 0x000bffff)
+        .io_pg_offst    = ((0xfe000000) >> 18) & 0xfffc,
-        MAPIO(footbridge_map_io)
+        .boot_params    = 0x00000100,
-        INITIRQ(footbridge_init_irq)
+        .video_start    = 0x000a0000,
+        .video_end      = 0x000bffff,
+        .map_io         = footbridge_map_io,
+        .init_irq       = footbridge_init_irq,
        .timer          = &footbridge_timer,
 MACHINE_END
diff --git a/arch/arm/mach-footbridge/isa-timer.c b/arch/arm/mach-footbridge/isa-timer.c
index a4fefa0bb5..c1d74f7ab6 100644
--- a/arch/arm/mach-footbridge/isa-timer.c
+++ b/arch/arm/mach-footbridge/isa-timer.c
@@ -72,7 +72,7 @@ isa_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 static struct irqaction isa_timer_irq = {
        .name           = "ISA timer tick",
        .handler        = isa_timer_interrupt,
-        .flags          = SA_INTERRUPT,
+        .flags          = SA_INTERRUPT | SA_TIMER,
 };
 static void __init isa_timer_init(void)
diff --git a/arch/arm/mach-footbridge/netwinder-hw.c b/arch/arm/mach-footbridge/netwinder-hw.c
index 1e1dfd79f4..775f85fc85 100644
--- a/arch/arm/mach-footbridge/netwinder-hw.c
+++ b/arch/arm/mach-footbridge/netwinder-hw.c
@@ -647,14 +647,17 @@ fixup_netwinder(struct machine_desc *desc, struct tag *tags,
 }
 MACHINE_START(NETWINDER, "Rebel-NetWinder")
-        MAINTAINER("Russell King/Rebel.com")
+        /* Maintainer: Russell King/Rebel.com */
-        BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = DC21285_ARMCSR_BASE,
-        VIDEO(0x000a0000, 0x000bffff)
+        .io_pg_offst    = ((0xfe000000) >> 18) & 0xfffc,
-        DISABLE_PARPORT(0)
+        .boot_params    = 0x00000100,
-        DISABLE_PARPORT(2)
+        .video_start    = 0x000a0000,
-        FIXUP(fixup_netwinder)
+        .video_end      = 0x000bffff,
-        MAPIO(footbridge_map_io)
+        .reserve_lp0    = 1,
-        INITIRQ(footbridge_init_irq)
+        .reserve_lp2    = 1,
+        .fixup          = fixup_netwinder,
+        .map_io         = footbridge_map_io,
+        .init_irq       = footbridge_init_irq,
        .timer          = &isa_timer,
 MACHINE_END
diff --git a/arch/arm/mach-footbridge/personal.c b/arch/arm/mach-footbridge/personal.c
index 415086d7bb..0146b8bb59 100644
--- a/arch/arm/mach-footbridge/personal.c
+++ b/arch/arm/mach-footbridge/personal.c
@@ -13,11 +13,13 @@
 #include "common.h"
 MACHINE_START(PERSONAL_SERVER, "Compaq-PersonalServer")
-        MAINTAINER("Jamey Hicks / George France")
+        /* Maintainer: Jamey Hicks / George France */
-        BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = DC21285_ARMCSR_BASE,
-        MAPIO(footbridge_map_io)
+        .io_pg_offst    = ((0xfe000000) >> 18) & 0xfffc,
-        INITIRQ(footbridge_init_irq)
+        .boot_params    = 0x00000100,
+        .map_io         = footbridge_map_io,
+        .init_irq       = footbridge_init_irq,
        .timer          = &footbridge_timer,
 MACHINE_END
diff --git a/arch/arm/mach-h720x/cpu-h7201.c b/arch/arm/mach-h720x/cpu-h7201.c
index 743656881e..af9e4a5d5e 100644
--- a/arch/arm/mach-h720x/cpu-h7201.c
+++ b/arch/arm/mach-h720x/cpu-h7201.c
@@ -41,8 +41,8 @@ h7201_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 static struct irqaction h7201_timer_irq = {
        .name           = "h7201 Timer Tick",
-        .flags          = SA_INTERRUPT,
+        .flags          = SA_INTERRUPT | SA_TIMER,
-        .handler        = h7201_timer_interrupt
+        .handler        = h7201_timer_interrupt,
 };
 /*
diff --git a/arch/arm/mach-h720x/cpu-h7202.c b/arch/arm/mach-h720x/cpu-h7202.c
index 21b8fb6122..593b6a2a30 100644
--- a/arch/arm/mach-h720x/cpu-h7202.c
+++ b/arch/arm/mach-h720x/cpu-h7202.c
@@ -171,8 +171,8 @@ static struct irqchip h7202_timerx_chip = {
 static struct irqaction h7202_timer_irq = {
        .name           = "h7202 Timer Tick",
-        .flags          = SA_INTERRUPT,
+        .flags          = SA_INTERRUPT | SA_TIMER,
-        .handler        = h7202_timer_interrupt
+        .handler        = h7202_timer_interrupt,
 };
 /*
diff --git a/arch/arm/mach-h720x/h7201-eval.c b/arch/arm/mach-h720x/h7201-eval.c
index 9b24b9b0db..fa59e9e2a5 100644
--- a/arch/arm/mach-h720x/h7201-eval.c
+++ b/arch/arm/mach-h720x/h7201-eval.c
@@ -30,10 +30,12 @@
 #include "common.h"
 MACHINE_START(H7201, "Hynix GMS30C7201")
-        MAINTAINER("Robert Schwebel, Pengutronix")
+        /* Maintainer: Robert Schwebel, Pengutronix */
-        BOOT_MEM(0x40000000, 0x80000000, 0xf0000000)
+        .phys_ram       = 0x40000000,
-        BOOT_PARAMS(0xc0001000)
+        .phys_io        = 0x80000000,
-        MAPIO(h720x_map_io)
+        .io_pg_offst    = ((0xf0000000) >> 18) & 0xfffc,
-        INITIRQ(h720x_init_irq)
+        .boot_params    = 0xc0001000,
-        .timer = &h7201_timer,
+        .map_io         = h720x_map_io,
+        .init_irq       = h720x_init_irq,
+        .timer          = &h7201_timer,
 MACHINE_END
diff --git a/arch/arm/mach-h720x/h7202-eval.c b/arch/arm/mach-h720x/h7202-eval.c
index 3456a00d5f..db9078ad00 100644
--- a/arch/arm/mach-h720x/h7202-eval.c
+++ b/arch/arm/mach-h720x/h7202-eval.c
@@ -71,11 +71,13 @@ static void __init init_eval_h7202(void)
 }
 MACHINE_START(H7202, "Hynix HMS30C7202")
-        MAINTAINER("Robert Schwebel, Pengutronix")
+        /* Maintainer: Robert Schwebel, Pengutronix */
-        BOOT_MEM(0x40000000, 0x80000000, 0xf0000000)
+        .phys_ram       = 0x40000000,
-        BOOT_PARAMS(0x40000100)
+        .phys_io        = 0x80000000,
-        MAPIO(h720x_map_io)
+        .io_pg_offst    = ((0xf0000000) >> 18) & 0xfffc,
-        INITIRQ(h7202_init_irq)
+        .boot_params    = 0x40000100,
-        .timer = &h7202_timer,
+        .map_io         = h720x_map_io,
-        INIT_MACHINE(init_eval_h7202)
+        .init_irq       = h7202_init_irq,
+        .timer          = &h7202_timer,
+        .init_machine   = init_eval_h7202,
 MACHINE_END
diff --git a/arch/arm/mach-imx/mx1ads.c b/arch/arm/mach-imx/mx1ads.c
index 625dd01c25..5d25434d33 100644
--- a/arch/arm/mach-imx/mx1ads.c
+++ b/arch/arm/mach-imx/mx1ads.c
@@ -78,11 +78,13 @@ mx1ads_map_io(void)
 }
 MACHINE_START(MX1ADS, "Motorola MX1ADS")
-        MAINTAINER("Sascha Hauer, Pengutronix")
+        /* Maintainer: Sascha Hauer, Pengutronix */
-        BOOT_MEM(0x08000000, 0x00200000, 0xe0200000)
+        .phys_ram       = 0x08000000,
-        BOOT_PARAMS(0x08000100)
+        .phys_io        = 0x00200000,
-        MAPIO(mx1ads_map_io)
+        .io_pg_offst    = ((0xe0200000) >> 18) & 0xfffc,
-        INITIRQ(imx_init_irq)
+        .boot_params    = 0x08000100,
+        .map_io         = mx1ads_map_io,
+        .init_irq       = imx_init_irq,
        .timer          = &imx_timer,
-        INIT_MACHINE(mx1ads_init)
+        .init_machine   = mx1ads_init,
 MACHINE_END
diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c
index 11f1e56c36..ea805bfa5e 100644
--- a/arch/arm/mach-imx/time.c
+++ b/arch/arm/mach-imx/time.c
@@ -72,8 +72,8 @@ imx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 static struct irqaction imx_timer_irq = {
        .name           = "i.MX Timer Tick",
-        .flags          = SA_INTERRUPT,
+        .flags          = SA_INTERRUPT | SA_TIMER,
-        .handler        = imx_timer_interrupt
+        .handler        = imx_timer_interrupt,
 };
 /*
diff --git a/arch/arm/mach-integrator/Makefile b/arch/arm/mach-integrator/Makefile
index 158daaf9e3..ebb255bdce 100644
--- a/arch/arm/mach-integrator/Makefile
+++ b/arch/arm/mach-integrator/Makefile
@@ -12,3 +12,4 @@ obj-$(CONFIG_LEDS)			+= leds.o
 obj-$(CONFIG_PCI)                       += pci_v3.o pci.o
 obj-$(CONFIG_CPU_FREQ_INTEGRATOR)       += cpu.o
 obj-$(CONFIG_INTEGRATOR_IMPD1)          += impd1.o
+obj-$(CONFIG_SMP)                       += platsmp.o headsmp.o
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index bd17b51543..dacbf504da 100644
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@ -14,11 +14,13 @@
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
 #include <linux/sched.h>
+#include <linux/smp.h>
 #include <asm/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/hardware/amba.h>
+#include <asm/hardware/arm_timer.h>
 #include <asm/arch/cm.h>
 #include <asm/system.h>
 #include <asm/leds.h>
@@ -155,16 +157,6 @@ EXPORT_SYMBOL(cm_control);
 #define TICKS2USECS(x)  ((x) / TICKS_PER_uSEC)
 #endif
-/*
- * What does it look like?
- */
-typedef struct TimerStruct {
-        unsigned long TimerLoad;
-        unsigned long TimerValue;
-        unsigned long TimerControl;
-        unsigned long TimerClear;
-} TimerStruct_t;
 static unsigned long timer_reload;
 /*
@@ -173,7 +165,6 @@ static unsigned long timer_reload;
 */
 unsigned long integrator_gettimeoffset(void)
 {
-        volatile TimerStruct_t *timer1 = (TimerStruct_t *)TIMER1_VA_BASE;
        unsigned long ticks1, ticks2, status;
        /*
@@ -182,11 +173,11 @@ unsigned long integrator_gettimeoffset(void)
         * an interrupt.  We get around this by ensuring that the
         * counter has not reloaded between our two reads.
         */
-        ticks2 = timer1->TimerValue & 0xffff;
+        ticks2 = readl(TIMER1_VA_BASE + TIMER_VALUE) & 0xffff;
        do {
                ticks1 = ticks2;
                status = __raw_readl(VA_IC_BASE + IRQ_RAW_STATUS);
-                ticks2 = timer1->TimerValue & 0xffff;
+                ticks2 = readl(TIMER1_VA_BASE + TIMER_VALUE) & 0xffff;
        } while (ticks2 > ticks1);
        /*
@@ -212,16 +203,30 @@ unsigned long integrator_gettimeoffset(void)
 static irqreturn_t
 integrator_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
-        volatile TimerStruct_t *timer1 = (volatile TimerStruct_t *)TIMER1_VA_BASE;
        write_seqlock(&xtime_lock);
        /*
         * clear the interrupt
         */
-        timer1->TimerClear = 1;
+        writel(1, TIMER1_VA_BASE + TIMER_INTCLR);
-        timer_tick(regs);
+        /*
+         * the clock tick routines are only processed on the
+         * primary CPU
+         */
+        if (hard_smp_processor_id() == 0) {
+                timer_tick(regs);
+#ifdef CONFIG_SMP
+                smp_send_timer();
+#endif
+        }
+#ifdef CONFIG_SMP
+        /*
+         * this is the ARM equivalent of the APIC timer interrupt
+         */
+        update_process_times(user_mode(regs));
+#endif /* CONFIG_SMP */
        write_sequnlock(&xtime_lock);
@@ -230,8 +235,8 @@ integrator_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 static struct irqaction integrator_timer_irq = {
        .name           = "Integrator Timer Tick",
-        .flags          = SA_INTERRUPT,
+        .flags          = SA_INTERRUPT | SA_TIMER,
-        .handler        = integrator_timer_interrupt
+        .handler        = integrator_timer_interrupt,
 };
 /*
@@ -239,32 +244,29 @@ static struct irqaction integrator_timer_irq = {
 */
 void __init integrator_time_init(unsigned long reload, unsigned int ctrl)
 {
-        volatile TimerStruct_t *timer0 = (volatile TimerStruct_t *)TIMER0_VA_BASE;
+        unsigned int timer_ctrl = TIMER_CTRL_ENABLE | TIMER_CTRL_PERIODIC;
-        volatile TimerStruct_t *timer1 = (volatile TimerStruct_t *)TIMER1_VA_BASE;
-        volatile TimerStruct_t *timer2 = (volatile TimerStruct_t *)TIMER2_VA_BASE;
-        unsigned int timer_ctrl = 0x80 | 0x40;  /* periodic */
        timer_reload = reload;
        timer_ctrl |= ctrl;
        if (timer_reload > 0x100000) {
                timer_reload >>= 8;
-                timer_ctrl |= 0x08; /* /256 */
+                timer_ctrl |= TIMER_CTRL_DIV256;
        } else if (timer_reload > 0x010000) {
                timer_reload >>= 4;
-                timer_ctrl |= 0x04; /* /16 */
+                timer_ctrl |= TIMER_CTRL_DIV16;
        }
        /*
         * Initialise to a known state (all timers off)
         */
-        timer0->TimerControl = 0;
+        writel(0, TIMER0_VA_BASE + TIMER_CTRL);
-        timer1->TimerControl = 0;
+        writel(0, TIMER1_VA_BASE + TIMER_CTRL);
-        timer2->TimerControl = 0;
+        writel(0, TIMER2_VA_BASE + TIMER_CTRL);
-        timer1->TimerLoad    = timer_reload;
+        writel(timer_reload, TIMER1_VA_BASE + TIMER_LOAD);
-        timer1->TimerValue   = timer_reload;
+        writel(timer_reload, TIMER1_VA_BASE + TIMER_VALUE);
-        timer1->TimerControl = timer_ctrl;
+        writel(timer_ctrl, TIMER1_VA_BASE + TIMER_CTRL);
        /*
         * Make irqs happen for the system timer
diff --git a/arch/arm/mach-integrator/headsmp.S b/arch/arm/mach-integrator/headsmp.S
new file mode 100644
index 0000000000..ceaa88e30d
--- /dev/null
+++ b/arch/arm/mach-integrator/headsmp.S
@@ -0,0 +1,37 @@
+/*
+ *  linux/arch/arm/mach-integrator/headsmp.S
+ *
+ *  Copyright (c) 2003 ARM Limited
+ *  All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/linkage.h>
+#include <linux/init.h>
+        __INIT
+/*
+ * Integrator specific entry point for secondary CPUs.  This provides
+ * a "holding pen" into which all secondary cores are held until we're
+ * ready for them to initialise.
+ */
+ENTRY(integrator_secondary_startup)
+        adr     r4, 1f
+        ldmia   r4, {r5, r6}
+        sub     r4, r4, r5
+        ldr     r6, [r6, r4]
+pen:    ldr     r7, [r6]
+        cmp     r7, r0
+        bne     pen
+        /*
+         * we've been released from the holding pen: secondary_stack
+         * should now contain the SVC stack for this core
+         */
+        b       secondary_startup
+1:      .long   .
+        .long   phys_pen_release
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index 91ba9fd79c..36e2b6eb67 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -292,11 +292,13 @@ static struct sys_timer ap_timer = {
 };
 MACHINE_START(INTEGRATOR, "ARM-Integrator")
-        MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
+        /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
-        BOOT_MEM(0x00000000, 0x16000000, 0xf1600000)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = 0x16000000,
-        MAPIO(ap_map_io)
+        .io_pg_offst    = ((0xf1600000) >> 18) & 0xfffc,
-        INITIRQ(ap_init_irq)
+        .boot_params    = 0x00000100,
+        .map_io         = ap_map_io,
+        .init_irq       = ap_init_irq,
        .timer          = &ap_timer,
-        INIT_MACHINE(ap_init)
+        .init_machine   = ap_init,
 MACHINE_END
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index e0a01eef09..569f328c47 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -532,11 +532,13 @@ static struct sys_timer cp_timer = {
 };
 MACHINE_START(CINTEGRATOR, "ARM-IntegratorCP")
-        MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
+        /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
-        BOOT_MEM(0x00000000, 0x16000000, 0xf1600000)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = 0x16000000,
-        MAPIO(intcp_map_io)
+        .io_pg_offst    = ((0xf1600000) >> 18) & 0xfffc,
-        INITIRQ(intcp_init_irq)
+        .boot_params    = 0x00000100,
+        .map_io         = intcp_map_io,
+        .init_irq       = intcp_init_irq,
        .timer          = &cp_timer,
-        INIT_MACHINE(intcp_init)
+        .init_machine   = intcp_init,
 MACHINE_END
diff --git a/arch/arm/mach-integrator/leds.c b/arch/arm/mach-integrator/leds.c
index d2c0ab2115..f1436e683b 100644
--- a/arch/arm/mach-integrator/leds.c
+++ b/arch/arm/mach-integrator/leds.c
@@ -22,6 +22,8 @@
 */
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/smp.h>
+#include <linux/spinlock.h>
 #include <asm/hardware.h>
 #include <asm/io.h>
@@ -85,4 +87,4 @@ static int __init leds_init(void)
        return 0;
 }
-__initcall(leds_init);
+core_initcall(leds_init);
diff --git a/arch/arm/mach-integrator/platsmp.c b/arch/arm/mach-integrator/platsmp.c
new file mode 100644
index 0000000000..ead15dfcb5
--- /dev/null
+++ b/arch/arm/mach-integrator/platsmp.c
@@ -0,0 +1,192 @@
+/*
+ *  linux/arch/arm/mach-cintegrator/platsmp.c
+ *
+ *  Copyright (C) 2002 ARM Ltd.
+ *  All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/errno.h>
+#include <linux/mm.h>
+#include <asm/atomic.h>
+#include <asm/delay.h>
+#include <asm/mmu_context.h>
+#include <asm/procinfo.h>
+#include <asm/ptrace.h>
+#include <asm/smp.h>
+extern void integrator_secondary_startup(void);
+/*
+ * control for which core is the next to come out of the secondary
+ * boot "holding pen"
+ */
+volatile int __initdata pen_release = -1;
+unsigned long __initdata phys_pen_release = 0;
+static DEFINE_SPINLOCK(boot_lock);
+void __init platform_secondary_init(unsigned int cpu)
+{
+        /*
+         * the primary core may have used a "cross call" soft interrupt
+         * to get this processor out of WFI in the BootMonitor - make
+         * sure that we are no longer being sent this soft interrupt
+         */
+        smp_cross_call_done(cpumask_of_cpu(cpu));
+        /*
+         * if any interrupts are already enabled for the primary
+         * core (e.g. timer irq), then they will not have been enabled
+         * for us: do so
+         */
+        secondary_scan_irqs();
+        /*
+         * let the primary processor know we're out of the
+         * pen, then head off into the C entry point
+         */
+        pen_release = -1;
+        /*
+         * Synchronise with the boot thread.
+         */
+        spin_lock(&boot_lock);
+        spin_unlock(&boot_lock);
+}
+int __init boot_secondary(unsigned int cpu, struct task_struct *idle)
+{
+        unsigned long timeout;
+        /*
+         * set synchronisation state between this boot processor
+         * and the secondary one
+         */
+        spin_lock(&boot_lock);
+        /*
+         * The secondary processor is waiting to be released from
+         * the holding pen - release it, then wait for it to flag
+         * that it has been released by resetting pen_release.
+         *
+         * Note that "pen_release" is the hardware CPU ID, whereas
+         * "cpu" is Linux's internal ID.
+         */
+        pen_release = cpu;
+        /*
+         * XXX
+         *
+         * This is a later addition to the booting protocol: the
+         * bootMonitor now puts secondary cores into WFI, so
+         * poke_milo() no longer gets the cores moving; we need
+         * to send a soft interrupt to wake the secondary core.
+         * Use smp_cross_call() for this, since there's little
+         * point duplicating the code here
+         */
+        smp_cross_call(cpumask_of_cpu(cpu));
+        timeout = jiffies + (1 * HZ);
+        while (time_before(jiffies, timeout)) {
+                if (pen_release == -1)
+                        break;
+                udelay(10);
+        }
+        /*
+         * now the secondary core is starting up let it run its
+         * calibrations, then wait for it to finish
+         */
+        spin_unlock(&boot_lock);
+        return pen_release != -1 ? -ENOSYS : 0;
+}
+static void __init poke_milo(void)
+{
+        extern void secondary_startup(void);
+        /* nobody is to be released from the pen yet */
+        pen_release = -1;
+        phys_pen_release = virt_to_phys(&pen_release);
+        /*
+         * write the address of secondary startup into the system-wide
+         * flags register, then clear the bottom two bits, which is what
+         * BootMonitor is waiting for
+         */
+#if 1
+#define CINTEGRATOR_HDR_FLAGSS_OFFSET 0x30
+        __raw_writel(virt_to_phys(integrator_secondary_startup),
+                     (IO_ADDRESS(INTEGRATOR_HDR_BASE) +
+                      CINTEGRATOR_HDR_FLAGSS_OFFSET));
+#define CINTEGRATOR_HDR_FLAGSC_OFFSET 0x34
+        __raw_writel(3,
+                     (IO_ADDRESS(INTEGRATOR_HDR_BASE) +
+                      CINTEGRATOR_HDR_FLAGSC_OFFSET));
+#endif
+        mb();
+}
+void __init smp_prepare_cpus(unsigned int max_cpus)
+{
+        unsigned int ncores = get_core_count();
+        unsigned int cpu = smp_processor_id();
+        int i;
+        /* sanity check */
+        if (ncores == 0) {
+                printk(KERN_ERR
+                       "Integrator/CP: strange CM count of 0? Default to 1\n");
+                ncores = 1;
+        }
+        if (ncores > NR_CPUS) {
+                printk(KERN_WARNING
+                       "Integrator/CP: no. of cores (%d) greater than configured "
+                       "maximum of %d - clipping\n",
+                       ncores, NR_CPUS);
+                ncores = NR_CPUS;
+        }
+        /*
+         * start with some more config for the Boot CPU, now that
+         * the world is a bit more alive (which was not the case
+         * when smp_prepare_boot_cpu() was called)
+         */
+        smp_store_cpu_info(cpu);
+        /*
+         * are we trying to boot more cores than exist?
+         */
+        if (max_cpus > ncores)
+                max_cpus = ncores;
+        /*
+         * Initialise the present mask - this tells us which CPUs should
+         * be present.
+         */
+        for (i = 0; i < max_cpus; i++) {
+                cpu_set(i, cpu_present_mask);
+        }
+        /*
+         * Do we need any more CPUs? If so, then let them know where
+         * to start. Note that, on modern versions of MILO, the "poke"
+         * doesn't actually do anything until each individual core is
+         * sent a soft interrupt to get it out of WFI
+         */
+        if (max_cpus > 1)
+                poke_milo();
+}
diff --git a/arch/arm/mach-iop3xx/iop321-setup.c b/arch/arm/mach-iop3xx/iop321-setup.c
index bf23e0fd28..0f921ba275 100644
--- a/arch/arm/mach-iop3xx/iop321-setup.c
+++ b/arch/arm/mach-iop3xx/iop321-setup.c
@@ -146,23 +146,27 @@ extern void iop321_init_time(void);
 #if defined(CONFIG_ARCH_IQ80321)
 MACHINE_START(IQ80321, "Intel IQ80321")
-        MAINTAINER("Intel Corporation")
+        /* Maintainer: Intel Corporation */
-        BOOT_MEM(PHYS_OFFSET, IQ80321_UART, IQ80321_UART)
+        .phys_ram       = PHYS_OFFSET,
-        MAPIO(iq80321_map_io)
+        .phys_io        = IQ80321_UART,
-        INITIRQ(iop321_init_irq)
+        .io_pg_offst    = ((IQ80321_UART) >> 18) & 0xfffc,
+        .map_io         = iq80321_map_io,
+        .init_irq       = iop321_init_irq,
        .timer          = &iop321_timer,
-    BOOT_PARAMS(0xa0000100)
+        .boot_params    = 0xa0000100,
-        INIT_MACHINE(iop32x_init)
+        .init_machine   = iop32x_init,
 MACHINE_END
 #elif defined(CONFIG_ARCH_IQ31244)
 MACHINE_START(IQ31244, "Intel IQ31244")
-    MAINTAINER("Intel Corp.")
+        /* Maintainer: Intel Corp. */
-    BOOT_MEM(PHYS_OFFSET, IQ31244_UART, IQ31244_UART)
+        .phys_ram       = PHYS_OFFSET,
-    MAPIO(iq31244_map_io)
+        .phys_io        = IQ31244_UART,
-    INITIRQ(iop321_init_irq)
+        .io_pg_offst    = ((IQ31244_UART) >> 18) & 0xfffc,
+        .map_io         = iq31244_map_io,
+        .init_irq       = iop321_init_irq,
        .timer          = &iop321_timer,
-    BOOT_PARAMS(0xa0000100)
+        .boot_params    = 0xa0000100,
-        INIT_MACHINE(iop32x_init)
+        .init_machine   = iop32x_init,
 MACHINE_END
 #else
 #error No machine descriptor defined for this IOP3XX implementation
diff --git a/arch/arm/mach-iop3xx/iop321-time.c b/arch/arm/mach-iop3xx/iop321-time.c
index 9b7dd64d1b..d53af16695 100644
--- a/arch/arm/mach-iop3xx/iop321-time.c
+++ b/arch/arm/mach-iop3xx/iop321-time.c
@@ -86,7 +86,7 @@ iop321_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 static struct irqaction iop321_timer_irq = {
        .name           = "IOP321 Timer Tick",
        .handler        = iop321_timer_interrupt,
-        .flags          = SA_INTERRUPT
+        .flags          = SA_INTERRUPT | SA_TIMER,
 };
 static void __init iop321_timer_init(void)
diff --git a/arch/arm/mach-iop3xx/iop331-setup.c b/arch/arm/mach-iop3xx/iop331-setup.c
index 622e791481..fc74b722f7 100644
--- a/arch/arm/mach-iop3xx/iop331-setup.c
+++ b/arch/arm/mach-iop3xx/iop331-setup.c
@@ -148,26 +148,28 @@ extern void iq80332_map_io(void);
 #if defined(CONFIG_ARCH_IQ80331)
 MACHINE_START(IQ80331, "Intel IQ80331")
-    MAINTAINER("Intel Corp.")
+        /* Maintainer: Intel Corp. */
-    BOOT_MEM(PHYS_OFFSET, 0xfefff000, 0xfffff000) // virtual, physical
+        .phys_ram       = PHYS_OFFSET,
-    //BOOT_MEM(PHYS_OFFSET, IOP331_UART0_VIRT, IOP331_UART0_PHYS)
+        .phys_io        = 0xfefff000,
-    MAPIO(iq80331_map_io)
+        .io_pg_offst    = ((0xfffff000) >> 18) & 0xfffc, // virtual, physical
-    INITIRQ(iop331_init_irq)
+        .map_io         = iq80331_map_io,
+        .init_irq       = iop331_init_irq,
        .timer          = &iop331_timer,
-    BOOT_PARAMS(0x0100)
+        .boot_params    = 0x0100,
-        INIT_MACHINE(iop33x_init)
+        .init_machine   = iop33x_init,
 MACHINE_END
 #elif defined(CONFIG_MACH_IQ80332)
 MACHINE_START(IQ80332, "Intel IQ80332")
-    MAINTAINER("Intel Corp.")
+        /* Maintainer: Intel Corp. */
-    BOOT_MEM(PHYS_OFFSET, 0xfefff000, 0xfffff000) // virtual, physical
+        .phys_ram       = PHYS_OFFSET,
-    //BOOT_MEM(PHYS_OFFSET, IOP331_UART0_VIRT, IOP331_UART0_PHYS)
+        .phys_io        = 0xfefff000,
-    MAPIO(iq80332_map_io)
+        .io_pg_offst    = ((0xfffff000) >> 18) & 0xfffc, // virtual, physical
-    INITIRQ(iop331_init_irq)
+        .map_io         = iq80332_map_io,
+        .init_irq       = iop331_init_irq,
        .timer          = &iop331_timer,
-    BOOT_PARAMS(0x0100)
+        .boot_params    = 0x0100,
-        INIT_MACHINE(iop33x_init)
+        .init_machine   = iop33x_init,
 MACHINE_END
 #else
diff --git a/arch/arm/mach-iop3xx/iop331-time.c b/arch/arm/mach-iop3xx/iop331-time.c
index e016967692..1a6d9d661e 100644
--- a/arch/arm/mach-iop3xx/iop331-time.c
+++ b/arch/arm/mach-iop3xx/iop331-time.c
@@ -83,7 +83,7 @@ iop331_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 static struct irqaction iop331_timer_irq = {
        .name           = "IOP331 Timer Tick",
        .handler        = iop331_timer_interrupt,
-        .flags          = SA_INTERRUPT
+        .flags          = SA_INTERRUPT | SA_TIMER,
 };
 static void __init iop331_timer_init(void)
diff --git a/arch/arm/mach-ixp2000/Kconfig b/arch/arm/mach-ixp2000/Kconfig
index 9361e05f6f..ecb58d8347 100644
--- a/arch/arm/mach-ixp2000/Kconfig
+++ b/arch/arm/mach-ixp2000/Kconfig
@@ -54,6 +54,14 @@ config ARCH_IXDP2X01
        depends on ARCH_IXDP2401 || ARCH_IXDP2801
        default y       
+config IXP2000_SUPPORT_BROKEN_PCI_IO
+        bool "Support broken PCI I/O on older IXP2000s"
+        default y
+        help
+          Say 'N' here if you only intend to run your kernel on an
+          IXP2000 B0 or later model and do not need the PCI I/O
+          byteswap workaround.  Say 'Y' otherwise.
 endmenu
 endif
diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c
index 4f3c3d5c78..45b1865849 100644
--- a/arch/arm/mach-ixp2000/core.c
+++ b/arch/arm/mach-ixp2000/core.c
@@ -23,7 +23,7 @@
 #include <linux/serial.h>
 #include <linux/tty.h>
 #include <linux/bitops.h>
-#include <linux/serial_core.h>
+#include <linux/serial_8250.h>
 #include <linux/mm.h>
 #include <asm/types.h>
@@ -40,6 +40,8 @@
 #include <asm/mach/time.h>
 #include <asm/mach/irq.h>
+#include <asm/arch/gpio.h>
 static DEFINE_SPINLOCK(ixp2000_slowport_lock);
 static unsigned long ixp2000_slowport_irq_flags;
@@ -101,6 +103,11 @@ static struct map_desc ixp2000_io_desc[] __initdata = {
                .length         = IXP2000_PCI_CSR_SIZE,
                .type           = MT_DEVICE
        }, {
+                .virtual        = IXP2000_MSF_VIRT_BASE,
+                .physical       = IXP2000_MSF_PHYS_BASE,
+                .length         = IXP2000_MSF_SIZE,
+                .type           = MT_DEVICE
+        }, {
                .virtual        = IXP2000_PCI_IO_VIRT_BASE,
                .physical       = IXP2000_PCI_IO_PHYS_BASE,
                .length         = IXP2000_PCI_IO_SIZE,
@@ -118,19 +125,6 @@ static struct map_desc ixp2000_io_desc[] __initdata = {
        }
 };
-static struct uart_port ixp2000_serial_port = {
-        .membase        = (char *)(IXP2000_UART_VIRT_BASE + 3),
-        .mapbase        = IXP2000_UART_PHYS_BASE + 3,
-        .irq            = IRQ_IXP2000_UART,
-        .flags          = UPF_SKIP_TEST,
-        .iotype         = UPIO_MEM,
-        .regshift       = 2,
-        .uartclk        = 50000000,
-        .line           = 0,
-        .type           = PORT_XSCALE,
-        .fifosize       = 16
-};
 void __init ixp2000_map_io(void)
 {
        extern unsigned int processor_id;
@@ -150,24 +144,63 @@ void __init ixp2000_map_io(void)
        }
        iotable_init(ixp2000_io_desc, ARRAY_SIZE(ixp2000_io_desc));
-        early_serial_setup(&ixp2000_serial_port);
        /* Set slowport to 8-bit mode.  */
        ixp2000_reg_write(IXP2000_SLOWPORT_FRM, 1);
 }
+/*************************************************************************
+ * Serial port support for IXP2000
+ *************************************************************************/
+static struct plat_serial8250_port ixp2000_serial_port[] = {
+        {
+                .mapbase        = IXP2000_UART_PHYS_BASE,
+                .membase        = (char *)(IXP2000_UART_VIRT_BASE + 3),
+                .irq            = IRQ_IXP2000_UART,
+                .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
+                .iotype         = UPIO_MEM,
+                .regshift       = 2,
+                .uartclk        = 50000000,
+        },
+        { },
+};
+static struct resource ixp2000_uart_resource = {
+        .start          = IXP2000_UART_PHYS_BASE,
+        .end            = IXP2000_UART_PHYS_BASE + 0xffff,
+        .flags          = IORESOURCE_MEM,
+};
+static struct platform_device ixp2000_serial_device = {
+        .name           = "serial8250",
+        .id             = 0,
+        .dev            = {
+                .platform_data          = ixp2000_serial_port,
+        },
+        .num_resources  = 1,
+        .resource       = &ixp2000_uart_resource,
+};
+void __init ixp2000_uart_init(void)
+{
+        platform_device_register(&ixp2000_serial_device);
+}
 /*************************************************************************
 * Timer-tick functions for IXP2000
 *************************************************************************/
 static unsigned ticks_per_jiffy;
 static unsigned ticks_per_usec;
 static unsigned next_jiffy_time;
+static volatile unsigned long *missing_jiffy_timer_csr;
 unsigned long ixp2000_gettimeoffset (void)
 {
        unsigned long offset;
-        offset = next_jiffy_time - *IXP2000_T4_CSR;
+        offset = next_jiffy_time - *missing_jiffy_timer_csr;
        return offset / ticks_per_usec;
 }
@@ -178,8 +211,8 @@ static int ixp2000_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
        /* clear timer 1 */
        ixp2000_reg_write(IXP2000_T1_CLR, 1);
-        
-        while ((next_jiffy_time - *IXP2000_T4_CSR) > ticks_per_jiffy) {
+        while ((next_jiffy_time - *missing_jiffy_timer_csr) > ticks_per_jiffy) {
                timer_tick(regs);
                next_jiffy_time -= ticks_per_jiffy;
        }
@@ -191,26 +224,43 @@ static int ixp2000_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 static struct irqaction ixp2000_timer_irq = {
        .name           = "IXP2000 Timer Tick",
-        .flags          = SA_INTERRUPT,
+        .flags          = SA_INTERRUPT | SA_TIMER,
-        .handler        = ixp2000_timer_interrupt
+        .handler        = ixp2000_timer_interrupt,
 };
 void __init ixp2000_init_time(unsigned long tick_rate)
 {
-        ixp2000_reg_write(IXP2000_T1_CLR, 0);
-        ixp2000_reg_write(IXP2000_T4_CLR, 0);
        ticks_per_jiffy = (tick_rate + HZ/2) / HZ;
        ticks_per_usec = tick_rate / 1000000;
+        /*
+         * We use timer 1 as our timer interrupt.
+         */
+        ixp2000_reg_write(IXP2000_T1_CLR, 0);
        ixp2000_reg_write(IXP2000_T1_CLD, ticks_per_jiffy - 1);
        ixp2000_reg_write(IXP2000_T1_CTL, (1 << 7));
        /*
-         * We use T4 as a monotonic counter to track missed jiffies
+         * We use a second timer as a monotonic counter for tracking
+         * missed jiffies.  The IXP2000 has four timers, but if we're
+         * on an A-step IXP2800, timer 2 and 3 don't work, so on those
+         * chips we use timer 4.  Timer 4 is the only timer that can
+         * be used for the watchdog, so we use timer 2 if we're on a
+         * non-buggy chip.
         */
-        ixp2000_reg_write(IXP2000_T4_CLD, -1);
+        if ((*IXP2000_PRODUCT_ID & 0x001ffef0) == 0x00000000) {
-        ixp2000_reg_write(IXP2000_T4_CTL, (1 << 7));
+                printk(KERN_INFO "Enabling IXP2800 erratum #25 workaround\n");
+                ixp2000_reg_write(IXP2000_T4_CLR, 0);
+                ixp2000_reg_write(IXP2000_T4_CLD, -1);
+                ixp2000_reg_write(IXP2000_T4_CTL, (1 << 7));
+                missing_jiffy_timer_csr = IXP2000_T4_CSR;
+        } else {
+                ixp2000_reg_write(IXP2000_T2_CLR, 0);
+                ixp2000_reg_write(IXP2000_T2_CLD, -1);
+                ixp2000_reg_write(IXP2000_T2_CTL, (1 << 7));
+                missing_jiffy_timer_csr = IXP2000_T2_CSR;
+        }
        next_jiffy_time = 0xffffffff;
        /* register for interrupt */
@@ -220,35 +270,40 @@ void __init ixp2000_init_time(unsigned long tick_rate)
 /*************************************************************************
 * GPIO helpers
 *************************************************************************/
-static unsigned long GPIO_IRQ_rising_edge;
 static unsigned long GPIO_IRQ_falling_edge;
+static unsigned long GPIO_IRQ_rising_edge;
 static unsigned long GPIO_IRQ_level_low;
 static unsigned long GPIO_IRQ_level_high;
-void gpio_line_config(int line, int style)
+static void update_gpio_int_csrs(void)
+{
+        ixp2000_reg_write(IXP2000_GPIO_FEDR, GPIO_IRQ_falling_edge);
+        ixp2000_reg_write(IXP2000_GPIO_REDR, GPIO_IRQ_rising_edge);
+        ixp2000_reg_write(IXP2000_GPIO_LSLR, GPIO_IRQ_level_low);
+        ixp2000_reg_write(IXP2000_GPIO_LSHR, GPIO_IRQ_level_high);
+}
+void gpio_line_config(int line, int direction)
 {
        unsigned long flags;
        local_irq_save(flags);
+        if (direction == GPIO_OUT) {
+                irq_desc[line + IRQ_IXP2000_GPIO0].valid = 0;
-        if(style == GPIO_OUT) {
                /* if it's an output, it ain't an interrupt anymore */
-                ixp2000_reg_write(IXP2000_GPIO_PDSR, (1 << line));
                GPIO_IRQ_falling_edge &= ~(1 << line);
                GPIO_IRQ_rising_edge &= ~(1 << line);
                GPIO_IRQ_level_low &= ~(1 << line);
                GPIO_IRQ_level_high &= ~(1 << line);
-                ixp2000_reg_write(IXP2000_GPIO_FEDR, GPIO_IRQ_falling_edge);
+                update_gpio_int_csrs();
-                ixp2000_reg_write(IXP2000_GPIO_REDR, GPIO_IRQ_rising_edge);
-                ixp2000_reg_write(IXP2000_GPIO_LSHR, GPIO_IRQ_level_high);
+                ixp2000_reg_write(IXP2000_GPIO_PDSR, 1 << line);
-                ixp2000_reg_write(IXP2000_GPIO_LSLR, GPIO_IRQ_level_low);
+        } else if (direction == GPIO_IN) {
-                irq_desc[line+IRQ_IXP2000_GPIO0].valid = 0;
+                ixp2000_reg_write(IXP2000_GPIO_PDCR, 1 << line);
-        } else if(style == GPIO_IN) {
-                ixp2000_reg_write(IXP2000_GPIO_PDCR, (1 << line));
        }
-                
        local_irq_restore(flags);
-}       
+}
 /*************************************************************************
@@ -267,9 +322,50 @@ static void ixp2000_GPIO_irq_handler(unsigned int irq, struct irqdesc *desc, str
        }
 }
+static int ixp2000_GPIO_irq_type(unsigned int irq, unsigned int type)
+{
+        int line = irq - IRQ_IXP2000_GPIO0;
+        /*
+         * First, configure this GPIO line as an input.
+         */
+        ixp2000_reg_write(IXP2000_GPIO_PDCR, 1 << line);
+        /*
+         * Then, set the proper trigger type.
+         */
+        if (type & IRQT_FALLING)
+                GPIO_IRQ_falling_edge |= 1 << line;
+        else
+                GPIO_IRQ_falling_edge &= ~(1 << line);
+        if (type & IRQT_RISING)
+                GPIO_IRQ_rising_edge |= 1 << line;
+        else
+                GPIO_IRQ_rising_edge &= ~(1 << line);
+        if (type & IRQT_LOW)
+                GPIO_IRQ_level_low |= 1 << line;
+        else
+                GPIO_IRQ_level_low &= ~(1 << line);
+        if (type & IRQT_HIGH)
+                GPIO_IRQ_level_high |= 1 << line;
+        else
+                GPIO_IRQ_level_high &= ~(1 << line);
+        update_gpio_int_csrs();
+        /*
+         * Finally, mark the corresponding IRQ as valid.
+         */
+        irq_desc[irq].valid = 1;
+        return 0;
+}
 static void ixp2000_GPIO_irq_mask_ack(unsigned int irq)
 {
        ixp2000_reg_write(IXP2000_GPIO_INCR, (1 << (irq - IRQ_IXP2000_GPIO0)));
+        ixp2000_reg_write(IXP2000_GPIO_EDSR, (1 << (irq - IRQ_IXP2000_GPIO0)));
+        ixp2000_reg_write(IXP2000_GPIO_LDSR, (1 << (irq - IRQ_IXP2000_GPIO0)));
        ixp2000_reg_write(IXP2000_GPIO_INST, (1 << (irq - IRQ_IXP2000_GPIO0)));
 }
@@ -284,6 +380,7 @@ static void ixp2000_GPIO_irq_unmask(unsigned int irq)
 }
 static struct irqchip ixp2000_GPIO_irq_chip = {
+        .type   = ixp2000_GPIO_irq_type,
        .ack    = ixp2000_GPIO_irq_mask_ack,
        .mask   = ixp2000_GPIO_irq_mask,
        .unmask = ixp2000_GPIO_irq_unmask
@@ -320,7 +417,7 @@ static void ixp2000_irq_mask(unsigned int irq)
 static void ixp2000_irq_unmask(unsigned int irq)
 {
-        ixp2000_reg_write(IXP2000_IRQ_ENABLE_SET,  (1 << irq));
+        ixp2000_reg_write(IXP2000_IRQ_ENABLE_SET, (1 << irq));
 }
 static struct irqchip ixp2000_irq_chip = {
@@ -357,16 +454,16 @@ void __init ixp2000_init_irq(void)
         * our mask/unmask code much simpler.
         */
        for (irq = IRQ_IXP2000_SOFT_INT; irq <= IRQ_IXP2000_THDB3; irq++) {
-                if((1 << irq) & IXP2000_VALID_IRQ_MASK) {
+                if ((1 << irq) & IXP2000_VALID_IRQ_MASK) {
                        set_irq_chip(irq, &ixp2000_irq_chip);
                        set_irq_handler(irq, do_level_IRQ);
                        set_irq_flags(irq, IRQF_VALID);
                } else set_irq_flags(irq, 0);
        }
-        
        /*
         * GPIO IRQs are invalid until someone sets the interrupt mode
-         * by calling gpio_line_set();
+         * by calling set_irq_type().
         */
        for (irq = IRQ_IXP2000_GPIO0; irq <= IRQ_IXP2000_GPIO7; irq++) {
                set_irq_chip(irq, &ixp2000_GPIO_irq_chip);
diff --git a/arch/arm/mach-ixp2000/enp2611.c b/arch/arm/mach-ixp2000/enp2611.c
index 04b38bcf9a..9aa54de447 100644
--- a/arch/arm/mach-ixp2000/enp2611.c
+++ b/arch/arm/mach-ixp2000/enp2611.c
@@ -197,24 +197,42 @@ static struct platform_device enp2611_flash = {
        .resource       = &enp2611_flash_resource,
 };
+static struct ixp2000_i2c_pins enp2611_i2c_gpio_pins = {
+        .sda_pin        = ENP2611_GPIO_SDA,
+        .scl_pin        = ENP2611_GPIO_SCL,
+};
+static struct platform_device enp2611_i2c_controller = {
+        .name           = "IXP2000-I2C",
+        .id             = 0,
+        .dev            = {
+                .platform_data = &enp2611_i2c_gpio_pins
+        },
+        .num_resources  = 0
+};
 static struct platform_device *enp2611_devices[] __initdata = {
-        &enp2611_flash
+        &enp2611_flash,
+        &enp2611_i2c_controller
 };
 static void __init enp2611_init_machine(void)
 {
        platform_add_devices(enp2611_devices, ARRAY_SIZE(enp2611_devices));
+        ixp2000_uart_init();
 }
 MACHINE_START(ENP2611, "Radisys ENP-2611 PCI network processor board")
-        MAINTAINER("Lennert Buytenhek <buytenh@wantstofly.org>")
+        /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
-        BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = IXP2000_UART_PHYS_BASE,
-        MAPIO(ixp2000_map_io)
+        .io_pg_offst    = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
-        INITIRQ(ixp2000_init_irq)
+        .boot_params    = 0x00000100,
+        .map_io         = ixp2000_map_io,
+        .init_irq       = ixp2000_init_irq,
        .timer          = &enp2611_timer,
-        INIT_MACHINE(enp2611_init_machine)
+        .init_machine   = enp2611_init_machine,
 MACHINE_END
diff --git a/arch/arm/mach-ixp2000/ixdp2400.c b/arch/arm/mach-ixp2000/ixdp2400.c
index df3ff26c8c..fd280a9363 100644
--- a/arch/arm/mach-ixp2000/ixdp2400.c
+++ b/arch/arm/mach-ixp2000/ixdp2400.c
@@ -168,12 +168,14 @@ void ixdp2400_init_irq(void)
 }
 MACHINE_START(IXDP2400, "Intel IXDP2400 Development Platform")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = IXP2000_UART_PHYS_BASE,
-        MAPIO(ixdp2x00_map_io)
+        .io_pg_offst    = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
-        INITIRQ(ixdp2400_init_irq)
+        .boot_params    = 0x00000100,
+        .map_io         = ixdp2x00_map_io,
+        .init_irq       = ixdp2400_init_irq,
        .timer          = &ixdp2400_timer,
-        INIT_MACHINE(ixdp2x00_init_machine)
+        .init_machine   = ixdp2x00_init_machine,
 MACHINE_END
diff --git a/arch/arm/mach-ixp2000/ixdp2800.c b/arch/arm/mach-ixp2000/ixdp2800.c
index aec13c7108..f9073aa286 100644
--- a/arch/arm/mach-ixp2000/ixdp2800.c
+++ b/arch/arm/mach-ixp2000/ixdp2800.c
@@ -42,12 +42,6 @@
 #include <asm/mach/flash.h>
 #include <asm/mach/arch.h>
-void ixdp2400_init_irq(void)
-{
-        ixdp2x00_init_irq(IXDP2800_CPLD_INT_STAT, IXDP2800_CPLD_INT_MASK, IXDP2400_NR_IRQS);
-}
 /*************************************************************************
 * IXDP2800 timer tick
 *************************************************************************/
@@ -290,12 +284,14 @@ void ixdp2800_init_irq(void)
 }
 MACHINE_START(IXDP2800, "Intel IXDP2800 Development Platform")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = IXP2000_UART_PHYS_BASE,
-        MAPIO(ixdp2x00_map_io)
+        .io_pg_offst    = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
-        INITIRQ(ixdp2800_init_irq)
+        .boot_params    = 0x00000100,
+        .map_io         = ixdp2x00_map_io,
+        .init_irq       = ixdp2800_init_irq,
        .timer          = &ixdp2800_timer,
-        INIT_MACHINE(ixdp2x00_init_machine)
+        .init_machine   = ixdp2x00_init_machine,
 MACHINE_END
diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c
index 21c41fe15b..a43369ad87 100644
--- a/arch/arm/mach-ixp2000/ixdp2x00.c
+++ b/arch/arm/mach-ixp2000/ixdp2x00.c
@@ -42,6 +42,9 @@
 #include <asm/mach/flash.h>
 #include <asm/mach/arch.h>
+#include <asm/arch/gpio.h>
 /*************************************************************************
 * IXDP2x00 IRQ Initialization
 *************************************************************************/
@@ -300,5 +303,6 @@ void __init ixdp2x00_init_machine(void)
        gpio_line_config(IXDP2X00_GPIO_I2C_ENABLE, GPIO_OUT);
        platform_add_devices(ixdp2x00_devices, ARRAY_SIZE(ixdp2x00_devices));
+        ixp2000_uart_init();
 }
diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c
index e94dace3d4..43447dad16 100644
--- a/arch/arm/mach-ixp2000/ixdp2x01.c
+++ b/arch/arm/mach-ixp2000/ixdp2x01.c
@@ -370,30 +370,35 @@ static void __init ixdp2x01_init_machine(void)
                ((*IXDP2X01_CPLD_FLASH_REG & IXDP2X01_CPLD_FLASH_BANK_MASK) + 1);
        platform_add_devices(ixdp2x01_devices, ARRAY_SIZE(ixdp2x01_devices));
+        ixp2000_uart_init();
 }
 #ifdef CONFIG_ARCH_IXDP2401
 MACHINE_START(IXDP2401, "Intel IXDP2401 Development Platform")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = IXP2000_UART_PHYS_BASE,
-        MAPIO(ixdp2x01_map_io)
+        .io_pg_offst    = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
-        INITIRQ(ixdp2x01_init_irq)
+        .boot_params    = 0x00000100,
+        .map_io         = ixdp2x01_map_io,
+        .init_irq       = ixdp2x01_init_irq,
        .timer          = &ixdp2x01_timer,
-        INIT_MACHINE(ixdp2x01_init_machine)
+        .init_machine   = ixdp2x01_init_machine,
 MACHINE_END
 #endif
 #ifdef CONFIG_ARCH_IXDP2801
 MACHINE_START(IXDP2801, "Intel IXDP2801 Development Platform")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = IXP2000_UART_PHYS_BASE,
-        MAPIO(ixdp2x01_map_io)
+        .io_pg_offst    = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
-        INITIRQ(ixdp2x01_init_irq)
+        .boot_params    = 0x00000100,
+        .map_io         = ixdp2x01_map_io,
+        .init_irq       = ixdp2x01_init_irq,
        .timer          = &ixdp2x01_timer,
-        INIT_MACHINE(ixdp2x01_init_machine)
+        .init_machine   = ixdp2x01_init_machine,
 MACHINE_END
 #endif
diff --git a/arch/arm/mach-ixp2000/pci.c b/arch/arm/mach-ixp2000/pci.c
index 5ff2f2718c..0788fb2b5c 100644
--- a/arch/arm/mach-ixp2000/pci.c
+++ b/arch/arm/mach-ixp2000/pci.c
@@ -198,6 +198,19 @@ clear_master_aborts(void)
 void __init
 ixp2000_pci_preinit(void)
 {
+#ifndef CONFIG_IXP2000_SUPPORT_BROKEN_PCI_IO
+        /*
+         * Configure the PCI unit to properly byteswap I/O transactions,
+         * and verify that it worked.
+         */
+        ixp2000_reg_write(IXP2000_PCI_CONTROL,
+                          (*IXP2000_PCI_CONTROL | PCI_CONTROL_IEE));
+        if ((*IXP2000_PCI_CONTROL & PCI_CONTROL_IEE) == 0)
+                panic("IXP2000: PCI I/O is broken on this ixp model, and "
+                        "the needed workaround has not been configured in");
+#endif
        hook_fault_code(16+6, ixp2000_pci_abort_handler, SIGBUS,
                                "PCI config cycle to non-existent device");
 }
diff --git a/arch/arm/mach-ixp4xx/common-pci.c b/arch/arm/mach-ixp4xx/common-pci.c
index aa92e37088..2b544363c0 100644
--- a/arch/arm/mach-ixp4xx/common-pci.c
+++ b/arch/arm/mach-ixp4xx/common-pci.c
@@ -453,8 +453,8 @@ int ixp4xx_setup(int nr, struct pci_sys_data *sys)
        local_write_config(PCI_COMMAND, 2, PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY);
        res[0].name = "PCI I/O Space";
-        res[0].start = 0x00001000;
+        res[0].start = 0x00000000;
-        res[0].end = 0xffff0000;
+        res[0].end = 0x0000ffff;
        res[0].flags = IORESOURCE_IO;
        res[1].name = "PCI Memory Space";
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index 267ba02d77..04490a9f8f 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -141,7 +141,15 @@ static struct map_desc ixp4xx_io_desc[] __initdata = {
                .physical       = IXP4XX_PCI_CFG_BASE_PHYS,
                .length         = IXP4XX_PCI_CFG_REGION_SIZE,
                .type           = MT_DEVICE
+        },
+#ifdef CONFIG_DEBUG_LL
+        {       /* Debug UART mapping */
+                .virtual        = IXP4XX_DEBUG_UART_BASE_VIRT,
+                .physical       = IXP4XX_DEBUG_UART_BASE_PHYS,
+                .length         = IXP4XX_DEBUG_UART_REGION_SIZE,
+                .type           = MT_DEVICE
        }
+#endif
 };
 void __init ixp4xx_map_io(void)
@@ -290,8 +298,8 @@ static irqreturn_t ixp4xx_timer_interrupt(int irq, void *dev_id, struct pt_regs
 static struct irqaction ixp4xx_timer_irq = {
        .name           = "IXP4xx Timer Tick",
-        .flags          = SA_INTERRUPT,
+        .flags          = SA_INTERRUPT | SA_TIMER,
-        .handler        = ixp4xx_timer_interrupt
+        .handler        = ixp4xx_timer_interrupt,
 };
 static void __init ixp4xx_timer_init(void)
diff --git a/arch/arm/mach-ixp4xx/coyote-setup.c b/arch/arm/mach-ixp4xx/coyote-setup.c
index 8a05a1227e..4ff4393ef0 100644
--- a/arch/arm/mach-ixp4xx/coyote-setup.c
+++ b/arch/arm/mach-ixp4xx/coyote-setup.c
@@ -56,21 +56,24 @@ static struct resource coyote_uart_resource = {
        .flags  = IORESOURCE_MEM,
 };
-static struct plat_serial8250_port coyote_uart_data = {
+static struct plat_serial8250_port coyote_uart_data[] = {
-        .mapbase        = IXP4XX_UART2_BASE_PHYS,
+        {
-        .membase        = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
+                .mapbase        = IXP4XX_UART2_BASE_PHYS,
-        .irq            = IRQ_IXP4XX_UART2,
+                .membase        = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
-        .flags          = UPF_BOOT_AUTOCONF,
+                .irq            = IRQ_IXP4XX_UART2,
-        .iotype         = UPIO_MEM,
+                .flags          = UPF_BOOT_AUTOCONF,
-        .regshift       = 2,
+                .iotype         = UPIO_MEM,
-        .uartclk        = IXP4XX_UART_XTAL,
+                .regshift       = 2,
+                .uartclk        = IXP4XX_UART_XTAL,
+        },
+        { },
 };
 static struct platform_device coyote_uart = {
        .name           = "serial8250",
        .id             = 0,
        .dev                    = {
-                .platform_data  = &coyote_uart_data,
+                .platform_data  = coyote_uart_data,
        },
        .num_resources  = 1,
        .resource       = &coyote_uart_resource,
@@ -87,10 +90,10 @@ static void __init coyote_init(void)
        *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
        if (machine_is_ixdpg425()) {
-                coyote_uart_data.membase =
+                coyote_uart_data[0].membase =
                        (char*)(IXP4XX_UART1_BASE_VIRT + REG_OFFSET);
-                coyote_uart_data.mapbase = IXP4XX_UART1_BASE_PHYS;
+                coyote_uart_data[0].mapbase = IXP4XX_UART1_BASE_PHYS;
-                coyote_uart_data.irq = IRQ_IXP4XX_UART1;
+                coyote_uart_data[0].irq = IRQ_IXP4XX_UART1;
        }
@@ -100,14 +103,15 @@ static void __init coyote_init(void)
 #ifdef CONFIG_ARCH_ADI_COYOTE
 MACHINE_START(ADI_COYOTE, "ADI Engineering Coyote")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
+        .phys_ram       = PHYS_OFFSET,
-                IXP4XX_PERIPHERAL_BASE_VIRT)
+        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
-        MAPIO(coyote_map_io)
+        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
-        INITIRQ(ixp4xx_init_irq)
+        .map_io         = coyote_map_io,
+        .init_irq       = ixp4xx_init_irq,
        .timer          = &ixp4xx_timer,
-        BOOT_PARAMS(0x0100)
+        .boot_params    = 0x0100,
-        INIT_MACHINE(coyote_init)
+        .init_machine   = coyote_init,
 MACHINE_END
 #endif
@@ -117,14 +121,15 @@ MACHINE_END
 */
 #ifdef CONFIG_MACH_IXDPG425
 MACHINE_START(IXDPG425, "Intel IXDPG425")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
+        .phys_ram       = PHYS_OFFSET,
-                IXP4XX_PERIPHERAL_BASE_VIRT)
+        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
-        MAPIO(coyote_map_io)
+        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
-        INITIRQ(ixp4xx_init_irq)
+        .map_io         = coyote_map_io,
+        .init_irq       = ixp4xx_init_irq,
        .timer          = &ixp4xx_timer,
-        BOOT_PARAMS(0x0100)
+        .boot_params    = 0x0100,
-        INIT_MACHINE(coyote_init)
+        .init_machine   = coyote_init,
 MACHINE_END
 #endif
diff --git a/arch/arm/mach-ixp4xx/gtwx5715-setup.c b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
index e77c86efd2..8ba1cd9406 100644
--- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c
+++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
@@ -140,14 +140,15 @@ static void __init gtwx5715_init(void)
 MACHINE_START(GTWX5715, "Gemtek GTWX5715 (Linksys WRV54G)")
-        MAINTAINER("George Joseph")
+        /* Maintainer: George Joseph */
-        BOOT_MEM(PHYS_OFFSET, IXP4XX_UART2_BASE_PHYS,
+        .phys_ram       = PHYS_OFFSET,
-                IXP4XX_UART2_BASE_VIRT)
+        .phys_io        = IXP4XX_UART2_BASE_PHYS,
-        MAPIO(gtwx5715_map_io)
+        .io_pg_offst    = ((IXP4XX_UART2_BASE_VIRT) >> 18) & 0xfffc,
-        INITIRQ(ixp4xx_init_irq)
+        .map_io         = gtwx5715_map_io,
-                  .timer                = &ixp4xx_timer,
+        .init_irq       = ixp4xx_init_irq,
-        BOOT_PARAMS(0x0100)
+        .timer          = &ixp4xx_timer,
-        INIT_MACHINE(gtwx5715_init)
+        .boot_params    = 0x0100,
+        .init_machine   = gtwx5715_init,
 MACHINE_END
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c
index 77346c1f67..c2ba759e99 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -95,7 +95,8 @@ static struct plat_serial8250_port ixdp425_uart_data[] = {
                .iotype         = UPIO_MEM,
                .regshift       = 2,
                .uartclk        = IXP4XX_UART_XTAL,
-        }
+        },
+        { },
 };
 static struct platform_device ixdp425_uart = {
@@ -128,36 +129,39 @@ static void __init ixdp425_init(void)
 }
 MACHINE_START(IXDP425, "Intel IXDP425 Development Platform")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
+        .phys_ram       = PHYS_OFFSET,
-                IXP4XX_PERIPHERAL_BASE_VIRT)
+        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
-        MAPIO(ixdp425_map_io)
+        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
-        INITIRQ(ixp4xx_init_irq)
+        .map_io         = ixdp425_map_io,
+        .init_irq       = ixp4xx_init_irq,
        .timer          = &ixp4xx_timer,
-        BOOT_PARAMS(0x0100)
+        .boot_params    = 0x0100,
-        INIT_MACHINE(ixdp425_init)
+        .init_machine   = ixdp425_init,
 MACHINE_END
 MACHINE_START(IXDP465, "Intel IXDP465 Development Platform")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
+        .phys_ram       = PHYS_OFFSET,
-                IXP4XX_PERIPHERAL_BASE_VIRT)
+        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
-        MAPIO(ixdp425_map_io)
+        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
-        INITIRQ(ixp4xx_init_irq)
+        .map_io         = ixdp425_map_io,
+        .init_irq       = ixp4xx_init_irq,
        .timer          = &ixp4xx_timer,
-        BOOT_PARAMS(0x0100)
+        .boot_params    = 0x0100,
-        INIT_MACHINE(ixdp425_init)
+        .init_machine   = ixdp425_init,
 MACHINE_END
 MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
+        .phys_ram       = PHYS_OFFSET,
-                IXP4XX_PERIPHERAL_BASE_VIRT)
+        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
-        MAPIO(ixdp425_map_io)
+        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
-        INITIRQ(ixp4xx_init_irq)
+        .map_io         = ixdp425_map_io,
+        .init_irq       = ixp4xx_init_irq,
        .timer          = &ixp4xx_timer,
-        BOOT_PARAMS(0x0100)
+        .boot_params    = 0x0100,
-        INIT_MACHINE(ixdp425_init)
+        .init_machine   = ixdp425_init,
 MACHINE_END
 /*
@@ -168,14 +172,15 @@ MACHINE_END
 */
 #ifdef CONFIG_ARCH_AVILA
 MACHINE_START(AVILA, "Gateworks Avila Network Platform")
-        MAINTAINER("Deepak Saxena <dsaxena@plexity.net>")
+        /* Maintainer: Deepak Saxena <dsaxena@plexity.net> */
-        BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
+        .phys_ram       = PHYS_OFFSET,
-                IXP4XX_PERIPHERAL_BASE_VIRT)
+        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
-        MAPIO(ixdp425_map_io)
+        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
-        INITIRQ(ixp4xx_init_irq)
+        .map_io         = ixdp425_map_io,
+        .init_irq       = ixp4xx_init_irq,
        .timer          = &ixp4xx_timer,
-        BOOT_PARAMS(0x0100)
+        .boot_params    = 0x0100,
-        INIT_MACHINE(ixdp425_init)
+        .init_machine   = ixdp425_init,
 MACHINE_END
 #endif
diff --git a/arch/arm/mach-l7200/core.c b/arch/arm/mach-l7200/core.c
index 606ca95f82..2a7fee2a76 100644
--- a/arch/arm/mach-l7200/core.c
+++ b/arch/arm/mach-l7200/core.c
@@ -81,9 +81,11 @@ static void __init l7200_map_io(void)
 }
 MACHINE_START(L7200, "LinkUp Systems L7200")
-        MAINTAINER("Steve Hill / Scott McConnell")
+        /* Maintainer: Steve Hill / Scott McConnell */
-        BOOT_MEM(0xf0000000, 0x80040000, 0xd0000000)
+        .phys_ram       = 0xf0000000,
-        MAPIO(l7200_map_io)
+        .phys_io        = 0x80040000,
-        INITIRQ(l7200_init_irq)
+        .io_pg_offst    = ((0xd0000000) >> 18) & 0xfffc,
+        .map_io         = l7200_map_io,
+        .init_irq       = l7200_init_irq,
 MACHINE_END
diff --git a/arch/arm/mach-lh7a40x/arch-kev7a400.c b/arch/arm/mach-lh7a40x/arch-kev7a400.c
index be5d17fe9d..cb3dcd3bd0 100644
--- a/arch/arm/mach-lh7a40x/arch-kev7a400.c
+++ b/arch/arm/mach-lh7a40x/arch-kev7a400.c
@@ -102,10 +102,12 @@ void __init lh7a40x_init_board_irq (void)
 }
 MACHINE_START (KEV7A400, "Sharp KEV7a400")
-        MAINTAINER ("Marc Singer")
+        /* Maintainer: Marc Singer */
-        BOOT_MEM (0xc0000000, 0x80000000, io_p2v (0x80000000))
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS (0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO (kev7a400_map_io)
+        .io_pg_offst    = ((io_p2v (0x80000000))>>18) & 0xfffc,
-        INITIRQ (lh7a400_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = kev7a400_map_io,
+        .init_irq       = lh7a400_init_irq,
        .timer          = &lh7a40x_timer,
 MACHINE_END
diff --git a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
index c823447a15..6eb61a17c6 100644
--- a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
+++ b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
@@ -260,13 +260,15 @@ lpd7a400_map_io(void)
 #ifdef CONFIG_MACH_LPD7A400
 MACHINE_START (LPD7A400, "Logic Product Development LPD7A400-10")
-        MAINTAINER ("Marc Singer")
+        /* Maintainer: Marc Singer */
-        BOOT_MEM (0xc0000000, 0x80000000, io_p2v (0x80000000))
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS (0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO (lpd7a400_map_io)
+        .io_pg_offst    = ((io_p2v (0x80000000))>>18) & 0xfffc,
-        INITIRQ (lh7a400_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = lpd7a400_map_io,
+        .init_irq       = lh7a400_init_irq,
        .timer          = &lh7a40x_timer,
-        INIT_MACHINE (lpd7a40x_init)
+        .init_machine   = lpd7a40x_init,
 MACHINE_END
 #endif
@@ -274,13 +276,15 @@ MACHINE_END
 #ifdef CONFIG_MACH_LPD7A404
 MACHINE_START (LPD7A404, "Logic Product Development LPD7A404-10")
-        MAINTAINER ("Marc Singer")
+        /* Maintainer: Marc Singer */
-        BOOT_MEM (0xc0000000, 0x80000000, io_p2v (0x80000000))
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS (0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO (lpd7a400_map_io)
+        .io_pg_offst    = ((io_p2v (0x80000000))>>18) & 0xfffc,
-        INITIRQ (lh7a404_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = lpd7a400_map_io,
+        .init_irq       = lh7a404_init_irq,
        .timer          = &lh7a40x_timer,
-        INIT_MACHINE (lpd7a40x_init)
+        .init_machine   = lpd7a40x_init,
 MACHINE_END
 #endif
diff --git a/arch/arm/mach-lh7a40x/time.c b/arch/arm/mach-lh7a40x/time.c
index 51e1c814b4..be377e331f 100644
--- a/arch/arm/mach-lh7a40x/time.c
+++ b/arch/arm/mach-lh7a40x/time.c
@@ -53,8 +53,8 @@ lh7a40x_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 static struct irqaction lh7a40x_timer_irq = {
        .name           = "LHA740x Timer Tick",
-        .flags          = SA_INTERRUPT,
+        .flags          = SA_INTERRUPT | SA_TIMER,
-        .handler        = lh7a40x_timer_interrupt
+        .handler        = lh7a40x_timer_interrupt,
 };
 static void __init lh7a40x_timer_init(void)
diff --git a/arch/arm/mach-omap/Kconfig b/arch/arm/mach-omap/Kconfig
deleted file mode 100644
index 9e42efa66b..0000000000
--- a/arch/arm/mach-omap/Kconfig
+++ /dev/null
@@ -1,221 +0,0 @@
-if ARCH_OMAP
-menu "TI OMAP Implementations"
-comment "OMAP Core Type"
-config ARCH_OMAP730
-        depends on ARCH_OMAP
-        bool "OMAP730 Based System"
-        select ARCH_OMAP_OTG
-config ARCH_OMAP1510
-        depends on ARCH_OMAP
-        default y
-        bool "OMAP1510 Based System"
-config ARCH_OMAP16XX
-        depends on ARCH_OMAP
-        bool "OMAP16XX Based System"
-        select ARCH_OMAP_OTG
-config ARCH_OMAP_OTG
-        bool
-comment "OMAP Board Type"
-config MACH_OMAP_INNOVATOR
-        bool "TI Innovator"
-        depends on ARCH_OMAP1510 || ARCH_OMAP16XX
-        help
-          TI OMAP 1510 or 1610 Innovator board support. Say Y here if you
-          have such a board.
-config MACH_OMAP_H2
-        bool "TI H2 Support"
-        depends on ARCH_OMAP16XX
-        help
-          TI OMAP 1610/1611B H2 board support. Say Y here if you have such
-          a board.
-config MACH_OMAP_H3
-        bool "TI H3 Support"
-        depends on ARCH_OMAP16XX
-        help
-          TI OMAP 1710 H3 board support. Say Y here if you have such
-          a board.
-config MACH_OMAP_H4
-        bool "TI H4 Support"
-        depends on ARCH_OMAP16XX
-        help
-          TI OMAP 1610 H4 board support. Say Y here if you have such
-          a board.
-config MACH_OMAP_OSK
-        bool "TI OSK Support"
-        depends on ARCH_OMAP16XX
-        help
-          TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here
-          if you have such a board.
-config MACH_OMAP_PERSEUS2
-        bool "TI Perseus2"
-        depends on ARCH_OMAP730
-        help
-          Support for TI OMAP 730 Perseus2 board. Say Y here if you have such
-          a board.
-config MACH_VOICEBLUE
-        bool "Voiceblue"
-        depends on ARCH_OMAP1510
-        help
-          Support for Voiceblue GSM/VoIP gateway. Say Y here if you have such
-          board.
-config MACH_NETSTAR
-        bool "NetStar"
-        depends on ARCH_OMAP1510
-        help
-          Support for NetStar PBX. Say Y here if you have such a board.
-config MACH_OMAP_GENERIC
-        bool "Generic OMAP board"
-        depends on ARCH_OMAP1510 || ARCH_OMAP16XX
-        help
-          Support for generic OMAP-1510, 1610 or 1710 board with
-          no FPGA. Can be used as template for porting Linux to
-          custom OMAP boards. Say Y here if you have a custom
-          board.
-comment "OMAP Feature Selections"
-#config OMAP_BOOT_TAG
-#       bool "OMAP bootloader information passing"
-#        depends on ARCH_OMAP
-#        default n
-#        help
-#          Say Y, if you have a bootloader which passes information
-#          about your board and its peripheral configuration.
-config OMAP_MUX
-        bool "OMAP multiplexing support"
-        depends on ARCH_OMAP
-        default y
-        help
-          Pin multiplexing support for OMAP boards. If your bootloader
-          sets the multiplexing correctly, say N. Otherwise, or if unsure,
-          say Y.
-config OMAP_MUX_DEBUG
-        bool "Multiplexing debug output"
-        depends on OMAP_MUX
-        default n
-        help
-          Makes the multiplexing functions print out a lot of debug info.
-          This is useful if you want to find out the correct values of the
-          multiplexing registers.
-config OMAP_MUX_WARNINGS
-        bool "Warn about pins the bootloader didn't set up"
-        depends on OMAP_MUX
-        default y
-        help
-          Choose Y here to warn whenever driver initialization logic needs
-          to change the pin multiplexing setup.  When there are no warnings
-          printed, it's safe to deselect OMAP_MUX for your product.
-choice
-        prompt "System timer"
-        default OMAP_MPU_TIMER
-config OMAP_MPU_TIMER
-        bool "Use mpu timer"
-        help
-          Select this option if you want to use the OMAP mpu timer. This
-          timer provides more intra-tick resolution than the 32KHz timer,
-          but consumes more power.
-config OMAP_32K_TIMER
-        bool "Use 32KHz timer"
-        depends on ARCH_OMAP16XX
-        help
-          Select this option if you want to enable the OMAP 32KHz timer.
-          This timer saves power compared to the OMAP_MPU_TIMER, and has
-          support for no tick during idle. The 32KHz timer provides less
-          intra-tick resolution than OMAP_MPU_TIMER. The 32KHz timer is
-          currently only available for OMAP-16xx.
-endchoice
-config OMAP_32K_TIMER_HZ
-       int "Kernel internal timer frequency for 32KHz timer"
-       range 32 1024
-       depends on OMAP_32K_TIMER
-       default "128"
-       help
-          Kernel internal timer frequency should be a divisor of 32768,
-          such as 64 or 128.
-choice
-        prompt "Low-level debug console UART"
-        depends on ARCH_OMAP
-        default OMAP_LL_DEBUG_UART1
-config OMAP_LL_DEBUG_UART1
-        bool "UART1"
-config OMAP_LL_DEBUG_UART2
-        bool "UART2"
-config OMAP_LL_DEBUG_UART3
-        bool "UART3"
-endchoice
-config OMAP_ARM_195MHZ
-        bool "OMAP ARM 195 MHz CPU"
-        depends on ARCH_OMAP730
-        help
-          Enable 195MHz clock for OMAP CPU. If unsure, say N.
-config OMAP_ARM_192MHZ
-        bool "OMAP ARM 192 MHz CPU"
-        depends on ARCH_OMAP16XX
-        help
-          Enable 192MHz clock for OMAP CPU. If unsure, say N.
-config OMAP_ARM_182MHZ
-        bool "OMAP ARM 182 MHz CPU"
-        depends on ARCH_OMAP730
-        help
-          Enable 182MHz clock for OMAP CPU. If unsure, say N.
-config OMAP_ARM_168MHZ
-        bool "OMAP ARM 168 MHz CPU"
-        depends on ARCH_OMAP1510 || ARCH_OMAP16XX || ARCH_OMAP730
-        help
-          Enable 168MHz clock for OMAP CPU. If unsure, say N.
-config OMAP_ARM_120MHZ
-        bool "OMAP ARM 120 MHz CPU"
-        depends on ARCH_OMAP1510 || ARCH_OMAP16XX || ARCH_OMAP730
-        help
-          Enable 120MHz clock for OMAP CPU. If unsure, say N.
-config OMAP_ARM_60MHZ
-        bool "OMAP ARM 60 MHz CPU"
-        depends on ARCH_OMAP1510 || ARCH_OMAP16XX || ARCH_OMAP730
-        default y
-        help
-          Enable 60MHz clock for OMAP CPU. If unsure, say Y.
-config OMAP_ARM_30MHZ
-        bool "OMAP ARM 30 MHz CPU"
-        depends on ARCH_OMAP1510 || ARCH_OMAP16XX || ARCH_OMAP730
-        help
-          Enable 30MHz clock for OMAP CPU. If unsure, say N.
-endmenu
-endif
diff --git a/arch/arm/mach-omap/Makefile b/arch/arm/mach-omap/Makefile
deleted file mode 100644
index 4cafb11d2c..0000000000
--- a/arch/arm/mach-omap/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Makefile for the linux kernel.
-#
-# Common support
-obj-y := common.o time.o irq.o dma.o clock.o mux.o gpio.o mcbsp.o usb.o
-obj-m :=
-obj-n :=
-obj-  :=
-led-y := leds.o
-# Specific board support
-obj-$(CONFIG_MACH_OMAP_H2) += board-h2.o
-obj-$(CONFIG_MACH_OMAP_INNOVATOR) += board-innovator.o
-obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o
-obj-$(CONFIG_MACH_OMAP_PERSEUS2) += board-perseus2.o
-obj-$(CONFIG_MACH_OMAP_OSK) += board-osk.o
-obj-$(CONFIG_MACH_OMAP_H3) += board-h3.o
-obj-$(CONFIG_MACH_VOICEBLUE) += board-voiceblue.o
-obj-$(CONFIG_MACH_NETSTAR) += board-netstar.o
-# OCPI interconnect support for 1710, 1610 and 5912
-obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o
-# LEDs support
-led-$(CONFIG_MACH_OMAP_H2) += leds-h2p2-debug.o
-led-$(CONFIG_MACH_OMAP_INNOVATOR) += leds-innovator.o
-led-$(CONFIG_MACH_OMAP_PERSEUS2) += leds-h2p2-debug.o
-obj-$(CONFIG_LEDS) += $(led-y)
-# Power Management
-obj-$(CONFIG_PM) += pm.o sleep.o
-ifeq ($(CONFIG_ARCH_OMAP1510),y)
-# Innovator-1510 FPGA
-obj-$(CONFIG_MACH_OMAP_INNOVATOR) += fpga.o
-endif
-# kgdb support
-obj-$(CONFIG_KGDB_SERIAL)       += kgdb-serial.o
diff --git a/arch/arm/mach-omap/common.c b/arch/arm/mach-omap/common.c
deleted file mode 100644
index 265cde4858..0000000000
--- a/arch/arm/mach-omap/common.c
+++ /dev/null
@@ -1,549 +0,0 @@
-/*
- * linux/arch/arm/mach-omap/common.c
- *
- * Code common to all OMAP machines.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/pm.h>
-#include <linux/console.h>
-#include <linux/serial.h>
-#include <linux/tty.h>
-#include <linux/serial_8250.h>
-#include <linux/serial_reg.h>
-#include <asm/hardware.h>
-#include <asm/system.h>
-#include <asm/pgtable.h>
-#include <asm/mach/map.h>
-#include <asm/hardware/clock.h>
-#include <asm/io.h>
-#include <asm/mach-types.h>
-#include <asm/arch/board.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/fpga.h>
-#include "clock.h"
-#define DEBUG 1
-struct omap_id {
-        u16     jtag_id;        /* Used to determine OMAP type */
-        u8      die_rev;        /* Processor revision */
-        u32     omap_id;        /* OMAP revision */
-        u32     type;           /* Cpu id bits [31:08], cpu class bits [07:00] */
-};
-/* Register values to detect the OMAP version */
-static struct omap_id omap_ids[] __initdata = {
-        { .jtag_id = 0x355f, .die_rev = 0x0, .omap_id = 0x03320000, .type = 0x07300100},
-        { .jtag_id = 0xb55f, .die_rev = 0x0, .omap_id = 0x03320000, .type = 0x07300300},
-        { .jtag_id = 0xb470, .die_rev = 0x0, .omap_id = 0x03310100, .type = 0x15100000},
-        { .jtag_id = 0xb576, .die_rev = 0x0, .omap_id = 0x03320000, .type = 0x16100000},
-        { .jtag_id = 0xb576, .die_rev = 0x2, .omap_id = 0x03320100, .type = 0x16110000},
-        { .jtag_id = 0xb576, .die_rev = 0x3, .omap_id = 0x03320100, .type = 0x16100c00},
-        { .jtag_id = 0xb576, .die_rev = 0x0, .omap_id = 0x03320200, .type = 0x16100d00},
-        { .jtag_id = 0xb613, .die_rev = 0x0, .omap_id = 0x03320300, .type = 0x1610ef00},
-        { .jtag_id = 0xb613, .die_rev = 0x0, .omap_id = 0x03320300, .type = 0x1610ef00},
-        { .jtag_id = 0xb576, .die_rev = 0x1, .omap_id = 0x03320100, .type = 0x16110000},
-        { .jtag_id = 0xb58c, .die_rev = 0x2, .omap_id = 0x03320200, .type = 0x16110b00},
-        { .jtag_id = 0xb58c, .die_rev = 0x3, .omap_id = 0x03320200, .type = 0x16110c00},
-        { .jtag_id = 0xb65f, .die_rev = 0x0, .omap_id = 0x03320400, .type = 0x16212300},
-        { .jtag_id = 0xb65f, .die_rev = 0x1, .omap_id = 0x03320400, .type = 0x16212300},
-        { .jtag_id = 0xb65f, .die_rev = 0x1, .omap_id = 0x03320500, .type = 0x16212300},
-        { .jtag_id = 0xb5f7, .die_rev = 0x0, .omap_id = 0x03330000, .type = 0x17100000},
-        { .jtag_id = 0xb5f7, .die_rev = 0x1, .omap_id = 0x03330100, .type = 0x17100000},
-        { .jtag_id = 0xb5f7, .die_rev = 0x2, .omap_id = 0x03330100, .type = 0x17100000},
-};
-/*
- * Get OMAP type from PROD_ID.
- * 1710 has the PROD_ID in bits 15:00, not in 16:01 as documented in TRM.
- * 1510 PROD_ID is empty, and 1610 PROD_ID does not make sense.
- * Undocumented register in TEST BLOCK is used as fallback; This seems to
- * work on 1510, 1610 & 1710. The official way hopefully will work in future
- * processors.
- */
-static u16 __init omap_get_jtag_id(void)
-{
-        u32 prod_id, omap_id;
-        prod_id = omap_readl(OMAP_PRODUCTION_ID_1);
-        omap_id = omap_readl(OMAP32_ID_1);
-        /* Check for unusable OMAP_PRODUCTION_ID_1 on 1611B/5912 and 730 */
-        if (((prod_id >> 20) == 0) || (prod_id == omap_id))
-                prod_id = 0;
-        else
-                prod_id &= 0xffff;
-        if (prod_id)
-                return prod_id;
-        /* Use OMAP32_ID_1 as fallback */
-        prod_id = ((omap_id >> 12) & 0xffff);
-        return prod_id;
-}
-/*
- * Get OMAP revision from DIE_REV.
- * Early 1710 processors may have broken OMAP_DIE_ID, it contains PROD_ID.
- * Undocumented register in the TEST BLOCK is used as fallback.
- * REVISIT: This does not seem to work on 1510
- */
-static u8 __init omap_get_die_rev(void)
-{
-        u32 die_rev;
-        die_rev = omap_readl(OMAP_DIE_ID_1);
-        /* Check for broken OMAP_DIE_ID on early 1710 */
-        if (((die_rev >> 12) & 0xffff) == omap_get_jtag_id())
-                die_rev = 0;
-        die_rev = (die_rev >> 17) & 0xf;
-        if (die_rev)
-                return die_rev;
-        die_rev = (omap_readl(OMAP32_ID_1) >> 28) & 0xf;
-        return die_rev;
-}
-static void __init omap_check_revision(void)
-{
-        int i;
-        u16 jtag_id;
-        u8 die_rev;
-        u32 omap_id;
-        u8 cpu_type;
-        jtag_id = omap_get_jtag_id();
-        die_rev = omap_get_die_rev();
-        omap_id = omap_readl(OMAP32_ID_0);
-#ifdef DEBUG
-        printk("OMAP_DIE_ID_0: 0x%08x\n", omap_readl(OMAP_DIE_ID_0));
-        printk("OMAP_DIE_ID_1: 0x%08x DIE_REV: %i\n",
-                omap_readl(OMAP_DIE_ID_1),
-               (omap_readl(OMAP_DIE_ID_1) >> 17) & 0xf);
-        printk("OMAP_PRODUCTION_ID_0: 0x%08x\n", omap_readl(OMAP_PRODUCTION_ID_0));
-        printk("OMAP_PRODUCTION_ID_1: 0x%08x JTAG_ID: 0x%04x\n",
-                omap_readl(OMAP_PRODUCTION_ID_1),
-                omap_readl(OMAP_PRODUCTION_ID_1) & 0xffff);
-        printk("OMAP32_ID_0: 0x%08x\n", omap_readl(OMAP32_ID_0));
-        printk("OMAP32_ID_1: 0x%08x\n", omap_readl(OMAP32_ID_1));
-        printk("JTAG_ID: 0x%04x DIE_REV: %i\n", jtag_id, die_rev);
-#endif
-        system_serial_high = omap_readl(OMAP_DIE_ID_0);
-        system_serial_low = omap_readl(OMAP_DIE_ID_1);
-        /* First check only the major version in a safe way */
-        for (i = 0; i < ARRAY_SIZE(omap_ids); i++) {
-                if (jtag_id == (omap_ids[i].jtag_id)) {
-                        system_rev = omap_ids[i].type;
-                        break;
-                }
-        }
-        /* Check if we can find the die revision */
-        for (i = 0; i < ARRAY_SIZE(omap_ids); i++) {
-                if (jtag_id == omap_ids[i].jtag_id && die_rev == omap_ids[i].die_rev) {
-                        system_rev = omap_ids[i].type;
-                        break;
-                }
-        }
-        /* Finally check also the omap_id */
-        for (i = 0; i < ARRAY_SIZE(omap_ids); i++) {
-                if (jtag_id == omap_ids[i].jtag_id
-                    && die_rev == omap_ids[i].die_rev
-                    && omap_id == omap_ids[i].omap_id) {
-                        system_rev = omap_ids[i].type;
-                        break;
-                }
-        }
-        /* Add the cpu class info (7xx, 15xx, 16xx, 24xx) */
-        cpu_type = system_rev >> 24;
-        switch (cpu_type) {
-        case 0x07:
-                system_rev |= 0x07;
-                break;
-        case 0x15:
-                system_rev |= 0x15;
-                break;
-        case 0x16:
-        case 0x17:
-                system_rev |= 0x16;
-                break;
-        case 0x24:
-                system_rev |= 0x24;
-                break;
-        default:
-                printk("Unknown OMAP cpu type: 0x%02x\n", cpu_type);
-        }
-        printk("OMAP%04x", system_rev >> 16);
-        if ((system_rev >> 8) & 0xff)
-                printk("%x", (system_rev >> 8) & 0xff);
-        printk(" revision %i handled as %02xxx id: %08x%08x\n",
-               die_rev, system_rev & 0xff, system_serial_low,
-               system_serial_high);
-}
-/*
- * ----------------------------------------------------------------------------
- * OMAP I/O mapping
- *
- * The machine specific code may provide the extra mapping besides the
- * default mapping provided here.
- * ----------------------------------------------------------------------------
- */
-static struct map_desc omap_io_desc[] __initdata = {
- { IO_VIRT,             IO_PHYS,             IO_SIZE,              MT_DEVICE },
-};
-#ifdef CONFIG_ARCH_OMAP730
-static struct map_desc omap730_io_desc[] __initdata = {
- { OMAP730_DSP_BASE,    OMAP730_DSP_START,    OMAP730_DSP_SIZE,    MT_DEVICE },
- { OMAP730_DSPREG_BASE, OMAP730_DSPREG_START, OMAP730_DSPREG_SIZE, MT_DEVICE },
- { OMAP730_SRAM_BASE,   OMAP730_SRAM_START,   OMAP730_SRAM_SIZE,   MT_DEVICE }
-};
-#endif
-#ifdef CONFIG_ARCH_OMAP1510
-static struct map_desc omap1510_io_desc[] __initdata = {
- { OMAP1510_DSP_BASE,    OMAP1510_DSP_START,    OMAP1510_DSP_SIZE,    MT_DEVICE },
- { OMAP1510_DSPREG_BASE, OMAP1510_DSPREG_START, OMAP1510_DSPREG_SIZE, MT_DEVICE },
- { OMAP1510_SRAM_BASE,   OMAP1510_SRAM_START,   OMAP1510_SRAM_SIZE,   MT_DEVICE }
-};
-#endif
-#if defined(CONFIG_ARCH_OMAP16XX)
-static struct map_desc omap1610_io_desc[] __initdata = {
- { OMAP16XX_DSP_BASE,    OMAP16XX_DSP_START,    OMAP16XX_DSP_SIZE,    MT_DEVICE },
- { OMAP16XX_DSPREG_BASE, OMAP16XX_DSPREG_START, OMAP16XX_DSPREG_SIZE, MT_DEVICE },
- { OMAP16XX_SRAM_BASE,   OMAP16XX_SRAM_START,   OMAP1610_SRAM_SIZE,   MT_DEVICE }
-};
-static struct map_desc omap5912_io_desc[] __initdata = {
- { OMAP16XX_DSP_BASE,    OMAP16XX_DSP_START,    OMAP16XX_DSP_SIZE,    MT_DEVICE },
- { OMAP16XX_DSPREG_BASE, OMAP16XX_DSPREG_START, OMAP16XX_DSPREG_SIZE, MT_DEVICE },
-/*
- * The OMAP5912 has 250kByte internal SRAM. Because the mapping is baseed on page
- * size (4kByte), it seems that the last 2kByte (=0x800) of the 250kByte are not mapped.
- * Add additional 2kByte (0x800) so that the last page is mapped and the last 2kByte
- * can be used.
- */
- { OMAP16XX_SRAM_BASE,   OMAP16XX_SRAM_START,   OMAP5912_SRAM_SIZE + 0x800,   MT_DEVICE }
-};
-#endif
-static int initialized = 0;
-static void __init _omap_map_io(void)
-{
-        initialized = 1;
-        /* We have to initialize the IO space mapping before we can run
-         * cpu_is_omapxxx() macros. */
-        iotable_init(omap_io_desc, ARRAY_SIZE(omap_io_desc));
-        omap_check_revision();
-#ifdef CONFIG_ARCH_OMAP730
-        if (cpu_is_omap730()) {
-                iotable_init(omap730_io_desc, ARRAY_SIZE(omap730_io_desc));
-        }
-#endif
-#ifdef CONFIG_ARCH_OMAP1510
-        if (cpu_is_omap1510()) {
-                iotable_init(omap1510_io_desc, ARRAY_SIZE(omap1510_io_desc));
-        }
-#endif
-#if defined(CONFIG_ARCH_OMAP16XX)
-        if (cpu_is_omap1610() || cpu_is_omap1710()) {
-                iotable_init(omap1610_io_desc, ARRAY_SIZE(omap1610_io_desc));
-        }
-        if (cpu_is_omap5912()) {
-                iotable_init(omap5912_io_desc, ARRAY_SIZE(omap5912_io_desc));
-        }
-#endif
-        /* REVISIT: Refer to OMAP5910 Errata, Advisory SYS_1: "Timeout Abort
-         * on a Posted Write in the TIPB Bridge".
-         */
-        omap_writew(0x0, MPU_PUBLIC_TIPB_CNTL);
-        omap_writew(0x0, MPU_PRIVATE_TIPB_CNTL);
-        /* Must init clocks early to assure that timer interrupt works
-         */
-        clk_init();
-}
-/*
- * This should only get called from board specific init
- */
-void omap_map_io(void)
-{
-        if (!initialized)
-                _omap_map_io();
-}
-static inline unsigned int omap_serial_in(struct plat_serial8250_port *up,
-                                          int offset)
-{
-        offset <<= up->regshift;
-        return (unsigned int)__raw_readb(up->membase + offset);
-}
-static inline void omap_serial_outp(struct plat_serial8250_port *p, int offset,
-                                    int value)
-{
-        offset <<= p->regshift;
-        __raw_writeb(value, p->membase + offset);
-}
-/*
- * Internal UARTs need to be initialized for the 8250 autoconfig to work
- * properly. Note that the TX watermark initialization may not be needed
- * once the 8250.c watermark handling code is merged.
- */
-static void __init omap_serial_reset(struct plat_serial8250_port *p)
-{
-        omap_serial_outp(p, UART_OMAP_MDR1, 0x07);      /* disable UART */
-        omap_serial_outp(p, UART_OMAP_SCR, 0x08);       /* TX watermark */
-        omap_serial_outp(p, UART_OMAP_MDR1, 0x00);      /* enable UART */
-        if (!cpu_is_omap1510()) {
-                omap_serial_outp(p, UART_OMAP_SYSC, 0x01);
-                while (!(omap_serial_in(p, UART_OMAP_SYSC) & 0x01));
-        }
-}
-static struct plat_serial8250_port serial_platform_data[] = {
-        {
-                .membase        = (char*)IO_ADDRESS(OMAP_UART1_BASE),
-                .mapbase        = (unsigned long)OMAP_UART1_BASE,
-                .irq            = INT_UART1,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .iotype         = UPIO_MEM,
-                .regshift       = 2,
-                .uartclk        = OMAP16XX_BASE_BAUD * 16,
-        },
-        {
-                .membase        = (char*)IO_ADDRESS(OMAP_UART2_BASE),
-                .mapbase        = (unsigned long)OMAP_UART2_BASE,
-                .irq            = INT_UART2,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .iotype         = UPIO_MEM,
-                .regshift       = 2,
-                .uartclk        = OMAP16XX_BASE_BAUD * 16,
-        },
-        {
-                .membase        = (char*)IO_ADDRESS(OMAP_UART3_BASE),
-                .mapbase        = (unsigned long)OMAP_UART3_BASE,
-                .irq            = INT_UART3,
-                .flags          = UPF_BOOT_AUTOCONF,
-                .iotype         = UPIO_MEM,
-                .regshift       = 2,
-                .uartclk        = OMAP16XX_BASE_BAUD * 16,
-        },
-        { },
-};
-static struct platform_device serial_device = {
-        .name                   = "serial8250",
-        .id                     = 0,
-        .dev                    = {
-                .platform_data  = serial_platform_data,
-        },
-};
-/*
- * Note that on Innovator-1510 UART2 pins conflict with USB2.
- * By default UART2 does not work on Innovator-1510 if you have
- * USB OHCI enabled. To use UART2, you must disable USB2 first.
- */
-void __init omap_serial_init(int ports[OMAP_MAX_NR_PORTS])
-{
-        int i;
-        if (cpu_is_omap730()) {
-                serial_platform_data[0].regshift = 0;
-                serial_platform_data[1].regshift = 0;
-                serial_platform_data[0].irq = INT_730_UART_MODEM_1;
-                serial_platform_data[1].irq = INT_730_UART_MODEM_IRDA_2;
-        }
-        if (cpu_is_omap1510()) {
-                serial_platform_data[0].uartclk = OMAP1510_BASE_BAUD * 16;
-                serial_platform_data[1].uartclk = OMAP1510_BASE_BAUD * 16;
-                serial_platform_data[2].uartclk = OMAP1510_BASE_BAUD * 16;
-        }
-        for (i = 0; i < OMAP_MAX_NR_PORTS; i++) {
-                unsigned char reg;
-                if (ports[i] == 0) {
-                        serial_platform_data[i].membase = 0;
-                        serial_platform_data[i].mapbase = 0;
-                        continue;
-                }
-                switch (i) {
-                case 0:
-                        if (cpu_is_omap1510()) {
-                                omap_cfg_reg(UART1_TX);
-                                omap_cfg_reg(UART1_RTS);
-                                if (machine_is_omap_innovator()) {
-                                        reg = fpga_read(OMAP1510_FPGA_POWER);
-                                        reg |= OMAP1510_FPGA_PCR_COM1_EN;
-                                        fpga_write(reg, OMAP1510_FPGA_POWER);
-                                        udelay(10);
-                                }
-                        }
-                        break;
-                case 1:
-                        if (cpu_is_omap1510()) {
-                                omap_cfg_reg(UART2_TX);
-                                omap_cfg_reg(UART2_RTS);
-                                if (machine_is_omap_innovator()) {
-                                        reg = fpga_read(OMAP1510_FPGA_POWER);
-                                        reg |= OMAP1510_FPGA_PCR_COM2_EN;
-                                        fpga_write(reg, OMAP1510_FPGA_POWER);
-                                        udelay(10);
-                                }
-                        }
-                        break;
-                case 2:
-                        if (cpu_is_omap1510()) {
-                                omap_cfg_reg(UART3_TX);
-                                omap_cfg_reg(UART3_RX);
-                        }
-                        if (cpu_is_omap1710()) {
-                                clk_enable(clk_get(0, "uart3_ck"));
-                        }
-                        break;
-                }
-                omap_serial_reset(&serial_platform_data[i]);
-        }
-}
-static int __init omap_init(void)
-{
-        return platform_device_register(&serial_device);
-}
-arch_initcall(omap_init);
-#define NO_LENGTH_CHECK 0xffffffff
-extern int omap_bootloader_tag_len;
-extern u8 omap_bootloader_tag[];
-struct omap_board_config_kernel *omap_board_config;
-int omap_board_config_size = 0;
-static const void *get_config(u16 tag, size_t len, int skip, size_t *len_out)
-{
-        struct omap_board_config_kernel *kinfo = NULL;
-        int i;
-#ifdef CONFIG_OMAP_BOOT_TAG
-        struct omap_board_config_entry *info = NULL;
-        if (omap_bootloader_tag_len > 4)
-                info = (struct omap_board_config_entry *) omap_bootloader_tag;
-        while (info != NULL) {
-                u8 *next;
-                if (info->tag == tag) {
-                        if (skip == 0)
-                                break;
-                        skip--;
-                }
-                if ((info->len & 0x03) != 0) {
-                        /* We bail out to avoid an alignment fault */
-                        printk(KERN_ERR "OMAP peripheral config: Length (%d) not word-aligned (tag %04x)\n",
-                               info->len, info->tag);
-                        return NULL;
-                }
-                next = (u8 *) info + sizeof(*info) + info->len;
-                if (next >= omap_bootloader_tag + omap_bootloader_tag_len)
-                        info = NULL;
-                else
-                        info = (struct omap_board_config_entry *) next;
-        }
-        if (info != NULL) {
-                /* Check the length as a lame attempt to check for
-                 * binary inconsistancy. */
-                if (len != NO_LENGTH_CHECK) {
-                        /* Word-align len */
-                        if (len & 0x03)
-                                len = (len + 3) & ~0x03;
-                        if (info->len != len) {
-                                printk(KERN_ERR "OMAP peripheral config: Length mismatch with tag %x (want %d, got %d)\n",
-                                       tag, len, info->len);
-                                return NULL;
-                        }
-                }
-                if (len_out != NULL)
-                        *len_out = info->len;
-                return info->data;
-        }
-#endif
-        /* Try to find the config from the board-specific structures
-         * in the kernel. */
-        for (i = 0; i < omap_board_config_size; i++) {
-                if (omap_board_config[i].tag == tag) {
-                        kinfo = &omap_board_config[i];
-                        break;
-                }
-        }
-        if (kinfo == NULL)
-                return NULL;
-        return kinfo->data;
-}
-const void *__omap_get_config(u16 tag, size_t len, int nr)
-{
-        return get_config(tag, len, nr, NULL);
-}
-EXPORT_SYMBOL(__omap_get_config);
-const void *omap_get_var_config(u16 tag, size_t *len)
-{
-        return get_config(tag, NO_LENGTH_CHECK, 0, len);
-}
-EXPORT_SYMBOL(omap_get_var_config);
-static int __init omap_add_serial_console(void)
-{
-        const struct omap_uart_config *info;
-        info = omap_get_config(OMAP_TAG_UART, struct omap_uart_config);
-        if (info != NULL && info->console_uart) {
-                static char speed[11], *opt = NULL;
-                if (info->console_speed) {
-                        snprintf(speed, sizeof(speed), "%u", info->console_speed);
-                        opt = speed;
-                }
-                return add_preferred_console("ttyS", info->console_uart - 1, opt);
-        }
-        return 0;
-}
-console_initcall(omap_add_serial_console);
diff --git a/arch/arm/mach-omap/common.h b/arch/arm/mach-omap/common.h
deleted file mode 100644
index 9f62858c0d..0000000000
--- a/arch/arm/mach-omap/common.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * linux/arch/arm/mach-omap/common.h
- *
- * Header for code common to all OMAP machines.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * You should have received a copy of the  GNU General Public License along
- * with this program; if not, write  to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#ifndef __ARCH_ARM_MACH_OMAP_COMMON_H
-#define __ARCH_ARM_MACH_OMAP_COMMON_H
-struct sys_timer;
-extern void omap_map_io(void);
-extern struct sys_timer omap_timer;
-extern void omap_serial_init(int ports[]);
-#endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
new file mode 100644
index 0000000000..7408ac94f7
--- /dev/null
+++ b/arch/arm/mach-omap1/Kconfig
@@ -0,0 +1,144 @@
+comment "OMAP Core Type"
+        depends on ARCH_OMAP1
+config ARCH_OMAP730
+        depends on ARCH_OMAP1
+        bool "OMAP730 Based System"
+        select ARCH_OMAP_OTG
+config ARCH_OMAP1510
+        depends on ARCH_OMAP1
+        default y
+        bool "OMAP1510 Based System"
+config ARCH_OMAP16XX
+        depends on ARCH_OMAP1
+        bool "OMAP16xx Based System"
+        select ARCH_OMAP_OTG
+comment "OMAP Board Type"
+        depends on ARCH_OMAP1
+config MACH_OMAP_INNOVATOR
+        bool "TI Innovator"
+        depends on ARCH_OMAP1 && (ARCH_OMAP1510 || ARCH_OMAP16XX)
+        help
+          TI OMAP 1510 or 1610 Innovator board support. Say Y here if you
+          have such a board.
+config MACH_OMAP_H2
+        bool "TI H2 Support"
+        depends on ARCH_OMAP1 && ARCH_OMAP16XX
+        help
+          TI OMAP 1610/1611B H2 board support. Say Y here if you have such
+          a board.
+config MACH_OMAP_H3
+        bool "TI H3 Support"
+        depends on ARCH_OMAP1 && ARCH_OMAP16XX
+        help
+          TI OMAP 1710 H3 board support. Say Y here if you have such
+          a board.
+config MACH_OMAP_OSK
+        bool "TI OSK Support"
+        depends on ARCH_OMAP1 && ARCH_OMAP16XX
+        help
+          TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here
+          if you have such a board.
+config MACH_OMAP_PERSEUS2
+        bool "TI Perseus2"
+        depends on ARCH_OMAP1 && ARCH_OMAP730
+        help
+          Support for TI OMAP 730 Perseus2 board. Say Y here if you have such
+          a board.
+config MACH_VOICEBLUE
+        bool "Voiceblue"
+        depends on ARCH_OMAP1 && ARCH_OMAP1510
+        help
+          Support for Voiceblue GSM/VoIP gateway. Say Y here if you have
+          such a board.
+config MACH_NETSTAR
+        bool "NetStar"
+        depends on ARCH_OMAP1 && ARCH_OMAP1510
+        help
+          Support for NetStar PBX. Say Y here if you have such a board.
+config MACH_OMAP_GENERIC
+        bool "Generic OMAP board"
+        depends on ARCH_OMAP1 && (ARCH_OMAP1510 || ARCH_OMAP16XX)
+        help
+          Support for generic OMAP-1510, 1610 or 1710 board with
+          no FPGA. Can be used as template for porting Linux to
+          custom OMAP boards. Say Y here if you have a custom
+          board.
+comment "OMAP CPU Speed"
+        depends on ARCH_OMAP1
+config OMAP_CLOCKS_SET_BY_BOOTLOADER
+        bool "OMAP clocks set by bootloader"
+        depends on ARCH_OMAP1
+        help
+          Enable this option to prevent the kernel from overriding the clock
+          frequencies programmed by bootloader for MPU, DSP, MMUs, TC,
+          internal LCD controller and MPU peripherals.
+config OMAP_ARM_216MHZ
+        bool "OMAP ARM 216 MHz CPU (1710 only)"
+        depends on ARCH_OMAP1 && ARCH_OMAP16XX
+        help
+          Enable 216 MHz clock for OMAP1710 CPU. If unsure, say N.
+config OMAP_ARM_195MHZ
+        bool "OMAP ARM 195 MHz CPU"
+        depends on ARCH_OMAP1 && ARCH_OMAP730
+        help
+          Enable 195MHz clock for OMAP CPU. If unsure, say N.
+config OMAP_ARM_192MHZ
+        bool "OMAP ARM 192 MHz CPU"
+        depends on ARCH_OMAP1 && ARCH_OMAP16XX
+        help
+          Enable 192MHz clock for OMAP CPU. If unsure, say N.
+config OMAP_ARM_182MHZ
+        bool "OMAP ARM 182 MHz CPU"
+        depends on ARCH_OMAP1 && ARCH_OMAP730
+        help
+          Enable 182MHz clock for OMAP CPU. If unsure, say N.
+config OMAP_ARM_168MHZ
+        bool "OMAP ARM 168 MHz CPU"
+        depends on ARCH_OMAP1 && (ARCH_OMAP1510 || ARCH_OMAP16XX || ARCH_OMAP730)
+        help
+          Enable 168MHz clock for OMAP CPU. If unsure, say N.
+config OMAP_ARM_150MHZ
+        bool "OMAP ARM 150 MHz CPU"
+        depends on ARCH_OMAP1 && ARCH_OMAP1510
+        help
+          Enable 150MHz clock for OMAP CPU. If unsure, say N.
+config OMAP_ARM_120MHZ
+        bool "OMAP ARM 120 MHz CPU"
+        depends on ARCH_OMAP1 && (ARCH_OMAP1510 || ARCH_OMAP16XX || ARCH_OMAP730)
+        help
+          Enable 120MHz clock for OMAP CPU. If unsure, say N.
+config OMAP_ARM_60MHZ
+        bool "OMAP ARM 60 MHz CPU"
+        depends on ARCH_OMAP1 && (ARCH_OMAP1510 || ARCH_OMAP16XX || ARCH_OMAP730)
+        default y
+        help
+          Enable 60MHz clock for OMAP CPU. If unsure, say Y.
+config OMAP_ARM_30MHZ
+        bool "OMAP ARM 30 MHz CPU"
+        depends on ARCH_OMAP1 && (ARCH_OMAP1510 || ARCH_OMAP16XX || ARCH_OMAP730)
+        help
+          Enable 30MHz clock for OMAP CPU. If unsure, say N.
diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile
new file mode 100644
index 0000000000..d386fd913f
--- /dev/null
+++ b/arch/arm/mach-omap1/Makefile
@@ -0,0 +1,30 @@
+#
+# Makefile for the linux kernel.
+#
+# Common support
+obj-y := io.o id.o irq.o time.o serial.o
+led-y := leds.o
+# Specific board support
+obj-$(CONFIG_MACH_OMAP_H2)              += board-h2.o
+obj-$(CONFIG_MACH_OMAP_INNOVATOR)       += board-innovator.o
+obj-$(CONFIG_MACH_OMAP_GENERIC)         += board-generic.o
+obj-$(CONFIG_MACH_OMAP_PERSEUS2)        += board-perseus2.o
+obj-$(CONFIG_MACH_OMAP_OSK)             += board-osk.o
+obj-$(CONFIG_MACH_OMAP_H3)              += board-h3.o
+obj-$(CONFIG_MACH_VOICEBLUE)            += board-voiceblue.o
+obj-$(CONFIG_MACH_NETSTAR)              += board-netstar.o
+ifeq ($(CONFIG_ARCH_OMAP1510),y)
+# Innovator-1510 FPGA
+obj-$(CONFIG_MACH_OMAP_INNOVATOR)       += fpga.o
+endif
+# LEDs support
+led-$(CONFIG_MACH_OMAP_H2)              += leds-h2p2-debug.o
+led-$(CONFIG_MACH_OMAP_INNOVATOR)       += leds-innovator.o
+led-$(CONFIG_MACH_OMAP_PERSEUS2)        += leds-h2p2-debug.o
+led-$(CONFIG_MACH_OMAP_OSK)             += leds-osk.o
+obj-$(CONFIG_LEDS)                      += $(led-y)
diff --git a/arch/arm/mach-omap/Makefile.boot b/arch/arm/mach-omap1/Makefile.boot
index fee1a6a15b..292d56c5a8 100644
--- a/arch/arm/mach-omap/Makefile.boot
+++ b/arch/arm/mach-omap1/Makefile.boot
@@ -1,4 +1,3 @@
   zreladdr-y           := 0x10008000
 params_phys-y           := 0x10000100
 initrd_phys-y           := 0x10800000
diff --git a/arch/arm/mach-omap/board-generic.c b/arch/arm/mach-omap1/board-generic.c
index 2102a2cd10..122796ebe8 100644
--- a/arch/arm/mach-omap/board-generic.c
+++ b/arch/arm/mach-omap1/board-generic.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/board-generic.c
+ * linux/arch/arm/mach-omap1/board-generic.c
 *
 * Modified from board-innovator1510.c
 *
@@ -26,8 +26,7 @@
 #include <asm/arch/mux.h>
 #include <asm/arch/usb.h>
 #include <asm/arch/board.h>
+#include <asm/arch/common.h>
-#include "common.h"
 static int __initdata generic_serial_ports[OMAP_MAX_NR_PORTS] = {1, 1, 1};
@@ -84,15 +83,17 @@ static void __init omap_generic_init(void)
 static void __init omap_generic_map_io(void)
 {
-        omap_map_io();
+        omap_map_common_io()
 }
 MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710")
-        MAINTAINER("Tony Lindgren <tony@atomide.com>")
+        /* Maintainer: Tony Lindgren <tony@atomide.com> */
-        BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
+        .phys_ram       = 0x10000000,
-        BOOT_PARAMS(0x10000100)
+        .phys_io        = 0xfff00000,
-        MAPIO(omap_generic_map_io)
+        .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
-        INITIRQ(omap_generic_init_irq)
+        .boot_params    = 0x10000100,
-        INIT_MACHINE(omap_generic_init)
+        .map_io         = omap_generic_map_io,
+        .init_irq       = omap_generic_init_irq,
+        .init_machine   = omap_generic_init,
        .timer          = &omap_timer,
 MACHINE_END
diff --git a/arch/arm/mach-omap/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 1f067830d1..f4983ee95a 100644
--- a/arch/arm/mach-omap/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/board-h2.c
+ * linux/arch/arm/mach-omap1/board-h2.c
 *
 * Board specific inits for OMAP-1610 H2
 *
@@ -35,8 +35,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/tc.h>
 #include <asm/arch/usb.h>
+#include <asm/arch/common.h>
-#include "common.h"
 extern int omap_gpio_init(void);
@@ -172,16 +171,18 @@ static void __init h2_init(void)
 static void __init h2_map_io(void)
 {
-        omap_map_io();
+        omap_map_common_io();
        omap_serial_init(h2_serial_ports);
 }
 MACHINE_START(OMAP_H2, "TI-H2")
-        MAINTAINER("Imre Deak <imre.deak@nokia.com>")
+        /* Maintainer: Imre Deak <imre.deak@nokia.com> */
-        BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
+        .phys_ram       = 0x10000000,
-        BOOT_PARAMS(0x10000100)
+        .phys_io        = 0xfff00000,
-        MAPIO(h2_map_io)
+        .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
-        INITIRQ(h2_init_irq)
+        .boot_params    = 0x10000100,
-        INIT_MACHINE(h2_init)
+        .map_io         = h2_map_io,
+        .init_irq       = h2_init_irq,
+        .init_machine   = h2_init,
        .timer          = &omap_timer,
 MACHINE_END
diff --git a/arch/arm/mach-omap/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index 486a5a006c..7cd419d61b 100644
--- a/arch/arm/mach-omap/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/board-h3.c
+ * linux/arch/arm/mach-omap1/board-h3.c
 *
 * This file contains OMAP1710 H3 specific code.
 *
@@ -37,8 +37,7 @@
 #include <asm/arch/mux.h>
 #include <asm/arch/tc.h>
 #include <asm/arch/usb.h>
+#include <asm/arch/common.h>
-#include "common.h"
 extern int omap_gpio_init(void);
@@ -190,16 +189,18 @@ void h3_init_irq(void)
 static void __init h3_map_io(void)
 {
-        omap_map_io();
+        omap_map_common_io();
        omap_serial_init(h3_serial_ports);
 }
 MACHINE_START(OMAP_H3, "TI OMAP1710 H3 board")
-        MAINTAINER("Texas Instruments, Inc.")
+        /* Maintainer: Texas Instruments, Inc. */
-        BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
+        .phys_ram       = 0x10000000,
-        BOOT_PARAMS(0x10000100)
+        .phys_io        = 0xfff00000,
-        MAPIO(h3_map_io)
+        .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
-        INITIRQ(h3_init_irq)
+        .boot_params    = 0x10000100,
-        INIT_MACHINE(h3_init)
+        .map_io         = h3_map_io,
+        .init_irq       = h3_init_irq,
+        .init_machine   = h3_init,
        .timer          = &omap_timer,
 MACHINE_END
diff --git a/arch/arm/mach-omap/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c
index 57cf4da88d..91de60a91e 100644
--- a/arch/arm/mach-omap/board-innovator.c
+++ b/arch/arm/mach-omap1/board-innovator.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/board-innovator.c
+ * linux/arch/arm/mach-omap1/board-innovator.c
 *
 * Board specific inits for OMAP-1510 and OMAP-1610 Innovator
 *
@@ -33,8 +33,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/tc.h>
 #include <asm/arch/usb.h>
+#include <asm/arch/common.h>
-#include "common.h"
 static int __initdata innovator_serial_ports[OMAP_MAX_NR_PORTS] = {1, 1, 1};
@@ -252,7 +251,7 @@ static void __init innovator_init(void)
 static void __init innovator_map_io(void)
 {
-        omap_map_io();
+        omap_map_common_io();
 #ifdef CONFIG_ARCH_OMAP1510
        if (cpu_is_omap1510()) {
@@ -270,11 +269,13 @@ static void __init innovator_map_io(void)
 }
 MACHINE_START(OMAP_INNOVATOR, "TI-Innovator")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
+        .phys_ram       = 0x10000000,
-        BOOT_PARAMS(0x10000100)
+        .phys_io        = 0xfff00000,
-        MAPIO(innovator_map_io)
+        .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
-        INITIRQ(innovator_init_irq)
+        .boot_params    = 0x10000100,
-        INIT_MACHINE(innovator_init)
+        .map_io         = innovator_map_io,
+        .init_irq       = innovator_init_irq,
+        .init_machine   = innovator_init,
        .timer          = &omap_timer,
 MACHINE_END
diff --git a/arch/arm/mach-omap/board-netstar.c b/arch/arm/mach-omap1/board-netstar.c
index 54acbd215c..6750b20140 100644
--- a/arch/arm/mach-omap/board-netstar.c
+++ b/arch/arm/mach-omap1/board-netstar.c
@@ -26,8 +26,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/usb.h>
+#include <asm/arch/common.h>
-#include "common.h"
 extern void __init omap_init_time(void);
 extern int omap_gpio_init(void);
@@ -100,7 +99,7 @@ static int __initdata omap_serial_ports[OMAP_MAX_NR_PORTS] = {1, 1, 1};
 static void __init netstar_map_io(void)
 {
-        omap_map_io();
+        omap_map_common_io();
        omap_serial_init(omap_serial_ports);
 }
@@ -141,11 +140,13 @@ static int __init netstar_late_init(void)
 postcore_initcall(netstar_late_init);
 MACHINE_START(NETSTAR, "NetStar OMAP5910")
-        MAINTAINER("Ladislav Michl <michl@2n.cz>")
+        /* Maintainer: Ladislav Michl <michl@2n.cz> */
-        BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
+        .phys_ram       = 0x10000000,
-        BOOT_PARAMS(0x10000100)
+        .phys_io        = 0xfff00000,
-        MAPIO(netstar_map_io)
+        .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
-        INITIRQ(netstar_init_irq)
+        .boot_params    = 0x10000100,
-        INIT_MACHINE(netstar_init)
+        .map_io         = netstar_map_io,
-        .timer = &omap_timer,
+        .init_irq       = netstar_init_irq,
+        .init_machine   = netstar_init,
+        .timer          = &omap_timer,
 MACHINE_END
diff --git a/arch/arm/mach-omap/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index a951fc8245..6844e536c6 100644
--- a/arch/arm/mach-omap/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/board-osk.c
+ * linux/arch/arm/mach-omap1/board-osk.c
 *
 * Board specific init for OMAP5912 OSK
 *
@@ -39,8 +39,7 @@
 #include <asm/arch/usb.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/tc.h>
+#include <asm/arch/common.h>
-#include "common.h"
 static struct map_desc osk5912_io_desc[] __initdata = {
 { OMAP_OSK_NOR_FLASH_BASE, OMAP_OSK_NOR_FLASH_START, OMAP_OSK_NOR_FLASH_SIZE,
@@ -153,17 +152,19 @@ static void __init osk_init(void)
 static void __init osk_map_io(void)
 {
-        omap_map_io();
+        omap_map_common_io();
        iotable_init(osk5912_io_desc, ARRAY_SIZE(osk5912_io_desc));
        omap_serial_init(osk_serial_ports);
 }
 MACHINE_START(OMAP_OSK, "TI-OSK")
-        MAINTAINER("Dirk Behme <dirk.behme@de.bosch.com>")
+        /* Maintainer: Dirk Behme <dirk.behme@de.bosch.com> */
-        BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
+        .phys_ram       = 0x10000000,
-        BOOT_PARAMS(0x10000100)
+        .phys_io        = 0xfff00000,
-        MAPIO(osk_map_io)
+        .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
-        INITIRQ(osk_init_irq)
+        .boot_params    = 0x10000100,
-        INIT_MACHINE(osk_init)
+        .map_io         = osk_map_io,
+        .init_irq       = osk_init_irq,
+        .init_machine   = osk_init,
        .timer          = &omap_timer,
 MACHINE_END
diff --git a/arch/arm/mach-omap/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index 64515aeb49..213317392d 100644
--- a/arch/arm/mach-omap/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/board-perseus2.c
+ * linux/arch/arm/mach-omap1/board-perseus2.c
 *
 * Modified from board-generic.c
 *
@@ -27,8 +27,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/fpga.h>
+#include <asm/arch/common.h>
-#include "common.h"
 static struct resource smc91x_resources[] = {
        [0] = {
@@ -140,7 +139,7 @@ static struct map_desc omap_perseus2_io_desc[] __initdata = {
 static void __init omap_perseus2_map_io(void)
 {
-        omap_map_io();
+        omap_map_common_io();
        iotable_init(omap_perseus2_io_desc,
                     ARRAY_SIZE(omap_perseus2_io_desc));
@@ -179,11 +178,13 @@ static void __init omap_perseus2_map_io(void)
 }
 MACHINE_START(OMAP_PERSEUS2, "OMAP730 Perseus2")
-        MAINTAINER("Kevin Hilman <kjh@hilman.org>")
+        /* Maintainer: Kevin Hilman <kjh@hilman.org> */
-        BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
+        .phys_ram       = 0x10000000,
-        BOOT_PARAMS(0x10000100)
+        .phys_io        = 0xfff00000,
-        MAPIO(omap_perseus2_map_io)
+        .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
-        INITIRQ(omap_perseus2_init_irq)
+        .boot_params    = 0x10000100,
-        INIT_MACHINE(omap_perseus2_init)
+        .map_io         = omap_perseus2_map_io,
+        .init_irq       = omap_perseus2_init_irq,
+        .init_machine   = omap_perseus2_init,
        .timer          = &omap_timer,
 MACHINE_END
diff --git a/arch/arm/mach-omap/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c
index f1a5bffac6..e422819889 100644
--- a/arch/arm/mach-omap/board-voiceblue.c
+++ b/arch/arm/mach-omap1/board-voiceblue.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/board-voiceblue.c
+ * linux/arch/arm/mach-omap1/board-voiceblue.c
 *
 * Modified from board-generic.c
 *
@@ -31,8 +31,7 @@
 #include <asm/arch/tc.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/usb.h>
+#include <asm/arch/common.h>
-#include "common.h"
 extern void omap_init_time(void);
 extern int omap_gpio_init(void);
@@ -170,7 +169,7 @@ static int __initdata omap_serial_ports[OMAP_MAX_NR_PORTS] = {1, 1, 1};
 static void __init voiceblue_map_io(void)
 {
-        omap_map_io();
+        omap_map_common_io();
        omap_serial_init(omap_serial_ports);
 }
@@ -246,11 +245,13 @@ EXPORT_SYMBOL(voiceblue_wdt_disable);
 EXPORT_SYMBOL(voiceblue_wdt_ping);
 MACHINE_START(VOICEBLUE, "VoiceBlue OMAP5910")
-        MAINTAINER("Ladislav Michl <michl@2n.cz>")
+        /* Maintainer: Ladislav Michl <michl@2n.cz> */
-        BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
+        .phys_ram       = 0x10000000,
-        BOOT_PARAMS(0x10000100)
+        .phys_io        = 0xfff00000,
-        MAPIO(voiceblue_map_io)
+        .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
-        INITIRQ(voiceblue_init_irq)
+        .boot_params    = 0x10000100,
-        INIT_MACHINE(voiceblue_init)
+        .map_io         = voiceblue_map_io,
-        .timer = &omap_timer,
+        .init_irq       = voiceblue_init_irq,
+        .init_machine   = voiceblue_init,
+        .timer          = &omap_timer,
 MACHINE_END
diff --git a/arch/arm/mach-omap/fpga.c b/arch/arm/mach-omap1/fpga.c
index 7c08f6c2e1..7c08f6c2e1 100644
--- a/arch/arm/mach-omap/fpga.c
+++ b/arch/arm/mach-omap1/fpga.c
diff --git a/arch/arm/mach-omap1/id.c b/arch/arm/mach-omap1/id.c
new file mode 100644
index 0000000000..986c3b7e09
--- /dev/null
+++ b/arch/arm/mach-omap1/id.c
@@ -0,0 +1,188 @@
+/*
+ * linux/arch/arm/mach-omap1/id.c
+ *
+ * OMAP1 CPU identification code
+ *
+ * Copyright (C) 2004 Nokia Corporation
+ * Written by Tony Lindgren <tony@atomide.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <asm/io.h>
+struct omap_id {
+        u16     jtag_id;        /* Used to determine OMAP type */
+        u8      die_rev;        /* Processor revision */
+        u32     omap_id;        /* OMAP revision */
+        u32     type;           /* Cpu id bits [31:08], cpu class bits [07:00] */
+};
+/* Register values to detect the OMAP version */
+static struct omap_id omap_ids[] __initdata = {
+        { .jtag_id = 0x355f, .die_rev = 0x0, .omap_id = 0x03320000, .type = 0x07300100},
+        { .jtag_id = 0xb55f, .die_rev = 0x0, .omap_id = 0x03320000, .type = 0x07300300},
+        { .jtag_id = 0xb470, .die_rev = 0x0, .omap_id = 0x03310100, .type = 0x15100000},
+        { .jtag_id = 0xb576, .die_rev = 0x0, .omap_id = 0x03320000, .type = 0x16100000},
+        { .jtag_id = 0xb576, .die_rev = 0x2, .omap_id = 0x03320100, .type = 0x16110000},
+        { .jtag_id = 0xb576, .die_rev = 0x3, .omap_id = 0x03320100, .type = 0x16100c00},
+        { .jtag_id = 0xb576, .die_rev = 0x0, .omap_id = 0x03320200, .type = 0x16100d00},
+        { .jtag_id = 0xb613, .die_rev = 0x0, .omap_id = 0x03320300, .type = 0x1610ef00},
+        { .jtag_id = 0xb613, .die_rev = 0x0, .omap_id = 0x03320300, .type = 0x1610ef00},
+        { .jtag_id = 0xb576, .die_rev = 0x1, .omap_id = 0x03320100, .type = 0x16110000},
+        { .jtag_id = 0xb58c, .die_rev = 0x2, .omap_id = 0x03320200, .type = 0x16110b00},
+        { .jtag_id = 0xb58c, .die_rev = 0x3, .omap_id = 0x03320200, .type = 0x16110c00},
+        { .jtag_id = 0xb65f, .die_rev = 0x0, .omap_id = 0x03320400, .type = 0x16212300},
+        { .jtag_id = 0xb65f, .die_rev = 0x1, .omap_id = 0x03320400, .type = 0x16212300},
+        { .jtag_id = 0xb65f, .die_rev = 0x1, .omap_id = 0x03320500, .type = 0x16212300},
+        { .jtag_id = 0xb5f7, .die_rev = 0x0, .omap_id = 0x03330000, .type = 0x17100000},
+        { .jtag_id = 0xb5f7, .die_rev = 0x1, .omap_id = 0x03330100, .type = 0x17100000},
+        { .jtag_id = 0xb5f7, .die_rev = 0x2, .omap_id = 0x03330100, .type = 0x17100000},
+};
+/*
+ * Get OMAP type from PROD_ID.
+ * 1710 has the PROD_ID in bits 15:00, not in 16:01 as documented in TRM.
+ * 1510 PROD_ID is empty, and 1610 PROD_ID does not make sense.
+ * Undocumented register in TEST BLOCK is used as fallback; This seems to
+ * work on 1510, 1610 & 1710. The official way hopefully will work in future
+ * processors.
+ */
+static u16 __init omap_get_jtag_id(void)
+{
+        u32 prod_id, omap_id;
+        prod_id = omap_readl(OMAP_PRODUCTION_ID_1);
+        omap_id = omap_readl(OMAP32_ID_1);
+        /* Check for unusable OMAP_PRODUCTION_ID_1 on 1611B/5912 and 730 */
+        if (((prod_id >> 20) == 0) || (prod_id == omap_id))
+                prod_id = 0;
+        else
+                prod_id &= 0xffff;
+        if (prod_id)
+                return prod_id;
+        /* Use OMAP32_ID_1 as fallback */
+        prod_id = ((omap_id >> 12) & 0xffff);
+        return prod_id;
+}
+/*
+ * Get OMAP revision from DIE_REV.
+ * Early 1710 processors may have broken OMAP_DIE_ID, it contains PROD_ID.
+ * Undocumented register in the TEST BLOCK is used as fallback.
+ * REVISIT: This does not seem to work on 1510
+ */
+static u8 __init omap_get_die_rev(void)
+{
+        u32 die_rev;
+        die_rev = omap_readl(OMAP_DIE_ID_1);
+        /* Check for broken OMAP_DIE_ID on early 1710 */
+        if (((die_rev >> 12) & 0xffff) == omap_get_jtag_id())
+                die_rev = 0;
+        die_rev = (die_rev >> 17) & 0xf;
+        if (die_rev)
+                return die_rev;
+        die_rev = (omap_readl(OMAP32_ID_1) >> 28) & 0xf;
+        return die_rev;
+}
+void __init omap_check_revision(void)
+{
+        int i;
+        u16 jtag_id;
+        u8 die_rev;
+        u32 omap_id;
+        u8 cpu_type;
+        jtag_id = omap_get_jtag_id();
+        die_rev = omap_get_die_rev();
+        omap_id = omap_readl(OMAP32_ID_0);
+#ifdef DEBUG
+        printk("OMAP_DIE_ID_0: 0x%08x\n", omap_readl(OMAP_DIE_ID_0));
+        printk("OMAP_DIE_ID_1: 0x%08x DIE_REV: %i\n",
+                omap_readl(OMAP_DIE_ID_1),
+               (omap_readl(OMAP_DIE_ID_1) >> 17) & 0xf);
+        printk("OMAP_PRODUCTION_ID_0: 0x%08x\n", omap_readl(OMAP_PRODUCTION_ID_0));
+        printk("OMAP_PRODUCTION_ID_1: 0x%08x JTAG_ID: 0x%04x\n",
+                omap_readl(OMAP_PRODUCTION_ID_1),
+                omap_readl(OMAP_PRODUCTION_ID_1) & 0xffff);
+        printk("OMAP32_ID_0: 0x%08x\n", omap_readl(OMAP32_ID_0));
+        printk("OMAP32_ID_1: 0x%08x\n", omap_readl(OMAP32_ID_1));
+        printk("JTAG_ID: 0x%04x DIE_REV: %i\n", jtag_id, die_rev);
+#endif
+        system_serial_high = omap_readl(OMAP_DIE_ID_0);
+        system_serial_low = omap_readl(OMAP_DIE_ID_1);
+        /* First check only the major version in a safe way */
+        for (i = 0; i < ARRAY_SIZE(omap_ids); i++) {
+                if (jtag_id == (omap_ids[i].jtag_id)) {
+                        system_rev = omap_ids[i].type;
+                        break;
+                }
+        }
+        /* Check if we can find the die revision */
+        for (i = 0; i < ARRAY_SIZE(omap_ids); i++) {
+                if (jtag_id == omap_ids[i].jtag_id && die_rev == omap_ids[i].die_rev) {
+                        system_rev = omap_ids[i].type;
+                        break;
+                }
+        }
+        /* Finally check also the omap_id */
+        for (i = 0; i < ARRAY_SIZE(omap_ids); i++) {
+                if (jtag_id == omap_ids[i].jtag_id
+                    && die_rev == omap_ids[i].die_rev
+                    && omap_id == omap_ids[i].omap_id) {
+                        system_rev = omap_ids[i].type;
+                        break;
+                }
+        }
+        /* Add the cpu class info (7xx, 15xx, 16xx, 24xx) */
+        cpu_type = system_rev >> 24;
+        switch (cpu_type) {
+        case 0x07:
+                system_rev |= 0x07;
+                break;
+        case 0x15:
+                system_rev |= 0x15;
+                break;
+        case 0x16:
+        case 0x17:
+                system_rev |= 0x16;
+                break;
+        case 0x24:
+                system_rev |= 0x24;
+                break;
+        default:
+                printk("Unknown OMAP cpu type: 0x%02x\n", cpu_type);
+        }
+        printk("OMAP%04x", system_rev >> 16);
+        if ((system_rev >> 8) & 0xff)
+                printk("%x", (system_rev >> 8) & 0xff);
+        printk(" revision %i handled as %02xxx id: %08x%08x\n",
+               die_rev, system_rev & 0xff, system_serial_low,
+               system_serial_high);
+}
diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c
new file mode 100644
index 0000000000..207df0fe93
--- /dev/null
+++ b/arch/arm/mach-omap1/io.c
@@ -0,0 +1,115 @@
+/*
+ * linux/arch/arm/mach-omap1/io.c
+ *
+ * OMAP1 I/O mapping code
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <asm/mach/map.h>
+#include <asm/io.h>
+#include <asm/arch/tc.h>
+extern int clk_init(void);
+extern void omap_check_revision(void);
+/*
+ * The machine specific code may provide the extra mapping besides the
+ * default mapping provided here.
+ */
+static struct map_desc omap_io_desc[] __initdata = {
+ { IO_VIRT,             IO_PHYS,             IO_SIZE,              MT_DEVICE },
+};
+#ifdef CONFIG_ARCH_OMAP730
+static struct map_desc omap730_io_desc[] __initdata = {
+ { OMAP730_DSP_BASE,    OMAP730_DSP_START,    OMAP730_DSP_SIZE,    MT_DEVICE },
+ { OMAP730_DSPREG_BASE, OMAP730_DSPREG_START, OMAP730_DSPREG_SIZE, MT_DEVICE },
+ { OMAP730_SRAM_BASE,   OMAP730_SRAM_START,   OMAP730_SRAM_SIZE,   MT_DEVICE }
+};
+#endif
+#ifdef CONFIG_ARCH_OMAP1510
+static struct map_desc omap1510_io_desc[] __initdata = {
+ { OMAP1510_DSP_BASE,    OMAP1510_DSP_START,    OMAP1510_DSP_SIZE,    MT_DEVICE },
+ { OMAP1510_DSPREG_BASE, OMAP1510_DSPREG_START, OMAP1510_DSPREG_SIZE, MT_DEVICE },
+ { OMAP1510_SRAM_BASE,   OMAP1510_SRAM_START,   OMAP1510_SRAM_SIZE,   MT_DEVICE }
+};
+#endif
+#if defined(CONFIG_ARCH_OMAP16XX)
+static struct map_desc omap1610_io_desc[] __initdata = {
+ { OMAP16XX_DSP_BASE,    OMAP16XX_DSP_START,    OMAP16XX_DSP_SIZE,    MT_DEVICE },
+ { OMAP16XX_DSPREG_BASE, OMAP16XX_DSPREG_START, OMAP16XX_DSPREG_SIZE, MT_DEVICE },
+ { OMAP16XX_SRAM_BASE,   OMAP16XX_SRAM_START,   OMAP1610_SRAM_SIZE,   MT_DEVICE }
+};
+static struct map_desc omap5912_io_desc[] __initdata = {
+ { OMAP16XX_DSP_BASE,    OMAP16XX_DSP_START,    OMAP16XX_DSP_SIZE,    MT_DEVICE },
+ { OMAP16XX_DSPREG_BASE, OMAP16XX_DSPREG_START, OMAP16XX_DSPREG_SIZE, MT_DEVICE },
+/*
+ * The OMAP5912 has 250kByte internal SRAM. Because the mapping is baseed on page
+ * size (4kByte), it seems that the last 2kByte (=0x800) of the 250kByte are not mapped.
+ * Add additional 2kByte (0x800) so that the last page is mapped and the last 2kByte
+ * can be used.
+ */
+ { OMAP16XX_SRAM_BASE,   OMAP16XX_SRAM_START,   OMAP5912_SRAM_SIZE + 0x800,   MT_DEVICE }
+};
+#endif
+static int initialized = 0;
+static void __init _omap_map_io(void)
+{
+        initialized = 1;
+        /* We have to initialize the IO space mapping before we can run
+         * cpu_is_omapxxx() macros. */
+        iotable_init(omap_io_desc, ARRAY_SIZE(omap_io_desc));
+        omap_check_revision();
+#ifdef CONFIG_ARCH_OMAP730
+        if (cpu_is_omap730()) {
+                iotable_init(omap730_io_desc, ARRAY_SIZE(omap730_io_desc));
+        }
+#endif
+#ifdef CONFIG_ARCH_OMAP1510
+        if (cpu_is_omap1510()) {
+                iotable_init(omap1510_io_desc, ARRAY_SIZE(omap1510_io_desc));
+        }
+#endif
+#if defined(CONFIG_ARCH_OMAP16XX)
+        if (cpu_is_omap1610() || cpu_is_omap1710()) {
+                iotable_init(omap1610_io_desc, ARRAY_SIZE(omap1610_io_desc));
+        }
+        if (cpu_is_omap5912()) {
+                iotable_init(omap5912_io_desc, ARRAY_SIZE(omap5912_io_desc));
+        }
+#endif
+        /* REVISIT: Refer to OMAP5910 Errata, Advisory SYS_1: "Timeout Abort
+         * on a Posted Write in the TIPB Bridge".
+         */
+        omap_writew(0x0, MPU_PUBLIC_TIPB_CNTL);
+        omap_writew(0x0, MPU_PRIVATE_TIPB_CNTL);
+        /* Must init clocks early to assure that timer interrupt works
+         */
+        clk_init();
+}
+/*
+ * This should only get called from board specific init
+ */
+void omap_map_common_io(void)
+{
+        if (!initialized)
+                _omap_map_io();
+}
diff --git a/arch/arm/mach-omap/irq.c b/arch/arm/mach-omap1/irq.c
index f01c99266a..a11b6d8073 100644
--- a/arch/arm/mach-omap/irq.c
+++ b/arch/arm/mach-omap1/irq.c
@@ -56,6 +56,7 @@
 struct omap_irq_bank {
        unsigned long base_reg;
        unsigned long trigger_map;
+        unsigned long wake_enable;
 };
 static unsigned int irq_bank_count = 0;
@@ -105,6 +106,19 @@ static void omap_mask_ack_irq(unsigned int irq)
        omap_ack_irq(irq);
 }
+static int omap_wake_irq(unsigned int irq, unsigned int enable)
+{
+        int bank = IRQ_BANK(irq);
+        if (enable)
+                irq_banks[bank].wake_enable |= IRQ_BIT(irq);
+        else
+                irq_banks[bank].wake_enable &= ~IRQ_BIT(irq);
+        return 0;
+}
 /*
 * Allows tuning the IRQ type and priority
 *
@@ -145,7 +159,7 @@ static struct omap_irq_bank omap1510_irq_banks[] = {
 static struct omap_irq_bank omap1610_irq_banks[] = {
        { .base_reg = OMAP_IH1_BASE,            .trigger_map = 0xb3fefe8f },
        { .base_reg = OMAP_IH2_BASE,            .trigger_map = 0xfdb7c1fd },
-        { .base_reg = OMAP_IH2_BASE + 0x100,    .trigger_map = 0xfffff7ff },
+        { .base_reg = OMAP_IH2_BASE + 0x100,    .trigger_map = 0xffffb7ff },
        { .base_reg = OMAP_IH2_BASE + 0x200,    .trigger_map = 0xffffffff },
 };
 #endif
@@ -154,6 +168,7 @@ static struct irqchip omap_irq_chip = {
        .ack    = omap_mask_ack_irq,
        .mask   = omap_mask_irq,
        .unmask = omap_unmask_irq,
+        .wake   = omap_wake_irq,
 };
 void __init omap_init_irq(void)
diff --git a/arch/arm/mach-omap/leds-h2p2-debug.c b/arch/arm/mach-omap1/leds-h2p2-debug.c
index 6e98290cca..6e98290cca 100644
--- a/arch/arm/mach-omap/leds-h2p2-debug.c
+++ b/arch/arm/mach-omap1/leds-h2p2-debug.c
diff --git a/arch/arm/mach-omap/leds-innovator.c b/arch/arm/mach-omap1/leds-innovator.c
index 8043b7d0f6..8043b7d0f6 100644
--- a/arch/arm/mach-omap/leds-innovator.c
+++ b/arch/arm/mach-omap1/leds-innovator.c
diff --git a/arch/arm/mach-omap/leds-osk.c b/arch/arm/mach-omap1/leds-osk.c
index f5177f4307..4a0e8b9d4f 100644
--- a/arch/arm/mach-omap/leds-osk.c
+++ b/arch/arm/mach-omap1/leds-osk.c
@@ -129,14 +129,11 @@ void osk_leds_event(led_event_t evt)
 #ifdef  CONFIG_FB_OMAP
-#ifdef CONFIG_LEDS_TIMER
        case led_timer:
                hw_led_state ^= TIMER_LED;
                mistral_setled();
                break;
-#endif
-#ifdef CONFIG_LEDS_CPU
        case led_idle_start:
                hw_led_state |= IDLE_LED;
                mistral_setled();
@@ -146,7 +143,6 @@ void osk_leds_event(led_event_t evt)
                hw_led_state &= ~IDLE_LED;
                mistral_setled();
                break;
-#endif
 #endif  /* CONFIG_FB_OMAP */
diff --git a/arch/arm/mach-omap/leds.c b/arch/arm/mach-omap1/leds.c
index 8ab21fe98e..8ab21fe98e 100644
--- a/arch/arm/mach-omap/leds.c
+++ b/arch/arm/mach-omap1/leds.c
diff --git a/arch/arm/mach-omap/leds.h b/arch/arm/mach-omap1/leds.h
index a1e9fedc37..a1e9fedc37 100644
--- a/arch/arm/mach-omap/leds.h
+++ b/arch/arm/mach-omap1/leds.h
diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c
new file mode 100644
index 0000000000..214e5d17c8
--- /dev/null
+++ b/arch/arm/mach-omap1/serial.c
@@ -0,0 +1,200 @@
+/*
+ * linux/arch/arm/mach-omap1/id.c
+ *
+ * OMAP1 CPU identification code
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/serial.h>
+#include <linux/tty.h>
+#include <linux/serial_8250.h>
+#include <linux/serial_reg.h>
+#include <asm/io.h>
+#include <asm/mach-types.h>
+#include <asm/hardware/clock.h>
+#include <asm/arch/board.h>
+#include <asm/arch/mux.h>
+#include <asm/arch/fpga.h>
+static struct clk * uart1_ck = NULL;
+static struct clk * uart2_ck = NULL;
+static struct clk * uart3_ck = NULL;
+static inline unsigned int omap_serial_in(struct plat_serial8250_port *up,
+                                          int offset)
+{
+        offset <<= up->regshift;
+        return (unsigned int)__raw_readb(up->membase + offset);
+}
+static inline void omap_serial_outp(struct plat_serial8250_port *p, int offset,
+                                    int value)
+{
+        offset <<= p->regshift;
+        __raw_writeb(value, p->membase + offset);
+}
+/*
+ * Internal UARTs need to be initialized for the 8250 autoconfig to work
+ * properly. Note that the TX watermark initialization may not be needed
+ * once the 8250.c watermark handling code is merged.
+ */
+static void __init omap_serial_reset(struct plat_serial8250_port *p)
+{
+        omap_serial_outp(p, UART_OMAP_MDR1, 0x07);      /* disable UART */
+        omap_serial_outp(p, UART_OMAP_SCR, 0x08);       /* TX watermark */
+        omap_serial_outp(p, UART_OMAP_MDR1, 0x00);      /* enable UART */
+        if (!cpu_is_omap1510()) {
+                omap_serial_outp(p, UART_OMAP_SYSC, 0x01);
+                while (!(omap_serial_in(p, UART_OMAP_SYSC) & 0x01));
+        }
+}
+static struct plat_serial8250_port serial_platform_data[] = {
+        {
+                .membase        = (char*)IO_ADDRESS(OMAP_UART1_BASE),
+                .mapbase        = (unsigned long)OMAP_UART1_BASE,
+                .irq            = INT_UART1,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .iotype         = UPIO_MEM,
+                .regshift       = 2,
+                .uartclk        = OMAP16XX_BASE_BAUD * 16,
+        },
+        {
+                .membase        = (char*)IO_ADDRESS(OMAP_UART2_BASE),
+                .mapbase        = (unsigned long)OMAP_UART2_BASE,
+                .irq            = INT_UART2,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .iotype         = UPIO_MEM,
+                .regshift       = 2,
+                .uartclk        = OMAP16XX_BASE_BAUD * 16,
+        },
+        {
+                .membase        = (char*)IO_ADDRESS(OMAP_UART3_BASE),
+                .mapbase        = (unsigned long)OMAP_UART3_BASE,
+                .irq            = INT_UART3,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .iotype         = UPIO_MEM,
+                .regshift       = 2,
+                .uartclk        = OMAP16XX_BASE_BAUD * 16,
+        },
+        { },
+};
+static struct platform_device serial_device = {
+        .name                   = "serial8250",
+        .id                     = 0,
+        .dev                    = {
+                .platform_data  = serial_platform_data,
+        },
+};
+/*
+ * Note that on Innovator-1510 UART2 pins conflict with USB2.
+ * By default UART2 does not work on Innovator-1510 if you have
+ * USB OHCI enabled. To use UART2, you must disable USB2 first.
+ */
+void __init omap_serial_init(int ports[OMAP_MAX_NR_PORTS])
+{
+        int i;
+        if (cpu_is_omap730()) {
+                serial_platform_data[0].regshift = 0;
+                serial_platform_data[1].regshift = 0;
+                serial_platform_data[0].irq = INT_730_UART_MODEM_1;
+                serial_platform_data[1].irq = INT_730_UART_MODEM_IRDA_2;
+        }
+        if (cpu_is_omap1510()) {
+                serial_platform_data[0].uartclk = OMAP1510_BASE_BAUD * 16;
+                serial_platform_data[1].uartclk = OMAP1510_BASE_BAUD * 16;
+                serial_platform_data[2].uartclk = OMAP1510_BASE_BAUD * 16;
+        }
+        for (i = 0; i < OMAP_MAX_NR_PORTS; i++) {
+                unsigned char reg;
+                if (ports[i] == 0) {
+                        serial_platform_data[i].membase = NULL;
+                        serial_platform_data[i].mapbase = 0;
+                        continue;
+                }
+                switch (i) {
+                case 0:
+                        uart1_ck = clk_get(NULL, "uart1_ck");
+                        if (IS_ERR(uart1_ck))
+                                printk("Could not get uart1_ck\n");
+                        else {
+                                clk_use(uart1_ck);
+                                if (cpu_is_omap1510())
+                                        clk_set_rate(uart1_ck, 12000000);
+                        }
+                        if (cpu_is_omap1510()) {
+                                omap_cfg_reg(UART1_TX);
+                                omap_cfg_reg(UART1_RTS);
+                                if (machine_is_omap_innovator()) {
+                                        reg = fpga_read(OMAP1510_FPGA_POWER);
+                                        reg |= OMAP1510_FPGA_PCR_COM1_EN;
+                                        fpga_write(reg, OMAP1510_FPGA_POWER);
+                                        udelay(10);
+                                }
+                        }
+                        break;
+                case 1:
+                        uart2_ck = clk_get(NULL, "uart2_ck");
+                        if (IS_ERR(uart2_ck))
+                                printk("Could not get uart2_ck\n");
+                        else {
+                                clk_use(uart2_ck);
+                                if (cpu_is_omap1510())
+                                        clk_set_rate(uart2_ck, 12000000);
+                                else
+                                        clk_set_rate(uart2_ck, 48000000);
+                        }
+                        if (cpu_is_omap1510()) {
+                                omap_cfg_reg(UART2_TX);
+                                omap_cfg_reg(UART2_RTS);
+                                if (machine_is_omap_innovator()) {
+                                        reg = fpga_read(OMAP1510_FPGA_POWER);
+                                        reg |= OMAP1510_FPGA_PCR_COM2_EN;
+                                        fpga_write(reg, OMAP1510_FPGA_POWER);
+                                        udelay(10);
+                                }
+                        }
+                        break;
+                case 2:
+                        uart3_ck = clk_get(NULL, "uart3_ck");
+                        if (IS_ERR(uart3_ck))
+                                printk("Could not get uart3_ck\n");
+                        else {
+                                clk_use(uart3_ck);
+                                if (cpu_is_omap1510())
+                                        clk_set_rate(uart3_ck, 12000000);
+                        }
+                        if (cpu_is_omap1510()) {
+                                omap_cfg_reg(UART3_TX);
+                                omap_cfg_reg(UART3_RX);
+                        }
+                        break;
+                }
+                omap_serial_reset(&serial_platform_data[i]);
+        }
+}
+static int __init omap_init(void)
+{
+        return platform_device_register(&serial_device);
+}
+arch_initcall(omap_init);
diff --git a/arch/arm/mach-omap/time.c b/arch/arm/mach-omap1/time.c
index 4205fdcb63..d540539c9b 100644
--- a/arch/arm/mach-omap/time.c
+++ b/arch/arm/mach-omap1/time.c
@@ -1,10 +1,10 @@
 /*
- * linux/arch/arm/mach-omap/time.c
+ * linux/arch/arm/mach-omap1/time.c
 *
 * OMAP Timers
 *
 * Copyright (C) 2004 Nokia Corporation
- * Partial timer rewrite and additional VST timer support by
+ * Partial timer rewrite and additional dynamic tick timer support by
 * Tony Lindgen <tony@atomide.com> and
 * Tuukka Tikkanen <tuukka.tikkanen@elektrobit.com>
 *
@@ -58,17 +58,9 @@ struct sys_timer omap_timer;
 * MPU timer
 * ---------------------------------------------------------------------------
 */
-#define OMAP_MPU_TIMER1_BASE            (0xfffec500)
-#define OMAP_MPU_TIMER2_BASE            (0xfffec600)
-#define OMAP_MPU_TIMER3_BASE            (0xfffec700)
 #define OMAP_MPU_TIMER_BASE             OMAP_MPU_TIMER1_BASE
 #define OMAP_MPU_TIMER_OFFSET           0x100
-#define MPU_TIMER_FREE                  (1 << 6)
-#define MPU_TIMER_CLOCK_ENABLE          (1 << 5)
-#define MPU_TIMER_AR                    (1 << 1)
-#define MPU_TIMER_ST                    (1 << 0)
 /* cycles to nsec conversions taken from arch/i386/kernel/timers/timer_tsc.c,
 * converted to use kHz by Kevin Hilman */
 /* convert from cycles(64bits) => nanoseconds (64bits)
@@ -188,8 +180,8 @@ static irqreturn_t omap_mpu_timer_interrupt(int irq, void *dev_id,
 static struct irqaction omap_mpu_timer_irq = {
        .name           = "mpu timer",
-        .flags          = SA_INTERRUPT,
+        .flags          = SA_INTERRUPT | SA_TIMER,
-        .handler        = omap_mpu_timer_interrupt
+        .handler        = omap_mpu_timer_interrupt,
 };
 static unsigned long omap_mpu_timer1_overflows;
@@ -203,7 +195,7 @@ static irqreturn_t omap_mpu_timer1_interrupt(int irq, void *dev_id,
 static struct irqaction omap_mpu_timer1_irq = {
        .name           = "mpu timer1 overflow",
        .flags          = SA_INTERRUPT,
-        .handler        = omap_mpu_timer1_interrupt
+        .handler        = omap_mpu_timer1_interrupt,
 };
 static __init void omap_init_mpu_timer(void)
@@ -255,13 +247,19 @@ unsigned long long sched_clock(void)
 #define OMAP_32K_TIMER_TCR              0x04
 #define OMAP_32K_TICKS_PER_HZ           (32768 / HZ)
+#if (32768 % HZ) != 0
+/* We cannot ignore modulo.
+ * Potential error can be as high as several percent.
+ */
+#define OMAP_32K_TICK_MODULO            (32768 % HZ)
+static unsigned modulo_count = 0; /* Counts 1/HZ units */
+#endif
 /*
 * TRM says 1 / HZ = ( TVR + 1) / 32768, so TRV = (32768 / HZ) - 1
 * so with HZ = 100, TVR = 327.68.
 */
 #define OMAP_32K_TIMER_TICK_PERIOD      ((32768 / HZ) - 1)
-#define MAX_SKIP_JIFFIES                25
 #define TIMER_32K_SYNCHRONIZED          0xfffbc410
 #define JIFFIES_TO_HW_TICKS(nr_jiffies, clock_rate)                     \
@@ -332,6 +330,19 @@ static irqreturn_t omap_32k_timer_interrupt(int irq, void *dev_id,
        now = omap_32k_sync_timer_read();
        while (now - omap_32k_last_tick >= OMAP_32K_TICKS_PER_HZ) {
+#ifdef OMAP_32K_TICK_MODULO
+                /* Modulo addition may put omap_32k_last_tick ahead of now
+                 * and cause unwanted repetition of the while loop.
+                 */
+                if (unlikely(now - omap_32k_last_tick == ~0))
+                        break;
+                modulo_count += OMAP_32K_TICK_MODULO;
+                if (modulo_count > HZ) {
+                        ++omap_32k_last_tick;
+                        modulo_count -= HZ;
+                }
+#endif
                omap_32k_last_tick += OMAP_32K_TICKS_PER_HZ;
                timer_tick(regs);
        }
@@ -347,14 +358,55 @@ static irqreturn_t omap_32k_timer_interrupt(int irq, void *dev_id,
        return IRQ_HANDLED;
 }
+#ifdef CONFIG_NO_IDLE_HZ
+/*
+ * Programs the next timer interrupt needed. Called when dynamic tick is
+ * enabled, and to reprogram the ticks to skip from pm_idle. Note that
+ * we can keep the timer continuous, and don't need to set it to run in
+ * one-shot mode. This is because the timer will get reprogrammed again
+ * after next interrupt.
+ */
+void omap_32k_timer_reprogram(unsigned long next_tick)
+{
+        omap_32k_timer_start(JIFFIES_TO_HW_TICKS(next_tick, 32768) + 1);
+}
+static struct irqaction omap_32k_timer_irq;
+extern struct timer_update_handler timer_update;
+static int omap_32k_timer_enable_dyn_tick(void)
+{
+        /* No need to reprogram timer, just use the next interrupt */
+        return 0;
+}
+static int omap_32k_timer_disable_dyn_tick(void)
+{
+        omap_32k_timer_start(OMAP_32K_TIMER_TICK_PERIOD);
+        return 0;
+}
+static struct dyn_tick_timer omap_dyn_tick_timer = {
+        .enable         = omap_32k_timer_enable_dyn_tick,
+        .disable        = omap_32k_timer_disable_dyn_tick,
+        .reprogram      = omap_32k_timer_reprogram,
+        .handler        = omap_32k_timer_interrupt,
+};
+#endif  /* CONFIG_NO_IDLE_HZ */
 static struct irqaction omap_32k_timer_irq = {
        .name           = "32KHz timer",
-        .flags          = SA_INTERRUPT,
+        .flags          = SA_INTERRUPT | SA_TIMER,
-        .handler        = omap_32k_timer_interrupt
+        .handler        = omap_32k_timer_interrupt,
 };
 static __init void omap_init_32k_timer(void)
 {
+#ifdef CONFIG_NO_IDLE_HZ
+        omap_timer.dyn_tick = &omap_dyn_tick_timer;
+#endif
        setup_irq(INT_OS_TIMER, &omap_32k_timer_irq);
        omap_timer.offset  = omap_32k_timer_gettimeoffset;
        omap_32k_last_tick = omap_32k_sync_timer_read();
@@ -367,7 +419,7 @@ static __init void omap_init_32k_timer(void)
 * Timer initialization
 * ---------------------------------------------------------------------------
 */
-void __init omap_timer_init(void)
+static void __init omap_timer_init(void)
 {
 #if defined(CONFIG_OMAP_MPU_TIMER)
        omap_init_mpu_timer();
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
index c4e6d25235..efc2f65718 100644
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -24,3 +24,7 @@ obj-$(CONFIG_LEDS) += $(led-y)
 # Misc features
 obj-$(CONFIG_PM) += pm.o sleep.o
+ifeq ($(CONFIG_PXA27x),y)
+obj-$(CONFIG_PM) += standby.o
+endif
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c
index f691cf77d3..86b862f56e 100644
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@ -287,34 +287,40 @@ static void __init corgi_map_io(void)
 #ifdef CONFIG_MACH_CORGI
 MACHINE_START(CORGI, "SHARP Corgi")
-        BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
+        .phys_ram       = 0xa0000000,
-        FIXUP(fixup_corgi)
+        .phys_io        = 0x40000000,
-        MAPIO(corgi_map_io)
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
-        INITIRQ(corgi_init_irq)
+        .fixup          = fixup_corgi,
-        .init_machine = corgi_init,
+        .map_io         = corgi_map_io,
-        .timer = &pxa_timer,
+        .init_irq       = corgi_init_irq,
+        .init_machine   = corgi_init,
+        .timer          = &pxa_timer,
 MACHINE_END
 #endif
 #ifdef CONFIG_MACH_SHEPHERD
 MACHINE_START(SHEPHERD, "SHARP Shepherd")
-        BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
+        .phys_ram       = 0xa0000000,
-        FIXUP(fixup_corgi)
+        .phys_io        = 0x40000000,
-        MAPIO(corgi_map_io)
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
-        INITIRQ(corgi_init_irq)
+        .fixup          = fixup_corgi,
-        .init_machine = corgi_init,
+        .map_io         = corgi_map_io,
-        .timer = &pxa_timer,
+        .init_irq       = corgi_init_irq,
+        .init_machine   = corgi_init,
+        .timer          = &pxa_timer,
 MACHINE_END
 #endif
 #ifdef CONFIG_MACH_HUSKY
 MACHINE_START(HUSKY, "SHARP Husky")
-        BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
+        .phys_ram       = 0xa0000000,
-        FIXUP(fixup_corgi)
+        .phys_io        = 0x40000000,
-        MAPIO(corgi_map_io)
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
-        INITIRQ(corgi_init_irq)
+        .fixup          = fixup_corgi,
-        .init_machine = corgi_init,
+        .map_io         = corgi_map_io,
-        .timer = &pxa_timer,
+        .init_irq       = corgi_init_irq,
+        .init_machine   = corgi_init,
+        .timer          = &pxa_timer,
 MACHINE_END
 #endif
diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c
index c5a66bf4d3..386e107b53 100644
--- a/arch/arm/mach-pxa/idp.c
+++ b/arch/arm/mach-pxa/idp.c
@@ -181,10 +181,12 @@ static void __init idp_map_io(void)
 MACHINE_START(PXA_IDP, "Vibren PXA255 IDP")
-        MAINTAINER("Vibren Technologies")
+        /* Maintainer: Vibren Technologies */
-        BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
+        .phys_ram       = 0xa0000000,
-        MAPIO(idp_map_io)
+        .phys_io        = 0x40000000,
-        INITIRQ(idp_init_irq)
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
+        .map_io         = idp_map_io,
+        .init_irq       = idp_init_irq,
        .timer          = &pxa_timer,
-        INIT_MACHINE(idp_init)
+        .init_machine   = idp_init,
 MACHINE_END
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index f2c9e0d2b2..6309853b59 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -268,10 +268,12 @@ static void __init lubbock_map_io(void)
 }
 MACHINE_START(LUBBOCK, "Intel DBPXA250 Development Platform (aka Lubbock)")
-        MAINTAINER("MontaVista Software Inc.")
+        /* Maintainer: MontaVista Software Inc. */
-        BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
+        .phys_ram       = 0xa0000000,
-        MAPIO(lubbock_map_io)
+        .phys_io        = 0x40000000,
-        INITIRQ(lubbock_init_irq)
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
+        .map_io         = lubbock_map_io,
+        .init_irq       = lubbock_init_irq,
        .timer          = &pxa_timer,
-        INIT_MACHINE(lubbock_init)
+        .init_machine   = lubbock_init,
 MACHINE_END
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index 9896afca75..827b7b5a5b 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -345,10 +345,12 @@ static void __init mainstone_map_io(void)
 }
 MACHINE_START(MAINSTONE, "Intel HCDDBBVA0 Development Platform (aka Mainstone)")
-        MAINTAINER("MontaVista Software Inc.")
+        /* Maintainer: MontaVista Software Inc. */
-        BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
+        .phys_ram       = 0xa0000000,
-        MAPIO(mainstone_map_io)
+        .phys_io        = 0x40000000,
-        INITIRQ(mainstone_init_irq)
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
+        .map_io         = mainstone_map_io,
+        .init_irq       = mainstone_init_irq,
        .timer          = &pxa_timer,
-        INIT_MACHINE(mainstone_init)
+        .init_machine   = mainstone_init,
 MACHINE_END
diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c
index 9799fe80df..ac4dd43361 100644
--- a/arch/arm/mach-pxa/pm.c
+++ b/arch/arm/mach-pxa/pm.c
@@ -133,6 +133,8 @@ static int pxa_pm_enter(suspend_state_t state)
        /* *** go zzz *** */
        pxa_cpu_pm_enter(state);
+        cpu_init();
        /* after sleeping, validate the checksum */
        checksum = 0;
        for (i = 0; i < SLEEP_SAVE_SIZE - 1; i++)
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index b6c746ea38..0e4f6fab10 100644
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -180,10 +180,12 @@ static void __init poodle_map_io(void)
 }
 MACHINE_START(POODLE, "SHARP Poodle")
-        BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
+        .phys_ram       = 0xa0000000,
-        FIXUP(fixup_poodle)
+        .phys_io        = 0x40000000,
-        MAPIO(poodle_map_io)
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
-        INITIRQ(pxa_init_irq)
+        .fixup          = fixup_poodle,
-        .timer = &pxa_timer,
+        .map_io         = poodle_map_io,
-        .init_machine = poodle_init,
+        .init_irq       = pxa_init_irq,
+        .timer          = &pxa_timer,
+        .init_machine   = poodle_init,
 MACHINE_END
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index 893964fb96..9a791b0711 100644
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -126,6 +126,7 @@ int pxa_cpu_pm_prepare(suspend_state_t state)
 {
        switch (state) {
        case PM_SUSPEND_MEM:
+        case PM_SUSPEND_STANDBY:
                return 0;
        default:
                return -EINVAL;
@@ -138,7 +139,10 @@ void pxa_cpu_pm_enter(suspend_state_t state)
        extern void pxa_cpu_suspend(unsigned int);
        extern void pxa_cpu_resume(void);
-        CKEN = CKEN22_MEMC | CKEN9_OSTIMER;
+        if (state == PM_SUSPEND_STANDBY)
+                CKEN = CKEN22_MEMC | CKEN9_OSTIMER | CKEN16_LCD |CKEN0_PWM0;
+        else
+                CKEN = CKEN22_MEMC | CKEN9_OSTIMER;
        /* ensure voltage-change sequencer not initiated, which hangs */
        PCFR &= ~PCFR_FVC;
@@ -147,6 +151,9 @@ void pxa_cpu_pm_enter(suspend_state_t state)
        PEDR = 0xDF12FE1B;
        switch (state) {
+        case PM_SUSPEND_STANDBY:
+                pxa_cpu_standby();
+                break;
        case PM_SUSPEND_MEM:
                /* set resume return address */
                PSPR = virt_to_phys(pxa_cpu_resume);
diff --git a/arch/arm/mach-pxa/standby.S b/arch/arm/mach-pxa/standby.S
new file mode 100644
index 0000000000..8a3f27b767
--- /dev/null
+++ b/arch/arm/mach-pxa/standby.S
@@ -0,0 +1,32 @@
+/*
+ * PXA27x standby mode
+ *
+ * Author: David Burrage
+ *
+ * 2005 (c) MontaVista Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+#include <linux/config.h>
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+#include <asm/hardware.h>
+#include <asm/arch/pxa-regs.h>
+                .text
+ENTRY(pxa_cpu_standby)
+        ldr     r0, =PSSR
+        mov     r1, #(PSSR_PH | PSSR_STS)
+        mov     r2, #2
+        mov     r3, #UNCACHED_PHYS_0    @ Read mem context in.
+        ldr     ip, [r3]
+        b       1f
+        .align  5
+1:      mcr     p14, 0, r2, c7, c0, 0   @ put the system into Standby
+        str     r1, [r0]                @ make sure PSSR_PH/STS are clear
+        mov     pc, lr
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c
index 473fb6173f..6e5202154f 100644
--- a/arch/arm/mach-pxa/time.c
+++ b/arch/arm/mach-pxa/time.c
@@ -105,8 +105,8 @@ pxa_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 static struct irqaction pxa_timer_irq = {
        .name           = "PXA Timer Tick",
-        .flags          = SA_INTERRUPT,
+        .flags          = SA_INTERRUPT | SA_TIMER,
-        .handler        = pxa_timer_interrupt
+        .handler        = pxa_timer_interrupt,
 };
 static void __init pxa_timer_init(void)
diff --git a/arch/arm/mach-rpc/riscpc.c b/arch/arm/mach-rpc/riscpc.c
index 815c53225c..a10268618f 100644
--- a/arch/arm/mach-rpc/riscpc.c
+++ b/arch/arm/mach-rpc/riscpc.c
@@ -32,10 +32,7 @@
 extern void rpc_init_irq(void);
-extern unsigned int vram_size;
+unsigned int vram_size;
-#if 0
 unsigned int memc_ctrl_reg;
 unsigned int number_mfm_drives;
@@ -63,8 +60,6 @@ static int __init parse_tag_acorn(const struct tag *tag)
 __tagtable(ATAG_ACORN, parse_tag_acorn);
-#endif
 static struct map_desc rpc_io_desc[] __initdata = {
 { SCREEN_BASE, SCREEN_START,   2*1048576, MT_DEVICE }, /* VRAM         */
 { (u32)IO_BASE, IO_START,      IO_SIZE  , MT_DEVICE }, /* IO space     */
@@ -168,12 +163,14 @@ arch_initcall(rpc_init);
 extern struct sys_timer ioc_timer;
 MACHINE_START(RISCPC, "Acorn-RiscPC")
-        MAINTAINER("Russell King")
+        /* Maintainer: Russell King */
-        BOOT_MEM(0x10000000, 0x03000000, 0xe0000000)
+        .phys_ram       = 0x10000000,
-        BOOT_PARAMS(0x10000100)
+        .phys_io        = 0x03000000,
-        DISABLE_PARPORT(0)
+        .io_pg_offst    = ((0xe0000000) >> 18) & 0xfffc,
-        DISABLE_PARPORT(1)
+        .boot_params    = 0x10000100,
-        MAPIO(rpc_map_io)
+        .reserve_lp0    = 1,
-        INITIRQ(rpc_init_irq)
+        .reserve_lp1    = 1,
+        .map_io         = rpc_map_io,
+        .init_irq       = rpc_init_irq,
        .timer          = &ioc_timer,
 MACHINE_END
diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index 534df0c6c7..d4d03d0daa 100644
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
@@ -154,6 +154,11 @@ config S3C2410_PM_CHECK_CHUNKSIZE
          the CRC data block will take more memory, but wil identify any
          faults with better precision.
+config PM_SIMTEC
+        bool
+        depends on PM && (ARCH_BAST || MACH_VR1000)
+        default y
 config S3C2410_LOWLEVEL_UART_PORT
        int "S3C2410 UART to use for low-level messages"
        default 0
diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile
index 7c379aad5d..f99b689e43 100644
--- a/arch/arm/mach-s3c2410/Makefile
+++ b/arch/arm/mach-s3c2410/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_S3C2410_DMA)  += dma.o
 # Power Management support
 obj-$(CONFIG_PM)           += pm.o sleep.o
+obj-$(CONFIG_PM_SIMTEC)    += pm-simtec.o
 # S3C2440 support
diff --git a/arch/arm/mach-s3c2410/devs.c b/arch/arm/mach-s3c2410/devs.c
index 64792f6786..4664bd11ad 100644
--- a/arch/arm/mach-s3c2410/devs.c
+++ b/arch/arm/mach-s3c2410/devs.c
@@ -96,8 +96,8 @@ struct platform_device s3c_device_lcd = {
        .num_resources    = ARRAY_SIZE(s3c_lcd_resource),
        .resource         = s3c_lcd_resource,
        .dev              = {
-                .dma_mask = &s3c_device_lcd_dmamask,
+                .dma_mask               = &s3c_device_lcd_dmamask,
-                .coherent_dma_mask = 0xffffffffUL
+                .coherent_dma_mask      = 0xffffffffUL
        }
 };
diff --git a/arch/arm/mach-s3c2410/irq.c b/arch/arm/mach-s3c2410/irq.c
index b668c48f43..cf9f46d880 100644
--- a/arch/arm/mach-s3c2410/irq.c
+++ b/arch/arm/mach-s3c2410/irq.c
@@ -40,8 +40,11 @@
 *   04-Nov-2004  Ben Dooks
 *                Fix standard IRQ wake for EINT0..4 and RTC
 *
- *   22-Feb-2004  Ben Dooks
+ *   22-Feb-2005  Ben Dooks
 *                Fixed edge-triggering on ADC IRQ
+ *
+ *   28-Jun-2005  Ben Dooks
+ *                Mark IRQ_LCD valid
 */
 #include <linux/init.h>
@@ -366,7 +369,6 @@ static struct irqchip s3c_irq_eint0t4 = {
 #define INTMSK_UART1     (1UL << (IRQ_UART1 - IRQ_EINT0))
 #define INTMSK_UART2     (1UL << (IRQ_UART2 - IRQ_EINT0))
 #define INTMSK_ADCPARENT (1UL << (IRQ_ADCPARENT - IRQ_EINT0))
-#define INTMSK_LCD       (1UL << (IRQ_LCD - IRQ_EINT0))
 static inline void
 s3c_irqsub_mask(unsigned int irqno, unsigned int parentbit,
@@ -716,7 +718,6 @@ void __init s3c24xx_init_irq(void)
                case IRQ_UART0:
                case IRQ_UART1:
                case IRQ_UART2:
-                case IRQ_LCD:
                case IRQ_ADCPARENT:
                        set_irq_chip(irqno, &s3c_irq_level_chip);
                        set_irq_handler(irqno, do_level_IRQ);
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c
index 3bb97eb6e6..ccb6bcefa4 100644
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
@@ -26,6 +26,8 @@
 *     03-Mar-2005 BJD  Ensured that bast-cpld.h is included
 *     10-Mar-2005 LCVR Changed S3C2410_VA to S3C24XX_VA
 *     14-Mar-2006 BJD  Updated for __iomem changes
+ *     22-Jun-2006 BJD  Added DM9000 platform information
+ *     28-Jun-2006 BJD  Moved pm functionality out to common code
 */
 #include <linux/kernel.h>
@@ -35,6 +37,7 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/device.h>
+#include <linux/dm9000.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -53,6 +56,7 @@
 #include <asm/arch/regs-serial.h>
 #include <asm/arch/regs-gpio.h>
 #include <asm/arch/regs-mem.h>
+#include <asm/arch/regs-lcd.h>
 #include <asm/arch/nand.h>
 #include <linux/mtd/mtd.h>
@@ -64,7 +68,6 @@
 #include "devs.h"
 #include "cpu.h"
 #include "usb-simtec.h"
-#include "pm.h"
 #define COPYRIGHT ", (c) 2004-2005 Simtec Electronics"
@@ -112,7 +115,6 @@ static struct map_desc bast_iodesc[] __initdata = {
  { VA_C2(BAST_VA_ISAMEM),  PA_CS2(BAST_PA_ISAMEM),   SZ_16M, MT_DEVICE },
  { VA_C2(BAST_VA_ASIXNET), PA_CS3(BAST_PA_ASIXNET),  SZ_1M,  MT_DEVICE },
  { VA_C2(BAST_VA_SUPERIO), PA_CS2(BAST_PA_SUPERIO),  SZ_1M,  MT_DEVICE },
-  { VA_C2(BAST_VA_DM9000),  PA_CS2(BAST_PA_DM9000),   SZ_1M,  MT_DEVICE },
  { VA_C2(BAST_VA_IDEPRI),  PA_CS3(BAST_PA_IDEPRI),   SZ_1M,  MT_DEVICE },
  { VA_C2(BAST_VA_IDESEC),  PA_CS3(BAST_PA_IDESEC),   SZ_1M,  MT_DEVICE },
  { VA_C2(BAST_VA_IDEPRIAUX), PA_CS3(BAST_PA_IDEPRIAUX), SZ_1M, MT_DEVICE },
@@ -123,7 +125,6 @@ static struct map_desc bast_iodesc[] __initdata = {
  { VA_C3(BAST_VA_ISAMEM),  PA_CS3(BAST_PA_ISAMEM),   SZ_16M, MT_DEVICE },
  { VA_C3(BAST_VA_ASIXNET), PA_CS3(BAST_PA_ASIXNET),  SZ_1M,  MT_DEVICE },
  { VA_C3(BAST_VA_SUPERIO), PA_CS3(BAST_PA_SUPERIO),  SZ_1M,  MT_DEVICE },
-  { VA_C3(BAST_VA_DM9000),  PA_CS3(BAST_PA_DM9000),   SZ_1M,  MT_DEVICE },
  { VA_C3(BAST_VA_IDEPRI),  PA_CS3(BAST_PA_IDEPRI),   SZ_1M,  MT_DEVICE },
  { VA_C3(BAST_VA_IDESEC),  PA_CS3(BAST_PA_IDESEC),   SZ_1M,  MT_DEVICE },
  { VA_C3(BAST_VA_IDEPRIAUX), PA_CS3(BAST_PA_IDEPRIAUX), SZ_1M, MT_DEVICE },
@@ -134,7 +135,6 @@ static struct map_desc bast_iodesc[] __initdata = {
  { VA_C4(BAST_VA_ISAMEM),  PA_CS4(BAST_PA_ISAMEM),   SZ_16M, MT_DEVICE },
  { VA_C4(BAST_VA_ASIXNET), PA_CS5(BAST_PA_ASIXNET),  SZ_1M,  MT_DEVICE },
  { VA_C4(BAST_VA_SUPERIO), PA_CS4(BAST_PA_SUPERIO),  SZ_1M,  MT_DEVICE },
-  { VA_C4(BAST_VA_DM9000),  PA_CS4(BAST_PA_DM9000),   SZ_1M,  MT_DEVICE },
  { VA_C4(BAST_VA_IDEPRI),  PA_CS5(BAST_PA_IDEPRI),   SZ_1M,  MT_DEVICE },
  { VA_C4(BAST_VA_IDESEC),  PA_CS5(BAST_PA_IDESEC),   SZ_1M,  MT_DEVICE },
  { VA_C4(BAST_VA_IDEPRIAUX), PA_CS5(BAST_PA_IDEPRIAUX), SZ_1M, MT_DEVICE },
@@ -145,7 +145,6 @@ static struct map_desc bast_iodesc[] __initdata = {
  { VA_C5(BAST_VA_ISAMEM),  PA_CS5(BAST_PA_ISAMEM),   SZ_16M, MT_DEVICE },
  { VA_C5(BAST_VA_ASIXNET), PA_CS5(BAST_PA_ASIXNET),  SZ_1M,  MT_DEVICE },
  { VA_C5(BAST_VA_SUPERIO), PA_CS5(BAST_PA_SUPERIO),  SZ_1M,  MT_DEVICE },
-  { VA_C5(BAST_VA_DM9000),  PA_CS5(BAST_PA_DM9000),   SZ_1M,  MT_DEVICE },
  { VA_C5(BAST_VA_IDEPRI),  PA_CS5(BAST_PA_IDEPRI),   SZ_1M,  MT_DEVICE },
  { VA_C5(BAST_VA_IDESEC),  PA_CS5(BAST_PA_IDESEC),   SZ_1M,  MT_DEVICE },
  { VA_C5(BAST_VA_IDEPRIAUX), PA_CS5(BAST_PA_IDEPRIAUX), SZ_1M, MT_DEVICE },
@@ -313,6 +312,45 @@ static struct s3c2410_platform_nand bast_nand_info = {
        .select_chip    = bast_nand_select,
 };
+/* DM9000 */
+static struct resource bast_dm9k_resource[] = {
+        [0] = {
+                .start = S3C2410_CS5 + BAST_PA_DM9000,
+                .end   = S3C2410_CS5 + BAST_PA_DM9000 + 3,
+                .flags = IORESOURCE_MEM
+        },
+        [1] = {
+                .start = S3C2410_CS5 + BAST_PA_DM9000 + 0x40,
+                .end   = S3C2410_CS5 + BAST_PA_DM9000 + 0x40 + 0x3f,
+                .flags = IORESOURCE_MEM
+        },
+        [2] = {
+                .start = IRQ_DM9000,
+                .end   = IRQ_DM9000,
+                .flags = IORESOURCE_IRQ
+        }
+};
+/* for the moment we limit ourselves to 16bit IO until some
+ * better IO routines can be written and tested
+*/
+struct dm9000_plat_data bast_dm9k_platdata = {
+        .flags          = DM9000_PLATF_16BITONLY
+};
+static struct platform_device bast_device_dm9k = {
+        .name           = "dm9000",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(bast_dm9k_resource),
+        .resource       = bast_dm9k_resource,
+        .dev            = {
+                .platform_data = &bast_dm9k_platdata,
+        }
+};
 /* Standard BAST devices */
@@ -324,7 +362,8 @@ static struct platform_device *bast_devices[] __initdata = {
        &s3c_device_iis,
        &s3c_device_rtc,
        &s3c_device_nand,
-        &bast_device_nor
+        &bast_device_nor,
+        &bast_device_dm9k,
 };
 static struct clk *bast_clocks[] = {
@@ -366,44 +405,14 @@ void __init bast_map_io(void)
        usb_simtec_init();
 }
-void __init bast_init_irq(void)
-{
-        s3c24xx_init_irq();
-}
-#ifdef CONFIG_PM
-/* bast_init_machine
- *
- * enable the power management functions for the EB2410ITX
-*/
-static __init void bast_init_machine(void)
-{
-        unsigned long gstatus4;
-        printk(KERN_INFO "BAST Power Manangement" COPYRIGHT "\n");
-        gstatus4  = (__raw_readl(S3C2410_BANKCON7) & 0x3) << 30;
-        gstatus4 |= (__raw_readl(S3C2410_BANKCON6) & 0x3) << 28;
-        gstatus4 |= (__raw_readl(S3C2410_BANKSIZE) & S3C2410_BANKSIZE_MASK);
-        __raw_writel(gstatus4, S3C2410_GSTATUS4);
-        s3c2410_pm_init();
-}
-#else
-#define bast_init_machine NULL
-#endif
 MACHINE_START(BAST, "Simtec-BAST")
-     MAINTAINER("Ben Dooks <ben@simtec.co.uk>")
+        /* Maintainer: Ben Dooks <ben@simtec.co.uk> */
-     BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
+        .phys_ram       = S3C2410_SDRAM_PA,
-     BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
+        .phys_io        = S3C2410_PA_UART,
-     MAPIO(bast_map_io)
+        .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
-     INITIRQ(bast_init_irq)
+        .boot_params    = S3C2410_SDRAM_PA + 0x100,
-        .init_machine   = bast_init_machine,
+        .map_io         = bast_map_io,
+        .init_irq       = s3c24xx_init_irq,
        .timer          = &s3c24xx_timer,
 MACHINE_END
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c
index 2924afc068..ea4fb1a97a 100644
--- a/arch/arm/mach-s3c2410/mach-h1940.c
+++ b/arch/arm/mach-s3c2410/mach-h1940.c
@@ -117,10 +117,12 @@ void __init h1940_init_irq(void)
 }
 MACHINE_START(H1940, "IPAQ-H1940")
-     MAINTAINER("Ben Dooks <ben@fluff.org>")
+        /* Maintainer: Ben Dooks <ben@fluff.org> */
-     BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
+        .phys_ram       = S3C2410_SDRAM_PA,
-     BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
+        .phys_io        = S3C2410_PA_UART,
-     MAPIO(h1940_map_io)
+        .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
-     INITIRQ(h1940_init_irq)
+        .boot_params    = S3C2410_SDRAM_PA + 0x100,
+        .map_io         = h1940_map_io,
+        .init_irq       = h1940_init_irq,
        .timer          = &s3c24xx_timer,
 MACHINE_END
diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c
index bd15998c12..79044d9bce 100644
--- a/arch/arm/mach-s3c2410/mach-n30.c
+++ b/arch/arm/mach-s3c2410/mach-n30.c
@@ -137,10 +137,11 @@ void __init n30_init(void)
 }
 MACHINE_START(N30, "Acer-N30")
-     MAINTAINER("Christer Weinigel <christer@weinigel.se>, Ben Dooks <ben-linux@fluff.org>")
+        /* Maintainer: Christer Weinigel <christer@weinigel.se>, Ben Dooks <ben-linux@fluff.org> */
-     BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
+        .phys_ram       = S3C2410_SDRAM_PA,
-     BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
+        .phys_io        = S3C2410_PA_UART,
+        .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
+        .boot_params    = S3C2410_SDRAM_PA + 0x100,
        .timer          = &s3c24xx_timer,
        .init_machine   = n30_init,
        .init_irq       = n30_init_irq,
diff --git a/arch/arm/mach-s3c2410/mach-nexcoder.c b/arch/arm/mach-s3c2410/mach-nexcoder.c
index 70487bf4b7..d24c242414 100644
--- a/arch/arm/mach-s3c2410/mach-nexcoder.c
+++ b/arch/arm/mach-s3c2410/mach-nexcoder.c
@@ -147,9 +147,11 @@ void __init nexcoder_map_io(void)
 MACHINE_START(NEXCODER_2440, "NexVision - Nexcoder 2440")
-     MAINTAINER("Guillaume GOURAT <guillaume.gourat@nexvision.tv>")
+        /* Maintainer: Guillaume GOURAT <guillaume.gourat@nexvision.tv> */
-     BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
+        .phys_ram       = S3C2410_SDRAM_PA,
-     BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
+        .phys_io        = S3C2410_PA_UART,
+        .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
+        .boot_params    = S3C2410_SDRAM_PA + 0x100,
        .map_io         = nexcoder_map_io,
        .init_irq       = s3c24xx_init_irq,
        .timer          = &s3c24xx_timer,
diff --git a/arch/arm/mach-s3c2410/mach-otom.c b/arch/arm/mach-s3c2410/mach-otom.c
index 67d8ce8fb0..d901ed492f 100644
--- a/arch/arm/mach-s3c2410/mach-otom.c
+++ b/arch/arm/mach-s3c2410/mach-otom.c
@@ -115,9 +115,11 @@ void __init otom11_map_io(void)
 MACHINE_START(OTOM, "Nex Vision - Otom 1.1")
-     MAINTAINER("Guillaume GOURAT <guillaume.gourat@nexvision.tv>")
+        /* Maintainer: Guillaume GOURAT <guillaume.gourat@nexvision.tv> */
-     BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
+        .phys_ram       = S3C2410_SDRAM_PA,
-     BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
+        .phys_io        = S3C2410_PA_UART,
+        .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
+        .boot_params    = S3C2410_SDRAM_PA + 0x100,
        .map_io         = otom11_map_io,
        .init_irq       = s3c24xx_init_irq,
        .timer          = &s3c24xx_timer,
diff --git a/arch/arm/mach-s3c2410/mach-rx3715.c b/arch/arm/mach-s3c2410/mach-rx3715.c
index f8d3a9784e..a73d61c1de 100644
--- a/arch/arm/mach-s3c2410/mach-rx3715.c
+++ b/arch/arm/mach-s3c2410/mach-rx3715.c
@@ -131,11 +131,13 @@ static void __init rx3715_init_machine(void)
 #endif
 MACHINE_START(RX3715, "IPAQ-RX3715")
-     MAINTAINER("Ben Dooks <ben@fluff.org>")
+        /* Maintainer: Ben Dooks <ben@fluff.org> */
-     BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
+        .phys_ram       = S3C2410_SDRAM_PA,
-     BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
+        .phys_io        = S3C2410_PA_UART,
-     MAPIO(rx3715_map_io)
+        .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
-     INITIRQ(rx3715_init_irq)
+        .boot_params    = S3C2410_SDRAM_PA + 0x100,
-     INIT_MACHINE(rx3715_init_machine)
+        .map_io         = rx3715_map_io,
+        .init_irq       = rx3715_init_irq,
+        .init_machine   = rx3715_init_machine,
        .timer          = &s3c24xx_timer,
 MACHINE_END
diff --git a/arch/arm/mach-s3c2410/mach-smdk2410.c b/arch/arm/mach-s3c2410/mach-smdk2410.c
index c1a4a1420e..67e903a700 100644
--- a/arch/arm/mach-s3c2410/mach-smdk2410.c
+++ b/arch/arm/mach-s3c2410/mach-smdk2410.c
@@ -112,11 +112,13 @@ void __init smdk2410_init_irq(void)
 MACHINE_START(SMDK2410, "SMDK2410") /* @TODO: request a new identifier and switch
                                    * to SMDK2410 */
-     MAINTAINER("Jonas Dietsche")
+        /* Maintainer: Jonas Dietsche */
-     BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
+        .phys_ram       = S3C2410_SDRAM_PA,
-     BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
+        .phys_io        = S3C2410_PA_UART,
-     MAPIO(smdk2410_map_io)
+        .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
-     INITIRQ(smdk2410_init_irq)
+        .boot_params    = S3C2410_SDRAM_PA + 0x100,
+        .map_io         = smdk2410_map_io,
+        .init_irq       = smdk2410_init_irq,
        .timer          = &s3c24xx_timer,
 MACHINE_END
diff --git a/arch/arm/mach-s3c2410/mach-smdk2440.c b/arch/arm/mach-s3c2410/mach-smdk2440.c
index 7857176d9b..357522106f 100644
--- a/arch/arm/mach-s3c2410/mach-smdk2440.c
+++ b/arch/arm/mach-s3c2410/mach-smdk2440.c
@@ -124,9 +124,11 @@ void __init smdk2440_machine_init(void)
 }
 MACHINE_START(S3C2440, "SMDK2440")
-        MAINTAINER("Ben Dooks <ben@fluff.org>")
+        /* Maintainer: Ben Dooks <ben@fluff.org> */
-        BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
+        .phys_ram       = S3C2410_SDRAM_PA,
-        BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
+        .phys_io        = S3C2410_PA_UART,
+        .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
+        .boot_params    = S3C2410_SDRAM_PA + 0x100,
        .init_irq       = s3c24xx_init_irq,
        .map_io         = smdk2440_map_io,
diff --git a/arch/arm/mach-s3c2410/mach-vr1000.c b/arch/arm/mach-s3c2410/mach-vr1000.c
index 5512146b1c..924e8464c2 100644
--- a/arch/arm/mach-s3c2410/mach-vr1000.c
+++ b/arch/arm/mach-s3c2410/mach-vr1000.c
@@ -27,6 +27,7 @@
 *     10-Feb-2005 BJD  Added power-off capability
 *     10-Mar-2005 LCVR Changed S3C2410_VA to S3C24XX_VA
 *     14-Mar-2006 BJD  void __iomem fixes
+ *     22-Jun-2006 BJD  Added DM9000 platform information
 */
 #include <linux/kernel.h>
@@ -35,6 +36,7 @@
 #include <linux/list.h>
 #include <linux/timer.h>
 #include <linux/init.h>
+#include <linux/dm9000.h>
 #include <linux/serial.h>
 #include <linux/tty.h>
@@ -98,28 +100,24 @@ static struct map_desc vr1000_iodesc[] __initdata = {
   * are only 8bit */
  /* slow, byte */
-  { VA_C2(VR1000_VA_DM9000),  PA_CS2(VR1000_PA_DM9000),   SZ_1M,  MT_DEVICE },
  { VA_C2(VR1000_VA_IDEPRI),  PA_CS3(VR1000_PA_IDEPRI),   SZ_1M,  MT_DEVICE },
  { VA_C2(VR1000_VA_IDESEC),  PA_CS3(VR1000_PA_IDESEC),   SZ_1M,  MT_DEVICE },
  { VA_C2(VR1000_VA_IDEPRIAUX), PA_CS3(VR1000_PA_IDEPRIAUX), SZ_1M, MT_DEVICE },
  { VA_C2(VR1000_VA_IDESECAUX), PA_CS3(VR1000_PA_IDESECAUX), SZ_1M, MT_DEVICE },
  /* slow, word */
-  { VA_C3(VR1000_VA_DM9000),  PA_CS3(VR1000_PA_DM9000),   SZ_1M,  MT_DEVICE },
  { VA_C3(VR1000_VA_IDEPRI),  PA_CS3(VR1000_PA_IDEPRI),   SZ_1M,  MT_DEVICE },
  { VA_C3(VR1000_VA_IDESEC),  PA_CS3(VR1000_PA_IDESEC),   SZ_1M,  MT_DEVICE },
  { VA_C3(VR1000_VA_IDEPRIAUX), PA_CS3(VR1000_PA_IDEPRIAUX), SZ_1M, MT_DEVICE },
  { VA_C3(VR1000_VA_IDESECAUX), PA_CS3(VR1000_PA_IDESECAUX), SZ_1M, MT_DEVICE },
  /* fast, byte */
-  { VA_C4(VR1000_VA_DM9000),  PA_CS4(VR1000_PA_DM9000),   SZ_1M,  MT_DEVICE },
  { VA_C4(VR1000_VA_IDEPRI),  PA_CS5(VR1000_PA_IDEPRI),   SZ_1M,  MT_DEVICE },
  { VA_C4(VR1000_VA_IDESEC),  PA_CS5(VR1000_PA_IDESEC),   SZ_1M,  MT_DEVICE },
  { VA_C4(VR1000_VA_IDEPRIAUX), PA_CS5(VR1000_PA_IDEPRIAUX), SZ_1M, MT_DEVICE },
  { VA_C4(VR1000_VA_IDESECAUX), PA_CS5(VR1000_PA_IDESECAUX), SZ_1M, MT_DEVICE },
  /* fast, word */
-  { VA_C5(VR1000_VA_DM9000),  PA_CS5(VR1000_PA_DM9000),   SZ_1M,  MT_DEVICE },
  { VA_C5(VR1000_VA_IDEPRI),  PA_CS5(VR1000_PA_IDEPRI),   SZ_1M,  MT_DEVICE },
  { VA_C5(VR1000_VA_IDESEC),  PA_CS5(VR1000_PA_IDESEC),   SZ_1M,  MT_DEVICE },
  { VA_C5(VR1000_VA_IDEPRIAUX), PA_CS5(VR1000_PA_IDEPRIAUX), SZ_1M, MT_DEVICE },
@@ -246,6 +244,74 @@ static struct platform_device vr1000_nor = {
        .resource       = vr1000_nor_resource,
 };
+/* DM9000 ethernet devices */
+static struct resource vr1000_dm9k0_resource[] = {
+        [0] = {
+                .start = S3C2410_CS5 + VR1000_PA_DM9000,
+                .end   = S3C2410_CS5 + VR1000_PA_DM9000 + 3,
+                .flags = IORESOURCE_MEM
+        },
+        [1] = {
+                .start = S3C2410_CS5 + VR1000_PA_DM9000 + 0x40,
+                .end   = S3C2410_CS5 + VR1000_PA_DM9000 + 0x7f,
+                .flags = IORESOURCE_MEM
+        },
+        [2] = {
+                .start = IRQ_VR1000_DM9000A,
+                .end   = IRQ_VR1000_DM9000A,
+                .flags = IORESOURCE_IRQ
+        }
+};
+static struct resource vr1000_dm9k1_resource[] = {
+        [0] = {
+                .start = S3C2410_CS5 + VR1000_PA_DM9000 + 0x80,
+                .end   = S3C2410_CS5 + VR1000_PA_DM9000 + 0x83,
+                .flags = IORESOURCE_MEM
+        },
+        [1] = {
+                .start = S3C2410_CS5 + VR1000_PA_DM9000 + 0xC0,
+                .end   = S3C2410_CS5 + VR1000_PA_DM9000 + 0xFF,
+                .flags = IORESOURCE_MEM
+        },
+        [2] = {
+                .start = IRQ_VR1000_DM9000N,
+                .end   = IRQ_VR1000_DM9000N,
+                .flags = IORESOURCE_IRQ
+        }
+};
+/* for the moment we limit ourselves to 16bit IO until some
+ * better IO routines can be written and tested
+*/
+struct dm9000_plat_data vr1000_dm9k_platdata = {
+        .flags          = DM9000_PLATF_16BITONLY,
+};
+static struct platform_device vr1000_dm9k0 = {
+        .name           = "dm9000",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(vr1000_dm9k0_resource),
+        .resource       = vr1000_dm9k0_resource,
+        .dev            = {
+                .platform_data = &vr1000_dm9k_platdata,
+        }
+};
+static struct platform_device vr1000_dm9k1 = {
+        .name           = "dm9000",
+        .id             = 1,
+        .num_resources  = ARRAY_SIZE(vr1000_dm9k1_resource),
+        .resource       = vr1000_dm9k1_resource,
+        .dev            = {
+                .platform_data = &vr1000_dm9k_platdata,
+        }
+};
+/* devices for this board */
 static struct platform_device *vr1000_devices[] __initdata = {
        &s3c_device_usb,
@@ -253,8 +319,11 @@ static struct platform_device *vr1000_devices[] __initdata = {
        &s3c_device_wdt,
        &s3c_device_i2c,
        &s3c_device_iis,
+        &s3c_device_adc,
        &serial_device,
        &vr1000_nor,
+        &vr1000_dm9k0,
+        &vr1000_dm9k1
 };
 static struct clk *vr1000_clocks[] = {
@@ -302,16 +371,14 @@ void __init vr1000_map_io(void)
        usb_simtec_init();
 }
-void __init vr1000_init_irq(void)
-{
-        s3c24xx_init_irq();
-}
 MACHINE_START(VR1000, "Thorcom-VR1000")
-     MAINTAINER("Ben Dooks <ben@simtec.co.uk>")
+        /* Maintainer: Ben Dooks <ben@simtec.co.uk> */
-     BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
+        .phys_ram       = S3C2410_SDRAM_PA,
-     BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
+        .phys_io        = S3C2410_PA_UART,
-     MAPIO(vr1000_map_io)
+        .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
-     INITIRQ(vr1000_init_irq)
+        .boot_params    = S3C2410_SDRAM_PA + 0x100,
+        .map_io         = vr1000_map_io,
+        .init_irq       = s3c24xx_init_irq,
        .timer          = &s3c24xx_timer,
 MACHINE_END
diff --git a/arch/arm/mach-s3c2410/pm-simtec.c b/arch/arm/mach-s3c2410/pm-simtec.c
new file mode 100644
index 0000000000..2cb7988322
--- /dev/null
+++ b/arch/arm/mach-s3c2410/pm-simtec.c
@@ -0,0 +1,65 @@
+/* linux/arch/arm/mach-s3c2410/pm-simtec.c
+ *
+ * Copyright (c) 2004 Simtec Electronics
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * http://armlinux.simtec.co.uk/
+ *
+ * Power Management helpers for Simtec S3C24XX implementations
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/interrupt.h>
+#include <linux/list.h>
+#include <linux/timer.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/hardware.h>
+#include <asm/io.h>
+#include <asm/arch/map.h>
+#include <asm/arch/regs-serial.h>
+#include <asm/arch/regs-gpio.h>
+#include <asm/arch/regs-mem.h>
+#include <asm/mach-types.h>
+#include "pm.h"
+#define COPYRIGHT ", (c) 2005 Simtec Electronics"
+/* pm_simtec_init
+ *
+ * enable the power management functions
+*/
+static __init int pm_simtec_init(void)
+{
+        unsigned long gstatus4;
+        /* check which machine we are running on */
+        if (!machine_is_bast() && !machine_is_vr1000())
+                return 0;
+        printk(KERN_INFO "Simtec Board Power Manangement" COPYRIGHT "\n");
+        gstatus4  = (__raw_readl(S3C2410_BANKCON7) & 0x3) << 30;
+        gstatus4 |= (__raw_readl(S3C2410_BANKCON6) & 0x3) << 28;
+        gstatus4 |= (__raw_readl(S3C2410_BANKSIZE) & S3C2410_BANKSIZE_MASK);
+        __raw_writel(gstatus4, S3C2410_GSTATUS4);
+        return s3c2410_pm_init();
+}
+arch_initcall(pm_simtec_init);
diff --git a/arch/arm/mach-s3c2410/time.c b/arch/arm/mach-s3c2410/time.c
index 179f0e031a..765a3a9ae0 100644
--- a/arch/arm/mach-s3c2410/time.c
+++ b/arch/arm/mach-s3c2410/time.c
@@ -137,8 +137,8 @@ s3c2410_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 static struct irqaction s3c2410_timer_irq = {
        .name           = "S3C2410 Timer Tick",
-        .flags          = SA_INTERRUPT,
+        .flags          = SA_INTERRUPT | SA_TIMER,
-        .handler        = s3c2410_timer_interrupt
+        .handler        = s3c2410_timer_interrupt,
 };
 /*
diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c
index bedf88fafe..4d4d303ee3 100644
--- a/arch/arm/mach-sa1100/assabet.c
+++ b/arch/arm/mach-sa1100/assabet.c
@@ -431,11 +431,13 @@ static void __init assabet_map_io(void)
 MACHINE_START(ASSABET, "Intel-Assabet")
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        FIXUP(fixup_assabet)
+        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
-        MAPIO(assabet_map_io)
+        .boot_params    = 0xc0000100,
-        INITIRQ(sa1100_init_irq)
+        .fixup          = fixup_assabet,
+        .map_io         = assabet_map_io,
+        .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
        .init_machine   = assabet_init,
 MACHINE_END
diff --git a/arch/arm/mach-sa1100/badge4.c b/arch/arm/mach-sa1100/badge4.c
index 6a60b497ab..b6169cb091 100644
--- a/arch/arm/mach-sa1100/badge4.c
+++ b/arch/arm/mach-sa1100/badge4.c
@@ -285,9 +285,11 @@ static void __init badge4_map_io(void)
 }
 MACHINE_START(BADGE4, "Hewlett-Packard Laboratories BadgePAD 4")
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO(badge4_map_io)
+        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
-        INITIRQ(sa1100_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = badge4_map_io,
+        .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
 MACHINE_END
diff --git a/arch/arm/mach-sa1100/cerf.c b/arch/arm/mach-sa1100/cerf.c
index f8edde5e7c..0aa918e24c 100644
--- a/arch/arm/mach-sa1100/cerf.c
+++ b/arch/arm/mach-sa1100/cerf.c
@@ -123,10 +123,12 @@ static void __init cerf_init(void)
 }
 MACHINE_START(CERF, "Intrinsyc CerfBoard/CerfCube")
-        MAINTAINER("support@intrinsyc.com")
+        /* Maintainer: support@intrinsyc.com */
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+        .phys_ram       = 0xc0000000,
-        MAPIO(cerf_map_io)
+        .phys_io        = 0x80000000,
-        INITIRQ(cerf_init_irq)
+        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
+        .map_io         = cerf_map_io,
+        .init_irq       = cerf_init_irq,
        .timer          = &sa1100_timer,
        .init_machine   = cerf_init,
 MACHINE_END
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
index 99287890d3..8cb69113a5 100644
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -184,9 +184,11 @@ static void __init collie_map_io(void)
 }
 MACHINE_START(COLLIE, "Sharp-Collie")
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+        .phys_ram       = 0xc0000000,
-        MAPIO(collie_map_io)
+        .phys_io        = 0x80000000,
-        INITIRQ(sa1100_init_irq)
+        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
+        .map_io         = collie_map_io,
+        .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
        .init_machine   = collie_init,
 MACHINE_END
diff --git a/arch/arm/mach-sa1100/cpu-sa1110.c b/arch/arm/mach-sa1100/cpu-sa1110.c
index 8d2a89a2ea..04c94ab6c1 100644
--- a/arch/arm/mach-sa1100/cpu-sa1110.c
+++ b/arch/arm/mach-sa1100/cpu-sa1110.c
@@ -271,8 +271,7 @@ static int sa1110_target(struct cpufreq_policy *policy,
         */
        sdram_set_refresh(2);
        if (!irqs_disabled()) {
-                set_current_state(TASK_UNINTERRUPTIBLE);
+                msleep(20);
-                schedule_timeout(20 * HZ / 1000);
        } else {
                mdelay(20);
        }
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c
index 84c8654350..e7aa2681ca 100644
--- a/arch/arm/mach-sa1100/h3600.c
+++ b/arch/arm/mach-sa1100/h3600.c
@@ -380,10 +380,12 @@ static void __init h3100_map_io(void)
 }
 MACHINE_START(H3100, "Compaq iPAQ H3100")
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO(h3100_map_io)
+        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
-        INITIRQ(sa1100_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = h3100_map_io,
+        .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
        .init_machine   = h3xxx_mach_init,
 MACHINE_END
@@ -496,10 +498,12 @@ static void __init h3600_map_io(void)
 }
 MACHINE_START(H3600, "Compaq iPAQ H3600")
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO(h3600_map_io)
+        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
-        INITIRQ(sa1100_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = h3600_map_io,
+        .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
        .init_machine   = h3xxx_mach_init,
 MACHINE_END
@@ -727,7 +731,7 @@ static void h3800_IRQ_demux(unsigned int irq, struct irqdesc *desc, struct pt_re
 static struct irqaction h3800_irq = {
        .name           = "h3800_asic",
        .handler        = h3800_IRQ_demux,
-        .flags          = SA_INTERRUPT,
+        .flags          = SA_INTERRUPT | SA_TIMER,
 };
 u32 kpio_int_shadow = 0;
@@ -881,10 +885,12 @@ static void __init h3800_map_io(void)
 }
 MACHINE_START(H3800, "Compaq iPAQ H3800")
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO(h3800_map_io)
+        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
-        INITIRQ(h3800_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = h3800_map_io,
+        .init_irq       = h3800_init_irq,
        .timer          = &sa1100_timer,
        .init_machine   = h3xxx_mach_init,
 MACHINE_END
diff --git a/arch/arm/mach-sa1100/hackkit.c b/arch/arm/mach-sa1100/hackkit.c
index 5708417797..502d65cfe6 100644
--- a/arch/arm/mach-sa1100/hackkit.c
+++ b/arch/arm/mach-sa1100/hackkit.c
@@ -191,10 +191,12 @@ static void __init hackkit_init(void)
 */
 MACHINE_START(HACKKIT, "HackKit Cpu Board")
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO(hackkit_map_io)
+        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
-        INITIRQ(sa1100_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = hackkit_map_io,
+        .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
        .init_machine   = hackkit_init,
 MACHINE_END
diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c
index 6be78291a8..eee3cbc5ec 100644
--- a/arch/arm/mach-sa1100/jornada720.c
+++ b/arch/arm/mach-sa1100/jornada720.c
@@ -97,9 +97,11 @@ static void __init jornada720_map_io(void)
 }
 MACHINE_START(JORNADA720, "HP Jornada 720")
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO(jornada720_map_io)
+        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
-        INITIRQ(sa1100_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = jornada720_map_io,
+        .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
 MACHINE_END
diff --git a/arch/arm/mach-sa1100/lart.c b/arch/arm/mach-sa1100/lart.c
index 51c08ccfb8..870b488aed 100644
--- a/arch/arm/mach-sa1100/lart.c
+++ b/arch/arm/mach-sa1100/lart.c
@@ -41,9 +41,11 @@ static void __init lart_map_io(void)
 }
 MACHINE_START(LART, "LART")
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO(lart_map_io)
+        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
-        INITIRQ(sa1100_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = lart_map_io,
+        .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
 MACHINE_END
diff --git a/arch/arm/mach-sa1100/pleb.c b/arch/arm/mach-sa1100/pleb.c
index 5606bd71b0..e17b58fb9c 100644
--- a/arch/arm/mach-sa1100/pleb.c
+++ b/arch/arm/mach-sa1100/pleb.c
@@ -146,9 +146,11 @@ static void __init pleb_map_io(void)
 }
 MACHINE_START(PLEB, "PLEB")
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+        .phys_ram       = 0xc0000000,
-        MAPIO(pleb_map_io)
+        .phys_io        = 0x80000000,
-        INITIRQ(sa1100_init_irq)
+        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
+        .map_io         = pleb_map_io,
+        .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
        .init_machine   = pleb_init,
 MACHINE_END
diff --git a/arch/arm/mach-sa1100/pm.c b/arch/arm/mach-sa1100/pm.c
index 379ea5e395..59c7964cfe 100644
--- a/arch/arm/mach-sa1100/pm.c
+++ b/arch/arm/mach-sa1100/pm.c
@@ -88,6 +88,8 @@ static int sa11x0_pm_enter(suspend_state_t state)
        /* go zzz */
        sa1100_cpu_suspend();
+        cpu_init();
        /*
         * Ensure not to come back here if it wasn't intended
         */
diff --git a/arch/arm/mach-sa1100/shannon.c b/arch/arm/mach-sa1100/shannon.c
index edddd559be..43a00359fc 100644
--- a/arch/arm/mach-sa1100/shannon.c
+++ b/arch/arm/mach-sa1100/shannon.c
@@ -76,10 +76,12 @@ static void __init shannon_map_io(void)
 }
 MACHINE_START(SHANNON, "Shannon (AKA: Tuxscreen)")
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO(shannon_map_io)
+        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
-        INITIRQ(sa1100_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = shannon_map_io,
+        .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
        .init_machine   = shannon_init,
 MACHINE_END
diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c
index 8d113d6298..77978586b1 100644
--- a/arch/arm/mach-sa1100/simpad.c
+++ b/arch/arm/mach-sa1100/simpad.c
@@ -215,10 +215,12 @@ arch_initcall(simpad_init);
 MACHINE_START(SIMPAD, "Simpad")
-        MAINTAINER("Holger Freyther")
+        /* Maintainer: Holger Freyther */
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO(simpad_map_io)
+        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
-        INITIRQ(sa1100_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = simpad_map_io,
+        .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
 MACHINE_END
diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c
index 19b0c0fd63..0eeb3616ff 100644
--- a/arch/arm/mach-sa1100/time.c
+++ b/arch/arm/mach-sa1100/time.c
@@ -99,8 +99,8 @@ sa1100_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 static struct irqaction sa1100_timer_irq = {
        .name           = "SA11xx Timer Tick",
-        .flags          = SA_INTERRUPT,
+        .flags          = SA_INTERRUPT | SA_TIMER,
-        .handler        = sa1100_timer_interrupt
+        .handler        = sa1100_timer_interrupt,
 };
 static void __init sa1100_timer_init(void)
diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c
index a9bc5d0dbd..726445895b 100644
--- a/arch/arm/mach-shark/core.c
+++ b/arch/arm/mach-shark/core.c
@@ -84,8 +84,8 @@ shark_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 static struct irqaction shark_timer_irq = {
        .name           = "Shark Timer Tick",
-        .flags          = SA_INTERRUPT,
+        .flags          = SA_INTERRUPT | SA_TIMER,
-        .handler        = shark_timer_interrupt
+        .handler        = shark_timer_interrupt,
 };
 /*
@@ -105,10 +105,12 @@ static struct sys_timer shark_timer = {
 };
 MACHINE_START(SHARK, "Shark")
-        MAINTAINER("Alexander Schulz")
+        /* Maintainer: Alexander Schulz */
-        BOOT_MEM(0x08000000, 0x40000000, 0xe0000000)
+        .phys_ram       = 0x08000000,
-        BOOT_PARAMS(0x08003000)
+        .phys_io        = 0x40000000,
-        MAPIO(shark_map_io)
+        .io_pg_offst    = ((0xe0000000) >> 18) & 0xfffc,
-        INITIRQ(shark_init_irq)
+        .boot_params    = 0x08003000,
+        .map_io         = shark_map_io,
+        .init_irq       = shark_init_irq,
        .timer          = &shark_timer,
 MACHINE_END
diff --git a/arch/arm/mach-versatile/Makefile b/arch/arm/mach-versatile/Makefile
index 5d60883775..ba81e70ed8 100644
--- a/arch/arm/mach-versatile/Makefile
+++ b/arch/arm/mach-versatile/Makefile
@@ -5,3 +5,4 @@
 obj-y                                   := core.o clock.o
 obj-$(CONFIG_ARCH_VERSATILE_PB)         += versatile_pb.o
 obj-$(CONFIG_MACH_VERSATILE_AB)         += versatile_ab.o
+obj-$(CONFIG_PCI)                       += pci.o
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index 302c2a7b9b..f01c0f8a2b 100644
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -33,6 +33,7 @@
 #include <asm/mach-types.h>
 #include <asm/hardware/amba.h>
 #include <asm/hardware/amba_clcd.h>
+#include <asm/hardware/arm_timer.h>
 #include <asm/hardware/icst307.h>
 #include <asm/mach/arch.h>
@@ -196,11 +197,15 @@ static struct map_desc versatile_io_desc[] __initdata = {
 #ifdef CONFIG_DEBUG_LL
 { IO_ADDRESS(VERSATILE_UART0_BASE), VERSATILE_UART0_BASE, SZ_4K,      MT_DEVICE },
 #endif
-#ifdef FIXME
+#ifdef CONFIG_PCI
- { PCI_MEMORY_VADDR,                 PHYS_PCI_MEM_BASE,    SZ_16M,     MT_DEVICE },
+ { IO_ADDRESS(VERSATILE_PCI_CORE_BASE), VERSATILE_PCI_CORE_BASE, SZ_4K, MT_DEVICE },
- { PCI_CONFIG_VADDR,                 PHYS_PCI_CONFIG_BASE, SZ_16M,     MT_DEVICE },
+ { VERSATILE_PCI_VIRT_BASE,          VERSATILE_PCI_BASE,   VERSATILE_PCI_BASE_SIZE, MT_DEVICE },
- { PCI_V3_VADDR,                     PHYS_PCI_V3_BASE,     SZ_512K,    MT_DEVICE },
+ { VERSATILE_PCI_CFG_VIRT_BASE,      VERSATILE_PCI_CFG_BASE, VERSATILE_PCI_CFG_BASE_SIZE, MT_DEVICE },
- { PCI_IO_VADDR,                     PHYS_PCI_IO_BASE,     SZ_64K,     MT_DEVICE },
+#if 0
+ { VERSATILE_PCI_VIRT_MEM_BASE0,     VERSATILE_PCI_MEM_BASE0, SZ_16M,  MT_DEVICE },
+ { VERSATILE_PCI_VIRT_MEM_BASE1,     VERSATILE_PCI_MEM_BASE1, SZ_16M,  MT_DEVICE },
+ { VERSATILE_PCI_VIRT_MEM_BASE2,     VERSATILE_PCI_MEM_BASE2, SZ_16M,  MT_DEVICE },
+#endif
 #endif
 };
@@ -784,38 +789,25 @@ void __init versatile_init(void)
 */
 #define TIMER_INTERVAL  (TICKS_PER_uSEC * mSEC_10)
 #if TIMER_INTERVAL >= 0x100000
-#define TIMER_RELOAD    (TIMER_INTERVAL >> 8)           /* Divide by 256 */
+#define TIMER_RELOAD    (TIMER_INTERVAL >> 8)
-#define TIMER_CTRL      0x88                            /* Enable, Clock / 256 */
+#define TIMER_DIVISOR   (TIMER_CTRL_DIV256)
 #define TICKS2USECS(x)  (256 * (x) / TICKS_PER_uSEC)
 #elif TIMER_INTERVAL >= 0x10000
 #define TIMER_RELOAD    (TIMER_INTERVAL >> 4)           /* Divide by 16 */
-#define TIMER_CTRL      0x84                            /* Enable, Clock / 16 */
+#define TIMER_DIVISOR   (TIMER_CTRL_DIV16)
 #define TICKS2USECS(x)  (16 * (x) / TICKS_PER_uSEC)
 #else
 #define TIMER_RELOAD    (TIMER_INTERVAL)
-#define TIMER_CTRL      0x80                            /* Enable */
+#define TIMER_DIVISOR   (TIMER_CTRL_DIV1)
 #define TICKS2USECS(x)  ((x) / TICKS_PER_uSEC)
 #endif
-#define TIMER_CTRL_IE   (1 << 5)        /* Interrupt Enable */
-/*
- * What does it look like?
- */
-typedef struct TimerStruct {
-        unsigned long TimerLoad;
-        unsigned long TimerValue;
-        unsigned long TimerControl;
-        unsigned long TimerClear;
-} TimerStruct_t;
 /*
 * Returns number of ms since last clock interrupt.  Note that interrupts
 * will have been disabled by do_gettimeoffset()
 */
 static unsigned long versatile_gettimeoffset(void)
 {
-        volatile TimerStruct_t *timer0 = (TimerStruct_t *)TIMER0_VA_BASE;
        unsigned long ticks1, ticks2, status;
        /*
@@ -824,11 +816,11 @@ static unsigned long versatile_gettimeoffset(void)
         * an interrupt.  We get around this by ensuring that the
         * counter has not reloaded between our two reads.
         */
-        ticks2 = timer0->TimerValue & 0xffff;
+        ticks2 = readl(TIMER0_VA_BASE + TIMER_VALUE) & 0xffff;
        do {
                ticks1 = ticks2;
                status = __raw_readl(VA_IC_BASE + VIC_IRQ_RAW_STATUS);
-                ticks2 = timer0->TimerValue & 0xffff;
+                ticks2 = readl(TIMER0_VA_BASE + TIMER_VALUE) & 0xffff;
        } while (ticks2 > ticks1);
        /*
@@ -855,12 +847,10 @@ static unsigned long versatile_gettimeoffset(void)
 */
 static irqreturn_t versatile_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
-        volatile TimerStruct_t *timer0 = (volatile TimerStruct_t *)TIMER0_VA_BASE;
        write_seqlock(&xtime_lock);
        // ...clear the interrupt
-        timer0->TimerClear = 1;
+        writel(1, TIMER0_VA_BASE + TIMER_INTCLR);
        timer_tick(regs);
@@ -871,8 +861,8 @@ static irqreturn_t versatile_timer_interrupt(int irq, void *dev_id, struct pt_re
 static struct irqaction versatile_timer_irq = {
        .name           = "Versatile Timer Tick",
-        .flags          = SA_INTERRUPT,
+        .flags          = SA_INTERRUPT | SA_TIMER,
-        .handler        = versatile_timer_interrupt
+        .handler        = versatile_timer_interrupt,
 };
 /*
@@ -880,31 +870,32 @@ static struct irqaction versatile_timer_irq = {
 */
 static void __init versatile_timer_init(void)
 {
-        volatile TimerStruct_t *timer0 = (volatile TimerStruct_t *)TIMER0_VA_BASE;
+        u32 val;
-        volatile TimerStruct_t *timer1 = (volatile TimerStruct_t *)TIMER1_VA_BASE;
-        volatile TimerStruct_t *timer2 = (volatile TimerStruct_t *)TIMER2_VA_BASE;
-        volatile TimerStruct_t *timer3 = (volatile TimerStruct_t *)TIMER3_VA_BASE;
        /* 
         * set clock frequency: 
         *      VERSATILE_REFCLK is 32KHz
         *      VERSATILE_TIMCLK is 1MHz
         */
-        *(volatile unsigned int *)IO_ADDRESS(VERSATILE_SCTL_BASE) |= 
+        val = readl(IO_ADDRESS(VERSATILE_SCTL_BASE));
-          ((VERSATILE_TIMCLK << VERSATILE_TIMER1_EnSel) | (VERSATILE_TIMCLK << VERSATILE_TIMER2_EnSel) | 
+        writel((VERSATILE_TIMCLK << VERSATILE_TIMER1_EnSel) |
-           (VERSATILE_TIMCLK << VERSATILE_TIMER3_EnSel) | (VERSATILE_TIMCLK << VERSATILE_TIMER4_EnSel));
+               (VERSATILE_TIMCLK << VERSATILE_TIMER2_EnSel) | 
+               (VERSATILE_TIMCLK << VERSATILE_TIMER3_EnSel) |
+               (VERSATILE_TIMCLK << VERSATILE_TIMER4_EnSel) | val,
+               IO_ADDRESS(VERSATILE_SCTL_BASE));
        /*
         * Initialise to a known state (all timers off)
         */
-        timer0->TimerControl = 0;
+        writel(0, TIMER0_VA_BASE + TIMER_CTRL);
-        timer1->TimerControl = 0;
+        writel(0, TIMER1_VA_BASE + TIMER_CTRL);
-        timer2->TimerControl = 0;
+        writel(0, TIMER2_VA_BASE + TIMER_CTRL);
-        timer3->TimerControl = 0;
+        writel(0, TIMER3_VA_BASE + TIMER_CTRL);
-        timer0->TimerLoad    = TIMER_RELOAD;
+        writel(TIMER_RELOAD, TIMER0_VA_BASE + TIMER_LOAD);
-        timer0->TimerValue   = TIMER_RELOAD;
+        writel(TIMER_RELOAD, TIMER0_VA_BASE + TIMER_VALUE);
-        timer0->TimerControl = TIMER_CTRL | 0x40 | TIMER_CTRL_IE;  /* periodic + IE */
+        writel(TIMER_DIVISOR | TIMER_CTRL_ENABLE | TIMER_CTRL_PERIODIC |
+               TIMER_CTRL_IE, TIMER0_VA_BASE + TIMER_CTRL);
        /* 
         * Make irqs happen for the system timer
diff --git a/arch/arm/mach-versatile/pci.c b/arch/arm/mach-versatile/pci.c
new file mode 100644
index 0000000000..d1565e851f
--- /dev/null
+++ b/arch/arm/mach-versatile/pci.c
@@ -0,0 +1,360 @@
+/*
+ *  linux/arch/arm/mach-versatile/pci.c
+ *
+ * (C) Copyright Koninklijke Philips Electronics NV 2004. All rights reserved.
+ * You can redistribute and/or modify this software under the terms of version 2
+ * of the GNU General Public License as published by the Free Software Foundation.
+ * THIS SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ * Koninklijke Philips Electronics nor its subsidiaries is obligated to provide any support for this software.
+ *
+ * ARM Versatile PCI driver.
+ *
+ * 14/04/2005 Initial version, colin.king@philips.com
+ *
+ */
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/ptrace.h>
+#include <linux/slab.h>
+#include <linux/ioport.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#include <linux/init.h>
+#include <asm/hardware.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/system.h>
+#include <asm/mach/pci.h>
+#include <asm/mach-types.h>
+/*
+ * these spaces are mapped using the following base registers:
+ *
+ * Usage Local Bus Memory         Base/Map registers used
+ *
+ * Mem   50000000 - 5FFFFFFF      LB_BASE0/LB_MAP0,  non prefetch
+ * Mem   60000000 - 6FFFFFFF      LB_BASE1/LB_MAP1,  prefetch
+ * IO    44000000 - 4FFFFFFF      LB_BASE2/LB_MAP2,  IO
+ * Cfg   42000000 - 42FFFFFF      PCI config
+ *
+ */
+#define SYS_PCICTL                      IO_ADDRESS(VERSATILE_SYS_PCICTL)
+#define PCI_IMAP0                       IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x0)
+#define PCI_IMAP1                       IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x4)
+#define PCI_IMAP2                       IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x8)
+#define PCI_SMAP0                       IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x10)
+#define PCI_SMAP1                       IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x14)
+#define PCI_SMAP2                       IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x18)
+#define PCI_SELFID                      IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0xc)
+#define DEVICE_ID_OFFSET                0x00
+#define CSR_OFFSET                      0x04
+#define CLASS_ID_OFFSET                 0x08
+#define VP_PCI_DEVICE_ID                0x030010ee
+#define VP_PCI_CLASS_ID                 0x0b400000
+static unsigned long pci_slot_ignore = 0;
+static int __init versatile_pci_slot_ignore(char *str)
+{
+        int retval;
+        int slot;
+        while ((retval = get_option(&str,&slot))) {
+                if ((slot < 0) || (slot > 31)) {
+                        printk("Illegal slot value: %d\n",slot);
+                } else {
+                        pci_slot_ignore |= (1 << slot);
+                }
+        }
+        return 1;
+}
+__setup("pci_slot_ignore=", versatile_pci_slot_ignore);
+static unsigned long __pci_addr(struct pci_bus *bus,
+                                unsigned int devfn, int offset)
+{
+        unsigned int busnr = bus->number;
+        /*
+         * Trap out illegal values
+         */
+        if (offset > 255)
+                BUG();
+        if (busnr > 255)
+                BUG();
+        if (devfn > 255)
+                BUG();
+        return (VERSATILE_PCI_CFG_VIRT_BASE | (busnr << 16) |
+                (PCI_SLOT(devfn) << 11) | (PCI_FUNC(devfn) << 8) | offset);
+}
+static int versatile_read_config(struct pci_bus *bus, unsigned int devfn, int where,
+                                 int size, u32 *val)
+{
+        unsigned long addr = __pci_addr(bus, devfn, where);
+        u32 v;
+        int slot = PCI_SLOT(devfn);
+        if (pci_slot_ignore & (1 << slot)) {
+                /* Ignore this slot */
+                switch (size) {
+                case 1:
+                        v = 0xff;
+                        break;
+                case 2:
+                        v = 0xffff;
+                        break;
+                default:
+                        v = 0xffffffff;
+                }
+        } else {
+                switch (size) {
+                case 1:
+                        addr &= ~3;
+                        v = __raw_readb(addr);
+                        break;
+                case 2:
+                        v = __raw_readl(addr & ~3);
+                        if (addr & 2) v >>= 16;
+                        v &= 0xffff;
+                        break;
+                default:
+                        addr &= ~3;
+                        v = __raw_readl(addr);
+                        break;
+                }
+        }
+        *val = v;
+        return PCIBIOS_SUCCESSFUL;
+}
+static int versatile_write_config(struct pci_bus *bus, unsigned int devfn, int where,
+                                  int size, u32 val)
+{
+        unsigned long addr = __pci_addr(bus, devfn, where);
+        int slot = PCI_SLOT(devfn);
+        if (pci_slot_ignore & (1 << slot)) {
+                return PCIBIOS_SUCCESSFUL;
+        }
+        switch (size) {
+        case 1:
+                __raw_writeb((u8)val, addr);
+                break;
+        case 2:
+                __raw_writew((u16)val, addr);
+                break;
+        case 4:
+                __raw_writel(val, addr);
+                break;
+        }
+        return PCIBIOS_SUCCESSFUL;
+}
+static struct pci_ops pci_versatile_ops = {
+        .read   = versatile_read_config,
+        .write  = versatile_write_config,
+};
+static struct resource io_mem = {
+        .name   = "PCI I/O space",
+        .start  = VERSATILE_PCI_MEM_BASE0,
+        .end    = VERSATILE_PCI_MEM_BASE0+VERSATILE_PCI_MEM_BASE0_SIZE-1,
+        .flags  = IORESOURCE_IO,
+};
+static struct resource non_mem = {
+        .name   = "PCI non-prefetchable",
+        .start  = VERSATILE_PCI_MEM_BASE1,
+        .end    = VERSATILE_PCI_MEM_BASE1+VERSATILE_PCI_MEM_BASE1_SIZE-1,
+        .flags  = IORESOURCE_MEM,
+};
+static struct resource pre_mem = {
+        .name   = "PCI prefetchable",
+        .start  = VERSATILE_PCI_MEM_BASE2,
+        .end    = VERSATILE_PCI_MEM_BASE2+VERSATILE_PCI_MEM_BASE2_SIZE-1,
+        .flags  = IORESOURCE_MEM | IORESOURCE_PREFETCH,
+};
+static int __init pci_versatile_setup_resources(struct resource **resource)
+{
+        int ret = 0;
+        ret = request_resource(&iomem_resource, &io_mem);
+        if (ret) {
+                printk(KERN_ERR "PCI: unable to allocate I/O "
+                       "memory region (%d)\n", ret);
+                goto out;
+        }
+        ret = request_resource(&iomem_resource, &non_mem);
+        if (ret) {
+                printk(KERN_ERR "PCI: unable to allocate non-prefetchable "
+                       "memory region (%d)\n", ret);
+                goto release_io_mem;
+        }
+        ret = request_resource(&iomem_resource, &pre_mem);
+        if (ret) {
+                printk(KERN_ERR "PCI: unable to allocate prefetchable "
+                       "memory region (%d)\n", ret);
+                goto release_non_mem;
+        }
+        /*
+         * bus->resource[0] is the IO resource for this bus
+         * bus->resource[1] is the mem resource for this bus
+         * bus->resource[2] is the prefetch mem resource for this bus
+         */
+        resource[0] = &io_mem;
+        resource[1] = &non_mem;
+        resource[2] = &pre_mem;
+        goto out;
+ release_non_mem:
+        release_resource(&non_mem);
+ release_io_mem:
+        release_resource(&io_mem);
+ out:
+        return ret;
+}
+int __init pci_versatile_setup(int nr, struct pci_sys_data *sys)
+{
+        int ret = 0;
+        int i;
+        int myslot = -1;
+        unsigned long val;
+        if (nr == 0) {
+                sys->mem_offset = 0;
+                ret = pci_versatile_setup_resources(sys->resource);
+                if (ret < 0) {
+                        printk("pci_versatile_setup: resources... oops?\n");
+                        goto out;
+                }
+        } else {
+                printk("pci_versatile_setup: resources... nr == 0??\n");
+                goto out;
+        }
+        __raw_writel(VERSATILE_PCI_MEM_BASE0 >> 28,PCI_IMAP0);
+        __raw_writel(VERSATILE_PCI_MEM_BASE1 >> 28,PCI_IMAP1);
+        __raw_writel(VERSATILE_PCI_MEM_BASE2 >> 28,PCI_IMAP2);
+        __raw_writel(1, SYS_PCICTL);
+        val = __raw_readl(SYS_PCICTL);
+        if (!(val & 1)) {
+                printk("Not plugged into PCI backplane!\n");
+                ret = -EIO;
+                goto out;
+        }
+        /*
+         *  We need to discover the PCI core first to configure itself
+         *  before the main PCI probing is performed
+         */
+        for (i=0; i<32; i++) {
+                if ((__raw_readl(VERSATILE_PCI_VIRT_BASE+(i<<11)+DEVICE_ID_OFFSET) == VP_PCI_DEVICE_ID) &&
+                    (__raw_readl(VERSATILE_PCI_VIRT_BASE+(i<<11)+CLASS_ID_OFFSET) == VP_PCI_CLASS_ID)) {
+                        myslot = i;
+                        __raw_writel(myslot, PCI_SELFID);
+                        val = __raw_readl(VERSATILE_PCI_CFG_VIRT_BASE+(myslot<<11)+CSR_OFFSET);
+                        val |= (1<<2);
+                        __raw_writel(val, VERSATILE_PCI_CFG_VIRT_BASE+(myslot<<11)+CSR_OFFSET);
+                        break;
+                }
+        }
+        if (myslot == -1) {
+                printk("Cannot find PCI core!\n");
+                ret = -EIO;
+        } else {
+                printk("PCI core found (slot %d)\n",myslot);
+                /* Do not to map Versatile FPGA PCI device
+                   into memory space as we are short of
+                   mappable memory */
+                pci_slot_ignore |= (1 << myslot);
+                ret = 1;
+        }
+ out:
+        return ret;
+}
+struct pci_bus *pci_versatile_scan_bus(int nr, struct pci_sys_data *sys)
+{
+        return pci_scan_bus(sys->busnr, &pci_versatile_ops, sys);
+}
+/*
+ * V3_LB_BASE? - local bus address
+ * V3_LB_MAP?  - pci bus address
+ */
+void __init pci_versatile_preinit(void)
+{
+}
+void __init pci_versatile_postinit(void)
+{
+}
+/*
+ * map the specified device/slot/pin to an IRQ.   Different backplanes may need to modify this.
+ */
+static int __init versatile_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+{
+        int irq;
+        int devslot = PCI_SLOT(dev->devfn);
+        /* slot,  pin,  irq
+            24    1     27
+            25    1     28      untested
+            26    1     29
+            27    1     30      untested
+        */
+        irq = 27 + ((slot + pin + 2) % 3);      /* Fudged */
+        printk("map irq: slot %d, pin %d, devslot %d, irq: %d\n",slot,pin,devslot,irq);
+        return irq;
+}
+static struct hw_pci versatile_pci __initdata = {
+        .swizzle                = NULL,
+        .map_irq                = versatile_map_irq,
+        .nr_controllers         = 1,
+        .setup                  = pci_versatile_setup,
+        .scan                   = pci_versatile_scan_bus,
+        .preinit                = pci_versatile_preinit,
+        .postinit               = pci_versatile_postinit,
+};
+static int __init versatile_pci_init(void)
+{
+        pci_common_init(&versatile_pci);
+        return 0;
+}
+subsys_initcall(versatile_pci_init);
diff --git a/arch/arm/mach-versatile/versatile_ab.c b/arch/arm/mach-versatile/versatile_ab.c
index d332084586..8b0b3bef24 100644
--- a/arch/arm/mach-versatile/versatile_ab.c
+++ b/arch/arm/mach-versatile/versatile_ab.c
@@ -35,11 +35,13 @@
 #include "core.h"
 MACHINE_START(VERSATILE_AB, "ARM-Versatile AB")
-        MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
+        /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
-        BOOT_MEM(0x00000000, 0x101f1000, 0xf11f1000)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = 0x101f1000,
-        MAPIO(versatile_map_io)
+        .io_pg_offst    = ((0xf11f1000) >> 18) & 0xfffc,
-        INITIRQ(versatile_init_irq)
+        .boot_params    = 0x00000100,
+        .map_io         = versatile_map_io,
+        .init_irq       = versatile_init_irq,
        .timer          = &versatile_timer,
-        INIT_MACHINE(versatile_init)
+        .init_machine   = versatile_init,
 MACHINE_END
diff --git a/arch/arm/mach-versatile/versatile_pb.c b/arch/arm/mach-versatile/versatile_pb.c
index 2702099a68..7c3078c389 100644
--- a/arch/arm/mach-versatile/versatile_pb.c
+++ b/arch/arm/mach-versatile/versatile_pb.c
@@ -99,11 +99,13 @@ static int __init versatile_pb_init(void)
 arch_initcall(versatile_pb_init);
 MACHINE_START(VERSATILE_PB, "ARM-Versatile PB")
-        MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
+        /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
-        BOOT_MEM(0x00000000, 0x101f1000, 0xf11f1000)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = 0x101f1000,
-        MAPIO(versatile_map_io)
+        .io_pg_offst    = ((0xf11f1000) >> 18) & 0xfffc,
-        INITIRQ(versatile_init_irq)
+        .boot_params    = 0x00000100,
+        .map_io         = versatile_map_io,
+        .init_irq       = versatile_init_irq,
        .timer          = &versatile_timer,
-        INIT_MACHINE(versatile_init)
+        .init_machine   = versatile_init,
 MACHINE_END
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 3fefb43c67..afbbeb6f46 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -62,7 +62,7 @@ config CPU_ARM720T
 # ARM920T
 config CPU_ARM920T
        bool "Support ARM920T processor" if !ARCH_S3C2410
-        depends on ARCH_INTEGRATOR || ARCH_S3C2410 || ARCH_IMX
+        depends on ARCH_INTEGRATOR || ARCH_S3C2410 || ARCH_IMX || ARCH_AAEC2000
        default y if ARCH_S3C2410
        select CPU_32v4
        select CPU_ABRT_EV4T
@@ -101,7 +101,7 @@ config CPU_ARM922T
 # ARM925T
 config CPU_ARM925T
-        bool "Support ARM925T processor" if ARCH_OMAP
+        bool "Support ARM925T processor" if ARCH_OMAP1
        depends on ARCH_OMAP1510
        default y if ARCH_OMAP1510
        select CPU_32v4
diff --git a/arch/arm/mm/blockops.c b/arch/arm/mm/blockops.c
index 806c6eeb1b..4f5ee2d089 100644
--- a/arch/arm/mm/blockops.c
+++ b/arch/arm/mm/blockops.c
@@ -25,13 +25,14 @@ blk_flush_kern_dcache_page(void *kaddr)
 {
        asm(
        "add    r1, r0, %0                                                      \n\
+        sub     r1, r1, %1                                                      \n\
 1:      .word   0xec401f0e      @ mcrr  p15, 0, r0, r1, c14, 0  @ blocking      \n\
        mov     r0, #0                                                          \n\
        mcr     p15, 0, r0, c7, c5, 0                                           \n\
        mcr     p15, 0, r0, c7, c10, 4                                          \n\
        mov     pc, lr"
        :
-        : "I" (PAGE_SIZE));
+        : "I" (PAGE_SIZE), "I" (L1_CACHE_BYTES));
 }
 /*
diff --git a/arch/arm/mm/copypage-v6.c b/arch/arm/mm/copypage-v6.c
index a8c00236bd..27d041574e 100644
--- a/arch/arm/mm/copypage-v6.c
+++ b/arch/arm/mm/copypage-v6.c
@@ -30,8 +30,6 @@
 static DEFINE_SPINLOCK(v6_lock);
-#define DCACHE_COLOUR(vaddr) ((vaddr & (SHMLBA - 1)) >> PAGE_SHIFT)
 /*
 * Copy the user page.  No aliasing to deal with so we can just
 * attack the kernel's existing mapping of these pages.
@@ -55,7 +53,7 @@ void v6_clear_user_page_nonaliasing(void *kaddr, unsigned long vaddr)
 */
 void v6_copy_user_page_aliasing(void *kto, const void *kfrom, unsigned long vaddr)
 {
-        unsigned int offset = DCACHE_COLOUR(vaddr);
+        unsigned int offset = CACHE_COLOUR(vaddr);
        unsigned long from, to;
        /*
@@ -95,7 +93,7 @@ void v6_copy_user_page_aliasing(void *kto, const void *kfrom, unsigned long vadd
 */
 void v6_clear_user_page_aliasing(void *kaddr, unsigned long vaddr)
 {
-        unsigned int offset = DCACHE_COLOUR(vaddr);
+        unsigned int offset = CACHE_COLOUR(vaddr);
        unsigned long to = to_address + (offset << PAGE_SHIFT);
        /*
diff --git a/arch/arm/mm/fault-armv.c b/arch/arm/mm/fault-armv.c
index 01967ddeef..be4ab3d73c 100644
--- a/arch/arm/mm/fault-armv.c
+++ b/arch/arm/mm/fault-armv.c
@@ -77,9 +77,8 @@ no_pmd:
 }
 static void
-make_coherent(struct vm_area_struct *vma, unsigned long addr, struct page *page, int dirty)
+make_coherent(struct address_space *mapping, struct vm_area_struct *vma, unsigned long addr, unsigned long pfn)
 {
-        struct address_space *mapping = page_mapping(page);
        struct mm_struct *mm = vma->vm_mm;
        struct vm_area_struct *mpnt;
        struct prio_tree_iter iter;
@@ -87,9 +86,6 @@ make_coherent(struct vm_area_struct *vma, unsigned long addr, struct page *page,
        pgoff_t pgoff;
        int aliases = 0;
-        if (!mapping)
-                return;
        pgoff = vma->vm_pgoff + ((addr - vma->vm_start) >> PAGE_SHIFT);
        /*
@@ -115,9 +111,11 @@ make_coherent(struct vm_area_struct *vma, unsigned long addr, struct page *page,
        if (aliases)
                adjust_pte(vma, addr);
        else
-                flush_cache_page(vma, addr, page_to_pfn(page));
+                flush_cache_page(vma, addr, pfn);
 }
+void __flush_dcache_page(struct address_space *mapping, struct page *page);
 /*
 * Take care of architecture specific things when placing a new PTE into
 * a page table, or changing an existing PTE.  Basically, there are two
@@ -134,29 +132,22 @@ make_coherent(struct vm_area_struct *vma, unsigned long addr, struct page *page,
 void update_mmu_cache(struct vm_area_struct *vma, unsigned long addr, pte_t pte)
 {
        unsigned long pfn = pte_pfn(pte);
+        struct address_space *mapping;
        struct page *page;
        if (!pfn_valid(pfn))
                return;
        page = pfn_to_page(pfn);
-        if (page_mapping(page)) {
+        mapping = page_mapping(page);
+        if (mapping) {
                int dirty = test_and_clear_bit(PG_dcache_dirty, &page->flags);
-                if (dirty) {
+                if (dirty)
-                        /*
+                        __flush_dcache_page(mapping, page);
-                         * This is our first userspace mapping of this page.
-                         * Ensure that the physical page is coherent with
-                         * the kernel mapping.
-                         *
-                         * FIXME: only need to do this on VIVT and aliasing
-                         *        VIPT cache architectures.  We can do that
-                         *        by choosing whether to set this bit...
-                         */
-                        __cpuc_flush_dcache_page(page_address(page));
-                }
                if (cache_is_vivt())
-                        make_coherent(vma, addr, page, dirty);
+                        make_coherent(mapping, vma, addr, pfn);
        }
 }
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index e25b4fd841..65bfe84b6d 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -372,49 +372,50 @@ do_bad(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
 static struct fsr_info {
        int     (*fn)(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
        int     sig;
+        int     code;
        const char *name;
 } fsr_info[] = {
        /*
         * The following are the standard ARMv3 and ARMv4 aborts.  ARMv5
         * defines these to be "precise" aborts.
         */
-        { do_bad,               SIGSEGV, "vector exception"                },
+        { do_bad,               SIGSEGV, 0,             "vector exception"                 },
-        { do_bad,               SIGILL,  "alignment exception"             },
+        { do_bad,               SIGILL,  BUS_ADRALN,    "alignment exception"              },
-        { do_bad,               SIGKILL, "terminal exception"              },
+        { do_bad,               SIGKILL, 0,             "terminal exception"               },
-        { do_bad,               SIGILL,  "alignment exception"             },
+        { do_bad,               SIGILL,  BUS_ADRALN,    "alignment exception"              },
-        { do_bad,               SIGBUS,  "external abort on linefetch"     },
+        { do_bad,               SIGBUS,  0,             "external abort on linefetch"      },
-        { do_translation_fault, SIGSEGV, "section translation fault"       },
+        { do_translation_fault, SIGSEGV, SEGV_MAPERR,   "section translation fault"        },
-        { do_bad,               SIGBUS,  "external abort on linefetch"     },
+        { do_bad,               SIGBUS,  0,             "external abort on linefetch"      },
-        { do_page_fault,        SIGSEGV, "page translation fault"          },
+        { do_page_fault,        SIGSEGV, SEGV_MAPERR,   "page translation fault"           },
-        { do_bad,               SIGBUS,  "external abort on non-linefetch" },
+        { do_bad,               SIGBUS,  0,             "external abort on non-linefetch"  },
-        { do_bad,               SIGSEGV, "section domain fault"            },
+        { do_bad,               SIGSEGV, SEGV_ACCERR,   "section domain fault"             },
-        { do_bad,               SIGBUS,  "external abort on non-linefetch" },
+        { do_bad,               SIGBUS,  0,             "external abort on non-linefetch"  },
-        { do_bad,               SIGSEGV, "page domain fault"               },
+        { do_bad,               SIGSEGV, SEGV_ACCERR,   "page domain fault"                },
-        { do_bad,               SIGBUS,  "external abort on translation"   },
+        { do_bad,               SIGBUS,  0,             "external abort on translation"    },
-        { do_sect_fault,        SIGSEGV, "section permission fault"        },
+        { do_sect_fault,        SIGSEGV, SEGV_ACCERR,   "section permission fault"         },
-        { do_bad,               SIGBUS,  "external abort on translation"   },
+        { do_bad,               SIGBUS,  0,             "external abort on translation"    },
-        { do_page_fault,        SIGSEGV, "page permission fault"           },
+        { do_page_fault,        SIGSEGV, SEGV_ACCERR,   "page permission fault"            },
        /*
         * The following are "imprecise" aborts, which are signalled by bit
         * 10 of the FSR, and may not be recoverable.  These are only
         * supported if the CPU abort handler supports bit 10.
         */
-        { do_bad,               SIGBUS,  "unknown 16"                      },
+        { do_bad,               SIGBUS,  0,             "unknown 16"                       },
-        { do_bad,               SIGBUS,  "unknown 17"                      },
+        { do_bad,               SIGBUS,  0,             "unknown 17"                       },
-        { do_bad,               SIGBUS,  "unknown 18"                      },
+        { do_bad,               SIGBUS,  0,             "unknown 18"                       },
-        { do_bad,               SIGBUS,  "unknown 19"                      },
+        { do_bad,               SIGBUS,  0,             "unknown 19"                       },
-        { do_bad,               SIGBUS,  "lock abort"                      }, /* xscale */
+        { do_bad,               SIGBUS,  0,             "lock abort"                       }, /* xscale */
-        { do_bad,               SIGBUS,  "unknown 21"                      },
+        { do_bad,               SIGBUS,  0,             "unknown 21"                       },
-        { do_bad,               SIGBUS,  "imprecise external abort"        }, /* xscale */
+        { do_bad,               SIGBUS,  BUS_OBJERR,    "imprecise external abort"         }, /* xscale */
-        { do_bad,               SIGBUS,  "unknown 23"                      },
+        { do_bad,               SIGBUS,  0,             "unknown 23"                       },
-        { do_bad,               SIGBUS,  "dcache parity error"             }, /* xscale */
+        { do_bad,               SIGBUS,  0,             "dcache parity error"              }, /* xscale */
-        { do_bad,               SIGBUS,  "unknown 25"                      },
+        { do_bad,               SIGBUS,  0,             "unknown 25"                       },
-        { do_bad,               SIGBUS,  "unknown 26"                      },
+        { do_bad,               SIGBUS,  0,             "unknown 26"                       },
-        { do_bad,               SIGBUS,  "unknown 27"                      },
+        { do_bad,               SIGBUS,  0,             "unknown 27"                       },
-        { do_bad,               SIGBUS,  "unknown 28"                      },
+        { do_bad,               SIGBUS,  0,             "unknown 28"                       },
-        { do_bad,               SIGBUS,  "unknown 29"                      },
+        { do_bad,               SIGBUS,  0,             "unknown 29"                       },
-        { do_bad,               SIGBUS,  "unknown 30"                      },
+        { do_bad,               SIGBUS,  0,             "unknown 30"                       },
-        { do_bad,               SIGBUS,  "unknown 31"                      }
+        { do_bad,               SIGBUS,  0,             "unknown 31"                       }
 };
 void __init
@@ -435,15 +436,19 @@ asmlinkage void
 do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
 {
        const struct fsr_info *inf = fsr_info + (fsr & 15) + ((fsr & (1 << 10)) >> 6);
+        struct siginfo info;
        if (!inf->fn(addr, fsr, regs))
                return;
        printk(KERN_ALERT "Unhandled fault: %s (0x%03x) at 0x%08lx\n",
                inf->name, fsr, addr);
-        force_sig(inf->sig, current);
-        show_pte(current->mm, addr);
+        info.si_signo = inf->sig;
-        die_if_kernel("Oops", regs, 0);
+        info.si_errno = 0;
+        info.si_code  = inf->code;
+        info.si_addr  = (void __user *)addr;
+        notify_die("", regs, &info, fsr, 0);
 }
 asmlinkage void
diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c
index 4085ed983e..191788fb18 100644
--- a/arch/arm/mm/flush.c
+++ b/arch/arm/mm/flush.c
@@ -37,13 +37,8 @@ static void flush_pfn_alias(unsigned long pfn, unsigned long vaddr)
 #define flush_pfn_alias(pfn,vaddr)      do { } while (0)
 #endif
-static void __flush_dcache_page(struct address_space *mapping, struct page *page)
+void __flush_dcache_page(struct address_space *mapping, struct page *page)
 {
-        struct mm_struct *mm = current->active_mm;
-        struct vm_area_struct *mpnt;
-        struct prio_tree_iter iter;
-        pgoff_t pgoff;
        /*
         * Writeback any data associated with the kernel mapping of this
         * page.  This ensures that data in the physical page is mutually
@@ -52,24 +47,21 @@ static void __flush_dcache_page(struct address_space *mapping, struct page *page
        __cpuc_flush_dcache_page(page_address(page));
        /*
-         * If there's no mapping pointer here, then this page isn't
+         * If this is a page cache page, and we have an aliasing VIPT cache,
-         * visible to userspace yet, so there are no cache lines
+         * we only need to do one flush - which would be at the relevant
-         * associated with any other aliases.
-         */
-        if (!mapping)
-                return;
-        /*
-         * This is a page cache page.  If we have a VIPT cache, we
-         * only need to do one flush - which would be at the relevant
         * userspace colour, which is congruent with page->index.
         */
-        if (cache_is_vipt()) {
+        if (mapping && cache_is_vipt_aliasing())
-                if (cache_is_vipt_aliasing())
+                flush_pfn_alias(page_to_pfn(page),
-                        flush_pfn_alias(page_to_pfn(page),
+                                page->index << PAGE_CACHE_SHIFT);
-                                        page->index << PAGE_CACHE_SHIFT);
+}
-                return;
-        }
+static void __flush_dcache_aliases(struct address_space *mapping, struct page *page)
+{
+        struct mm_struct *mm = current->active_mm;
+        struct vm_area_struct *mpnt;
+        struct prio_tree_iter iter;
+        pgoff_t pgoff;
        /*
         * There are possible user space mappings of this page:
@@ -116,12 +108,12 @@ void flush_dcache_page(struct page *page)
 {
        struct address_space *mapping = page_mapping(page);
-        if (cache_is_vipt_nonaliasing())
-                return;
        if (mapping && !mapping_mapped(mapping))
                set_bit(PG_dcache_dirty, &page->flags);
-        else
+        else {
                __flush_dcache_page(mapping, page);
+                if (mapping && cache_is_vivt())
+                        __flush_dcache_aliases(mapping, page);
+        }
 }
 EXPORT_SYMBOL(flush_dcache_page);
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 72a2b8cee3..edffa47a4b 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -93,14 +93,7 @@ struct node_info {
 };
 #define O_PFN_DOWN(x)   ((x) >> PAGE_SHIFT)
-#define V_PFN_DOWN(x)   O_PFN_DOWN(__pa(x))
 #define O_PFN_UP(x)     (PAGE_ALIGN(x) >> PAGE_SHIFT)
-#define V_PFN_UP(x)     O_PFN_UP(__pa(x))
-#define PFN_SIZE(x)     ((x) >> PAGE_SHIFT)
-#define PFN_RANGE(s,e)  PFN_SIZE(PAGE_ALIGN((unsigned long)(e)) - \
-                                (((unsigned long)(s)) & PAGE_MASK))
 /*
 * FIXME: We really want to avoid allocating the bootmap bitmap
@@ -113,7 +106,7 @@ find_bootmap_pfn(int node, struct meminfo *mi, unsigned int bootmap_pages)
 {
        unsigned int start_pfn, bank, bootmap_pfn;
-        start_pfn   = V_PFN_UP(&_end);
+        start_pfn   = O_PFN_UP(__pa(&_end));
        bootmap_pfn = 0;
        for (bank = 0; bank < mi->nr_banks; bank ++) {
@@ -122,9 +115,9 @@ find_bootmap_pfn(int node, struct meminfo *mi, unsigned int bootmap_pages)
                if (mi->bank[bank].node != node)
                        continue;
-                start = O_PFN_UP(mi->bank[bank].start);
+                start = mi->bank[bank].start >> PAGE_SHIFT;
-                end   = O_PFN_DOWN(mi->bank[bank].size +
+                end   = (mi->bank[bank].size +
-                                   mi->bank[bank].start);
+                         mi->bank[bank].start) >> PAGE_SHIFT;
                if (end < start_pfn)
                        continue;
@@ -191,8 +184,8 @@ find_memend_and_nodes(struct meminfo *mi, struct node_info *np)
                /*
                 * Get the start and end pfns for this bank
                 */
-                start = O_PFN_UP(mi->bank[i].start);
+                start = mi->bank[i].start >> PAGE_SHIFT;
-                end   = O_PFN_DOWN(mi->bank[i].start + mi->bank[i].size);
+                end   = (mi->bank[i].start + mi->bank[i].size) >> PAGE_SHIFT;
                if (np[node].start > start)
                        np[node].start = start;
@@ -444,7 +437,7 @@ void __init paging_init(struct meminfo *mi, struct machine_desc *mdesc)
        memtable_init(mi);
        if (mdesc->map_io)
                mdesc->map_io();
-        flush_tlb_all();
+        local_flush_tlb_all();
        /*
         * initialise the zones within each node
@@ -529,6 +522,69 @@ static inline void free_area(unsigned long addr, unsigned long end, char *s)
                printk(KERN_INFO "Freeing %s memory: %dK\n", s, size);
 }
+static inline void
+free_memmap(int node, unsigned long start_pfn, unsigned long end_pfn)
+{
+        struct page *start_pg, *end_pg;
+        unsigned long pg, pgend;
+        /*
+         * Convert start_pfn/end_pfn to a struct page pointer.
+         */
+        start_pg = pfn_to_page(start_pfn);
+        end_pg = pfn_to_page(end_pfn);
+        /*
+         * Convert to physical addresses, and
+         * round start upwards and end downwards.
+         */
+        pg = PAGE_ALIGN(__pa(start_pg));
+        pgend = __pa(end_pg) & PAGE_MASK;
+        /*
+         * If there are free pages between these,
+         * free the section of the memmap array.
+         */
+        if (pg < pgend)
+                free_bootmem_node(NODE_DATA(node), pg, pgend - pg);
+}
+/*
+ * The mem_map array can get very big.  Free the unused area of the memory map.
+ */
+static void __init free_unused_memmap_node(int node, struct meminfo *mi)
+{
+        unsigned long bank_start, prev_bank_end = 0;
+        unsigned int i;
+        /*
+         * [FIXME] This relies on each bank being in address order.  This
+         * may not be the case, especially if the user has provided the
+         * information on the command line.
+         */
+        for (i = 0; i < mi->nr_banks; i++) {
+                if (mi->bank[i].size == 0 || mi->bank[i].node != node)
+                        continue;
+                bank_start = mi->bank[i].start >> PAGE_SHIFT;
+                if (bank_start < prev_bank_end) {
+                        printk(KERN_ERR "MEM: unordered memory banks.  "
+                                "Not freeing memmap.\n");
+                        break;
+                }
+                /*
+                 * If we had a previous bank, and there is a space
+                 * between the current bank and the previous, free it.
+                 */
+                if (prev_bank_end && prev_bank_end != bank_start)
+                        free_memmap(node, prev_bank_end, bank_start);
+                prev_bank_end = (mi->bank[i].start +
+                                 mi->bank[i].size) >> PAGE_SHIFT;
+        }
+}
 /*
 * mem_init() marks the free areas in the mem_map and tells us how much
 * memory is free.  This is done after various parts of the system have
@@ -547,16 +603,12 @@ void __init mem_init(void)
        max_mapnr   = virt_to_page(high_memory) - mem_map;
 #endif
-        /*
-         * We may have non-contiguous memory.
-         */
-        if (meminfo.nr_banks != 1)
-                create_memmap_holes(&meminfo);
        /* this will put all unused low memory onto the freelists */
        for_each_online_node(node) {
                pg_data_t *pgdat = NODE_DATA(node);
+                free_unused_memmap_node(node, &meminfo);
                if (pgdat->node_spanned_pages != 0)
                        totalram_pages += free_all_bootmem_node(pgdat);
        }
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
index 00bb8fd37a..7110e54182 100644
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
@@ -170,3 +170,50 @@ void __iounmap(void __iomem *addr)
        vfree((void *) (PAGE_MASK & (unsigned long) addr));
 }
 EXPORT_SYMBOL(__iounmap);
+#ifdef __io
+void __iomem *ioport_map(unsigned long port, unsigned int nr)
+{
+        return __io(port);
+}
+EXPORT_SYMBOL(ioport_map);
+void ioport_unmap(void __iomem *addr)
+{
+}
+EXPORT_SYMBOL(ioport_unmap);
+#endif
+#ifdef CONFIG_PCI
+#include <linux/pci.h>
+#include <linux/ioport.h>
+void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
+{
+        unsigned long start = pci_resource_start(dev, bar);
+        unsigned long len   = pci_resource_len(dev, bar);
+        unsigned long flags = pci_resource_flags(dev, bar);
+        if (!len || !start)
+                return NULL;
+        if (maxlen && len > maxlen)
+                len = maxlen;
+        if (flags & IORESOURCE_IO)
+                return ioport_map(start, len);
+        if (flags & IORESOURCE_MEM) {
+                if (flags & IORESOURCE_CACHEABLE)
+                        return ioremap(start, len);
+                return ioremap_nocache(start, len);
+        }
+        return NULL;
+}
+EXPORT_SYMBOL(pci_iomap);
+void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
+{
+        if ((unsigned long)addr >= VMALLOC_START &&
+            (unsigned long)addr < VMALLOC_END)
+                iounmap(addr);
+}
+EXPORT_SYMBOL(pci_iounmap);
+#endif
diff --git a/arch/arm/mm/mm-armv.c b/arch/arm/mm/mm-armv.c
index 2c2b93d77d..b19f00e99a 100644
--- a/arch/arm/mm/mm-armv.c
+++ b/arch/arm/mm/mm-armv.c
@@ -169,7 +169,14 @@ pgd_t *get_pgd_slow(struct mm_struct *mm)
        memzero(new_pgd, FIRST_KERNEL_PGD_NR * sizeof(pgd_t));
+        /*
+         * Copy over the kernel and IO PGD entries
+         */
        init_pgd = pgd_offset_k(0);
+        memcpy(new_pgd + FIRST_KERNEL_PGD_NR, init_pgd + FIRST_KERNEL_PGD_NR,
+                       (PTRS_PER_PGD - FIRST_KERNEL_PGD_NR) * sizeof(pgd_t));
+        clean_dcache_area(new_pgd, PTRS_PER_PGD * sizeof(pgd_t));
        if (!vectors_high()) {
                /*
@@ -198,14 +205,6 @@ pgd_t *get_pgd_slow(struct mm_struct *mm)
                spin_unlock(&mm->page_table_lock);
        }
-        /*
-         * Copy over the kernel and IO PGD entries
-         */
-        memcpy(new_pgd + FIRST_KERNEL_PGD_NR, init_pgd + FIRST_KERNEL_PGD_NR,
-                       (PTRS_PER_PGD - FIRST_KERNEL_PGD_NR) * sizeof(pgd_t));
-        clean_dcache_area(new_pgd, PTRS_PER_PGD * sizeof(pgd_t));
        return new_pgd;
 no_pte:
@@ -400,7 +399,7 @@ static void __init build_mem_type_table(void)
                ecc_mask = 0;
        }
-        if (cpu_arch <= CPU_ARCH_ARMv5) {
+        if (cpu_arch <= CPU_ARCH_ARMv5TEJ) {
                for (i = 0; i < ARRAY_SIZE(mem_types); i++) {
                        if (mem_types[i].prot_l1)
                                mem_types[i].prot_l1 |= PMD_BIT4;
@@ -585,7 +584,7 @@ void setup_mm_for_reboot(char mode)
                pmdval = (i << PGDIR_SHIFT) |
                         PMD_SECT_AP_WRITE | PMD_SECT_AP_READ |
                         PMD_TYPE_SECT;
-                if (cpu_arch <= CPU_ARCH_ARMv5)
+                if (cpu_arch <= CPU_ARCH_ARMv5TEJ)
                        pmdval |= PMD_BIT4;
                pmd = pmd_off(pgd, i << PGDIR_SHIFT);
                pmd[0] = __pmd(pmdval);
@@ -683,7 +682,7 @@ void __init memtable_init(struct meminfo *mi)
        }
        flush_cache_all();
-        flush_tlb_all();
+        local_flush_tlb_all();
        top_pmd = pmd_off_k(0xffff0000);
 }
@@ -698,75 +697,3 @@ void __init iotable_init(struct map_desc *io_desc, int nr)
        for (i = 0; i < nr; i++)
                create_mapping(io_desc + i);
 }
-static inline void
-free_memmap(int node, unsigned long start_pfn, unsigned long end_pfn)
-{
-        struct page *start_pg, *end_pg;
-        unsigned long pg, pgend;
-        /*
-         * Convert start_pfn/end_pfn to a struct page pointer.
-         */
-        start_pg = pfn_to_page(start_pfn);
-        end_pg = pfn_to_page(end_pfn);
-        /*
-         * Convert to physical addresses, and
-         * round start upwards and end downwards.
-         */
-        pg = PAGE_ALIGN(__pa(start_pg));
-        pgend = __pa(end_pg) & PAGE_MASK;
-        /*
-         * If there are free pages between these,
-         * free the section of the memmap array.
-         */
-        if (pg < pgend)
-                free_bootmem_node(NODE_DATA(node), pg, pgend - pg);
-}
-static inline void free_unused_memmap_node(int node, struct meminfo *mi)
-{
-        unsigned long bank_start, prev_bank_end = 0;
-        unsigned int i;
-        /*
-         * [FIXME] This relies on each bank being in address order.  This
-         * may not be the case, especially if the user has provided the
-         * information on the command line.
-         */
-        for (i = 0; i < mi->nr_banks; i++) {
-                if (mi->bank[i].size == 0 || mi->bank[i].node != node)
-                        continue;
-                bank_start = mi->bank[i].start >> PAGE_SHIFT;
-                if (bank_start < prev_bank_end) {
-                        printk(KERN_ERR "MEM: unordered memory banks.  "
-                                "Not freeing memmap.\n");
-                        break;
-                }
-                /*
-                 * If we had a previous bank, and there is a space
-                 * between the current bank and the previous, free it.
-                 */
-                if (prev_bank_end && prev_bank_end != bank_start)
-                        free_memmap(node, prev_bank_end, bank_start);
-                prev_bank_end = PAGE_ALIGN(mi->bank[i].start +
-                                           mi->bank[i].size) >> PAGE_SHIFT;
-        }
-}
-/*
- * The mem_map array can get very big.  Free
- * the unused area of the memory map.
- */
-void __init create_memmap_holes(struct meminfo *mi)
-{
-        int node;
-        for_each_online_node(node)
-                free_unused_memmap_node(node, mi);
-}
diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
index 32c4b0e35b..3de7f84b53 100644
--- a/arch/arm/mm/mmap.c
+++ b/arch/arm/mm/mmap.c
@@ -73,7 +73,12 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
                    (!vma || addr + len <= vma->vm_start))
                        return addr;
        }
-        start_addr = addr = mm->free_area_cache;
+        if (len > mm->cached_hole_size) {
+                start_addr = addr = mm->free_area_cache;
+        } else {
+                start_addr = addr = TASK_UNMAPPED_BASE;
+                mm->cached_hole_size = 0;
+        }
 full_search:
        if (do_align)
@@ -90,6 +95,7 @@ full_search:
                         */
                        if (start_addr != TASK_UNMAPPED_BASE) {
                                start_addr = addr = TASK_UNMAPPED_BASE;
+                                mm->cached_hole_size = 0;
                                goto full_search;
                        }
                        return -ENOMEM;
@@ -101,6 +107,8 @@ full_search:
                        mm->free_area_cache = addr + len;
                        return addr;
                }
+                if (addr + mm->cached_hole_size < vma->vm_start)
+                        mm->cached_hole_size = vma->vm_start - addr;
                addr = vma->vm_end;
                if (do_align)
                        addr = COLOUR_ALIGN(addr, pgoff);
diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S
index 1f325231b9..5c0ae5260d 100644
--- a/arch/arm/mm/proc-arm1020.S
+++ b/arch/arm/mm/proc-arm1020.S
@@ -445,14 +445,14 @@ __arm1020_setup:
        /*
         *  R
         * .RVI ZFRS BLDP WCAM
-         * .0.1 1001 ..11 0101  /* FIXME: why no V bit? */
+         * .011 1001 ..11 0101
         */
        .type   arm1020_cr1_clear, #object
        .type   arm1020_cr1_set, #object
 arm1020_cr1_clear:
        .word   0x593f
 arm1020_cr1_set:
-        .word   0x1935
+        .word   0x3935
        __INITDATA
diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S
index 142a2c2d6f..d69389c4d4 100644
--- a/arch/arm/mm/proc-arm1020e.S
+++ b/arch/arm/mm/proc-arm1020e.S
@@ -427,14 +427,14 @@ __arm1020e_setup:
        /*
         *  R
         * .RVI ZFRS BLDP WCAM
-         * .0.1 1001 ..11 0101  /* FIXME: why no V bit? */
+         * .011 1001 ..11 0101
         */
        .type   arm1020e_cr1_clear, #object
        .type   arm1020e_cr1_set, #object
 arm1020e_cr1_clear:
        .word   0x5f3f
 arm1020e_cr1_set:
-        .word   0x1935
+        .word   0x3935
        __INITDATA
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
index 0aa73d4147..352db98ee2 100644
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
@@ -132,8 +132,8 @@ ENTRY(cpu_v6_switch_mm)
 *        100x   1   0   1      r/o     no acc
 *        10x0   1   0   1      r/o     no acc
 *        1011   0   0   1      r/w     no acc
- *        110x   1   1   0      r/o     r/o
+ *        110x   0   1   0      r/w     r/o
- *        11x0   1   1   0      r/o     r/o
+ *        11x0   0   1   0      r/w     r/o
 *        1111   0   1   1      r/w     r/w
 */
 ENTRY(cpu_v6_set_pte)
@@ -150,7 +150,7 @@ ENTRY(cpu_v6_set_pte)
        tst     r1, #L_PTE_USER
        orrne   r2, r2, #AP1 | nG
        tstne   r2, #APX
-        eorne   r2, r2, #AP0
+        bicne   r2, r2, #APX | AP0
        tst     r1, #L_PTE_YOUNG
        biceq   r2, r2, #APX | AP1 | AP0
@@ -200,7 +200,7 @@ __v6_setup:
        mcr     p15, 0, r4, c2, c0, 1           @ load TTB1
 #ifdef CONFIG_VFP
        mrc     p15, 0, r0, c1, c0, 2
-        orr     r0, r0, #(3 << 20)
+        orr     r0, r0, #(0xf << 20)
        mcr     p15, 0, r0, c1, c0, 2           @ Enable full access to VFP
 #endif
        mrc     p15, 0, r0, c1, c0, 0           @ read control register
diff --git a/arch/arm/nwfpe/softfloat-macros b/arch/arm/nwfpe/softfloat-macros
index 5469989f2c..5a060f95a5 100644
--- a/arch/arm/nwfpe/softfloat-macros
+++ b/arch/arm/nwfpe/softfloat-macros
@@ -563,8 +563,14 @@ static bits64 estimateDiv128To64( bits64 a0, bits64 a1, bits64 b )
    bits64 rem0, rem1, term0, term1;
    bits64 z;
    if ( b <= a0 ) return LIT64( 0xFFFFFFFFFFFFFFFF );
-    b0 = b>>32;
+    b0 = b>>32;  /* hence b0 is 32 bits wide now */
-    z = ( b0<<32 <= a0 ) ? LIT64( 0xFFFFFFFF00000000 ) : ( a0 / b0 )<<32;
+    if ( b0<<32 <= a0 ) {
+        z = LIT64( 0xFFFFFFFF00000000 );
+    }  else {
+        z = a0;
+        do_div( z, b0 );
+        z <<= 32;
+    }
    mul64To128( b, z, &term0, &term1 );
    sub128( a0, a1, term0, term1, &rem0, &rem1 );
    while ( ( (sbits64) rem0 ) < 0 ) {
@@ -573,7 +579,12 @@ static bits64 estimateDiv128To64( bits64 a0, bits64 a1, bits64 b )
        add128( rem0, rem1, b0, b1, &rem0, &rem1 );
    }
    rem0 = ( rem0<<32 ) | ( rem1>>32 );
-    z |= ( b0<<32 <= rem0 ) ? 0xFFFFFFFF : rem0 / b0;
+    if ( b0<<32 <= rem0 ) {
+        z |= 0xFFFFFFFF;
+    } else {
+        do_div( rem0, b0 );
+        z |= rem0;
+    }
    return z;
 }
@@ -601,6 +612,7 @@ static bits32 estimateSqrt32( int16 aExp, bits32 a )
    };
    int8 index;
    bits32 z;
+    bits64 A;
    index = ( a>>27 ) & 15;
    if ( aExp & 1 ) {
@@ -614,7 +626,9 @@ static bits32 estimateSqrt32( int16 aExp, bits32 a )
        z = ( 0x20000 <= z ) ? 0xFFFF8000 : ( z<<15 );
        if ( z <= a ) return (bits32) ( ( (sbits32) a )>>1 );
    }
-    return ( (bits32) ( ( ( (bits64) a )<<31 ) / z ) ) + ( z>>1 );
+    A = ( (bits64) a )<<31;
+    do_div( A, z );
+    return ( (bits32) A ) + ( z>>1 );
 }
diff --git a/arch/arm/nwfpe/softfloat.c b/arch/arm/nwfpe/softfloat.c
index 9d743ae290..e038dd3be9 100644
--- a/arch/arm/nwfpe/softfloat.c
+++ b/arch/arm/nwfpe/softfloat.c
@@ -28,6 +28,8 @@ this code that are retained.
 ===============================================================================
 */
+#include <asm/div64.h>
 #include "fpa11.h"
 //#include "milieu.h"
 //#include "softfloat.h"
@@ -1331,7 +1333,11 @@ float32 float32_div( float32 a, float32 b )
        aSig >>= 1;
        ++zExp;
    }
-    zSig = ( ( (bits64) aSig )<<32 ) / bSig;
+    {
+        bits64 tmp = ( (bits64) aSig )<<32;
+        do_div( tmp, bSig );
+        zSig = tmp;
+    }
    if ( ( zSig & 0x3F ) == 0 ) {
        zSig |= ( ( (bits64) bSig ) * zSig != ( (bits64) aSig )<<32 );
    }
@@ -1397,7 +1403,9 @@ float32 float32_rem( float32 a, float32 b )
        q = ( bSig <= aSig );
        if ( q ) aSig -= bSig;
        if ( 0 < expDiff ) {
-            q = ( ( (bits64) aSig )<<32 ) / bSig;
+            bits64 tmp = ( (bits64) aSig )<<32;
+            do_div( tmp, bSig );
+            q = tmp;
            q >>= 32 - expDiff;
            bSig >>= 2;
            aSig = ( ( aSig>>1 )<<( expDiff - 1 ) ) - bSig * q;
diff --git a/arch/arm/oprofile/Makefile b/arch/arm/oprofile/Makefile
index ba1a6e9f2b..8ffb523e6c 100644
--- a/arch/arm/oprofile/Makefile
+++ b/arch/arm/oprofile/Makefile
@@ -6,6 +6,6 @@ DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
                oprofilefs.o oprofile_stats.o \
                timer_int.o )
-oprofile-y                              := $(DRIVER_OBJS) init.o
+oprofile-y                              := $(DRIVER_OBJS) init.o backtrace.o
 oprofile-$(CONFIG_CPU_XSCALE)           += common.o op_model_xscale.o
diff --git a/arch/arm/oprofile/backtrace.c b/arch/arm/oprofile/backtrace.c
new file mode 100644
index 0000000000..ec58d3e2eb
--- /dev/null
+++ b/arch/arm/oprofile/backtrace.c
@@ -0,0 +1,144 @@
+/*
+ * Arm specific backtracing code for oprofile
+ *
+ * Copyright 2005 Openedhand Ltd.
+ *
+ * Author: Richard Purdie <rpurdie@openedhand.com>
+ *
+ * Based on i386 oprofile backtrace code by John Levon, David Smith
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+#include <linux/oprofile.h>
+#include <linux/sched.h>
+#include <linux/mm.h>
+#include <asm/ptrace.h>
+#include <asm/uaccess.h>
+/*
+ * The registers we're interested in are at the end of the variable
+ * length saved register structure. The fp points at the end of this
+ * structure so the address of this struct is:
+ * (struct frame_tail *)(xxx->fp)-1
+ */
+struct frame_tail {
+        struct frame_tail *fp;
+        unsigned long sp;
+        unsigned long lr;
+} __attribute__((packed));
+#ifdef CONFIG_FRAME_POINTER
+static struct frame_tail* kernel_backtrace(struct frame_tail *tail)
+{
+        oprofile_add_trace(tail->lr);
+        /* frame pointers should strictly progress back up the stack
+         * (towards higher addresses) */
+        if (tail >= tail->fp)
+                return NULL;
+        return tail->fp-1;
+}
+#endif
+static struct frame_tail* user_backtrace(struct frame_tail *tail)
+{
+        struct frame_tail buftail;
+        /* hardware pte might not be valid due to dirty/accessed bit emulation
+         * so we use copy_from_user and benefit from exception fixups */
+        if (copy_from_user(&buftail, tail, sizeof(struct frame_tail)))
+                return NULL;
+        oprofile_add_trace(buftail.lr);
+        /* frame pointers should strictly progress back up the stack
+         * (towards higher addresses) */
+        if (tail >= buftail.fp)
+                return NULL;
+        return buftail.fp-1;
+}
+/* Compare two addresses and see if they're on the same page */
+#define CMP_ADDR_EQUAL(x,y,offset) ((((unsigned long) x) >> PAGE_SHIFT) \
+        == ((((unsigned long) y) + offset) >> PAGE_SHIFT))
+/* check that the page(s) containing the frame tail are present */
+static int pages_present(struct frame_tail *tail)
+{
+        struct mm_struct * mm = current->mm;
+        if (!check_user_page_readable(mm, (unsigned long)tail))
+                return 0;
+        if (CMP_ADDR_EQUAL(tail, tail, 8))
+                return 1;
+        if (!check_user_page_readable(mm, ((unsigned long)tail) + 8))
+                return 0;
+        return 1;
+}
+/*
+ * |             | /\ Higher addresses
+ * |             |
+ * --------------- stack base (address of current_thread_info)
+ * | thread info |
+ * .             .
+ * |    stack    |
+ * --------------- saved regs->ARM_fp value if valid (frame_tail address)
+ * .             .
+ * --------------- struct pt_regs stored on stack (struct pt_regs *)
+ * |             |
+ * .             .
+ * |             |
+ * --------------- %esp
+ * |             |
+ * |             | \/ Lower addresses
+ *
+ * Thus, &pt_regs <-> stack base restricts the valid(ish) fp values
+ */
+static int valid_kernel_stack(struct frame_tail *tail, struct pt_regs *regs)
+{
+        unsigned long tailaddr = (unsigned long)tail;
+        unsigned long stack = (unsigned long)regs;
+        unsigned long stack_base = (stack & ~(THREAD_SIZE - 1)) + THREAD_SIZE;
+        return (tailaddr > stack) && (tailaddr < stack_base);
+}
+void arm_backtrace(struct pt_regs const *regs, unsigned int depth)
+{
+        struct frame_tail *tail;
+        unsigned long last_address = 0;
+        tail = ((struct frame_tail *) regs->ARM_fp) - 1;
+        if (!user_mode(regs)) {
+#ifdef CONFIG_FRAME_POINTER
+                while (depth-- && tail && valid_kernel_stack(tail, regs)) {
+                        tail = kernel_backtrace(tail);
+                }
+#endif
+                return;
+        }
+        while (depth-- && tail && !((unsigned long) tail & 3)) {
+                if ((!CMP_ADDR_EQUAL(last_address, tail, 0)
+                        || !CMP_ADDR_EQUAL(last_address, tail, 8))
+                                && !pages_present(tail))
+                        return;
+                last_address = (unsigned long) tail;
+                tail = user_backtrace(tail);
+        }
+}
diff --git a/arch/arm/oprofile/init.c b/arch/arm/oprofile/init.c
index cce3d3015e..d315a3a86c 100644
--- a/arch/arm/oprofile/init.c
+++ b/arch/arm/oprofile/init.c
@@ -20,6 +20,8 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
        ret = pmu_init(ops, &op_xscale_spec);
 #endif
+        ops->backtrace = arm_backtrace;
        return ret;
 }
diff --git a/arch/arm/oprofile/op_arm_model.h b/arch/arm/oprofile/op_arm_model.h
index 2d4caf4781..2148d07484 100644
--- a/arch/arm/oprofile/op_arm_model.h
+++ b/arch/arm/oprofile/op_arm_model.h
@@ -24,6 +24,8 @@ struct op_arm_model_spec {
 extern struct op_arm_model_spec op_xscale_spec;
 #endif
+extern void arm_backtrace(struct pt_regs * const regs, unsigned int depth);
 extern int __init pmu_init(struct oprofile_operations *ops, struct op_arm_model_spec *spec);
 extern void pmu_exit(void);
 #endif /* OP_ARM_MODEL_H */
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
new file mode 100644
index 0000000000..345365852f
--- /dev/null
+++ b/arch/arm/plat-omap/Kconfig
@@ -0,0 +1,112 @@
+if ARCH_OMAP
+menu "TI OMAP Implementations"
+config ARCH_OMAP_OTG
+        bool
+choice
+        prompt "OMAP System Type"
+        default ARCH_OMAP1
+config ARCH_OMAP1
+        bool "TI OMAP1"
+config ARCH_OMAP2
+        bool "TI OMAP2"
+endchoice
+comment "OMAP Feature Selections"
+config OMAP_RESET_CLOCKS
+        bool "Reset unused clocks during boot"
+        depends on ARCH_OMAP
+        default n
+        help
+          Say Y if you want to reset unused clocks during boot.
+          This option saves power, but assumes all drivers are
+          using the clock framework. Broken drivers that do not
+          yet use clock framework may not work with this option.
+          If you are booting from another operating system, you
+          probably do not want this option enabled until your
+          device drivers work properly.
+config OMAP_MUX
+        bool "OMAP multiplexing support"
+        depends on ARCH_OMAP
+        default y
+        help
+          Pin multiplexing support for OMAP boards. If your bootloader
+          sets the multiplexing correctly, say N. Otherwise, or if unsure,
+          say Y.
+config OMAP_MUX_DEBUG
+        bool "Multiplexing debug output"
+        depends on OMAP_MUX
+        default n
+        help
+          Makes the multiplexing functions print out a lot of debug info.
+          This is useful if you want to find out the correct values of the
+          multiplexing registers.
+config OMAP_MUX_WARNINGS
+        bool "Warn about pins the bootloader didn't set up"
+        depends on OMAP_MUX
+        default y
+        help
+          Choose Y here to warn whenever driver initialization logic needs
+          to change the pin multiplexing setup.  When there are no warnings
+          printed, it's safe to deselect OMAP_MUX for your product.
+choice
+        prompt "System timer"
+        default OMAP_MPU_TIMER
+config OMAP_MPU_TIMER
+        bool "Use mpu timer"
+        help
+          Select this option if you want to use the OMAP mpu timer. This
+          timer provides more intra-tick resolution than the 32KHz timer,
+          but consumes more power.
+config OMAP_32K_TIMER
+        bool "Use 32KHz timer"
+        depends on ARCH_OMAP16XX
+        help
+          Select this option if you want to enable the OMAP 32KHz timer.
+          This timer saves power compared to the OMAP_MPU_TIMER, and has
+          support for no tick during idle. The 32KHz timer provides less
+          intra-tick resolution than OMAP_MPU_TIMER. The 32KHz timer is
+          currently only available for OMAP-16xx.
+endchoice
+config OMAP_32K_TIMER_HZ
+       int "Kernel internal timer frequency for 32KHz timer"
+       range 32 1024
+       depends on OMAP_32K_TIMER
+       default "128"
+       help
+          Kernel internal timer frequency should be a divisor of 32768,
+          such as 64 or 128.
+choice
+        prompt "Low-level debug console UART"
+        depends on ARCH_OMAP
+        default OMAP_LL_DEBUG_UART1
+config OMAP_LL_DEBUG_UART1
+        bool "UART1"
+config OMAP_LL_DEBUG_UART2
+        bool "UART2"
+config OMAP_LL_DEBUG_UART3
+        bool "UART3"
+endchoice
+endmenu
+endif
diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
new file mode 100644
index 0000000000..531e11af54
--- /dev/null
+++ b/arch/arm/plat-omap/Makefile
@@ -0,0 +1,17 @@
+#
+# Makefile for the linux kernel.
+#
+# Common support
+obj-y := common.o dma.o clock.o mux.o gpio.o mcbsp.o usb.o
+obj-m :=
+obj-n :=
+obj-  :=
+# OCPI interconnect support for 1710, 1610 and 5912
+obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o
+# Power Management
+obj-$(CONFIG_PM) += pm.o sleep.o
+obj-$(CONFIG_CPU_FREQ) += cpu-omap.o
diff --git a/arch/arm/mach-omap/clock.c b/arch/arm/plat-omap/clock.c
index e91186b534..59d91b3262 100644
--- a/arch/arm/mach-omap/clock.c
+++ b/arch/arm/plat-omap/clock.c
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/arm/mach-omap/clock.c
+ *  linux/arch/arm/plat-omap/clock.c
 *
 *  Copyright (C) 2004 Nokia corporation
 *  Written by Tuukka Tikkanen <tuukka.tikkanen@elektrobit.com>
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <linux/err.h>
+#include <asm/io.h>
 #include <asm/semaphore.h>
 #include <asm/hardware/clock.h>
 #include <asm/arch/board.h>
@@ -25,6 +26,8 @@ static LIST_HEAD(clocks);
 static DECLARE_MUTEX(clocks_sem);
 static DEFINE_SPINLOCK(clockfw_lock);
 static void propagate_rate(struct clk *  clk);
+/* UART clock function */
+static int set_uart_rate(struct clk * clk, unsigned long rate);
 /* External clock (MCLK & BCLK) functions */
 static int set_ext_clk_rate(struct clk *  clk, unsigned long rate);
 static long round_ext_clk_rate(struct clk *  clk, unsigned long rate);
@@ -34,7 +37,7 @@ static int select_table_rate(struct clk *  clk, unsigned long rate);
 static long round_to_table_rate(struct clk *  clk, unsigned long rate);
 void clk_setdpll(__u16, __u16);
-struct mpu_rate rate_table[] = {
+static struct mpu_rate rate_table[] = {
        /* MPU MHz, xtal MHz, dpll1 MHz, CKCTL, DPLL_CTL
         * armdiv, dspdiv, dspmmu, tcdiv, perdiv, lcddiv
         */
@@ -48,7 +51,7 @@ struct mpu_rate rate_table[] = {
        { 192000000, 19200000, 192000000, 0x050f, 0x2510 }, /* 1/1/2/2/8/8 */
        { 192000000, 12000000, 192000000, 0x050f, 0x2810 }, /* 1/1/2/2/8/8 */
        {  96000000, 12000000, 192000000, 0x055f, 0x2810 }, /* 2/2/2/2/8/8 */
-        {  48000000, 12000000, 192000000, 0x0ccf, 0x2810 }, /* 4/4/4/4/8/8 */
+        {  48000000, 12000000, 192000000, 0x0baf, 0x2810 }, /* 4/8/4/4/8/8 */
        {  24000000, 12000000, 192000000, 0x0fff, 0x2810 }, /* 8/8/8/8/8/8 */
 #endif
 #if defined(CONFIG_OMAP_ARM_182MHZ)
@@ -58,7 +61,7 @@ struct mpu_rate rate_table[] = {
        { 168000000, 12000000, 168000000, 0x010f, 0x2710 }, /* 1/1/1/2/8/8 */
 #endif
 #if defined(CONFIG_OMAP_ARM_150MHZ)
-        { 150000000, 12000000, 150000000, 0x150a, 0x2cb0 }, /* 0/0/1/1/2/2 */
+        { 150000000, 12000000, 150000000, 0x010a, 0x2cb0 }, /* 1/1/1/2/4/4 */
 #endif
 #if defined(CONFIG_OMAP_ARM_120MHZ)
        { 120000000, 12000000, 120000000, 0x010a, 0x2510 }, /* 1/1/1/2/4/4 */
@@ -76,19 +79,11 @@ struct mpu_rate rate_table[] = {
 };
-static void ckctl_recalc(struct clk *  clk)
+static void ckctl_recalc(struct clk *  clk);
-{
+int __clk_enable(struct clk *clk);
-        int dsor;
+void __clk_disable(struct clk *clk);
+void __clk_unuse(struct clk *clk);
-        /* Calculate divisor encoded as 2-bit exponent */
+int __clk_use(struct clk *clk);
-        dsor = 1 << (3 & (omap_readw(ARM_CKCTL) >> clk->rate_offset));
-        if (unlikely(clk->rate == clk->parent->rate / dsor))
-                return; /* No change, quick exit */
-        clk->rate = clk->parent->rate / dsor;
-        if (unlikely(clk->flags & RATE_PROPAGATES))
-                propagate_rate(clk);
-}
 static void followparent_recalc(struct clk *  clk)
@@ -102,6 +97,14 @@ static void watchdog_recalc(struct clk *  clk)
        clk->rate = clk->parent->rate / 14;
 }
+static void uart_recalc(struct clk * clk)
+{
+        unsigned int val = omap_readl(clk->enable_reg);
+        if (val & clk->enable_bit)
+                clk->rate = 48000000;
+        else
+                clk->rate = 12000000;
+}
 static struct clk ck_ref = {
        .name           = "ck_ref",
@@ -138,7 +141,7 @@ static struct clk arm_ck = {
 static struct clk armper_ck = {
        .name           = "armper_ck",
        .parent         = &ck_dpll1,
-        .flags          = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX |
+        .flags          = CLOCK_IN_OMAP730 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX |
                          RATE_CKCTL,
        .enable_reg     = ARM_IDLECT2,
        .enable_bit     = EN_PERCK,
@@ -185,7 +188,7 @@ static struct clk armwdt_ck = {
 static struct clk arminth_ck16xx = {
        .name           = "arminth_ck",
        .parent         = &arm_ck,
-        .flags          = CLOCK_IN_OMAP16XX,
+        .flags          = CLOCK_IN_OMAP16XX | ALWAYS_ENABLED,
        .recalc         = &followparent_recalc,
        /* Note: On 16xx the frequency can be divided by 2 by programming
         * ARM_CKCTL:ARM_INTHCK_SEL(14) to 1
@@ -214,6 +217,38 @@ static struct clk dspmmu_ck = {
        .recalc         = &ckctl_recalc,
 };
+static struct clk dspper_ck = {
+        .name           = "dspper_ck",
+        .parent         = &ck_dpll1,
+        .flags          = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX |
+                          RATE_CKCTL | DSP_DOMAIN_CLOCK | VIRTUAL_IO_ADDRESS,
+        .enable_reg     = DSP_IDLECT2,
+        .enable_bit     = EN_PERCK,
+        .rate_offset    = CKCTL_PERDIV_OFFSET,
+        .recalc         = &followparent_recalc,
+        //.recalc               = &ckctl_recalc,
+};
+static struct clk dspxor_ck = {
+        .name           = "dspxor_ck",
+        .parent         = &ck_ref,
+        .flags          = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX |
+                          DSP_DOMAIN_CLOCK | VIRTUAL_IO_ADDRESS,
+        .enable_reg     = DSP_IDLECT2,
+        .enable_bit     = EN_XORPCK,
+        .recalc         = &followparent_recalc,
+};
+static struct clk dsptim_ck = {
+        .name           = "dsptim_ck",
+        .parent         = &ck_ref,
+        .flags          = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX |
+                          DSP_DOMAIN_CLOCK | VIRTUAL_IO_ADDRESS,
+        .enable_reg     = DSP_IDLECT2,
+        .enable_bit     = EN_DSPTIMCK,
+        .recalc         = &followparent_recalc,
+};
 static struct clk tc_ck = {
        .name           = "tc_ck",
        .parent         = &ck_dpll1,
@@ -226,7 +261,7 @@ static struct clk tc_ck = {
 static struct clk arminth_ck1510 = {
        .name           = "arminth_ck",
        .parent         = &tc_ck,
-        .flags          = CLOCK_IN_OMAP1510,
+        .flags          = CLOCK_IN_OMAP1510 | ALWAYS_ENABLED,
        .recalc         = &followparent_recalc,
        /* Note: On 1510 the frequency follows TC_CK
         *
@@ -237,7 +272,7 @@ static struct clk arminth_ck1510 = {
 static struct clk tipb_ck = {
        .name           = "tibp_ck",
        .parent         = &tc_ck,
-        .flags          = CLOCK_IN_OMAP1510,
+        .flags          = CLOCK_IN_OMAP1510 | ALWAYS_ENABLED,
        .recalc         = &followparent_recalc,
 };
@@ -271,14 +306,15 @@ static struct clk tc2_ck = {
 static struct clk dma_ck = {
        .name           = "dma_ck",
        .parent         = &tc_ck,
-        .flags          = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX,
+        .flags          = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX |
+                          ALWAYS_ENABLED,
        .recalc         = &followparent_recalc,
 };
 static struct clk dma_lcdfree_ck = {
        .name           = "dma_lcdfree_ck",
        .parent         = &tc_ck,
-        .flags          = CLOCK_IN_OMAP16XX,
+        .flags          = CLOCK_IN_OMAP16XX | ALWAYS_ENABLED,
        .recalc         = &followparent_recalc,
 };
@@ -303,14 +339,14 @@ static struct clk lb_ck = {
 static struct clk rhea1_ck = {
        .name           = "rhea1_ck",
        .parent         = &tc_ck,
-        .flags          = CLOCK_IN_OMAP16XX,
+        .flags          = CLOCK_IN_OMAP16XX | ALWAYS_ENABLED,
        .recalc         = &followparent_recalc,
 };
 static struct clk rhea2_ck = {
        .name           = "rhea2_ck",
        .parent         = &tc_ck,
-        .flags          = CLOCK_IN_OMAP16XX,
+        .flags          = CLOCK_IN_OMAP16XX | ALWAYS_ENABLED,
        .recalc         = &followparent_recalc,
 };
@@ -325,43 +361,55 @@ static struct clk lcd_ck = {
        .recalc         = &ckctl_recalc,
 };
-static struct clk uart1_ck = {
+static struct clk uart1_1510 = {
+        .name           = "uart1_ck",
+        /* Direct from ULPD, no parent */
+        .rate           = 12000000,
+        .flags          = CLOCK_IN_OMAP1510 | ENABLE_REG_32BIT | ALWAYS_ENABLED,
+        .enable_reg     = MOD_CONF_CTRL_0,
+        .enable_bit     = 29,   /* Chooses between 12MHz and 48MHz */
+        .set_rate       = &set_uart_rate,
+        .recalc         = &uart_recalc,
+};
+static struct clk uart1_16xx = {
        .name           = "uart1_ck",
        /* Direct from ULPD, no parent */
        .rate           = 48000000,
-        .flags          = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX |
+        .flags          = CLOCK_IN_OMAP16XX | RATE_FIXED | ENABLE_REG_32BIT,
-                          RATE_FIXED | ENABLE_REG_32BIT,
        .enable_reg     = MOD_CONF_CTRL_0,
        .enable_bit     = 29,
-        /* (Only on 1510)
-         * The "enable bit" actually chooses between 48MHz and 12MHz.
-         */
 };
 static struct clk uart2_ck = {
        .name           = "uart2_ck",
        /* Direct from ULPD, no parent */
-        .rate           = 48000000,
+        .rate           = 12000000,
-        .flags          = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX |
+        .flags          = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | ENABLE_REG_32BIT,
-                          RATE_FIXED | ENABLE_REG_32BIT,
        .enable_reg     = MOD_CONF_CTRL_0,
-        .enable_bit     = 30,
+        .enable_bit     = 30,   /* Chooses between 12MHz and 48MHz */
-        /* (for both 1510 and 16xx)
+        .set_rate       = &set_uart_rate,
-         * The "enable bit" actually chooses between 48MHz and 12MHz/32kHz.
+        .recalc         = &uart_recalc,
-         */
 };
-static struct clk uart3_ck = {
+static struct clk uart3_1510 = {
+        .name           = "uart3_ck",
+        /* Direct from ULPD, no parent */
+        .rate           = 12000000,
+        .flags          = CLOCK_IN_OMAP1510 | ENABLE_REG_32BIT | ALWAYS_ENABLED,
+        .enable_reg     = MOD_CONF_CTRL_0,
+        .enable_bit     = 31,   /* Chooses between 12MHz and 48MHz */
+        .set_rate       = &set_uart_rate,
+        .recalc         = &uart_recalc,
+};
+static struct clk uart3_16xx = {
        .name           = "uart3_ck",
        /* Direct from ULPD, no parent */
        .rate           = 48000000,
-        .flags          = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX |
+        .flags          = CLOCK_IN_OMAP16XX | RATE_FIXED | ENABLE_REG_32BIT,
-                          RATE_FIXED | ENABLE_REG_32BIT,
        .enable_reg     = MOD_CONF_CTRL_0,
        .enable_bit     = 31,
-        /* (Only on 1510)
-         * The "enable bit" actually chooses between 48MHz and 12MHz.
-         */
 };
 static struct clk usb_clko = {  /* 6 MHz output on W4_USB_CLKO */
@@ -480,6 +528,9 @@ static struct clk *  onchip_clks[] = {
        /* CK_GEN2 clocks */
        &dsp_ck,
        &dspmmu_ck,
+        &dspper_ck,
+        &dspxor_ck,
+        &dsptim_ck,
        /* CK_GEN3 clocks */
        &tc_ck,
        &tipb_ck,
@@ -494,9 +545,11 @@ static struct clk *  onchip_clks[] = {
        &rhea2_ck,
        &lcd_ck,
        /* ULPD clocks */
-        &uart1_ck,
+        &uart1_1510,
+        &uart1_16xx,
        &uart2_ck,
-        &uart3_ck,
+        &uart3_1510,
+        &uart3_16xx,
        &usb_clko,
        &usb_hhc_ck1510, &usb_hhc_ck16xx,
        &mclk_1510,  &mclk_16xx,
@@ -547,14 +600,34 @@ int __clk_enable(struct clk *clk)
                return 0;
        }
+        if (clk->flags & DSP_DOMAIN_CLOCK) {
+                __clk_use(&api_ck);
+        }
        if (clk->flags & ENABLE_REG_32BIT) {
-                regval32 = omap_readl(clk->enable_reg);
+                if (clk->flags & VIRTUAL_IO_ADDRESS) {
-                regval32 |= (1 << clk->enable_bit);
+                        regval32 = __raw_readl(clk->enable_reg);
-                omap_writel(regval32, clk->enable_reg);
+                        regval32 |= (1 << clk->enable_bit);
+                        __raw_writel(regval32, clk->enable_reg);
+                } else {
+                        regval32 = omap_readl(clk->enable_reg);
+                        regval32 |= (1 << clk->enable_bit);
+                        omap_writel(regval32, clk->enable_reg);
+                }
        } else {
-                regval16 = omap_readw(clk->enable_reg);
+                if (clk->flags & VIRTUAL_IO_ADDRESS) {
-                regval16 |= (1 << clk->enable_bit);
+                        regval16 = __raw_readw(clk->enable_reg);
-                omap_writew(regval16, clk->enable_reg);
+                        regval16 |= (1 << clk->enable_bit);
+                        __raw_writew(regval16, clk->enable_reg);
+                } else {
+                        regval16 = omap_readw(clk->enable_reg);
+                        regval16 |= (1 << clk->enable_bit);
+                        omap_writew(regval16, clk->enable_reg);
+                }
+        }
+        if (clk->flags & DSP_DOMAIN_CLOCK) {
+                __clk_unuse(&api_ck);
        }
        return 0;
@@ -569,14 +642,34 @@ void __clk_disable(struct clk *clk)
        if (clk->enable_reg == 0)
                return;
+        if (clk->flags & DSP_DOMAIN_CLOCK) {
+                __clk_use(&api_ck);
+        }
        if (clk->flags & ENABLE_REG_32BIT) {
-                regval32 = omap_readl(clk->enable_reg);
+                if (clk->flags & VIRTUAL_IO_ADDRESS) {
-                regval32 &= ~(1 << clk->enable_bit);
+                        regval32 = __raw_readl(clk->enable_reg);
-                omap_writel(regval32, clk->enable_reg);
+                        regval32 &= ~(1 << clk->enable_bit);
+                        __raw_writel(regval32, clk->enable_reg);
+                } else {
+                        regval32 = omap_readl(clk->enable_reg);
+                        regval32 &= ~(1 << clk->enable_bit);
+                        omap_writel(regval32, clk->enable_reg);
+                }
        } else {
-                regval16 = omap_readw(clk->enable_reg);
+                if (clk->flags & VIRTUAL_IO_ADDRESS) {
-                regval16 &= ~(1 << clk->enable_bit);
+                        regval16 = __raw_readw(clk->enable_reg);
-                omap_writew(regval16, clk->enable_reg);
+                        regval16 &= ~(1 << clk->enable_bit);
+                        __raw_writew(regval16, clk->enable_reg);
+                } else {
+                        regval16 = omap_readw(clk->enable_reg);
+                        regval16 &= ~(1 << clk->enable_bit);
+                        omap_writew(regval16, clk->enable_reg);
+                }
+        }
+        if (clk->flags & DSP_DOMAIN_CLOCK) {
+                __clk_unuse(&api_ck);
        }
 }
@@ -766,6 +859,33 @@ static int calc_dsor_exp(struct clk *clk, unsigned long rate)
        return dsor_exp;
 }
+static void ckctl_recalc(struct clk *  clk)
+{
+        int dsor;
+        /* Calculate divisor encoded as 2-bit exponent */
+        if (clk->flags & DSP_DOMAIN_CLOCK) {
+                /* The clock control bits are in DSP domain,
+                 * so api_ck is needed for access.
+                 * Note that DSP_CKCTL virt addr = phys addr, so
+                 * we must use __raw_readw() instead of omap_readw().
+                 */
+                __clk_use(&api_ck);
+                dsor = 1 << (3 & (__raw_readw(DSP_CKCTL) >> clk->rate_offset));
+                __clk_unuse(&api_ck);
+        } else {
+                dsor = 1 << (3 & (omap_readw(ARM_CKCTL) >> clk->rate_offset));
+        }
+        if (unlikely(clk->rate == clk->parent->rate / dsor))
+                return; /* No change, quick exit */
+        clk->rate = clk->parent->rate / dsor;
+        if (unlikely(clk->flags & RATE_PROPAGATES))
+                propagate_rate(clk);
+}
 long clk_round_rate(struct clk *clk, unsigned long rate)
 {
        int dsor_exp;
@@ -826,6 +946,9 @@ static int select_table_rate(struct clk *  clk, unsigned long rate)
        if (!ptr->rate)
                return -EINVAL;
+        if (!ptr->rate)
+                return -EINVAL;
        if (unlikely(ck_dpll1.rate == 0)) {
                omap_writew(ptr->dpllctl_val, DPLL_CTL);
                ck_dpll1.rate = ptr->pll_rate;
@@ -921,6 +1044,23 @@ static unsigned calc_ext_dsor(unsigned long rate)
        return dsor;
 }
+/* Only needed on 1510 */
+static int set_uart_rate(struct clk * clk, unsigned long rate)
+{
+        unsigned int val;
+        val = omap_readl(clk->enable_reg);
+        if (rate == 12000000)
+                val &= ~(1 << clk->enable_bit);
+        else if (rate == 48000000)
+                val |= (1 << clk->enable_bit);
+        else
+                return -EINVAL;
+        omap_writel(val, clk->enable_reg);
+        clk->rate = rate;
+        return 0;
+}
 static int set_ext_clk_rate(struct clk *  clk, unsigned long rate)
 {
@@ -985,7 +1125,18 @@ void clk_unregister(struct clk *clk)
 }
 EXPORT_SYMBOL(clk_unregister);
+#ifdef CONFIG_OMAP_RESET_CLOCKS
+/*
+ * Resets some clocks that may be left on from bootloader,
+ * but leaves serial clocks on. See also omap_late_clk_reset().
+ */
+static inline void omap_early_clk_reset(void)
+{
+        //omap_writel(0x3 << 29, MOD_CONF_CTRL_0);
+}
+#else
+#define omap_early_clk_reset()  {}
+#endif
 int __init clk_init(void)
 {
@@ -993,6 +1144,8 @@ int __init clk_init(void)
        const struct omap_clock_config *info;
        int crystal_type = 0; /* Default 12 MHz */
+        omap_early_clk_reset();
        for (clkp = onchip_clks; clkp < onchip_clks+ARRAY_SIZE(onchip_clks); clkp++) {
                if (((*clkp)->flags &CLOCK_IN_OMAP1510) && cpu_is_omap1510()) {
                        clk_register(*clkp);
@@ -1023,9 +1176,42 @@ int __init clk_init(void)
                ck_ref.rate = 19200000;
 #endif
+        printk("Clocks: ARM_SYSST: 0x%04x DPLL_CTL: 0x%04x ARM_CKCTL: 0x%04x\n",
+               omap_readw(ARM_SYSST), omap_readw(DPLL_CTL),
+               omap_readw(ARM_CKCTL));
        /* We want to be in syncronous scalable mode */
        omap_writew(0x1000, ARM_SYSST);
+#ifdef CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER
+        /* Use values set by bootloader. Determine PLL rate and recalculate
+         * dependent clocks as if kernel had changed PLL or divisors.
+         */
+        {
+                unsigned pll_ctl_val = omap_readw(DPLL_CTL);
+                ck_dpll1.rate = ck_ref.rate; /* Base xtal rate */
+                if (pll_ctl_val & 0x10) {
+                        /* PLL enabled, apply multiplier and divisor */
+                        if (pll_ctl_val & 0xf80)
+                                ck_dpll1.rate *= (pll_ctl_val & 0xf80) >> 7;
+                        ck_dpll1.rate /= ((pll_ctl_val & 0x60) >> 5) + 1;
+                } else {
+                        /* PLL disabled, apply bypass divisor */
+                        switch (pll_ctl_val & 0xc) {
+                        case 0:
+                                break;
+                        case 0x4:
+                                ck_dpll1.rate /= 2;
+                                break;
+                        default:
+                                ck_dpll1.rate /= 4;
+                                break;
+                        }
+                }
+        }
+        propagate_rate(&ck_dpll1);
+#else
        /* Find the highest supported frequency and enable it */
        if (select_table_rate(&virtual_ck_mpu, ~0)) {
                printk(KERN_ERR "System frequencies not set. Check your config.\n");
@@ -1034,12 +1220,13 @@ int __init clk_init(void)
                omap_writew(0x1005, ARM_CKCTL);
                ck_dpll1.rate = 60000000;
                propagate_rate(&ck_dpll1);
-                printk(KERN_INFO "Clocking rate (xtal/DPLL1/MPU): %ld/%ld/%ld\n",
-                       ck_ref.rate, ck_dpll1.rate, arm_ck.rate);
        }
+#endif
        /* Cache rates for clocks connected to ck_ref (not dpll1) */
        propagate_rate(&ck_ref);
+        printk(KERN_INFO "Clocking rate (xtal/DPLL1/MPU): %ld.%01ld/%ld/%ld MHz\n",
+               ck_ref.rate / 1000000, (ck_ref.rate / 100000) % 10,
+               ck_dpll1.rate, arm_ck.rate);
 #ifdef CONFIG_MACH_OMAP_PERSEUS2
        /* Select slicer output as OMAP input clock */
@@ -1074,3 +1261,63 @@ int __init clk_init(void)
        return 0;
 }
+#ifdef CONFIG_OMAP_RESET_CLOCKS
+static int __init omap_late_clk_reset(void)
+{
+        /* Turn off all unused clocks */
+        struct clk *p;
+        __u32 regval32;
+        omap_writew(0, SOFT_REQ_REG);
+        omap_writew(0, SOFT_REQ_REG2);
+        list_for_each_entry(p, &clocks, node) {
+                if (p->usecount > 0 || (p->flags & ALWAYS_ENABLED) ||
+                        p->enable_reg == 0)
+                        continue;
+                /* Assume no DSP clocks have been activated by bootloader */
+                if (p->flags & DSP_DOMAIN_CLOCK)
+                        continue;
+                /* Is the clock already disabled? */
+                if (p->flags & ENABLE_REG_32BIT) {
+                        if (p->flags & VIRTUAL_IO_ADDRESS)
+                                regval32 = __raw_readl(p->enable_reg);
+                        else
+                                regval32 = omap_readl(p->enable_reg);
+                } else {
+                        if (p->flags & VIRTUAL_IO_ADDRESS)
+                                regval32 = __raw_readw(p->enable_reg);
+                        else
+                                regval32 = omap_readw(p->enable_reg);
+                }
+                if ((regval32 & (1 << p->enable_bit)) == 0)
+                        continue;
+                /* FIXME: This clock seems to be necessary but no-one
+                 * has asked for its activation. */
+                if (p == &tc2_ck         // FIX: pm.c (SRAM), CCP, Camera
+                    || p == &ck_dpll1out // FIX: SoSSI, SSR
+                    || p == &arm_gpio_ck // FIX: GPIO code for 1510
+                    ) {
+                        printk(KERN_INFO "FIXME: Clock \"%s\" seems unused\n",
+                               p->name);
+                        continue;
+                }
+                printk(KERN_INFO "Disabling unused clock \"%s\"... ", p->name);
+                __clk_disable(p);
+                printk(" done\n");
+        }
+        return 0;
+}
+late_initcall(omap_late_clk_reset);
+#endif
diff --git a/arch/arm/mach-omap/clock.h b/arch/arm/plat-omap/clock.h
index 08c0ddde18..a89e1e8c25 100644
--- a/arch/arm/mach-omap/clock.h
+++ b/arch/arm/plat-omap/clock.h
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/arm/mach-omap/clock.h
+ *  linux/arch/arm/plat-omap/clock.h
 *
 *  Copyright (C) 2004 Nokia corporation
 *  Written by Tuukka Tikkanen <tuukka.tikkanen@elektrobit.com>
@@ -52,6 +52,8 @@ struct mpu_rate {
 #define CLOCK_IN_OMAP16XX       64
 #define CLOCK_IN_OMAP1510       128
 #define CLOCK_IN_OMAP730        256
+#define DSP_DOMAIN_CLOCK        512
+#define VIRTUAL_IO_ADDRESS      1024
 /* ARM_CKCTL bit shifts */
 #define CKCTL_PERDIV_OFFSET     0
@@ -63,6 +65,8 @@ struct mpu_rate {
 /*#define ARM_TIMXO             12*/
 #define EN_DSPCK                13
 /*#define ARM_INTHCK_SEL        14*/ /* Divide-by-2 for mpu inth_ck */
+/* DSP_CKCTL bit shifts */
+#define CKCTL_DSPPERDIV_OFFSET  0
 /* ARM_IDLECT1 bit shifts */
 /*#define IDLWDT_ARM    0*/
@@ -96,6 +100,9 @@ struct mpu_rate {
 #define EN_TC1_CK       2
 #define EN_TC2_CK       4
+/* DSP_IDLECT2 bit shifts (0,1,2 are same as for ARM_IDLECT2) */
+#define EN_DSPTIMCK     5
 /* Various register defines for clock controls scattered around OMAP chip */
 #define USB_MCLK_EN_BIT         4       /* In ULPD_CLKC_CTRL */
 #define USB_HOST_HHC_UHOST_EN   9       /* In MOD_CONF_CTRL_0 */
@@ -103,7 +110,8 @@ struct mpu_rate {
 #define COM_ULPD_PLL_CLK_REQ    1       /* In COM_CLK_DIV_CTRL_SEL */
 #define SWD_CLK_DIV_CTRL_SEL    0xfffe0874
 #define COM_CLK_DIV_CTRL_SEL    0xfffe0878
+#define SOFT_REQ_REG            0xfffe0834
+#define SOFT_REQ_REG2           0xfffe0880
 int clk_register(struct clk *clk);
 void clk_unregister(struct clk *clk);
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
new file mode 100644
index 0000000000..ea967a8f6c
--- /dev/null
+++ b/arch/arm/plat-omap/common.c
@@ -0,0 +1,135 @@
+/*
+ * linux/arch/arm/plat-omap/common.c
+ *
+ * Code common to all OMAP machines.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/pm.h>
+#include <linux/console.h>
+#include <linux/serial.h>
+#include <linux/tty.h>
+#include <linux/serial_8250.h>
+#include <linux/serial_reg.h>
+#include <asm/hardware.h>
+#include <asm/system.h>
+#include <asm/pgtable.h>
+#include <asm/mach/map.h>
+#include <asm/hardware/clock.h>
+#include <asm/io.h>
+#include <asm/mach-types.h>
+#include <asm/arch/board.h>
+#include <asm/arch/mux.h>
+#include <asm/arch/fpga.h>
+#include "clock.h"
+#define NO_LENGTH_CHECK 0xffffffff
+extern int omap_bootloader_tag_len;
+extern u8 omap_bootloader_tag[];
+struct omap_board_config_kernel *omap_board_config;
+int omap_board_config_size = 0;
+static const void *get_config(u16 tag, size_t len, int skip, size_t *len_out)
+{
+        struct omap_board_config_kernel *kinfo = NULL;
+        int i;
+#ifdef CONFIG_OMAP_BOOT_TAG
+        struct omap_board_config_entry *info = NULL;
+        if (omap_bootloader_tag_len > 4)
+                info = (struct omap_board_config_entry *) omap_bootloader_tag;
+        while (info != NULL) {
+                u8 *next;
+                if (info->tag == tag) {
+                        if (skip == 0)
+                                break;
+                        skip--;
+                }
+                if ((info->len & 0x03) != 0) {
+                        /* We bail out to avoid an alignment fault */
+                        printk(KERN_ERR "OMAP peripheral config: Length (%d) not word-aligned (tag %04x)\n",
+                               info->len, info->tag);
+                        return NULL;
+                }
+                next = (u8 *) info + sizeof(*info) + info->len;
+                if (next >= omap_bootloader_tag + omap_bootloader_tag_len)
+                        info = NULL;
+                else
+                        info = (struct omap_board_config_entry *) next;
+        }
+        if (info != NULL) {
+                /* Check the length as a lame attempt to check for
+                 * binary inconsistancy. */
+                if (len != NO_LENGTH_CHECK) {
+                        /* Word-align len */
+                        if (len & 0x03)
+                                len = (len + 3) & ~0x03;
+                        if (info->len != len) {
+                                printk(KERN_ERR "OMAP peripheral config: Length mismatch with tag %x (want %d, got %d)\n",
+                                       tag, len, info->len);
+                                return NULL;
+                        }
+                }
+                if (len_out != NULL)
+                        *len_out = info->len;
+                return info->data;
+        }
+#endif
+        /* Try to find the config from the board-specific structures
+         * in the kernel. */
+        for (i = 0; i < omap_board_config_size; i++) {
+                if (omap_board_config[i].tag == tag) {
+                        kinfo = &omap_board_config[i];
+                        break;
+                }
+        }
+        if (kinfo == NULL)
+                return NULL;
+        return kinfo->data;
+}
+const void *__omap_get_config(u16 tag, size_t len, int nr)
+{
+        return get_config(tag, len, nr, NULL);
+}
+EXPORT_SYMBOL(__omap_get_config);
+const void *omap_get_var_config(u16 tag, size_t *len)
+{
+        return get_config(tag, NO_LENGTH_CHECK, 0, len);
+}
+EXPORT_SYMBOL(omap_get_var_config);
+static int __init omap_add_serial_console(void)
+{
+        const struct omap_serial_console_config *info;
+        info = omap_get_config(OMAP_TAG_SERIAL_CONSOLE,
+                               struct omap_serial_console_config);
+        if (info != NULL && info->console_uart) {
+                static char speed[11], *opt = NULL;
+                if (info->console_speed) {
+                        snprintf(speed, sizeof(speed), "%u", info->console_speed);
+                        opt = speed;
+                }
+                return add_preferred_console("ttyS", info->console_uart - 1, opt);
+        }
+        return 0;
+}
+console_initcall(omap_add_serial_console);
diff --git a/arch/arm/plat-omap/cpu-omap.c b/arch/arm/plat-omap/cpu-omap.c
new file mode 100644
index 0000000000..409aac2c4b
--- /dev/null
+++ b/arch/arm/plat-omap/cpu-omap.c
@@ -0,0 +1,128 @@
+/*
+ *  linux/arch/arm/plat-omap/cpu-omap.c
+ *
+ *  CPU frequency scaling for OMAP
+ *
+ *  Copyright (C) 2005 Nokia Corporation
+ *  Written by Tony Lindgren <tony@atomide.com>
+ *
+ *  Based on cpu-sa1110.c, Copyright (C) 2001 Russell King
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/cpufreq.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/err.h>
+#include <asm/hardware.h>
+#include <asm/mach-types.h>
+#include <asm/io.h>
+#include <asm/system.h>
+#include <asm/hardware/clock.h>
+/* TODO: Add support for SDRAM timing changes */
+int omap_verify_speed(struct cpufreq_policy *policy)
+{
+        struct clk * mpu_clk;
+        if (policy->cpu)
+                return -EINVAL;
+        cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq,
+                                     policy->cpuinfo.max_freq);
+        mpu_clk = clk_get(NULL, "mpu");
+        if (IS_ERR(mpu_clk))
+                return PTR_ERR(mpu_clk);
+        policy->min = clk_round_rate(mpu_clk, policy->min * 1000) / 1000;
+        policy->max = clk_round_rate(mpu_clk, policy->max * 1000) / 1000;
+        cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq,
+                                     policy->cpuinfo.max_freq);
+        clk_put(mpu_clk);
+        return 0;
+}
+unsigned int omap_getspeed(unsigned int cpu)
+{
+        struct clk * mpu_clk;
+        unsigned long rate;
+        if (cpu)
+                return 0;
+        mpu_clk = clk_get(NULL, "mpu");
+        if (IS_ERR(mpu_clk))
+                return 0;
+        rate = clk_get_rate(mpu_clk) / 1000;
+        clk_put(mpu_clk);
+        return rate;
+}
+static int omap_target(struct cpufreq_policy *policy,
+                       unsigned int target_freq,
+                       unsigned int relation)
+{
+        struct clk * mpu_clk;
+        struct cpufreq_freqs freqs;
+        int ret = 0;
+        mpu_clk = clk_get(NULL, "mpu");
+        if (IS_ERR(mpu_clk))
+                return PTR_ERR(mpu_clk);
+        freqs.old = omap_getspeed(0);
+        freqs.new = clk_round_rate(mpu_clk, target_freq * 1000) / 1000;
+        freqs.cpu = 0;
+        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        ret = clk_set_rate(mpu_clk, target_freq * 1000);
+        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        clk_put(mpu_clk);
+        return ret;
+}
+static int __init omap_cpu_init(struct cpufreq_policy *policy)
+{
+        struct clk * mpu_clk;
+        mpu_clk = clk_get(NULL, "mpu");
+        if (IS_ERR(mpu_clk))
+                return PTR_ERR(mpu_clk);
+        if (policy->cpu != 0)
+                return -EINVAL;
+        policy->cur = policy->min = policy->max = omap_getspeed(0);
+        policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
+        policy->cpuinfo.min_freq = clk_round_rate(mpu_clk, 0) / 1000;
+        policy->cpuinfo.max_freq = clk_round_rate(mpu_clk, 216000000) / 1000;
+        policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
+        clk_put(mpu_clk);
+        return 0;
+}
+static struct cpufreq_driver omap_driver = {
+        .flags          = CPUFREQ_STICKY,
+        .verify         = omap_verify_speed,
+        .target         = omap_target,
+        .get            = omap_getspeed,
+        .init           = omap_cpu_init,
+        .name           = "omap",
+};
+static int __init omap_cpufreq_init(void)
+{
+        return cpufreq_register_driver(&omap_driver);
+}
+arch_initcall(omap_cpufreq_init);
diff --git a/arch/arm/mach-omap/dma.c b/arch/arm/plat-omap/dma.c
index 7a9ebe80d6..c0a5c2fa42 100644
--- a/arch/arm/mach-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/omap/dma.c
+ * linux/arch/arm/plat-omap/dma.c
 *
 * Copyright (C) 2003 Nokia Corporation
 * Author: Juha Yrj�l� <juha.yrjola@nokia.com>
@@ -794,10 +794,6 @@ static void set_b1_regs(void)
        w = omap_readw(OMAP1610_DMA_LCD_CTRL);
        /* Always set the source port as SDRAM for now*/
        w &= ~(0x03 << 6);
-        if (lcd_dma.ext_ctrl)
-                w |= 1 << 8;
-        else
-                w &= ~(1 << 8);
        if (lcd_dma.callback != NULL)
                w |= 1 << 1;            /* Block interrupt enable */
        else
@@ -889,9 +885,15 @@ void omap_enable_lcd_dma(void)
         */
        if (enable_1510_mode || !lcd_dma.ext_ctrl)
                return;
+        w = omap_readw(OMAP1610_DMA_LCD_CTRL);
+        w |= 1 << 8;
+        omap_writew(w, OMAP1610_DMA_LCD_CTRL);
        w = omap_readw(OMAP1610_DMA_LCD_CCR);
        w |= 1 << 7;
        omap_writew(w, OMAP1610_DMA_LCD_CCR);
        lcd_dma.active = 1;
 }
@@ -922,10 +924,19 @@ void omap_setup_lcd_dma(void)
 void omap_stop_lcd_dma(void)
 {
+        u16 w;
        lcd_dma.active = 0;
-        if (!enable_1510_mode && lcd_dma.ext_ctrl)
+        if (enable_1510_mode || !lcd_dma.ext_ctrl)
-                omap_writew(omap_readw(OMAP1610_DMA_LCD_CCR) & ~(1 << 7),
+                return;
-                            OMAP1610_DMA_LCD_CCR);
+        w = omap_readw(OMAP1610_DMA_LCD_CCR);
+        w &= ~(1 << 7);
+        omap_writew(w, OMAP1610_DMA_LCD_CCR);
+        w = omap_readw(OMAP1610_DMA_LCD_CTRL);
+        w &= ~(1 << 8);
+        omap_writew(w, OMAP1610_DMA_LCD_CTRL);
 }
 /*
@@ -972,6 +983,25 @@ dma_addr_t omap_get_dma_dst_pos(int lch)
                             (OMAP_DMA_CDSA_U(lch) << 16));
 }
+int omap_dma_running(void)
+{
+        int lch;
+        /* Check if LCD DMA is running */
+        if (cpu_is_omap16xx())
+                if (omap_readw(OMAP1610_DMA_LCD_CCR) & OMAP_DMA_CCR_EN)
+                        return 1;
+        for (lch = 0; lch < dma_chan_count; lch++) {
+                u16 w;
+                w = omap_readw(OMAP_DMA_CCR(lch));
+                if (w & OMAP_DMA_CCR_EN)
+                        return 1;
+        }
+        return 0;
+}
 static int __init omap_init_dma(void)
 {
        int ch, r;
diff --git a/arch/arm/mach-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index 9045dfd469..1c85b4e536 100644
--- a/arch/arm/mach-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/arm/mach-omap/gpio.c
+ *  linux/arch/arm/plat-omap/gpio.c
 *
 * Support functions for OMAP GPIO
 *
diff --git a/arch/arm/mach-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c
index 7c4ad77130..43567d5edd 100644
--- a/arch/arm/mach-omap/mcbsp.c
+++ b/arch/arm/plat-omap/mcbsp.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/omap/mcbsp.c
+ * linux/arch/arm/plat-omap/mcbsp.c
 *
 * Copyright (C) 2004 Nokia Corporation
 * Author: Samuel Ortiz <samuel.ortiz@nokia.com>
@@ -66,6 +66,7 @@ struct omap_mcbsp {
 static struct omap_mcbsp mcbsp[OMAP_MAX_MCBSP_COUNT];
 static struct clk *mcbsp_dsp_ck = 0;
 static struct clk *mcbsp_api_ck = 0;
+static struct clk *mcbsp_dspxor_ck = 0;
 static void omap_mcbsp_dump_reg(u8 id)
@@ -175,7 +176,7 @@ static int omap_mcbsp_check(unsigned int id)
                return 0;
        }
-        if (cpu_is_omap1510() || cpu_is_omap1610() || cpu_is_omap1710()) {
+        if (cpu_is_omap1510() || cpu_is_omap16xx()) {
                if (id > OMAP_MAX_MCBSP_COUNT) {
                        printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n", id + 1);
                        return -1;
@@ -191,15 +192,12 @@ static int omap_mcbsp_check(unsigned int id)
 static void omap_mcbsp_dsp_request(void)
 {
-        if (cpu_is_omap1510() || cpu_is_omap1610() || cpu_is_omap1710()) {
+        if (cpu_is_omap1510() || cpu_is_omap16xx()) {
-                omap_writew((omap_readw(ARM_RSTCT1) | (1 << 1) | (1 << 2)),
+                clk_use(mcbsp_dsp_ck);
-                            ARM_RSTCT1);
+                clk_use(mcbsp_api_ck);
-                clk_enable(mcbsp_dsp_ck);
-                clk_enable(mcbsp_api_ck);
                /* enable 12MHz clock to mcbsp 1 & 3 */
-                __raw_writew(__raw_readw(DSP_IDLECT2) | (1 << EN_XORPCK),
+                clk_use(mcbsp_dspxor_ck);
-                             DSP_IDLECT2);
                __raw_writew(__raw_readw(DSP_RSTCT2) | 1 | 1 << 1,
                             DSP_RSTCT2);
        }
@@ -207,10 +205,13 @@ static void omap_mcbsp_dsp_request(void)
 static void omap_mcbsp_dsp_free(void)
 {
-        /* Useless for now */
+        if (cpu_is_omap1510() || cpu_is_omap16xx()) {
+                clk_unuse(mcbsp_dspxor_ck);
+                clk_unuse(mcbsp_dsp_ck);
+                clk_unuse(mcbsp_api_ck);
+        }
 }
 int omap_mcbsp_request(unsigned int id)
 {
        int err;
@@ -350,6 +351,73 @@ void omap_mcbsp_stop(unsigned int id)
 }
+/* polled mcbsp i/o operations */
+int omap_mcbsp_pollwrite(unsigned int id, u16 buf)
+{
+        u32 base = mcbsp[id].io_base;
+        writew(buf, base + OMAP_MCBSP_REG_DXR1);
+        /* if frame sync error - clear the error */
+        if (readw(base + OMAP_MCBSP_REG_SPCR2) & XSYNC_ERR) {
+                /* clear error */
+                writew(readw(base + OMAP_MCBSP_REG_SPCR2) & (~XSYNC_ERR),
+                       base + OMAP_MCBSP_REG_SPCR2);
+                /* resend */
+                return -1;
+        } else {
+                /* wait for transmit confirmation */
+                int attemps = 0;
+                while (!(readw(base + OMAP_MCBSP_REG_SPCR2) & XRDY)) {
+                        if (attemps++ > 1000) {
+                                writew(readw(base + OMAP_MCBSP_REG_SPCR2) &
+                                       (~XRST),
+                                       base + OMAP_MCBSP_REG_SPCR2);
+                                udelay(10);
+                                writew(readw(base + OMAP_MCBSP_REG_SPCR2) |
+                                       (XRST),
+                                       base + OMAP_MCBSP_REG_SPCR2);
+                                udelay(10);
+                                printk(KERN_ERR
+                                       " Could not write to McBSP Register\n");
+                                return -2;
+                        }
+                }
+        }
+        return 0;
+}
+int omap_mcbsp_pollread(unsigned int id, u16 * buf)
+{
+        u32 base = mcbsp[id].io_base;
+        /* if frame sync error - clear the error */
+        if (readw(base + OMAP_MCBSP_REG_SPCR1) & RSYNC_ERR) {
+                /* clear error */
+                writew(readw(base + OMAP_MCBSP_REG_SPCR1) & (~RSYNC_ERR),
+                       base + OMAP_MCBSP_REG_SPCR1);
+                /* resend */
+                return -1;
+        } else {
+                /* wait for recieve confirmation */
+                int attemps = 0;
+                while (!(readw(base + OMAP_MCBSP_REG_SPCR1) & RRDY)) {
+                        if (attemps++ > 1000) {
+                                writew(readw(base + OMAP_MCBSP_REG_SPCR1) &
+                                       (~RRST),
+                                       base + OMAP_MCBSP_REG_SPCR1);
+                                udelay(10);
+                                writew(readw(base + OMAP_MCBSP_REG_SPCR1) |
+                                       (RRST),
+                                       base + OMAP_MCBSP_REG_SPCR1);
+                                udelay(10);
+                                printk(KERN_ERR
+                                       " Could not read from McBSP Register\n");
+                                return -2;
+                        }
+                }
+        }
+        *buf = readw(base + OMAP_MCBSP_REG_DRR1);
+        return 0;
+}
 /*
 * IRQ based word transmission.
 */
@@ -625,10 +693,15 @@ static int __init omap_mcbsp_init(void)
                return PTR_ERR(mcbsp_dsp_ck);
        }
        mcbsp_api_ck = clk_get(0, "api_ck");
-        if (IS_ERR(mcbsp_dsp_ck)) {
+        if (IS_ERR(mcbsp_api_ck)) {
                printk(KERN_ERR "mcbsp: could not acquire api_ck handle.\n");
                return PTR_ERR(mcbsp_api_ck);
        }
+        mcbsp_dspxor_ck = clk_get(0, "dspxor_ck");
+        if (IS_ERR(mcbsp_dspxor_ck)) {
+                printk(KERN_ERR "mcbsp: could not acquire dspxor_ck handle.\n");
+                return PTR_ERR(mcbsp_dspxor_ck);
+        }
 #ifdef CONFIG_ARCH_OMAP730
        if (cpu_is_omap730()) {
@@ -643,7 +716,7 @@ static int __init omap_mcbsp_init(void)
        }
 #endif
 #if defined(CONFIG_ARCH_OMAP16XX)
-        if (cpu_is_omap1610() || cpu_is_omap1710()) {
+        if (cpu_is_omap16xx()) {
                mcbsp_info = mcbsp_1610;
                mcbsp_count = ARRAY_SIZE(mcbsp_1610);
        }
diff --git a/arch/arm/mach-omap/mux.c b/arch/arm/plat-omap/mux.c
index bcf3c6e5ec..ea7b955b9c 100644
--- a/arch/arm/mach-omap/mux.c
+++ b/arch/arm/plat-omap/mux.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/mux.c
+ * linux/arch/arm/plat-omap/mux.c
 *
 * Utility to set the Omap MUX and PULL_DWN registers from a table in mux.h
 *
@@ -53,19 +53,13 @@ omap_cfg_reg(const reg_cfg_t reg_cfg)
                return -EINVAL;
        }
-        cfg = &reg_cfg_table[reg_cfg];
+        cfg = (reg_cfg_set *)&reg_cfg_table[reg_cfg];
-        /*
-         * We do a pretty long section here with lock on, but pin muxing
-         * should only happen on driver init for each driver, so it's not time
-         * critical.
-         */
-        spin_lock_irqsave(&mux_spin_lock, flags);
        /* Check the mux register in question */
        if (cfg->mux_reg) {
                unsigned        tmp1, tmp2;
+                spin_lock_irqsave(&mux_spin_lock, flags);
                reg_orig = omap_readl(cfg->mux_reg);
                /* The mux registers always seem to be 3 bits long */
@@ -80,11 +74,13 @@ omap_cfg_reg(const reg_cfg_t reg_cfg)
                        warn = 1;
                omap_writel(reg, cfg->mux_reg);
+                spin_unlock_irqrestore(&mux_spin_lock, flags);
        }
        /* Check for pull up or pull down selection on 1610 */
        if (!cpu_is_omap1510()) {
                if (cfg->pu_pd_reg && cfg->pull_val) {
+                        spin_lock_irqsave(&mux_spin_lock, flags);
                        pu_pd_orig = omap_readl(cfg->pu_pd_reg);
                        mask = 1 << cfg->pull_bit;
@@ -100,11 +96,13 @@ omap_cfg_reg(const reg_cfg_t reg_cfg)
                                pu_pd = pu_pd_orig & ~mask;
                        }
                        omap_writel(pu_pd, cfg->pu_pd_reg);
+                        spin_unlock_irqrestore(&mux_spin_lock, flags);
                }
        }
        /* Check for an associated pull down register */
        if (cfg->pull_reg) {
+                spin_lock_irqsave(&mux_spin_lock, flags);
                pull_orig = omap_readl(cfg->pull_reg);
                mask = 1 << cfg->pull_bit;
@@ -121,6 +119,7 @@ omap_cfg_reg(const reg_cfg_t reg_cfg)
                }
                omap_writel(pull, cfg->pull_reg);
+                spin_unlock_irqrestore(&mux_spin_lock, flags);
        }
        if (warn) {
@@ -149,8 +148,6 @@ omap_cfg_reg(const reg_cfg_t reg_cfg)
        }
 #endif
-        spin_unlock_irqrestore(&mux_spin_lock, flags);
 #ifdef CONFIG_OMAP_MUX_ERRORS
        return warn ? -ETXTBSY : 0;
 #else
diff --git a/arch/arm/mach-omap/ocpi.c b/arch/arm/plat-omap/ocpi.c
index c9ced134a7..1fb16f9edf 100644
--- a/arch/arm/mach-omap/ocpi.c
+++ b/arch/arm/plat-omap/ocpi.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/ocpi.c
+ * linux/arch/arm/plat-omap/ocpi.c
 *
 * Minimal OCP bus support for omap16xx
 *
diff --git a/arch/arm/mach-omap/pm.c b/arch/arm/plat-omap/pm.c
index 00fac155df..e6536b16c3 100644
--- a/arch/arm/mach-omap/pm.c
+++ b/arch/arm/plat-omap/pm.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/pm.c
+ * linux/arch/arm/plat-omap/pm.c
 *
 * OMAP Power Management Routines
 *
@@ -41,7 +41,9 @@
 #include <linux/pm.h>
 #include <asm/io.h>
+#include <asm/mach/time.h>
 #include <asm/mach-types.h>
 #include <asm/arch/omap16xx.h>
 #include <asm/arch/pm.h>
 #include <asm/arch/mux.h>
@@ -80,13 +82,13 @@ void omap_pm_idle(void)
                return;
        }
        mask32 = omap_readl(ARM_SYSST);
-        local_fiq_enable();
-        local_irq_enable();
-#if defined(CONFIG_OMAP_32K_TIMER) && defined(CONFIG_NO_IDLE_HZ)
+        /*
-        /* Override timer to use VST for the next cycle */
+         * Since an interrupt may set up a timer, we don't want to
-        omap_32k_timer_next_vst_interrupt();
+         * reprogram the hardware timer with interrupts enabled.
-#endif
+         * Re-enable interrupts only after returning from idle.
+         */
+        timer_dyn_reprogram();
        if ((mask32 & DSP_IDLE) == 0) {
                __asm__ volatile ("mcr  p15, 0, r0, c7, c0, 4");
@@ -102,6 +104,8 @@ void omap_pm_idle(void)
                func_ptr();
        }
+        local_fiq_enable();
+        local_irq_enable();
 }
 /*
diff --git a/arch/arm/mach-omap/sleep.S b/arch/arm/plat-omap/sleep.S
index 4d426d1058..279490ce77 100644
--- a/arch/arm/mach-omap/sleep.S
+++ b/arch/arm/plat-omap/sleep.S
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/sleep.S
+ * linux/arch/arm/plat-omap/sleep.S
 *
 * Low-level OMAP1510/1610 sleep/wakeUp support
 *
diff --git a/arch/arm/mach-omap/usb.c b/arch/arm/plat-omap/usb.c
index 6e805d451d..25bc4a8dd7 100644
--- a/arch/arm/mach-omap/usb.c
+++ b/arch/arm/plat-omap/usb.c
@@ -1,5 +1,5 @@
 /*
- * arch/arm/mach-omap/usb.c -- platform level USB initialization
+ * arch/arm/plat-omap/usb.c -- platform level USB initialization
 *
 * Copyright (C) 2004 Texas Instruments, Inc.
 *
@@ -41,7 +41,6 @@
 /* These routines should handle the standard chip-specific modes
 * for usb0/1/2 ports, covering basic mux and transceiver setup.
- * Call omap_usb_init() once, from INIT_MACHINE().
 *
 * Some board-*.c files will need to set up additional mux options,
 * like for suspend handling, vbus sensing, GPIOs, and the D+ pullup.
@@ -288,8 +287,8 @@ static void usb_release(struct device *dev)
 static struct resource udc_resources[] = {
        /* order is significant! */
        {               /* registers */
-                .start          = IO_ADDRESS(UDC_BASE),
+                .start          = UDC_BASE,
-                .end            = IO_ADDRESS(UDC_BASE + 0xff),
+                .end            = UDC_BASE + 0xff,
                .flags          = IORESOURCE_MEM,
        }, {            /* general IRQ */
                .start          = IH2_BASE + 20,
@@ -327,7 +326,7 @@ static u64 ohci_dmamask = ~(u32)0;
 static struct resource ohci_resources[] = {
        {
                .start  = OMAP_OHCI_BASE,
-                .end    = OMAP_OHCI_BASE + 4096,
+                .end    = OMAP_OHCI_BASE + 4096 - 1,
                .flags  = IORESOURCE_MEM,
        },
        {
@@ -355,8 +354,8 @@ static struct platform_device ohci_device = {
 static struct resource otg_resources[] = {
        /* order is significant! */
        {
-                .start          = IO_ADDRESS(OTG_BASE),
+                .start          = OTG_BASE,
-                .end            = IO_ADDRESS(OTG_BASE + 0xff),
+                .end            = OTG_BASE + 0xff,
                .flags          = IORESOURCE_MEM,
        }, {
                .start          = IH2_BASE + 8,
diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index 30c1dfbb05..6d3a79e5fe 100644
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -6,7 +6,7 @@
 # To add an entry into this database, please see Documentation/arm/README,
 # or contact rmk@arm.linux.org.uk
 #
-# Last update: Thu Mar 24 14:34:50 2005
+# Last update: Thu Jun 23 20:19:33 2005
 #
 # machine_is_xxx        CONFIG_xxxx             MACH_TYPE_xxx           number
 #
@@ -243,7 +243,7 @@ yoho			ARCH_YOHO		YOHO			231
 jasper                  ARCH_JASPER             JASPER                  232
 dsc25                   ARCH_DSC25              DSC25                   233
 omap_innovator          MACH_OMAP_INNOVATOR     OMAP_INNOVATOR          234
-ramses                  ARCH_RAMSES             RAMSES                  235
+mnci                    ARCH_RAMSES             RAMSES                  235
 s28x                    ARCH_S28X               S28X                    236
 mport3                  ARCH_MPORT3             MPORT3                  237
 pxa_eagle250            ARCH_PXA_EAGLE250       PXA_EAGLE250            238
@@ -323,7 +323,7 @@ nimbra29x		ARCH_NIMBRA29X		NIMBRA29X		311
 nimbra210               ARCH_NIMBRA210          NIMBRA210               312
 hhp_d95xx               ARCH_HHP_D95XX          HHP_D95XX               313
 labarm                  ARCH_LABARM             LABARM                  314
-m825xx                  ARCH_M825XX             M825XX                  315
+comcerto                ARCH_M825XX             M825XX                  315
 m7100                   SA1100_M7100            M7100                   316
 nipc2                   ARCH_NIPC2              NIPC2                   317
 fu7202                  ARCH_FU7202             FU7202                  318
@@ -724,3 +724,66 @@ lpc22xx			MACH_LPC22XX		LPC22XX			715
 omap_comet3             MACH_COMET3             COMET3                  716
 omap_comet4             MACH_COMET4             COMET4                  717
 csb625                  MACH_CSB625             CSB625                  718
+fortunet2               MACH_FORTUNET2          FORTUNET2               719
+s5h2200                 MACH_S5H2200            S5H2200                 720
+optorm920               MACH_OPTORM920          OPTORM920               721
+adsbitsyxb              MACH_ADSBITSYXB         ADSBITSYXB              722
+adssphere               MACH_ADSSPHERE          ADSSPHERE               723
+adsportal               MACH_ADSPORTAL          ADSPORTAL               724
+ln2410sbc               MACH_LN2410SBC          LN2410SBC               725
+cb3rufc                 MACH_CB3RUFC            CB3RUFC                 726
+mp2usb                  MACH_MP2USB             MP2USB                  727
+ntnp425c                MACH_NTNP425C           NTNP425C                728
+colibri                 MACH_COLIBRI            COLIBRI                 729
+pcm7220                 MACH_PCM7220            PCM7220                 730
+gateway7001             MACH_GATEWAY7001        GATEWAY7001             731
+pcm027                  MACH_PCM027             PCM027                  732
+cmpxa                   MACH_CMPXA              CMPXA                   733
+anubis                  MACH_ANUBIS             ANUBIS                  734
+ite8152                 MACH_ITE8152            ITE8152                 735
+lpc3xxx                 MACH_LPC3XXX            LPC3XXX                 736
+puppeteer               MACH_PUPPETEER          PUPPETEER               737
+vt001                   MACH_MACH_VADATECH      MACH_VADATECH           738
+e570                    MACH_E570               E570                    739
+x50                     MACH_X50                X50                     740
+recon                   MACH_RECON              RECON                   741
+xboardgp8               MACH_XBOARDGP8          XBOARDGP8               742
+fpic2                   MACH_FPIC2              FPIC2                   743
+akita                   MACH_AKITA              AKITA                   744
+a81                     MACH_A81                A81                     745
+svm_sc25x               MACH_SVM_SC25X          SVM_SC25X               746
+vt020                   MACH_VADATECH020        VADATECH020             747
+tli                     MACH_TLI                TLI                     748
+edb9315lc               MACH_EDB9315LC          EDB9315LC               749
+passec                  MACH_PASSEC             PASSEC                  750
+ds_tiger                MACH_DS_TIGER           DS_TIGER                751
+e310                    MACH_E310               E310                    752
+e330                    MACH_E330               E330                    753
+rt3000                  MACH_RT3000             RT3000                  754
+nokia770                MACH_NOKIA770           NOKIA770                755
+pnx0106                 MACH_PNX0106            PNX0106                 756
+hx21xx                  MACH_HX21XX             HX21XX                  757
+faraday                 MACH_FARADAY            FARADAY                 758
+sbc9312                 MACH_SBC9312            SBC9312                 759
+batman                  MACH_BATMAN             BATMAN                  760
+jpd201                  MACH_JPD201             JPD201                  761
+mipsa                   MACH_MIPSA              MIPSA                   762
+kacom                   MACH_KACOM              KACOM                   763
+swarcocpu               MACH_SWARCOCPU          SWARCOCPU               764
+swarcodsl               MACH_SWARCODSL          SWARCODSL               765
+blueangel               MACH_BLUEANGEL          BLUEANGEL               766
+hairygrama              MACH_HAIRYGRAMA         HAIRYGRAMA              767
+banff                   MACH_BANFF              BANFF                   768
+carmeva                 MACH_CARMEVA            CARMEVA                 769
+sam255                  MACH_SAM255             SAM255                  770
+ppm10                   MACH_PPM10              PPM10                   771
+edb9315a                MACH_EDB9315A           EDB9315A                772
+sunset                  MACH_SUNSET             SUNSET                  773
+stargate2               MACH_STARGATE2          STARGATE2               774
+intelmote2              MACH_INTELMOTE2         INTELMOTE2              775
+trizeps4                MACH_TRIZEPS4           TRIZEPS4                776
+mainstone2              MACH_MAINSTONE2         MAINSTONE2              777
+ez_ixp42x               MACH_EZ_IXP42X          EZ_IXP42X               778
+tapwave_zodiac          MACH_TAPWAVE_ZODIAC     TAPWAVE_ZODIAC          779
+universalmeter          MACH_UNIVERSALMETER     UNIVERSALMETER          780
+hicoarm9                MACH_HICOARM9           HICOARM9                781
diff --git a/arch/arm/vfp/vfp.h b/arch/arm/vfp/vfp.h
index 55a02bc994..4b97950984 100644
--- a/arch/arm/vfp/vfp.h
+++ b/arch/arm/vfp/vfp.h
@@ -117,7 +117,13 @@ static inline u64 vfp_estimate_div128to64(u64 nh, u64 nl, u64 m)
        if (nh >= m)
                return ~0ULL;
        mh = m >> 32;
-        z = (mh << 32 <= nh) ? 0xffffffff00000000ULL : (nh / mh) << 32;
+        if (mh << 32 <= nh) {
+                z = 0xffffffff00000000ULL;
+        } else {
+                z = nh;
+                do_div(z, mh);
+                z <<= 32;
+        }
        mul64to128(&termh, &terml, m, z);
        sub128(&remh, &reml, nh, nl, termh, terml);
        ml = m << 32;
@@ -126,7 +132,12 @@ static inline u64 vfp_estimate_div128to64(u64 nh, u64 nl, u64 m)
                add128(&remh, &reml, remh, reml, mh, ml);
        }
        remh = (remh << 32) | (reml >> 32);
-        z |= (mh << 32 <= remh) ? 0xffffffff : remh / mh;
+        if (mh << 32 <= remh) {
+                z |= 0xffffffff;
+        } else {
+                do_div(remh, mh);
+                z |= remh;
+        }
        return z;
 }
diff --git a/arch/arm/vfp/vfpdouble.c b/arch/arm/vfp/vfpdouble.c
index fa3053e84d..b801cd66b6 100644
--- a/arch/arm/vfp/vfpdouble.c
+++ b/arch/arm/vfp/vfpdouble.c
@@ -32,6 +32,8 @@
 */
 #include <linux/kernel.h>
 #include <linux/bitops.h>
+#include <asm/div64.h>
 #include <asm/ptrace.h>
 #include <asm/vfp.h>
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c
index 3aeedd2afc..22f3da4e08 100644
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
@@ -89,7 +89,7 @@ void vfp_raise_sigfpe(unsigned int sicode, struct pt_regs *regs)
        current->thread.error_code = 0;
        current->thread.trap_no = 6;
-        force_sig_info(SIGFPE, &info, current);
+        send_sig_info(SIGFPE, &info, current);
 }
 static void vfp_panic(char *reason)
diff --git a/arch/arm/vfp/vfpsingle.c b/arch/arm/vfp/vfpsingle.c
index 6849fe35cb..14dd696dde 100644
--- a/arch/arm/vfp/vfpsingle.c
+++ b/arch/arm/vfp/vfpsingle.c
@@ -32,6 +32,8 @@
 */
 #include <linux/kernel.h>
 #include <linux/bitops.h>
+#include <asm/div64.h>
 #include <asm/ptrace.h>
 #include <asm/vfp.h>
@@ -303,7 +305,11 @@ u32 vfp_estimate_sqrt_significand(u32 exponent, u32 significand)
                if (z <= a)
                        return (s32)a >> 1;
        }
-        return (u32)(((u64)a << 31) / z) + (z >> 1);
+        {
+                u64 v = (u64)a << 31;
+                do_div(v, z);
+                return v + (z >> 1);
+        }
 }
 static u32 vfp_single_fsqrt(int sd, int unused, s32 m, u32 fpscr)
@@ -1107,7 +1113,11 @@ static u32 vfp_single_fdiv(int sd, int sn, s32 m, u32 fpscr)
                vsn.significand >>= 1;
                vsd.exponent++;
        }
-        vsd.significand = ((u64)vsn.significand << 32) / vsm.significand;
+        {
+                u64 significand = (u64)vsn.significand << 32;
+                do_div(significand, vsm.significand);
+                vsd.significand = significand;
+        }
        if ((vsd.significand & 0x3f) == 0)
                vsd.significand |= ((u64)vsm.significand * vsd.significand != (u64)vsn.significand << 32);