498 files changed, 6864 insertions, 17255 deletions

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index e3a82775f9da..60219bf94198 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -41,10 +41,6 @@ config ARCH_HAS_ILOG2_U64
         bool
         default n
 
-config GENERIC_FIND_NEXT_BIT
-        bool
-        default y
-
 config GENERIC_CALIBRATE_DELAY
         bool
         default y
diff --git a/arch/alpha/include/asm/unistd.h b/arch/alpha/include/asm/unistd.h
index b1834166922d..4ac48a095f3a 100644
--- a/arch/alpha/include/asm/unistd.h
+++ b/arch/alpha/include/asm/unistd.h
@@ -456,10 +456,11 @@
 #define __NR_open_by_handle_at          498
 #define __NR_clock_adjtime              499
 #define __NR_syncfs                     500
+#define __NR_setns                      501
 
 #ifdef __KERNEL__
 
-#define NR_SYSCALLS                     501
+#define NR_SYSCALLS                     502
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
diff --git a/arch/alpha/kernel/systbls.S b/arch/alpha/kernel/systbls.S
index 15f999d41c75..b9c28f3f1956 100644
--- a/arch/alpha/kernel/systbls.S
+++ b/arch/alpha/kernel/systbls.S
@@ -519,6 +519,7 @@ sys_call_table:
         .quad sys_open_by_handle_at
         .quad sys_clock_adjtime
         .quad sys_syncfs                        /* 500 */
+        .quad sys_setns
 
         .size sys_call_table, . - sys_call_table
         .type sys_call_table, @object
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 7275009686e6..9adc278a22ab 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -294,6 +294,8 @@ config ARCH_AT91
         bool "Atmel AT91"
         select ARCH_REQUIRE_GPIOLIB
         select HAVE_CLK
+        select CLKDEV_LOOKUP
+        select ARM_PATCH_PHYS_VIRT if MMU
         help
           This enables support for systems based on the Atmel AT91RM9200,
           AT91SAM9 and AT91CAP9 processors.
@@ -730,16 +732,6 @@ config ARCH_S5P64X0
           Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440,
           SMDK6450.
 
-config ARCH_S5P6442
-        bool "Samsung S5P6442"
-        select CPU_V6
-        select GENERIC_GPIO
-        select HAVE_CLK
-        select ARCH_USES_GETTIMEOFFSET
-        select HAVE_S3C2410_WATCHDOG if WATCHDOG
-        help
-          Samsung S5P6442 CPU based systems
-
 config ARCH_S5PC100
         bool "Samsung S5PC100"
         select GENERIC_GPIO
@@ -991,8 +983,6 @@ endif
 
 source "arch/arm/mach-s5p64x0/Kconfig"
 
-source "arch/arm/mach-s5p6442/Kconfig"
-
 source "arch/arm/mach-s5pc100/Kconfig"
 
 source "arch/arm/mach-s5pv210/Kconfig"
@@ -1399,7 +1389,6 @@ config NR_CPUS
 config HOTPLUG_CPU
         bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
         depends on SMP && HOTPLUG && EXPERIMENTAL
-        depends on !ARCH_MSM
         help
           Say Y here to experiment with turning CPUs off and on.  CPUs
           can be controlled through /sys/devices/system/cpu.
@@ -1420,7 +1409,7 @@ source kernel/Kconfig.preempt
 config HZ
         int
         default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P64X0 || \
-                ARCH_S5P6442 || ARCH_S5PV210 || ARCH_EXYNOS4
+                ARCH_S5PV210 || ARCH_EXYNOS4
         default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER
         default AT91_TIMER_HZ if ARCH_AT91
         default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE
@@ -1516,6 +1505,9 @@ config ARCH_SPARSEMEM_DEFAULT
 config ARCH_SELECT_MEMORY_MODEL
         def_bool ARCH_SPARSEMEM_ENABLE
 
+config HAVE_ARCH_PFN_VALID
+        def_bool ARCH_HAS_HOLES_MEMORYMODEL || !SPARSEMEM
+
 config HIGHMEM
         bool "High Memory Support"
         depends on MMU
@@ -1683,6 +1675,13 @@ endmenu
 
 menu "Boot options"
 
+config USE_OF
+        bool "Flattened Device Tree support"
+        select OF
+        select OF_EARLY_FLATTREE
+        help
+          Include support for flattened device tree machine descriptions.
+
 # Compressed boot loader in ROM.  Yes, we really want to ask about
 # TEXT and BSS so we preserve their values in the config files.
 config ZBOOT_ROM_TEXT
@@ -2021,7 +2020,7 @@ menu "Power management options"
 source "kernel/power/Kconfig"
 
 config ARCH_SUSPEND_POSSIBLE
-        depends on !ARCH_S5P64X0 && !ARCH_S5P6442 && !ARCH_S5PC100
+        depends on !ARCH_S5P64X0 && !ARCH_S5PC100
         depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \
                 CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE
         def_bool y
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 25750bcb3397..f5b2b390c8f2 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -176,7 +176,6 @@ machine-$(CONFIG_ARCH_S3C2410)		:= s3c2410 s3c2400 s3c2412 s3c2416 s3c2440 s3c24
 machine-$(CONFIG_ARCH_S3C24A0)          := s3c24a0
 machine-$(CONFIG_ARCH_S3C64XX)          := s3c64xx
 machine-$(CONFIG_ARCH_S5P64X0)          := s5p64x0
-machine-$(CONFIG_ARCH_S5P6442)          := s5p6442
 machine-$(CONFIG_ARCH_S5PC100)          := s5pc100
 machine-$(CONFIG_ARCH_S5PV210)          := s5pv210
 machine-$(CONFIG_ARCH_EXYNOS4)          := exynos4
diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
index ea5ee4d067f3..4b71766fb21d 100644
--- a/arch/arm/common/Kconfig
+++ b/arch/arm/common/Kconfig
@@ -7,7 +7,7 @@ config ARM_VIC
 config ARM_VIC_NR
         int
         default 4 if ARCH_S5PV210
-        default 3 if ARCH_S5P6442 || ARCH_S5PC100
+        default 3 if ARCH_S5PC100
         default 2
         depends on ARM_VIC
         help
diff --git a/arch/arm/configs/at572d940hfek_defconfig b/arch/arm/configs/at572d940hfek_defconfig
deleted file mode 100644
index 1b1158ae8f82..000000000000
--- a/arch/arm/configs/at572d940hfek_defconfig
+++ /dev/null
@@ -1,358 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-CONFIG_LOCALVERSION="-AT572D940HF"
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_AUDIT=y
-CONFIG_CGROUPS=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_SYSFS_DEPRECATED_V2=y
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_EXPERT=y
-CONFIG_SLAB=y
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-CONFIG_KPROBES=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-CONFIG_MODULE_SRCVERSION_ALL=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_ARCH_AT91=y
-CONFIG_ARCH_AT572D940HF=y
-CONFIG_MACH_AT572D940HFEB=y
-CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_PREEMPT=y
-CONFIG_CMDLINE="mem=48M console=ttyS0 initrd=0x21100000,3145728 root=/dev/ram0 rw ip=172.16.1.181"
-CONFIG_KEXEC=y
-CONFIG_FPE_NWFPE=y
-CONFIG_FPE_NWFPE_XP=y
-CONFIG_NET=y
-CONFIG_PACKET=m
-CONFIG_UNIX=y
-CONFIG_INET=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
-CONFIG_NET_PKTGEN=m
-CONFIG_NET_TCPPROBE=m
-CONFIG_CAN=m
-CONFIG_CAN_RAW=m
-CONFIG_CAN_BCM=m
-CONFIG_CAN_VCAN=m
-CONFIG_CAN_DEBUG_DEVICES=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_CONNECTOR=m
-CONFIG_MTD=m
-CONFIG_MTD_DEBUG=y
-CONFIG_MTD_DEBUG_VERBOSE=1
-CONFIG_MTD_CONCAT=m
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_FTL=m
-CONFIG_NFTL=m
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=m
-CONFIG_RFD_FTL=m
-CONFIG_SSFDC=m
-CONFIG_MTD_OOPS=m
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=m
-CONFIG_MTD_PLATRAM=m
-CONFIG_MTD_DATAFLASH=m
-CONFIG_MTD_M25P80=m
-CONFIG_MTD_SLRAM=m
-CONFIG_MTD_PHRAM=m
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTD_BLOCK2MTD=m
-CONFIG_MTD_NAND=m
-CONFIG_MTD_NAND_VERIFY_WRITE=y
-CONFIG_MTD_NAND_DISKONCHIP=m
-CONFIG_MTD_NAND_NANDSIM=m
-CONFIG_MTD_NAND_PLATFORM=m
-CONFIG_MTD_ALAUDA=m
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_GLUEBI=m
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=65536
-CONFIG_ATMEL_TCLIB=y
-CONFIG_ATMEL_SSC=m
-CONFIG_SENSORS_TSL2550=m
-CONFIG_DS1682=m
-CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=m
-CONFIG_SCSI_TGT=m
-# CONFIG_SCSI_PROC_FS is not set
-CONFIG_BLK_DEV_SD=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SCAN_ASYNC=y
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_NETDEVICES=y
-CONFIG_DUMMY=m
-CONFIG_BONDING=m
-CONFIG_MACVLAN=m
-CONFIG_EQUALIZER=m
-CONFIG_TUN=m
-CONFIG_VETH=m
-CONFIG_PHYLIB=y
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_MDIO_BITBANG=m
-CONFIG_NET_ETHERNET=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
-CONFIG_USB_ZD1201=m
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_KC2190=y
-# CONFIG_USB_NET_ZAURUS is not set
-CONFIG_INPUT_MOUSEDEV=m
-CONFIG_INPUT_EVDEV=m
-CONFIG_INPUT_EVBUG=m
-CONFIG_KEYBOARD_LKKBD=m
-CONFIG_KEYBOARD_GPIO=m
-CONFIG_KEYBOARD_NEWTON=m
-CONFIG_KEYBOARD_STOWAWAY=m
-CONFIG_KEYBOARD_SUNKBD=m
-CONFIG_KEYBOARD_XTKBD=m
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_SERIAL=m
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_VSXXXAA=m
-CONFIG_MOUSE_GPIO=m
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=m
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_RAW=m
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_N_HDLC=m
-CONFIG_SPECIALIX=m
-CONFIG_STALDRV=y
-CONFIG_SERIAL_ATMEL=y
-CONFIG_SERIAL_ATMEL_CONSOLE=y
-CONFIG_IPMI_HANDLER=m
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-CONFIG_HW_RANDOM=y
-CONFIG_R3964=m
-CONFIG_RAW_DRIVER=m
-CONFIG_TCG_TPM=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
-CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
-CONFIG_SPI=y
-CONFIG_SPI_ATMEL=y
-CONFIG_SPI_BITBANG=m
-CONFIG_SPI_SPIDEV=m
-# CONFIG_HWMON is not set
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_SOUND=m
-CONFIG_SND=m
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-# CONFIG_SND_PCM_OSS_PLUGINS is not set
-CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_DYNAMIC_MINORS=y
-# CONFIG_SND_VERBOSE_PROCFS is not set
-CONFIG_SND_DUMMY=m
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_HID=m
-CONFIG_HIDRAW=y
-CONFIG_USB_HID=m
-CONFIG_USB_HIDDEV=y
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
-CONFIG_HID_A4TECH=m
-CONFIG_HID_APPLE=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_EZKEY=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SONY=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_USB=y
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_MON=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_STORAGE=m
-CONFIG_USB_STORAGE_DATAFAB=m
-CONFIG_USB_STORAGE_FREECOM=m
-CONFIG_USB_STORAGE_ISD200=m
-CONFIG_USB_STORAGE_USBAT=m
-CONFIG_USB_STORAGE_SDDR09=m
-CONFIG_USB_STORAGE_SDDR55=m
-CONFIG_USB_STORAGE_JUMPSHOT=m
-CONFIG_USB_STORAGE_ALAUDA=m
-CONFIG_USB_STORAGE_KARMA=m
-CONFIG_USB_LIBUSUAL=y
-CONFIG_USB_SERIAL=m
-CONFIG_USB_EZUSB=y
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_DEBUG=m
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_ADUTUX=m
-CONFIG_USB_TEST=m
-CONFIG_USB_GADGET=m
-CONFIG_USB_GADGET_DEBUG_FILES=y
-CONFIG_USB_GADGET_DEBUG_FS=y
-CONFIG_USB_ZERO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_FILE_STORAGE=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_MIDI_GADGET=m
-CONFIG_MMC=y
-CONFIG_SDIO_UART=m
-CONFIG_MMC_AT91=m
-CONFIG_MMC_SPI=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=m
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1305=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_JBD_DEBUG=y
-CONFIG_REISERFS_FS=m
-CONFIG_REISERFS_CHECK=y
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_INOTIFY=y
-CONFIG_FUSE_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=y
-CONFIG_NTFS_FS=m
-CONFIG_NTFS_RW=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_CMODE_FAVOURLZO=y
-CONFIG_CRAMFS=m
-CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V4=y
-CONFIG_CIFS=m
-CONFIG_CIFS_WEAK_PW_HASH=y
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_MAC_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_UNIXWARE_DISKLABEL=y
-CONFIG_LDM_PARTITION=y
-CONFIG_LDM_DEBUG=y
-CONFIG_SGI_PARTITION=y
-CONFIG_SUN_PARTITION=y
-CONFIG_NLS_DEFAULT="cp437"
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-CONFIG_PRINTK_TIME=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_UNUSED_SYMBOLS=y
-CONFIG_DEBUG_FS=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-CONFIG_SYSCTL_SYSCALL_CHECK=y
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_MD5=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_HW is not set
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=m
diff --git a/arch/arm/configs/at91sam9261ek_defconfig b/arch/arm/configs/at91sam9261_defconfig
index b46025b66b64..ade6b2f23116 100644
--- a/arch/arm/configs/at91sam9261ek_defconfig
+++ b/arch/arm/configs/at91sam9261_defconfig
@@ -1,9 +1,13 @@
 CONFIG_EXPERIMENTAL=y
 # CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_KERNEL_LZMA=y
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
-CONFIG_BLK_DEV_INITRD=y
+CONFIG_NAMESPACES=y
+CONFIG_EMBEDDED=y
 CONFIG_SLAB=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
@@ -15,18 +19,27 @@ CONFIG_ARCH_AT91SAM9261=y
 CONFIG_MACH_AT91SAM9261EK=y
 CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
 # CONFIG_ARM_THUMB is not set
+CONFIG_AEABI=y
+# CONFIG_OABI_COMPAT is not set
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"
-CONFIG_FPE_NWFPE=y
+CONFIG_AUTO_ZRELADDR=y
+CONFIG_VFP=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
 CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_LRO is not set
 # CONFIG_IPV6 is not set
+CONFIG_CFG80211=y
+CONFIG_LIB80211=y
+CONFIG_MAC80211=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_MTD=y
 CONFIG_MTD_PARTITIONS=y
@@ -34,8 +47,12 @@ CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_ATMEL=y
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_GLUEBI=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_MISC_DEVICES=y
+CONFIG_ATMEL_TCLIB=y
 CONFIG_ATMEL_SSC=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
@@ -45,12 +62,27 @@ CONFIG_NET_ETHERNET=y
 CONFIG_DM9000=y
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
+CONFIG_USB_ZD1201=m
+CONFIG_RTL8187=m
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_SDIO=m
+CONFIG_LIBERTAS_SPI=m
+CONFIG_RT2X00=m
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_ZD1211RW=m
+CONFIG_INPUT_POLLDEV=m
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=240
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320
+CONFIG_INPUT_EVDEV=y
 # CONFIG_KEYBOARD_ATKBD is not set
 CONFIG_KEYBOARD_GPIO=y
 # CONFIG_INPUT_MOUSE is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_ADS7846=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 CONFIG_SERIAL_ATMEL=y
 CONFIG_SERIAL_ATMEL_CONSOLE=y
 CONFIG_HW_RANDOM=y
@@ -65,31 +97,62 @@ CONFIG_WATCHDOG_NOWAYOUT=y
 CONFIG_AT91SAM9X_WATCHDOG=y
 CONFIG_FB=y
 CONFIG_FB_ATMEL=y
-# CONFIG_VGA_CONSOLE is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_ATMEL_LCDC=y
+# CONFIG_BACKLIGHT_GENERIC is not set
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_LOGO=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_SEQUENCER=y
+CONFIG_SND_MIXER_OSS=y
+CONFIG_SND_PCM_OSS=y
+# CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_VERBOSE_PROCFS is not set
+# CONFIG_SND_DRIVERS is not set
+# CONFIG_SND_ARM is not set
+CONFIG_SND_AT73C213=y
+CONFIG_SND_USB_AUDIO=m
 # CONFIG_USB_HID is not set
 CONFIG_USB=y
 CONFIG_USB_DEVICEFS=y
-CONFIG_USB_MON=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_STORAGE=y
-CONFIG_USB_STORAGE_DEBUG=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_ZERO=m
+CONFIG_USB_ETH=m
 CONFIG_USB_GADGETFS=m
 CONFIG_USB_FILE_STORAGE=m
 CONFIG_USB_G_SERIAL=m
 CONFIG_MMC=y
 CONFIG_MMC_AT91=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_GPIO=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_AT91SAM9=y
-CONFIG_EXT2_FS=y
-CONFIG_INOTIFY=y
+CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_TMPFS=y
-CONFIG_CRAMFS=y
+CONFIG_UBIFS_FS=y
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+CONFIG_ROOT_NFS=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_CODEPAGE_850=y
 CONFIG_NLS_ISO8859_1=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_USER=y
-CONFIG_DEBUG_LL=y
+CONFIG_NLS_ISO8859_15=y
+CONFIG_NLS_UTF8=y
+CONFIG_FTRACE=y
+CONFIG_CRC_CCITT=m
diff --git a/arch/arm/configs/at91sam9263ek_defconfig b/arch/arm/configs/at91sam9263_defconfig
index 8a04d6f4e065..1cf96264cba1 100644
--- a/arch/arm/configs/at91sam9263ek_defconfig
+++ b/arch/arm/configs/at91sam9263_defconfig
@@ -1,9 +1,13 @@
 CONFIG_EXPERIMENTAL=y
 # CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_KERNEL_LZMA=y
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
-CONFIG_BLK_DEV_INITRD=y
+CONFIG_NAMESPACES=y
+CONFIG_EMBEDDED=y
 CONFIG_SLAB=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
@@ -13,53 +17,81 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_ARCH_AT91=y
 CONFIG_ARCH_AT91SAM9263=y
 CONFIG_MACH_AT91SAM9263EK=y
+CONFIG_MACH_USB_A9263=y
+CONFIG_MACH_NEOCORE926=y
 CONFIG_MTD_AT91_DATAFLASH_CARD=y
 # CONFIG_ARM_THUMB is not set
+CONFIG_AEABI=y
+# CONFIG_OABI_COMPAT is not set
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"
-CONFIG_FPE_NWFPE=y
+CONFIG_AUTO_ZRELADDR=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
+CONFIG_NET_KEY=y
 CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_ROUTE_VERBOSE=y
 CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_IP_PNP_RARP=y
+CONFIG_NET_IPIP=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_LRO is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
+CONFIG_IPV6=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_MTD=y
 CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
+CONFIG_NFTL=y
+CONFIG_NFTL_RW=y
 CONFIG_MTD_DATAFLASH=y
+CONFIG_MTD_BLOCK2MTD=y
 CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_ATMEL=y
+CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_GLUEBI=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_ATMEL_SSC=y
+CONFIG_MISC_DEVICES=y
+CONFIG_ATMEL_PWM=y
+CONFIG_ATMEL_TCLIB=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_NETDEVICES=y
-CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
+CONFIG_SMSC_PHY=y
+CONFIG_NET_ETHERNET=y
 CONFIG_MACB=y
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+CONFIG_USB_ZD1201=m
+CONFIG_INPUT_POLLDEV=m
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=240
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320
 CONFIG_INPUT_EVDEV=y
 # CONFIG_KEYBOARD_ATKBD is not set
 CONFIG_KEYBOARD_GPIO=y
 # CONFIG_INPUT_MOUSE is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_ADS7846=y
-# CONFIG_SERIO is not set
+CONFIG_LEGACY_PTY_COUNT=4
 CONFIG_SERIAL_ATMEL=y
 CONFIG_SERIAL_ATMEL_CONSOLE=y
 CONFIG_HW_RANDOM=y
@@ -74,8 +106,25 @@ CONFIG_WATCHDOG_NOWAYOUT=y
 CONFIG_AT91SAM9X_WATCHDOG=y
 CONFIG_FB=y
 CONFIG_FB_ATMEL=y
-# CONFIG_VGA_CONSOLE is not set
-# CONFIG_USB_HID is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_ATMEL_LCDC=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_LOGO=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_SEQUENCER=y
+CONFIG_SND_MIXER_OSS=y
+CONFIG_SND_PCM_OSS=y
+# CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_VERBOSE_PROCFS is not set
+# CONFIG_SND_DRIVERS is not set
+# CONFIG_SND_ARM is not set
+CONFIG_SND_ATMEL_AC97C=y
+# CONFIG_SND_SPI is not set
+CONFIG_SND_USB_AUDIO=m
 CONFIG_USB=y
 CONFIG_USB_DEVICEFS=y
 CONFIG_USB_MON=y
@@ -83,24 +132,37 @@ CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_ZERO=m
+CONFIG_USB_ETH=m
 CONFIG_USB_GADGETFS=m
 CONFIG_USB_FILE_STORAGE=m
 CONFIG_USB_G_SERIAL=m
 CONFIG_MMC=y
+CONFIG_SDIO_UART=m
 CONFIG_MMC_AT91=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_ATMEL_PWM=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_AT91SAM9=y
 CONFIG_EXT2_FS=y
-CONFIG_INOTIFY=y
+CONFIG_FUSE_FS=m
 CONFIG_VFAT_FS=y
 CONFIG_TMPFS=y
 CONFIG_JFFS2_FS=y
+CONFIG_UBIFS_FS=y
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
 CONFIG_CRAMFS=y
 CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
 CONFIG_ROOT_NFS=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_CODEPAGE_850=y
 CONFIG_NLS_ISO8859_1=y
-CONFIG_DEBUG_KERNEL=y
+CONFIG_FTRACE=y
 CONFIG_DEBUG_USER=y
-CONFIG_DEBUG_LL=y
+CONFIG_XZ_DEC=y
diff --git a/arch/arm/configs/exynos4_defconfig b/arch/arm/configs/exynos4_defconfig
index 2ffba24d2e2a..da53ff3b4d70 100644
--- a/arch/arm/configs/exynos4_defconfig
+++ b/arch/arm/configs/exynos4_defconfig
@@ -8,7 +8,9 @@ CONFIG_ARCH_EXYNOS4=y
 CONFIG_S3C_LOWLEVEL_UART_PORT=1
 CONFIG_MACH_SMDKC210=y
 CONFIG_MACH_SMDKV310=y
+CONFIG_MACH_ARMLEX4210=y
 CONFIG_MACH_UNIVERSAL_C210=y
+CONFIG_MACH_NURI=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_SMP=y
diff --git a/arch/arm/configs/neocore926_defconfig b/arch/arm/configs/neocore926_defconfig
deleted file mode 100644
index 462dd1850d15..000000000000
--- a/arch/arm/configs/neocore926_defconfig
+++ /dev/null
@@ -1,104 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-# CONFIG_LOCALVERSION_AUTO is not set
-# CONFIG_SWAP is not set
-CONFIG_SYSVIPC=y
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_COMPAT_BRK is not set
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_AT91=y
-CONFIG_ARCH_AT91SAM9263=y
-CONFIG_MACH_NEOCORE926=y
-CONFIG_MTD_AT91_DATAFLASH_CARD=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_FPE_NWFPE=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_NET_KEY=y
-CONFIG_INET=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-CONFIG_NET_IPIP=y
-# CONFIG_INET_LRO is not set
-CONFIG_IPV6=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-CONFIG_MTD=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-CONFIG_NFTL=y
-CONFIG_NFTL_RW=y
-CONFIG_MTD_BLOCK2MTD=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_ECC_SMC=y
-CONFIG_MTD_NAND_VERIFY_WRITE=y
-CONFIG_MTD_NAND_ATMEL=y
-CONFIG_MTD_NAND_PLATFORM=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_NBD=y
-CONFIG_ATMEL_PWM=y
-CONFIG_ATMEL_TCLIB=y
-CONFIG_SCSI=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_NETDEVICES=y
-CONFIG_SMSC_PHY=y
-CONFIG_NET_ETHERNET=y
-CONFIG_MACB=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_ADS7846=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-# CONFIG_DEVKMEM is not set
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_SERIAL_ATMEL=y
-CONFIG_SERIAL_ATMEL_CONSOLE=y
-# CONFIG_SERIAL_ATMEL_PDC is not set
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_SPI=y
-CONFIG_SPI_ATMEL=y
-# CONFIG_HWMON is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=y
-CONFIG_FB=y
-CONFIG_FB_ATMEL=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_ATMEL_LCDC=y
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_LOGO=y
-CONFIG_USB=y
-CONFIG_USB_DEVICEFS=y
-CONFIG_USB_MON=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_STORAGE=y
-CONFIG_MMC=y
-CONFIG_SDIO_UART=y
-CONFIG_MMC_AT91=m
-CONFIG_EXT2_FS=y
-# CONFIG_DNOTIFY is not set
-CONFIG_AUTOFS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_FS_WBUF_VERIFY=y
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_SYSCTL_SYSCALL_CHECK=y
-# CONFIG_CRYPTO_HW is not set
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index 076db52ff672..d5f00d7eb075 100644
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -21,58 +21,22 @@ CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_ARCH_OMAP=y
-CONFIG_ARCH_OMAP2=y
-CONFIG_ARCH_OMAP3=y
-CONFIG_ARCH_OMAP4=y
 CONFIG_OMAP_RESET_CLOCKS=y
 CONFIG_OMAP_MUX_DEBUG=y
-CONFIG_OMAP_32K_TIMER=y
-CONFIG_MACH_OMAP_GENERIC=y
-CONFIG_ARCH_OMAP2420=y
-CONFIG_ARCH_OMAP2430=y
-CONFIG_ARCH_OMAP3430=y
-CONFIG_MACH_OMAP_H4=y
-CONFIG_MACH_OMAP_APOLLON=y
-CONFIG_MACH_OMAP_2430SDP=y
-CONFIG_MACH_OMAP3_BEAGLE=y
-CONFIG_MACH_DEVKIT8000=y
-CONFIG_MACH_OMAP_LDP=y
-CONFIG_MACH_OVERO=y
-CONFIG_MACH_OMAP3EVM=y
-CONFIG_MACH_OMAP3517EVM=y
-CONFIG_MACH_OMAP3_PANDORA=y
-CONFIG_MACH_OMAP3_TOUCHBOOK=y
-CONFIG_MACH_OMAP_3430SDP=y
-CONFIG_MACH_NOKIA_N8X0=y
-CONFIG_MACH_NOKIA_RX51=y
-CONFIG_MACH_OMAP_ZOOM2=y
-CONFIG_MACH_OMAP_ZOOM3=y
-CONFIG_MACH_CM_T35=y
-CONFIG_MACH_IGEP0020=y
-CONFIG_MACH_SBC3530=y
-CONFIG_MACH_OMAP_3630SDP=y
-CONFIG_MACH_OMAP_4430SDP=y
 CONFIG_ARM_THUMBEE=y
-CONFIG_ARM_L1_CACHE_SHIFT=5
 CONFIG_ARM_ERRATA_411920=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=2
-# CONFIG_LOCAL_TIMERS is not set
-CONFIG_AEABI=y
 CONFIG_LEDS=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200"
 CONFIG_KEXEC=y
 CONFIG_FPE_NWFPE=y
-CONFIG_VFP=y
-CONFIG_NEON=y
 CONFIG_BINFMT_MISC=y
-CONFIG_PM=y
 CONFIG_PM_DEBUG=y
-CONFIG_PM_RUNTIME=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
@@ -89,14 +53,6 @@ CONFIG_IP_PNP_RARP=y
 # CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=y
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
@@ -107,11 +63,9 @@ CONFIG_CFG80211=m
 CONFIG_MAC80211=m
 CONFIG_MAC80211_RC_PID=y
 CONFIG_MAC80211_RC_DEFAULT_PID=y
-CONFIG_MAC80211_LEDS=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
-CONFIG_MTD_CONCAT=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
@@ -127,7 +81,6 @@ CONFIG_MTD_UBI=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=16384
-CONFIG_EEPROM_LEGACY=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_SCSI_MULTI_LUN=y
@@ -158,19 +111,15 @@ CONFIG_TOUCHSCREEN_ADS7846=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_TWL4030_PWRBUTTON=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_8250_NR_UARTS=32
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 CONFIG_SERIAL_8250_DETECT_IRQ=y
 CONFIG_SERIAL_8250_RSA=y
-# CONFIG_LEGACY_PTYS is not set
 CONFIG_HW_RANDOM=y
-CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_OMAP=y
 CONFIG_SPI=y
 CONFIG_SPI_OMAP24XX=y
 CONFIG_DEBUG_GPIO=y
@@ -181,10 +130,6 @@ CONFIG_POWER_SUPPLY=y
 CONFIG_WATCHDOG=y
 CONFIG_OMAP_WATCHDOG=y
 CONFIG_TWL4030_WATCHDOG=y
-CONFIG_MENELAUS=y
-CONFIG_TWL4030_CORE=y
-CONFIG_TWL4030_POWER=y
-CONFIG_REGULATOR=y
 CONFIG_REGULATOR_TWL4030=y
 CONFIG_REGULATOR_TPS65023=y
 CONFIG_REGULATOR_TPS6507X=y
@@ -208,7 +153,6 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y
 CONFIG_LCD_PLATFORM=y
 CONFIG_DISPLAY_SUPPORT=y
-# CONFIG_VGA_CONSOLE is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FONTS=y
@@ -217,25 +161,20 @@ CONFIG_FONT_8x16=y
 CONFIG_LOGO=y
 CONFIG_SOUND=m
 CONFIG_SND=m
-CONFIG_SND_MIXER_OSS=y
-CONFIG_SND_PCM_OSS=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
 CONFIG_SND_VERBOSE_PRINTK=y
 CONFIG_SND_DEBUG=y
-CONFIG_SND_USB_AUDIO=y
-CONFIG_SND_SOC=y
-CONFIG_SND_OMAP_SOC=y
-CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_SOC=m
+CONFIG_SND_OMAP_SOC=m
+CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
 CONFIG_USB=y
 CONFIG_USB_DEBUG=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_DEVICEFS=y
 CONFIG_USB_SUSPEND=y
-# CONFIG_USB_OTG_WHITELIST is not set
 CONFIG_USB_MON=y
-# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_MUSB_OTG is not set
-# CONFIG_USB_GADGET_MUSB_HDRC is not set
-CONFIG_USB_MUSB_DEBUG=y
 CONFIG_USB_WDM=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_LIBUSUAL=y
@@ -250,18 +189,12 @@ CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_SDIO_UART=y
 CONFIG_MMC_OMAP=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_TWL92330=y
 CONFIG_RTC_DRV_TWL4030=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_XATTR is not set
-CONFIG_INOTIFY=y
 CONFIG_QUOTA=y
 CONFIG_QFMT_V2=y
 CONFIG_MSDOS_FS=y
@@ -285,12 +218,10 @@ CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_PRINTK_TIME=y
 CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
 CONFIG_PROVE_LOCKING=y
-# CONFIG_LOCK_STAT is not set
 CONFIG_DEBUG_SPINLOCK_SLEEP=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
 CONFIG_DEBUG_INFO=y
diff --git a/arch/arm/configs/s5p6442_defconfig b/arch/arm/configs/s5p6442_defconfig
deleted file mode 100644
index 0e92a784af66..000000000000
--- a/arch/arm/configs/s5p6442_defconfig
+++ /dev/null
@@ -1,65 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-CONFIG_SYSFS_DEPRECATED_V2=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_ARCH_S5P6442=y
-CONFIG_S3C_LOWLEVEL_UART_PORT=1
-CONFIG_MACH_SMDK6442=y
-CONFIG_CPU_32v6K=y
-CONFIG_AEABI=y
-CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x20800000,8M console=ttySAC1,115200 init=/linuxrc"
-CONFIG_FPE_NWFPE=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=8192
-# CONFIG_MISC_DEVICES is not set
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_NR_UARTS=3
-CONFIG_SERIAL_SAMSUNG=y
-CONFIG_SERIAL_SAMSUNG_CONSOLE=y
-CONFIG_HW_RANDOM=y
-# CONFIG_HWMON is not set
-# CONFIG_VGA_CONSOLE is not set
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_USB_SUPPORT is not set
-CONFIG_EXT2_FS=y
-CONFIG_INOTIFY=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_CRAMFS=y
-CONFIG_ROMFS_FS=y
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_SPINLOCK=y
-CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_SPINLOCK_SLEEP=y
-CONFIG_DEBUG_INFO=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-CONFIG_SYSCTL_SYSCALL_CHECK=y
-# CONFIG_ARM_UNWIND is not set
-CONFIG_DEBUG_USER=y
-CONFIG_DEBUG_ERRORS=y
-CONFIG_DEBUG_LL=y
-CONFIG_DEBUG_S3C_UART=1
-CONFIG_CRC_CCITT=y
diff --git a/arch/arm/configs/usb-a9263_defconfig b/arch/arm/configs/usb-a9263_defconfig
deleted file mode 100644
index ee82d09249c6..000000000000
--- a/arch/arm/configs/usb-a9263_defconfig
+++ /dev/null
@@ -1,106 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-# CONFIG_LOCALVERSION_AUTO is not set
-# CONFIG_SWAP is not set
-CONFIG_SYSVIPC=y
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_AT91=y
-CONFIG_ARCH_AT91SAM9263=y
-CONFIG_MACH_USB_A9263=y
-CONFIG_AT91_SLOW_CLOCK=y
-# CONFIG_ARM_THUMB is not set
-CONFIG_AEABI=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="mem=64M console=ttyS0,115200"
-CONFIG_FPE_NWFPE=y
-CONFIG_PM=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_MTD=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_DATAFLASH=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_ATMEL=y
-CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y
-CONFIG_BLK_DEV_LOOP=y
-# CONFIG_MISC_DEVICES is not set
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_NETDEVICES=y
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
-CONFIG_MACB=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_EVBUG=y
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_GPIO=y
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_SERIO is not set
-CONFIG_SERIAL_ATMEL=y
-CONFIG_SERIAL_ATMEL_CONSOLE=y
-CONFIG_HW_RANDOM=y
-CONFIG_SPI=y
-CONFIG_SPI_ATMEL=y
-# CONFIG_HWMON is not set
-# CONFIG_VGA_CONSOLE is not set
-# CONFIG_USB_HID is not set
-CONFIG_USB=y
-CONFIG_USB_DEVICEFS=y
-CONFIG_USB_MON=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_ETH=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_EXT2_FS=y
-CONFIG_INOTIFY=y
-CONFIG_FUSE_FS=m
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_USER=y
-CONFIG_DEBUG_LL=y
-# CONFIG_CRYPTO_HW is not set
diff --git a/arch/arm/include/asm/bitops.h b/arch/arm/include/asm/bitops.h
index 6b7403fd8f54..b4892a06442c 100644
--- a/arch/arm/include/asm/bitops.h
+++ b/arch/arm/include/asm/bitops.h
@@ -203,8 +203,6 @@ extern int _find_next_bit_be(const unsigned long *p, int size, int offset);
 #define find_first_bit(p,sz)            _find_first_bit_le(p,sz)
 #define find_next_bit(p,sz,off)         _find_next_bit_le(p,sz,off)
 
-#define WORD_BITOFF_TO_LE(x)            ((x))
-
 #else
 /*
  * These are the big endian, atomic definitions.
@@ -214,8 +212,6 @@ extern int _find_next_bit_be(const unsigned long *p, int size, int offset);
 #define find_first_bit(p,sz)            _find_first_bit_be(p,sz)
 #define find_next_bit(p,sz,off)         _find_next_bit_be(p,sz,off)
 
-#define WORD_BITOFF_TO_LE(x)            ((x) ^ 0x18)
-
 #endif
 
 #if __LINUX_ARM_ARCH__ < 5
@@ -287,55 +283,29 @@ static inline int fls(int x)
 #include <asm-generic/bitops/hweight.h>
 #include <asm-generic/bitops/lock.h>
 
-static inline void __set_bit_le(int nr, void *addr)
-{
-        __set_bit(WORD_BITOFF_TO_LE(nr), addr);
-}
-
-static inline void __clear_bit_le(int nr, void *addr)
-{
-        __clear_bit(WORD_BITOFF_TO_LE(nr), addr);
-}
-
-static inline int __test_and_set_bit_le(int nr, void *addr)
-{
-        return __test_and_set_bit(WORD_BITOFF_TO_LE(nr), addr);
-}
-
-static inline int test_and_set_bit_le(int nr, void *addr)
-{
-        return test_and_set_bit(WORD_BITOFF_TO_LE(nr), addr);
-}
-
-static inline int __test_and_clear_bit_le(int nr, void *addr)
-{
-        return __test_and_clear_bit(WORD_BITOFF_TO_LE(nr), addr);
-}
-
-static inline int test_and_clear_bit_le(int nr, void *addr)
-{
-        return test_and_clear_bit(WORD_BITOFF_TO_LE(nr), addr);
-}
-
-static inline int test_bit_le(int nr, const void *addr)
-{
-        return test_bit(WORD_BITOFF_TO_LE(nr), addr);
-}
+#ifdef __ARMEB__
 
 static inline int find_first_zero_bit_le(const void *p, unsigned size)
 {
         return _find_first_zero_bit_le(p, size);
 }
+#define find_first_zero_bit_le find_first_zero_bit_le
 
 static inline int find_next_zero_bit_le(const void *p, int size, int offset)
 {
         return _find_next_zero_bit_le(p, size, offset);
 }
+#define find_next_zero_bit_le find_next_zero_bit_le
 
 static inline int find_next_bit_le(const void *p, int size, int offset)
 {
         return _find_next_bit_le(p, size, offset);
 }
+#define find_next_bit_le find_next_bit_le
+
+#endif
+
+#include <asm-generic/bitops/le.h>
 
 /*
  * Ext2 is defined to use little-endian byte ordering.
diff --git a/arch/arm/include/asm/fiq.h b/arch/arm/include/asm/fiq.h
index 2242ce22ec6c..d493d0b742a1 100644
--- a/arch/arm/include/asm/fiq.h
+++ b/arch/arm/include/asm/fiq.h
@@ -4,6 +4,13 @@
  * Support for FIQ on ARM architectures.
  * Written by Philip Blundell <philb@gnu.org>, 1998
  * Re-written by Russell King
+ *
+ * NOTE: The FIQ mode registers are not magically preserved across
+ * suspend/resume.
+ *
+ * Drivers which require these registers to be preserved across power
+ * management operations must implement appropriate suspend/resume handlers to
+ * save and restore them.
  */
 
 #ifndef __ASM_FIQ_H
@@ -29,9 +36,21 @@ struct fiq_handler {
 extern int claim_fiq(struct fiq_handler *f);
 extern void release_fiq(struct fiq_handler *f);
 extern void set_fiq_handler(void *start, unsigned int length);
-extern void set_fiq_regs(struct pt_regs *regs);
-extern void get_fiq_regs(struct pt_regs *regs);
 extern void enable_fiq(int fiq);
 extern void disable_fiq(int fiq);
 
+/* helpers defined in fiqasm.S: */
+extern void __set_fiq_regs(unsigned long const *regs);
+extern void __get_fiq_regs(unsigned long *regs);
+
+static inline void set_fiq_regs(struct pt_regs const *regs)
+{
+        __set_fiq_regs(&regs->ARM_r8);
+}
+
+static inline void get_fiq_regs(struct pt_regs *regs)
+{
+        __get_fiq_regs(&regs->ARM_r8);
+}
+
 #endif
diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h
index bf13b814c1b8..946f4d778f71 100644
--- a/arch/arm/include/asm/mach/arch.h
+++ b/arch/arm/include/asm/mach/arch.h
@@ -18,6 +18,8 @@ struct machine_desc {
         unsigned int            nr;             /* architecture number  */
         const char              *name;          /* architecture name    */
         unsigned long           boot_params;    /* tagged list          */
+        const char              **dt_compat;    /* array of device tree
+                                                 * 'compatible' strings */
 
         unsigned int            nr_irqs;        /* number of IRQs */
 
@@ -48,6 +50,13 @@ struct machine_desc {
 extern struct machine_desc *machine_desc;
 
 /*
+ * Machine type table - also only accessible during boot
+ */
+extern struct machine_desc __arch_info_begin[], __arch_info_end[];
+#define for_each_machine_desc(p)                        \
+        for (p = __arch_info_begin; p < __arch_info_end; p++)
+
+/*
  * Set of macros to define architecture features.  This is built into
  * a table by the linker.
  */
diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
index f51a69595f6e..ac75d0848889 100644
--- a/arch/arm/include/asm/page.h
+++ b/arch/arm/include/asm/page.h
@@ -197,7 +197,7 @@ typedef unsigned long pgprot_t;
 
 typedef struct page *pgtable_t;
 
-#ifndef CONFIG_SPARSEMEM
+#ifdef CONFIG_HAVE_ARCH_PFN_VALID
 extern int pfn_valid(unsigned long);
 #endif
 
diff --git a/arch/arm/include/asm/prom.h b/arch/arm/include/asm/prom.h
new file mode 100644
index 000000000000..11b8708fc4db
--- /dev/null
+++ b/arch/arm/include/asm/prom.h
@@ -0,0 +1,37 @@
+/*
+ *  arch/arm/include/asm/prom.h
+ *
+ *  Copyright (C) 2009 Canonical Ltd. <jeremy.kerr@canonical.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.
+ *
+ */
+#ifndef __ASMARM_PROM_H
+#define __ASMARM_PROM_H
+
+#ifdef CONFIG_OF
+
+#include <asm/setup.h>
+#include <asm/irq.h>
+
+static inline void irq_dispose_mapping(unsigned int virq)
+{
+        return;
+}
+
+extern struct machine_desc *setup_machine_fdt(unsigned int dt_phys);
+extern void arm_dt_memblock_reserve(void);
+
+#else /* CONFIG_OF */
+
+static inline struct machine_desc *setup_machine_fdt(unsigned int dt_phys)
+{
+        return NULL;
+}
+
+static inline void arm_dt_memblock_reserve(void) { }
+
+#endif /* CONFIG_OF */
+#endif /* ASMARM_PROM_H */
diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h
index 95176af3df8c..ee2ad8ae07af 100644
--- a/arch/arm/include/asm/setup.h
+++ b/arch/arm/include/asm/setup.h
@@ -217,6 +217,10 @@ extern struct meminfo meminfo;
 #define bank_phys_end(bank)     ((bank)->start + (bank)->size)
 #define bank_phys_size(bank)    (bank)->size
 
+extern int arm_add_memory(phys_addr_t start, unsigned long size);
+extern void early_print(const char *str, ...);
+extern void dump_machine_table(void);
+
 #endif  /*  __KERNEL__  */
 
 #endif
diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
index d2b514fd76f4..e42d96a45d3e 100644
--- a/arch/arm/include/asm/smp.h
+++ b/arch/arm/include/asm/smp.h
@@ -70,6 +70,7 @@ extern void platform_smp_prepare_cpus(unsigned int);
  */
 struct secondary_data {
         unsigned long pgdir;
+        unsigned long swapper_pg_dir;
         void *stack;
 };
 extern struct secondary_data secondary_data;
diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
index 87dbe3e21970..2c04ed5efeb5 100644
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@ -400,6 +400,8 @@
 #define __NR_open_by_handle_at          (__NR_SYSCALL_BASE+371)
 #define __NR_clock_adjtime              (__NR_SYSCALL_BASE+372)
 #define __NR_syncfs                     (__NR_SYSCALL_BASE+373)
+#define __NR_sendmmsg                   (__NR_SYSCALL_BASE+374)
+#define __NR_setns                      (__NR_SYSCALL_BASE+375)
 
 /*
  * The following SWIs are ARM private.
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index 8d95446150a3..a5b31af5c2b8 100644
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -24,7 +24,7 @@ obj-$(CONFIG_OC_ETM)		+= etm.o
 
 obj-$(CONFIG_ISA_DMA_API)       += dma.o
 obj-$(CONFIG_ARCH_ACORN)        += ecard.o 
-obj-$(CONFIG_FIQ)               += fiq.o
+obj-$(CONFIG_FIQ)               += fiq.o fiqasm.o
 obj-$(CONFIG_MODULES)           += armksyms.o module.o
 obj-$(CONFIG_ARTHUR)            += arthur.o
 obj-$(CONFIG_ISA_DMA)           += dma-isa.o
@@ -44,6 +44,7 @@ obj-$(CONFIG_ARM_THUMBEE)	+= thumbee.o
 obj-$(CONFIG_KGDB)              += kgdb.o
 obj-$(CONFIG_ARM_UNWIND)        += unwind.o
 obj-$(CONFIG_HAVE_TCM)          += tcm.o
+obj-$(CONFIG_OF)                += devtree.o
 obj-$(CONFIG_CRASH_DUMP)        += crash_dump.o
 obj-$(CONFIG_SWP_EMULATE)       += swp_emulate.o
 CFLAGS_swp_emulate.o            := -Wa,-march=armv7-a
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
index 7fbf28c35bb2..80f7896cc016 100644
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
@@ -383,6 +383,8 @@
                 CALL(sys_open_by_handle_at)
                 CALL(sys_clock_adjtime)
                 CALL(sys_syncfs)
+                CALL(sys_sendmmsg)
+/* 375 */       CALL(sys_setns)
 #ifndef syscalls_counted
 .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
 #define syscalls_counted
diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
new file mode 100644
index 000000000000..a701e4226a6c
--- /dev/null
+++ b/arch/arm/kernel/devtree.c
@@ -0,0 +1,145 @@
+/*
+ *  linux/arch/arm/kernel/devtree.c
+ *
+ *  Copyright (C) 2009 Canonical Ltd. <jeremy.kerr@canonical.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/init.h>
+#include <linux/module.h>
+#include <linux/errno.h>
+#include <linux/types.h>
+#include <linux/bootmem.h>
+#include <linux/memblock.h>
+#include <linux/of.h>
+#include <linux/of_fdt.h>
+#include <linux/of_irq.h>
+#include <linux/of_platform.h>
+
+#include <asm/setup.h>
+#include <asm/page.h>
+#include <asm/mach/arch.h>
+#include <asm/mach-types.h>
+
+void __init early_init_dt_add_memory_arch(u64 base, u64 size)
+{
+        arm_add_memory(base, size);
+}
+
+void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
+{
+        return alloc_bootmem_align(size, align);
+}
+
+void __init arm_dt_memblock_reserve(void)
+{
+        u64 *reserve_map, base, size;
+
+        if (!initial_boot_params)
+                return;
+
+        /* Reserve the dtb region */
+        memblock_reserve(virt_to_phys(initial_boot_params),
+                         be32_to_cpu(initial_boot_params->totalsize));
+
+        /*
+         * Process the reserve map.  This will probably overlap the initrd
+         * and dtb locations which are already reserved, but overlaping
+         * doesn't hurt anything
+         */
+        reserve_map = ((void*)initial_boot_params) +
+                        be32_to_cpu(initial_boot_params->off_mem_rsvmap);
+        while (1) {
+                base = be64_to_cpup(reserve_map++);
+                size = be64_to_cpup(reserve_map++);
+                if (!size)
+                        break;
+                memblock_reserve(base, size);
+        }
+}
+
+/**
+ * setup_machine_fdt - Machine setup when an dtb was passed to the kernel
+ * @dt_phys: physical address of dt blob
+ *
+ * If a dtb was passed to the kernel in r2, then use it to choose the
+ * correct machine_desc and to setup the system.
+ */
+struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
+{
+        struct boot_param_header *devtree;
+        struct machine_desc *mdesc, *mdesc_best = NULL;
+        unsigned int score, mdesc_score = ~1;
+        unsigned long dt_root;
+        const char *model;
+
+        devtree = phys_to_virt(dt_phys);
+
+        /* check device tree validity */
+        if (be32_to_cpu(devtree->magic) != OF_DT_HEADER)
+                return NULL;
+
+        /* Search the mdescs for the 'best' compatible value match */
+        initial_boot_params = devtree;
+        dt_root = of_get_flat_dt_root();
+        for_each_machine_desc(mdesc) {
+                score = of_flat_dt_match(dt_root, mdesc->dt_compat);
+                if (score > 0 && score < mdesc_score) {
+                        mdesc_best = mdesc;
+                        mdesc_score = score;
+                }
+        }
+        if (!mdesc_best) {
+                const char *prop;
+                long size;
+
+                early_print("\nError: unrecognized/unsupported "
+                            "device tree compatible list:\n[ ");
+
+                prop = of_get_flat_dt_prop(dt_root, "compatible", &size);
+                while (size > 0) {
+                        early_print("'%s' ", prop);
+                        size -= strlen(prop) + 1;
+                        prop += strlen(prop) + 1;
+                }
+                early_print("]\n\n");
+
+                dump_machine_table(); /* does not return */
+        }
+
+        model = of_get_flat_dt_prop(dt_root, "model", NULL);
+        if (!model)
+                model = of_get_flat_dt_prop(dt_root, "compatible", NULL);
+        if (!model)
+                model = "<unknown>";
+        pr_info("Machine: %s, model: %s\n", mdesc_best->name, model);
+
+        /* Retrieve various information from the /chosen node */
+        of_scan_flat_dt(early_init_dt_scan_chosen, boot_command_line);
+        /* Initialize {size,address}-cells info */
+        of_scan_flat_dt(early_init_dt_scan_root, NULL);
+        /* Setup memory, calling early_init_dt_add_memory_arch */
+        of_scan_flat_dt(early_init_dt_scan_memory, NULL);
+
+        /* Change machine number to match the mdesc we're using */
+        __machine_arch_type = mdesc_best->nr;
+
+        return mdesc_best;
+}
+
+/**
+ * irq_create_of_mapping - Hook to resolve OF irq specifier into a Linux irq#
+ *
+ * Currently the mapping mechanism is trivial; simple flat hwirq numbers are
+ * mapped 1:1 onto Linux irq numbers.  Cascaded irq controllers are not
+ * supported.
+ */
+unsigned int irq_create_of_mapping(struct device_node *controller,
+                                   const u32 *intspec, unsigned int intsize)
+{
+        return intspec[0];
+}
+EXPORT_SYMBOL_GPL(irq_create_of_mapping);
diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
index e72dc34eea1c..4c164ece5891 100644
--- a/arch/arm/kernel/fiq.c
+++ b/arch/arm/kernel/fiq.c
@@ -89,47 +89,6 @@ void set_fiq_handler(void *start, unsigned int length)
                 flush_icache_range(0x1c, 0x1c + length);
 }
 
-/*
- * Taking an interrupt in FIQ mode is death, so both these functions
- * disable irqs for the duration.  Note - these functions are almost
- * entirely coded in assembly.
- */
-void __naked set_fiq_regs(struct pt_regs *regs)
-{
-        register unsigned long tmp;
-        asm volatile (
-        "mov    ip, sp\n\
-        stmfd   sp!, {fp, ip, lr, pc}\n\
-        sub     fp, ip, #4\n\
-        mrs     %0, cpsr\n\
-        msr     cpsr_c, %2      @ select FIQ mode\n\
-        mov     r0, r0\n\
-        ldmia   %1, {r8 - r14}\n\
-        msr     cpsr_c, %0      @ return to SVC mode\n\
-        mov     r0, r0\n\
-        ldmfd   sp, {fp, sp, pc}"
-        : "=&r" (tmp)
-        : "r" (&regs->ARM_r8), "I" (PSR_I_BIT | PSR_F_BIT | FIQ_MODE));
-}
-
-void __naked get_fiq_regs(struct pt_regs *regs)
-{
-        register unsigned long tmp;
-        asm volatile (
-        "mov    ip, sp\n\
-        stmfd   sp!, {fp, ip, lr, pc}\n\
-        sub     fp, ip, #4\n\
-        mrs     %0, cpsr\n\
-        msr     cpsr_c, %2      @ select FIQ mode\n\
-        mov     r0, r0\n\
-        stmia   %1, {r8 - r14}\n\
-        msr     cpsr_c, %0      @ return to SVC mode\n\
-        mov     r0, r0\n\
-        ldmfd   sp, {fp, sp, pc}"
-        : "=&r" (tmp)
-        : "r" (&regs->ARM_r8), "I" (PSR_I_BIT | PSR_F_BIT | FIQ_MODE));
-}
-
 int claim_fiq(struct fiq_handler *f)
 {
         int ret = 0;
@@ -174,8 +133,8 @@ void disable_fiq(int fiq)
 }
 
 EXPORT_SYMBOL(set_fiq_handler);
-EXPORT_SYMBOL(set_fiq_regs);
-EXPORT_SYMBOL(get_fiq_regs);
+EXPORT_SYMBOL(__set_fiq_regs);  /* defined in fiqasm.S */
+EXPORT_SYMBOL(__get_fiq_regs);  /* defined in fiqasm.S */
 EXPORT_SYMBOL(claim_fiq);
 EXPORT_SYMBOL(release_fiq);
 EXPORT_SYMBOL(enable_fiq);
diff --git a/arch/arm/kernel/fiqasm.S b/arch/arm/kernel/fiqasm.S
new file mode 100644
index 000000000000..207f9d652010
--- /dev/null
+++ b/arch/arm/kernel/fiqasm.S
@@ -0,0 +1,49 @@
+/*
+ *  linux/arch/arm/kernel/fiqasm.S
+ *
+ *  Derived from code originally in linux/arch/arm/kernel/fiq.c:
+ *
+ *  Copyright (C) 1998 Russell King
+ *  Copyright (C) 1998, 1999 Phil Blundell
+ *  Copyright (C) 2011, Linaro Limited
+ *
+ *  FIQ support written by Philip Blundell <philb@gnu.org>, 1998.
+ *
+ *  FIQ support re-written by Russell King to be more generic
+ *
+ *  v7/Thumb-2 compatibility modifications by Linaro Limited, 2011.
+ */
+
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+
+/*
+ * Taking an interrupt in FIQ mode is death, so both these functions
+ * disable irqs for the duration.
+ */
+
+ENTRY(__set_fiq_regs)
+        mov     r2, #PSR_I_BIT | PSR_F_BIT | FIQ_MODE
+        mrs     r1, cpsr
+        msr     cpsr_c, r2      @ select FIQ mode
+        mov     r0, r0          @ avoid hazard prior to ARMv4
+        ldmia   r0!, {r8 - r12}
+        ldr     sp, [r0], #4
+        ldr     lr, [r0]
+        msr     cpsr_c, r1      @ return to SVC mode
+        mov     r0, r0          @ avoid hazard prior to ARMv4
+        mov     pc, lr
+ENDPROC(__set_fiq_regs)
+
+ENTRY(__get_fiq_regs)
+        mov     r2, #PSR_I_BIT | PSR_F_BIT | FIQ_MODE
+        mrs     r1, cpsr
+        msr     cpsr_c, r2      @ select FIQ mode
+        mov     r0, r0          @ avoid hazard prior to ARMv4
+        stmia   r0!, {r8 - r12}
+        str     sp, [r0], #4
+        str     lr, [r0]
+        msr     cpsr_c, r1      @ return to SVC mode
+        mov     r0, r0          @ avoid hazard prior to ARMv4
+        mov     pc, lr
+ENDPROC(__get_fiq_regs)
diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S
index c84b57d27d07..854bd22380d3 100644
--- a/arch/arm/kernel/head-common.S
+++ b/arch/arm/kernel/head-common.S
@@ -15,6 +15,12 @@
 #define ATAG_CORE_SIZE ((2*4 + 3*4) >> 2)
 #define ATAG_CORE_SIZE_EMPTY ((2*4) >> 2)
 
+#ifdef CONFIG_CPU_BIG_ENDIAN
+#define OF_DT_MAGIC 0xd00dfeed
+#else
+#define OF_DT_MAGIC 0xedfe0dd0 /* 0xd00dfeed in big-endian */
+#endif
+
 /*
  * Exception handling.  Something went wrong and we can't proceed.  We
  * ought to tell the user, but since we don't have any guarantee that
@@ -28,20 +34,26 @@
 
 /* Determine validity of the r2 atags pointer.  The heuristic requires
  * that the pointer be aligned, in the first 16k of physical RAM and
- * that the ATAG_CORE marker is first and present.  Future revisions
+ * that the ATAG_CORE marker is first and present.  If CONFIG_OF_FLATTREE
+ * is selected, then it will also accept a dtb pointer.  Future revisions
  * of this function may be more lenient with the physical address and
  * may also be able to move the ATAGS block if necessary.
  *
  * Returns:
- *  r2 either valid atags pointer, or zero
+ *  r2 either valid atags pointer, valid dtb pointer, or zero
  *  r5, r6 corrupted
  */
 __vet_atags:
         tst     r2, #0x3                        @ aligned?
         bne     1f
 
-        ldr     r5, [r2, #0]                    @ is first tag ATAG_CORE?
-        cmp     r5, #ATAG_CORE_SIZE
+        ldr     r5, [r2, #0]
+#ifdef CONFIG_OF_FLATTREE
+        ldr     r6, =OF_DT_MAGIC                @ is it a DTB?
+        cmp     r5, r6
+        beq     2f
+#endif
+        cmp     r5, #ATAG_CORE_SIZE             @ is first tag ATAG_CORE?
         cmpne   r5, #ATAG_CORE_SIZE_EMPTY
         bne     1f
         ldr     r5, [r2, #4]
@@ -49,7 +61,7 @@ __vet_atags:
         cmp     r5, r6
         bne     1f
 
-        mov     pc, lr                          @ atag pointer is ok
+2:      mov     pc, lr                          @ atag/dtb pointer is ok
 
 1:      mov     r2, #0
         mov     pc, lr
@@ -61,7 +73,7 @@ ENDPROC(__vet_atags)
  *
  *  r0  = cp#15 control register
  *  r1  = machine ID
- *  r2  = atags pointer
+ *  r2  = atags/dtb pointer
  *  r9  = processor ID
  */
         __INIT
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index c9173cfbbc74..278c1b0ebb2e 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -59,7 +59,7 @@
  *
  * This is normally called from the decompressor code.  The requirements
  * are: MMU = off, D-cache = off, I-cache = dont care, r0 = 0,
- * r1 = machine nr, r2 = atags pointer.
+ * r1 = machine nr, r2 = atags or dtb pointer.
  *
  * This code is mostly position independent, so if you link the kernel at
  * 0xc0008000, you call this at __pa(0xc0008000).
@@ -91,7 +91,7 @@ ENTRY(stext)
 #endif
 
         /*
-         * r1 = machine no, r2 = atags,
+         * r1 = machine no, r2 = atags or dtb,
          * r8 = phys_offset, r9 = cpuid, r10 = procinfo
          */
         bl      __vet_atags
@@ -113,6 +113,7 @@ ENTRY(stext)
         ldr     r13, =__mmap_switched           @ address to jump to after
                                                 @ mmu has been enabled
         adr     lr, BSYM(1f)                    @ return (PIC) address
+        mov     r8, r4                          @ set TTBR1 to swapper_pg_dir
  ARM(   add     pc, r10, #PROCINFO_INITFUNC     )
  THUMB( add     r12, r10, #PROCINFO_INITFUNC    )
  THUMB( mov     pc, r12                         )
@@ -302,8 +303,10 @@ ENTRY(secondary_startup)
          */
         adr     r4, __secondary_data
         ldmia   r4, {r5, r7, r12}               @ address to jump to after
-        sub     r4, r4, r5                      @ mmu has been enabled
-        ldr     r4, [r7, r4]                    @ get secondary_data.pgdir
+        sub     lr, r4, r5                      @ mmu has been enabled
+        ldr     r4, [r7, lr]                    @ get secondary_data.pgdir
+        add     r7, r7, #4
+        ldr     r8, [r7, lr]                    @ get secondary_data.swapper_pg_dir
         adr     lr, BSYM(__enable_mmu)          @ return address
         mov     r13, r12                        @ __secondary_switched address
  ARM(   add     pc, r10, #PROCINFO_INITFUNC     ) @ initialise processor
@@ -339,7 +342,7 @@ __secondary_data:
  *
  *  r0  = cp#15 control register
  *  r1  = machine ID
- *  r2  = atags pointer
+ *  r2  = atags or dtb pointer
  *  r4  = page table pointer
  *  r9  = processor ID
  *  r13 = *virtual* address to jump to upon completion
@@ -376,7 +379,7 @@ ENDPROC(__enable_mmu)
  *
  *  r0  = cp#15 control register
  *  r1  = machine ID
- *  r2  = atags pointer
+ *  r2  = atags or dtb pointer
  *  r9  = processor ID
  *  r13 = *virtual* address to jump to upon completion
  *
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 6dce209a623b..ed11fb08b05a 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -20,6 +20,7 @@
 #include <linux/screen_info.h>
 #include <linux/init.h>
 #include <linux/kexec.h>
+#include <linux/of_fdt.h>
 #include <linux/crash_dump.h>
 #include <linux/root_dev.h>
 #include <linux/cpu.h>
@@ -42,6 +43,7 @@
 #include <asm/cachetype.h>
 #include <asm/tlbflush.h>
 
+#include <asm/prom.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/time.h>
@@ -309,7 +311,7 @@ static void __init cacheid_init(void)
  */
 extern struct proc_info_list *lookup_processor_type(unsigned int);
 
-static void __init early_print(const char *str, ...)
+void __init early_print(const char *str, ...)
 {
         extern void printascii(const char *);
         char buf[256];
@@ -439,25 +441,12 @@ void cpu_init(void)
             : "r14");
 }
 
-static struct machine_desc * __init setup_machine(unsigned int nr)
+void __init dump_machine_table(void)
 {
-        extern struct machine_desc __arch_info_begin[], __arch_info_end[];
         struct machine_desc *p;
 
-        /*
-         * locate machine in the list of supported machines.
-         */
-        for (p = __arch_info_begin; p < __arch_info_end; p++)
-                if (nr == p->nr) {
-                        printk("Machine: %s\n", p->name);
-                        return p;
-                }
-
-        early_print("\n"
-                "Error: unrecognized/unsupported machine ID (r1 = 0x%08x).\n\n"
-                "Available machine support:\n\nID (hex)\tNAME\n", nr);
-
-        for (p = __arch_info_begin; p < __arch_info_end; p++)
+        early_print("Available machine support:\n\nID (hex)\tNAME\n");
+        for_each_machine_desc(p)
                 early_print("%08x\t%s\n", p->nr, p->name);
 
         early_print("\nPlease check your kernel config and/or bootloader.\n");
@@ -466,7 +455,7 @@ static struct machine_desc * __init setup_machine(unsigned int nr)
                 /* can't use cpu_relax() here as it may require MMU setup */;
 }
 
-static int __init arm_add_memory(phys_addr_t start, unsigned long size)
+int __init arm_add_memory(phys_addr_t start, unsigned long size)
 {
         struct membank *bank = &meminfo.bank[meminfo.nr_banks];
 
@@ -801,23 +790,29 @@ static void __init squash_mem_tags(struct tag *tag)
                         tag->hdr.tag = ATAG_NONE;
 }
 
-void __init setup_arch(char **cmdline_p)
+static struct machine_desc * __init setup_machine_tags(unsigned int nr)
 {
         struct tag *tags = (struct tag *)&init_tags;
-        struct machine_desc *mdesc;
+        struct machine_desc *mdesc = NULL, *p;
         char *from = default_command_line;
 
         init_tags.mem.start = PHYS_OFFSET;
 
-        unwind_init();
-
-        setup_processor();
-        mdesc = setup_machine(machine_arch_type);
-        machine_desc = mdesc;
-        machine_name = mdesc->name;
+        /*
+         * locate machine in the list of supported machines.
+         */
+        for_each_machine_desc(p)
+                if (nr == p->nr) {
+                        printk("Machine: %s\n", p->name);
+                        mdesc = p;
+                        break;
+                }
 
-        if (mdesc->soft_reboot)
-                reboot_setup("s");
+        if (!mdesc) {
+                early_print("\nError: unrecognized/unsupported machine ID"
+                        " (r1 = 0x%08x).\n\n", nr);
+                dump_machine_table(); /* does not return */
+        }
 
         if (__atags_pointer)
                 tags = phys_to_virt(__atags_pointer);
@@ -849,8 +844,17 @@ void __init setup_arch(char **cmdline_p)
         if (tags->hdr.tag != ATAG_CORE)
                 convert_to_tag_list(tags);
 #endif
-        if (tags->hdr.tag != ATAG_CORE)
+
+        if (tags->hdr.tag != ATAG_CORE) {
+#if defined(CONFIG_OF)
+                /*
+                 * If CONFIG_OF is set, then assume this is a reasonably
+                 * modern system that should pass boot parameters
+                 */
+                early_print("Warning: Neither atags nor dtb found\n");
+#endif
                 tags = (struct tag *)&init_tags;
+        }
 
         if (mdesc->fixup)
                 mdesc->fixup(mdesc, tags, &from, &meminfo);
@@ -862,14 +866,34 @@ void __init setup_arch(char **cmdline_p)
                 parse_tags(tags);
         }
 
+        /* parse_early_param needs a boot_command_line */
+        strlcpy(boot_command_line, from, COMMAND_LINE_SIZE);
+
+        return mdesc;
+}
+
+
+void __init setup_arch(char **cmdline_p)
+{
+        struct machine_desc *mdesc;
+
+        unwind_init();
+
+        setup_processor();
+        mdesc = setup_machine_fdt(__atags_pointer);
+        if (!mdesc)
+                mdesc = setup_machine_tags(machine_arch_type);
+        machine_desc = mdesc;
+        machine_name = mdesc->name;
+
+        if (mdesc->soft_reboot)
+                reboot_setup("s");
+
         init_mm.start_code = (unsigned long) _text;
         init_mm.end_code   = (unsigned long) _etext;
         init_mm.end_data   = (unsigned long) _edata;
         init_mm.brk        = (unsigned long) _end;
 
-        /* parse_early_param needs a boot_command_line */
-        strlcpy(boot_command_line, from, COMMAND_LINE_SIZE);
-
         /* populate cmd_line too for later use, preserving boot_command_line */
         strlcpy(cmd_line, boot_command_line, COMMAND_LINE_SIZE);
         *cmdline_p = cmd_line;
@@ -881,6 +905,8 @@ void __init setup_arch(char **cmdline_p)
         paging_init(mdesc);
         request_standard_resources(mdesc);
 
+        unflatten_device_tree();
+
 #ifdef CONFIG_SMP
         if (is_smp())
                 smp_init_cpus();
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index d439a8f4c078..344e52b16c8c 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -105,6 +105,7 @@ int __cpuinit __cpu_up(unsigned int cpu)
          */
         secondary_data.stack = task_stack_page(idle) + THREAD_START_SP;
         secondary_data.pgdir = virt_to_phys(pgd);
+        secondary_data.swapper_pg_dir = virt_to_phys(swapper_pg_dir);
         __cpuc_flush_dcache_area(&secondary_data, sizeof(secondary_data));
         outer_clean_range(__pa(&secondary_data), __pa(&secondary_data + 1));
 
diff --git a/arch/arm/lib/lib1funcs.S b/arch/arm/lib/lib1funcs.S
index 6dc06487f3c3..c562f649734c 100644
--- a/arch/arm/lib/lib1funcs.S
+++ b/arch/arm/lib/lib1funcs.S
@@ -35,7 +35,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-
+#include <asm/unwind.h>
 
 .macro ARM_DIV_BODY dividend, divisor, result, curbit
 
@@ -207,6 +207,7 @@ Boston, MA 02111-1307, USA.  */
 
 ENTRY(__udivsi3)
 ENTRY(__aeabi_uidiv)
+UNWIND(.fnstart)
 
         subs    r2, r1, #1
         moveq   pc, lr
@@ -230,10 +231,12 @@ ENTRY(__aeabi_uidiv)
         mov     r0, r0, lsr r2
         mov     pc, lr
 
+UNWIND(.fnend)
 ENDPROC(__udivsi3)
 ENDPROC(__aeabi_uidiv)
 
 ENTRY(__umodsi3)
+UNWIND(.fnstart)
 
         subs    r2, r1, #1                      @ compare divisor with 1
         bcc     Ldiv0
@@ -247,10 +250,12 @@ ENTRY(__umodsi3)
 
         mov     pc, lr
 
+UNWIND(.fnend)
 ENDPROC(__umodsi3)
 
 ENTRY(__divsi3)
 ENTRY(__aeabi_idiv)
+UNWIND(.fnstart)
 
         cmp     r1, #0
         eor     ip, r0, r1                      @ save the sign of the result.
@@ -287,10 +292,12 @@ ENTRY(__aeabi_idiv)
         rsbmi   r0, r0, #0
         mov     pc, lr
 
+UNWIND(.fnend)
 ENDPROC(__divsi3)
 ENDPROC(__aeabi_idiv)
 
 ENTRY(__modsi3)
+UNWIND(.fnstart)
 
         cmp     r1, #0
         beq     Ldiv0
@@ -310,11 +317,14 @@ ENTRY(__modsi3)
         rsbmi   r0, r0, #0
         mov     pc, lr
 
+UNWIND(.fnend)
 ENDPROC(__modsi3)
 
 #ifdef CONFIG_AEABI
 
 ENTRY(__aeabi_uidivmod)
+UNWIND(.fnstart)
+UNWIND(.save {r0, r1, ip, lr}   )
 
         stmfd   sp!, {r0, r1, ip, lr}
         bl      __aeabi_uidiv
@@ -323,10 +333,12 @@ ENTRY(__aeabi_uidivmod)
         sub     r1, r1, r3
         mov     pc, lr
 
+UNWIND(.fnend)
 ENDPROC(__aeabi_uidivmod)
 
 ENTRY(__aeabi_idivmod)
-
+UNWIND(.fnstart)
+UNWIND(.save {r0, r1, ip, lr}   )
         stmfd   sp!, {r0, r1, ip, lr}
         bl      __aeabi_idiv
         ldmfd   sp!, {r1, r2, ip, lr}
@@ -334,15 +346,18 @@ ENTRY(__aeabi_idivmod)
         sub     r1, r1, r3
         mov     pc, lr
 
+UNWIND(.fnend)
 ENDPROC(__aeabi_idivmod)
 
 #endif
 
 Ldiv0:
-
+UNWIND(.fnstart)
+UNWIND(.pad #4)
+UNWIND(.save {lr})
         str     lr, [sp, #-8]!
         bl      __div0
         mov     r0, #0                  @ About as wrong as it could be.
         ldr     pc, [sp], #8
-
-
+UNWIND(.fnend)
+ENDPROC(Ldiv0)
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 2d299bf5d72f..22484670e7ba 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -3,9 +3,6 @@ if ARCH_AT91
 config HAVE_AT91_DATAFLASH_CARD
         bool
 
-config HAVE_NAND_ATMEL_BUSWIDTH_16
-        bool
-
 config HAVE_AT91_USART3
         bool
 
@@ -85,11 +82,6 @@ config ARCH_AT91CAP9
         select HAVE_FB_ATMEL
         select HAVE_NET_MACB
 
-config ARCH_AT572D940HF
-        bool "AT572D940HF"
-        select CPU_ARM926T
-        select GENERIC_CLOCKEVENTS
-
 config ARCH_AT91X40
         bool "AT91x40"
         select ARCH_USES_GETTIMEOFFSET
@@ -209,7 +201,6 @@ comment "AT91SAM9260 / AT91SAM9XE Board Type"
 config MACH_AT91SAM9260EK
         bool "Atmel AT91SAM9260-EK / AT91SAM9XE Evaluation Kit"
         select HAVE_AT91_DATAFLASH_CARD
-        select HAVE_NAND_ATMEL_BUSWIDTH_16
         help
           Select this if you are using Atmel's AT91SAM9260-EK or AT91SAM9XE Evaluation Kit
           <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3933>
@@ -270,7 +261,6 @@ comment "AT91SAM9261 Board Type"
 config MACH_AT91SAM9261EK
         bool "Atmel AT91SAM9261-EK Evaluation Kit"
         select HAVE_AT91_DATAFLASH_CARD
-        select HAVE_NAND_ATMEL_BUSWIDTH_16
         help
           Select this if you are using Atmel's AT91SAM9261-EK Evaluation Kit.
           <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3820>
@@ -286,7 +276,6 @@ comment "AT91SAM9G10 Board Type"
 config MACH_AT91SAM9G10EK
         bool "Atmel AT91SAM9G10-EK Evaluation Kit"
         select HAVE_AT91_DATAFLASH_CARD
-        select HAVE_NAND_ATMEL_BUSWIDTH_16
         help
           Select this if you are using Atmel's AT91SAM9G10-EK Evaluation Kit.
           <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4588>
@@ -302,7 +291,6 @@ comment "AT91SAM9263 Board Type"
 config MACH_AT91SAM9263EK
         bool "Atmel AT91SAM9263-EK Evaluation Kit"
         select HAVE_AT91_DATAFLASH_CARD
-        select HAVE_NAND_ATMEL_BUSWIDTH_16
         help
           Select this if you are using Atmel's AT91SAM9263-EK Evaluation Kit.
           <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4057>
@@ -343,7 +331,6 @@ comment "AT91SAM9G20 Board Type"
 config MACH_AT91SAM9G20EK
         bool "Atmel AT91SAM9G20-EK Evaluation Kit"
         select HAVE_AT91_DATAFLASH_CARD
-        select HAVE_NAND_ATMEL_BUSWIDTH_16
         help
           Select this if you are using Atmel's AT91SAM9G20-EK Evaluation Kit
           that embeds only one SD/MMC slot.
@@ -351,7 +338,6 @@ config MACH_AT91SAM9G20EK
 config MACH_AT91SAM9G20EK_2MMC
         depends on MACH_AT91SAM9G20EK
         bool "Atmel AT91SAM9G20-EK Evaluation Kit with 2 SD/MMC Slots"
-        select HAVE_NAND_ATMEL_BUSWIDTH_16
         help
           Select this if you are using an Atmel AT91SAM9G20-EK Evaluation Kit
           with 2 SD/MMC Slots. This is the case for AT91SAM9G20-EK rev. C and
@@ -416,7 +402,6 @@ comment "AT91SAM9G45 Board Type"
 
 config MACH_AT91SAM9M10G45EK
         bool "Atmel AT91SAM9M10G45-EK Evaluation Kits"
-        select HAVE_NAND_ATMEL_BUSWIDTH_16
         help
           Select this if you are using Atmel's AT91SAM9G45-EKES Evaluation Kit.
           "ES" at the end of the name means that this board is an
@@ -433,7 +418,6 @@ comment "AT91CAP9 Board Type"
 config MACH_AT91CAP9ADK
         bool "Atmel AT91CAP9A-DK Evaluation Kit"
         select HAVE_AT91_DATAFLASH_CARD
-        select HAVE_NAND_ATMEL_BUSWIDTH_16
         help
           Select this if you are using Atmel's AT91CAP9A-DK Evaluation Kit.
           <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4138>
@@ -442,23 +426,6 @@ endif
 
 # ----------------------------------------------------------
 
-if ARCH_AT572D940HF
-
-comment "AT572D940HF Board Type"
-
-config MACH_AT572D940HFEB
-        bool "AT572D940HF-EK"
-        depends on ARCH_AT572D940HF
-        select HAVE_AT91_DATAFLASH_CARD
-        select HAVE_NAND_ATMEL_BUSWIDTH_16
-        help
-          Select this if you are using Atmel's AT572D940HF-EK evaluation kit.
-          <http://www.atmel.com/products/diopsis/default.asp>
-
-endif
-
-# ----------------------------------------------------------
-
 if ARCH_AT91X40
 
 comment "AT91X40 Board Type"
@@ -483,13 +450,6 @@ config MTD_AT91_DATAFLASH_CARD
         help
           Enable support for the DataFlash card.
 
-config MTD_NAND_ATMEL_BUSWIDTH_16
-        bool "Enable 16-bit data bus interface to NAND flash"
-        depends on HAVE_NAND_ATMEL_BUSWIDTH_16
-        help
-          On AT91SAM926x boards both types of NAND flash can be present
-          (8 and 16 bit data bus width).
-
 # ----------------------------------------------------------
 
 comment "AT91 Feature Selections"
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index a83835e0c185..96966231920c 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -19,7 +19,6 @@ obj-$(CONFIG_ARCH_AT91SAM9RL)	+= at91sam9rl.o at91sam926x_time.o at91sam9rl_devi
 obj-$(CONFIG_ARCH_AT91SAM9G20)  += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o sam9_smc.o at91sam9_alt_reset.o
 obj-$(CONFIG_ARCH_AT91SAM9G45)  += at91sam9g45.o at91sam926x_time.o at91sam9g45_devices.o sam9_smc.o
 obj-$(CONFIG_ARCH_AT91CAP9)     += at91cap9.o at91sam926x_time.o at91cap9_devices.o sam9_smc.o
-obj-$(CONFIG_ARCH_AT572D940HF)  += at572d940hf.o at91sam926x_time.o at572d940hf_devices.o sam9_smc.o
 obj-$(CONFIG_ARCH_AT91X40)      += at91x40.o at91x40_time.o
 
 # AT91RM9200 board-specific support
@@ -78,9 +77,6 @@ obj-$(CONFIG_MACH_AT91SAM9M10G45EK) += board-sam9m10g45ek.o
 # AT91CAP9 board-specific support
 obj-$(CONFIG_MACH_AT91CAP9ADK)  += board-cap9adk.o
 
-# AT572D940HF board-specific support
-obj-$(CONFIG_MACH_AT572D940HFEB) += board-at572d940hf_ek.o
-
 # AT91X40 board-specific support
 obj-$(CONFIG_MACH_AT91EB01)     += board-eb01.o
 
diff --git a/arch/arm/mach-at91/at572d940hf.c b/arch/arm/mach-at91/at572d940hf.c
deleted file mode 100644
index a6b9c68c003a..000000000000
--- a/arch/arm/mach-at91/at572d940hf.c
+++ /dev/null
@@ -1,377 +0,0 @@
-/*
- * arch/arm/mach-at91/at572d940hf.c
- *
- * Antonio R. Costa <costa.antonior@gmail.com>
- * Copyright (C) 2008 Atmel
- *
- * Copyright (C) 2005 SAN People
- *
- * 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 program 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
- *
- */
-
-#include <linux/module.h>
-
-#include <asm/mach/irq.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <mach/at572d940hf.h>
-#include <mach/at91_pmc.h>
-#include <mach/at91_rstc.h>
-
-#include "generic.h"
-#include "clock.h"
-
-static struct map_desc at572d940hf_io_desc[] __initdata = {
-        {
-                .virtual        = AT91_VA_BASE_SYS,
-                .pfn            = __phys_to_pfn(AT91_BASE_SYS),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = AT91_IO_VIRT_BASE - AT572D940HF_SRAM_SIZE,
-                .pfn            = __phys_to_pfn(AT572D940HF_SRAM_BASE),
-                .length         = AT572D940HF_SRAM_SIZE,
-                .type           = MT_DEVICE,
-        },
-};
-
-/* --------------------------------------------------------------------
- *  Clocks
- * -------------------------------------------------------------------- */
-
-/*
- * The peripheral clocks.
- */
-static struct clk pioA_clk = {
-        .name           = "pioA_clk",
-        .pmc_mask       = 1 << AT572D940HF_ID_PIOA,
-        .type           = CLK_TYPE_PERIPHERAL,
-};
-static struct clk pioB_clk = {
-        .name           = "pioB_clk",
-        .pmc_mask       = 1 << AT572D940HF_ID_PIOB,
-        .type           = CLK_TYPE_PERIPHERAL,
-};
-static struct clk pioC_clk = {
-        .name           = "pioC_clk",
-        .pmc_mask       = 1 << AT572D940HF_ID_PIOC,
-        .type           = CLK_TYPE_PERIPHERAL,
-};
-static struct clk macb_clk = {
-        .name           = "macb_clk",
-        .pmc_mask       = 1 << AT572D940HF_ID_EMAC,
-        .type           = CLK_TYPE_PERIPHERAL,
-};
-static struct clk usart0_clk = {
-        .name           = "usart0_clk",
-        .pmc_mask       = 1 << AT572D940HF_ID_US0,
-        .type           = CLK_TYPE_PERIPHERAL,
-};
-static struct clk usart1_clk = {
-        .name           = "usart1_clk",
-        .pmc_mask       = 1 << AT572D940HF_ID_US1,
-        .type           = CLK_TYPE_PERIPHERAL,
-};
-static struct clk usart2_clk = {
-        .name           = "usart2_clk",
-        .pmc_mask       = 1 << AT572D940HF_ID_US2,
-        .type           = CLK_TYPE_PERIPHERAL,
-};
-static struct clk mmc_clk = {
-        .name           = "mci_clk",
-        .pmc_mask       = 1 << AT572D940HF_ID_MCI,
-        .type           = CLK_TYPE_PERIPHERAL,
-};
-static struct clk udc_clk = {
-        .name           = "udc_clk",
-        .pmc_mask       = 1 << AT572D940HF_ID_UDP,
-        .type           = CLK_TYPE_PERIPHERAL,
-};
-static struct clk twi0_clk = {
-        .name           = "twi0_clk",
-        .pmc_mask       = 1 << AT572D940HF_ID_TWI0,
-        .type           = CLK_TYPE_PERIPHERAL,
-};
-static struct clk spi0_clk = {
-        .name           = "spi0_clk",
-        .pmc_mask       = 1 << AT572D940HF_ID_SPI0,
-        .type           = CLK_TYPE_PERIPHERAL,
-};
-static struct clk spi1_clk = {
-        .name           = "spi1_clk",
-        .pmc_mask       = 1 << AT572D940HF_ID_SPI1,
-        .type           = CLK_TYPE_PERIPHERAL,
-};
-static struct clk ssc0_clk = {
-        .name           = "ssc0_clk",
-        .pmc_mask       = 1 << AT572D940HF_ID_SSC0,
-        .type           = CLK_TYPE_PERIPHERAL,
-};
-static struct clk ssc1_clk = {
-        .name           = "ssc1_clk",
-        .pmc_mask       = 1 << AT572D940HF_ID_SSC1,
-        .type           = CLK_TYPE_PERIPHERAL,
-};
-static struct clk ssc2_clk = {
-        .name           = "ssc2_clk",
-        .pmc_mask       = 1 << AT572D940HF_ID_SSC2,
-        .type           = CLK_TYPE_PERIPHERAL,
-};
-static struct clk tc0_clk = {
-        .name           = "tc0_clk",
-        .pmc_mask       = 1 << AT572D940HF_ID_TC0,
-        .type           = CLK_TYPE_PERIPHERAL,
-};
-static struct clk tc1_clk = {
-        .name           = "tc1_clk",
-        .pmc_mask       = 1 << AT572D940HF_ID_TC1,
-        .type           = CLK_TYPE_PERIPHERAL,
-};
-static struct clk tc2_clk = {
-        .name           = "tc2_clk",
-        .pmc_mask       = 1 << AT572D940HF_ID_TC2,
-        .type           = CLK_TYPE_PERIPHERAL,
-};
-static struct clk ohci_clk = {
-        .name           = "ohci_clk",
-        .pmc_mask       = 1 << AT572D940HF_ID_UHP,
-        .type           = CLK_TYPE_PERIPHERAL,
-};
-static struct clk ssc3_clk = {
-        .name           = "ssc3_clk",
-        .pmc_mask       = 1 << AT572D940HF_ID_SSC3,
-        .type           = CLK_TYPE_PERIPHERAL,
-};
-static struct clk twi1_clk = {
-        .name           = "twi1_clk",
-        .pmc_mask       = 1 << AT572D940HF_ID_TWI1,
-        .type           = CLK_TYPE_PERIPHERAL,
-};
-static struct clk can0_clk = {
-        .name           = "can0_clk",
-        .pmc_mask       = 1 << AT572D940HF_ID_CAN0,
-        .type           = CLK_TYPE_PERIPHERAL,
-};
-static struct clk can1_clk = {
-        .name           = "can1_clk",
-        .pmc_mask       = 1 << AT572D940HF_ID_CAN1,
-        .type           = CLK_TYPE_PERIPHERAL,
-};
-static struct clk mAgicV_clk = {
-        .name           = "mAgicV_clk",
-        .pmc_mask       = 1 << AT572D940HF_ID_MSIRQ0,
-        .type           = CLK_TYPE_PERIPHERAL,
-};
-
-
-static struct clk *periph_clocks[] __initdata = {
-        &pioA_clk,
-        &pioB_clk,
-        &pioC_clk,
-        &macb_clk,
-        &usart0_clk,
-        &usart1_clk,
-        &usart2_clk,
-        &mmc_clk,
-        &udc_clk,
-        &twi0_clk,
-        &spi0_clk,
-        &spi1_clk,
-        &ssc0_clk,
-        &ssc1_clk,
-        &ssc2_clk,
-        &tc0_clk,
-        &tc1_clk,
-        &tc2_clk,
-        &ohci_clk,
-        &ssc3_clk,
-        &twi1_clk,
-        &can0_clk,
-        &can1_clk,
-        &mAgicV_clk,
-        /* irq0 .. irq2 */
-};
-
-/*
- * The five programmable clocks.
- * You must configure pin multiplexing to bring these signals out.
- */
-static struct clk pck0 = {
-        .name           = "pck0",
-        .pmc_mask       = AT91_PMC_PCK0,
-        .type           = CLK_TYPE_PROGRAMMABLE,
-        .id             = 0,
-};
-static struct clk pck1 = {
-        .name           = "pck1",
-        .pmc_mask       = AT91_PMC_PCK1,
-        .type           = CLK_TYPE_PROGRAMMABLE,
-        .id             = 1,
-};
-static struct clk pck2 = {
-        .name           = "pck2",
-        .pmc_mask       = AT91_PMC_PCK2,
-        .type           = CLK_TYPE_PROGRAMMABLE,
-        .id             = 2,
-};
-static struct clk pck3 = {
-        .name           = "pck3",
-        .pmc_mask       = AT91_PMC_PCK3,
-        .type           = CLK_TYPE_PROGRAMMABLE,
-        .id             = 3,
-};
-
-static struct clk mAgicV_mem_clk = {
-        .name           = "mAgicV_mem_clk",
-        .pmc_mask       = AT91_PMC_PCK4,
-        .type           = CLK_TYPE_PROGRAMMABLE,
-        .id             = 4,
-};
-
-/* HClocks */
-static struct clk hck0 = {
-        .name           = "hck0",
-        .pmc_mask       = AT91_PMC_HCK0,
-        .type           = CLK_TYPE_SYSTEM,
-        .id             = 0,
-};
-static struct clk hck1 = {
-        .name           = "hck1",
-        .pmc_mask       = AT91_PMC_HCK1,
-        .type           = CLK_TYPE_SYSTEM,
-        .id             = 1,
-};
-
-static void __init at572d940hf_register_clocks(void)
-{
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(periph_clocks); i++)
-                clk_register(periph_clocks[i]);
-
-        clk_register(&pck0);
-        clk_register(&pck1);
-        clk_register(&pck2);
-        clk_register(&pck3);
-        clk_register(&mAgicV_mem_clk);
-
-        clk_register(&hck0);
-        clk_register(&hck1);
-}
-
-/* --------------------------------------------------------------------
- *  GPIO
- * -------------------------------------------------------------------- */
-
-static struct at91_gpio_bank at572d940hf_gpio[] = {
-        {
-                .id             = AT572D940HF_ID_PIOA,
-                .offset         = AT91_PIOA,
-                .clock          = &pioA_clk,
-        }, {
-                .id             = AT572D940HF_ID_PIOB,
-                .offset         = AT91_PIOB,
-                .clock          = &pioB_clk,
-        }, {
-                .id             = AT572D940HF_ID_PIOC,
-                .offset         = AT91_PIOC,
-                .clock          = &pioC_clk,
-        }
-};
-
-static void at572d940hf_reset(void)
-{
-        at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);
-}
-
-
-/* --------------------------------------------------------------------
- *  AT572D940HF processor initialization
- * -------------------------------------------------------------------- */
-
-void __init at572d940hf_initialize(unsigned long main_clock)
-{
-        /* Map peripherals */
-        iotable_init(at572d940hf_io_desc, ARRAY_SIZE(at572d940hf_io_desc));
-
-        at91_arch_reset = at572d940hf_reset;
-        at91_extern_irq = (1 << AT572D940HF_ID_IRQ0) | (1 << AT572D940HF_ID_IRQ1)
-                        | (1 << AT572D940HF_ID_IRQ2);
-
-        /* Init clock subsystem */
-        at91_clock_init(main_clock);
-
-        /* Register the processor-specific clocks */
-        at572d940hf_register_clocks();
-
-        /* Register GPIO subsystem */
-        at91_gpio_init(at572d940hf_gpio, 3);
-}
-
-/* --------------------------------------------------------------------
- *  Interrupt initialization
- * -------------------------------------------------------------------- */
-
-/*
- * The default interrupt priority levels (0 = lowest, 7 = highest).
- */
-static unsigned int at572d940hf_default_irq_priority[NR_AIC_IRQS] __initdata = {
-        7,      /* Advanced Interrupt Controller */
-        7,      /* System Peripherals */
-        0,      /* Parallel IO Controller A */
-        0,      /* Parallel IO Controller B */
-        0,      /* Parallel IO Controller C */
-        3,      /* Ethernet */
-        6,      /* USART 0 */
-        6,      /* USART 1 */
-        6,      /* USART 2 */
-        0,      /* Multimedia Card Interface */
-        4,      /* USB Device Port */
-        0,      /* Two-Wire Interface 0 */
-        6,      /* Serial Peripheral Interface 0 */
-        6,      /* Serial Peripheral Interface 1 */
-        5,      /* Serial Synchronous Controller 0 */
-        5,      /* Serial Synchronous Controller 1 */
-        5,      /* Serial Synchronous Controller 2 */
-        0,      /* Timer Counter 0 */
-        0,      /* Timer Counter 1 */
-        0,      /* Timer Counter 2 */
-        3,      /* USB Host port */
-        3,      /* Serial Synchronous Controller 3 */
-        0,      /* Two-Wire Interface 1 */
-        0,      /* CAN Controller 0 */
-        0,      /* CAN Controller 1 */
-        0,      /* mAgicV HALT line */
-        0,      /* mAgicV SIRQ0 line */
-        0,      /* mAgicV exception line */
-        0,      /* mAgicV end of DMA line */
-        0,      /* Advanced Interrupt Controller */
-        0,      /* Advanced Interrupt Controller */
-        0,      /* Advanced Interrupt Controller */
-};
-
-void __init at572d940hf_init_interrupts(unsigned int priority[NR_AIC_IRQS])
-{
-        if (!priority)
-                priority = at572d940hf_default_irq_priority;
-
-        /* Initialize the AIC interrupt controller */
-        at91_aic_init(priority);
-
-        /* Enable GPIO interrupts */
-        at91_gpio_irq_setup();
-}
-
diff --git a/arch/arm/mach-at91/at572d940hf_devices.c b/arch/arm/mach-at91/at572d940hf_devices.c
deleted file mode 100644
index 0fc20a240782..000000000000
--- a/arch/arm/mach-at91/at572d940hf_devices.c
+++ /dev/null
@@ -1,970 +0,0 @@
-/*
- * arch/arm/mach-at91/at572d940hf_devices.c
- *
- * Copyright (C) 2008 Atmel Antonio R. Costa <costa.antonior@gmail.com>
- * Copyright (C) 2005 Thibaut VARENE <varenet@parisc-linux.org>
- * Copyright (C) 2005 David Brownell
- *
- * 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 program 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
- *
- */
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-
-#include <linux/dma-mapping.h>
-#include <linux/platform_device.h>
-
-#include <mach/board.h>
-#include <mach/gpio.h>
-#include <mach/at572d940hf.h>
-#include <mach/at572d940hf_matrix.h>
-#include <mach/at91sam9_smc.h>
-
-#include "generic.h"
-#include "sam9_smc.h"
-
-
-/* --------------------------------------------------------------------
- *  USB Host
- * -------------------------------------------------------------------- */
-
-#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
-static u64 ohci_dmamask = DMA_BIT_MASK(32);
-static struct at91_usbh_data usbh_data;
-
-static struct resource usbh_resources[] = {
-        [0] = {
-                .start  = AT572D940HF_UHP_BASE,
-                .end    = AT572D940HF_UHP_BASE + SZ_1M - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = AT572D940HF_ID_UHP,
-                .end    = AT572D940HF_ID_UHP,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device at572d940hf_usbh_device = {
-        .name           = "at91_ohci",
-        .id             = -1,
-        .dev            = {
-                                .dma_mask               = &ohci_dmamask,
-                                .coherent_dma_mask      = DMA_BIT_MASK(32),
-                                .platform_data          = &usbh_data,
-        },
-        .resource       = usbh_resources,
-        .num_resources  = ARRAY_SIZE(usbh_resources),
-};
-
-void __init at91_add_device_usbh(struct at91_usbh_data *data)
-{
-        if (!data)
-                return;
-
-        usbh_data = *data;
-        platform_device_register(&at572d940hf_usbh_device);
-
-}
-#else
-void __init at91_add_device_usbh(struct at91_usbh_data *data) {}
-#endif
-
-
-/* --------------------------------------------------------------------
- *  USB Device (Gadget)
- * -------------------------------------------------------------------- */
-
-#ifdef CONFIG_USB_GADGET_AT91
-static struct at91_udc_data udc_data;
-
-static struct resource udc_resources[] = {
-        [0] = {
-                .start  = AT572D940HF_BASE_UDP,
-                .end    = AT572D940HF_BASE_UDP + SZ_16K - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = AT572D940HF_ID_UDP,
-                .end    = AT572D940HF_ID_UDP,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device at572d940hf_udc_device = {
-        .name           = "at91_udc",
-        .id             = -1,
-        .dev            = {
-                                .platform_data          = &udc_data,
-        },
-        .resource       = udc_resources,
-        .num_resources  = ARRAY_SIZE(udc_resources),
-};
-
-void __init at91_add_device_udc(struct at91_udc_data *data)
-{
-        if (!data)
-                return;
-
-        if (data->vbus_pin) {
-                at91_set_gpio_input(data->vbus_pin, 0);
-                at91_set_deglitch(data->vbus_pin, 1);
-        }
-
-        /* Pullup pin is handled internally */
-
-        udc_data = *data;
-        platform_device_register(&at572d940hf_udc_device);
-}
-#else
-void __init at91_add_device_udc(struct at91_udc_data *data) {}
-#endif
-
-
-/* --------------------------------------------------------------------
- *  Ethernet
- * -------------------------------------------------------------------- */
-
-#if defined(CONFIG_MACB) || defined(CONFIG_MACB_MODULE)
-static u64 eth_dmamask = DMA_BIT_MASK(32);
-static struct at91_eth_data eth_data;
-
-static struct resource eth_resources[] = {
-        [0] = {
-                .start  = AT572D940HF_BASE_EMAC,
-                .end    = AT572D940HF_BASE_EMAC + SZ_16K - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = AT572D940HF_ID_EMAC,
-                .end    = AT572D940HF_ID_EMAC,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device at572d940hf_eth_device = {
-        .name           = "macb",
-        .id             = -1,
-        .dev            = {
-                        .dma_mask               = &eth_dmamask,
-                        .coherent_dma_mask      = DMA_BIT_MASK(32),
-                        .platform_data          = &eth_data,
-        },
-        .resource       = eth_resources,
-        .num_resources  = ARRAY_SIZE(eth_resources),
-};
-
-void __init at91_add_device_eth(struct at91_eth_data *data)
-{
-        if (!data)
-                return;
-
-        if (data->phy_irq_pin) {
-                at91_set_gpio_input(data->phy_irq_pin, 0);
-                at91_set_deglitch(data->phy_irq_pin, 1);
-        }
-
-        /* Only RMII is supported */
-        data->is_rmii = 1;
-
-        /* Pins used for RMII */
-        at91_set_A_periph(AT91_PIN_PA16, 0);    /* ETXCK_EREFCK */
-        at91_set_A_periph(AT91_PIN_PA17, 0);    /* ERXDV */
-        at91_set_A_periph(AT91_PIN_PA18, 0);    /* ERX0 */
-        at91_set_A_periph(AT91_PIN_PA19, 0);    /* ERX1 */
-        at91_set_A_periph(AT91_PIN_PA20, 0);    /* ERXER */
-        at91_set_A_periph(AT91_PIN_PA23, 0);    /* ETXEN */
-        at91_set_A_periph(AT91_PIN_PA21, 0);    /* ETX0 */
-        at91_set_A_periph(AT91_PIN_PA22, 0);    /* ETX1 */
-        at91_set_A_periph(AT91_PIN_PA13, 0);    /* EMDIO */
-        at91_set_A_periph(AT91_PIN_PA14, 0);    /* EMDC */
-
-        eth_data = *data;
-        platform_device_register(&at572d940hf_eth_device);
-}
-#else
-void __init at91_add_device_eth(struct at91_eth_data *data) {}
-#endif
-
-
-/* --------------------------------------------------------------------
- *  MMC / SD
- * -------------------------------------------------------------------- */
-
-#if defined(CONFIG_MMC_AT91) || defined(CONFIG_MMC_AT91_MODULE)
-static u64 mmc_dmamask = DMA_BIT_MASK(32);
-static struct at91_mmc_data mmc_data;
-
-static struct resource mmc_resources[] = {
-        [0] = {
-                .start  = AT572D940HF_BASE_MCI,
-                .end    = AT572D940HF_BASE_MCI + SZ_16K - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = AT572D940HF_ID_MCI,
-                .end    = AT572D940HF_ID_MCI,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device at572d940hf_mmc_device = {
-        .name           = "at91_mci",
-        .id             = -1,
-        .dev            = {
-                                .dma_mask               = &mmc_dmamask,
-                                .coherent_dma_mask      = DMA_BIT_MASK(32),
-                                .platform_data          = &mmc_data,
-        },
-        .resource       = mmc_resources,
-        .num_resources  = ARRAY_SIZE(mmc_resources),
-};
-
-void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)
-{
-        if (!data)
-                return;
-
-        /* input/irq */
-        if (data->det_pin) {
-                at91_set_gpio_input(data->det_pin, 1);
-                at91_set_deglitch(data->det_pin, 1);
-        }
-        if (data->wp_pin)
-                at91_set_gpio_input(data->wp_pin, 1);
-        if (data->vcc_pin)
-                at91_set_gpio_output(data->vcc_pin, 0);
-
-        /* CLK */
-        at91_set_A_periph(AT91_PIN_PC22, 0);
-
-        /* CMD */
-        at91_set_A_periph(AT91_PIN_PC23, 1);
-
-        /* DAT0, maybe DAT1..DAT3 */
-        at91_set_A_periph(AT91_PIN_PC24, 1);
-        if (data->wire4) {
-                at91_set_A_periph(AT91_PIN_PC25, 1);
-                at91_set_A_periph(AT91_PIN_PC26, 1);
-                at91_set_A_periph(AT91_PIN_PC27, 1);
-        }
-
-        mmc_data = *data;
-        platform_device_register(&at572d940hf_mmc_device);
-}
-#else
-void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {}
-#endif
-
-
-/* --------------------------------------------------------------------
- *  NAND / SmartMedia
- * -------------------------------------------------------------------- */
-
-#if defined(CONFIG_MTD_NAND_ATMEL) || defined(CONFIG_MTD_NAND_ATMEL_MODULE)
-static struct atmel_nand_data nand_data;
-
-#define NAND_BASE       AT91_CHIPSELECT_3
-
-static struct resource nand_resources[] = {
-        {
-                .start  = NAND_BASE,
-                .end    = NAND_BASE + SZ_256M - 1,
-                .flags  = IORESOURCE_MEM,
-        }
-};
-
-static struct platform_device at572d940hf_nand_device = {
-        .name           = "atmel_nand",
-        .id             = -1,
-        .dev            = {
-                                .platform_data  = &nand_data,
-        },
-        .resource       = nand_resources,
-        .num_resources  = ARRAY_SIZE(nand_resources),
-};
-
-void __init at91_add_device_nand(struct atmel_nand_data *data)
-{
-        unsigned long csa;
-
-        if (!data)
-                return;
-
-        csa = at91_sys_read(AT91_MATRIX_EBICSA);
-        at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA);
-
-        /* enable pin */
-        if (data->enable_pin)
-                at91_set_gpio_output(data->enable_pin, 1);
-
-        /* ready/busy pin */
-        if (data->rdy_pin)
-                at91_set_gpio_input(data->rdy_pin, 1);
-
-        /* card detect pin */
-        if (data->det_pin)
-                at91_set_gpio_input(data->det_pin, 1);
-
-        at91_set_A_periph(AT91_PIN_PB28, 0);            /* A[22] */
-        at91_set_B_periph(AT91_PIN_PA28, 0);            /* NANDOE */
-        at91_set_B_periph(AT91_PIN_PA29, 0);            /* NANDWE */
-
-        nand_data = *data;
-        platform_device_register(&at572d940hf_nand_device);
-}
-
-#else
-void __init at91_add_device_nand(struct atmel_nand_data *data) {}
-#endif
-
-
-/* --------------------------------------------------------------------
- *  TWI (i2c)
- * -------------------------------------------------------------------- */
-
-/*
- * Prefer the GPIO code since the TWI controller isn't robust
- * (gets overruns and underruns under load) and can only issue
- * repeated STARTs in one scenario (the driver doesn't yet handle them).
- */
-
-#if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE)
-
-static struct i2c_gpio_platform_data pdata = {
-        .sda_pin                = AT91_PIN_PC7,
-        .sda_is_open_drain      = 1,
-        .scl_pin                = AT91_PIN_PC8,
-        .scl_is_open_drain      = 1,
-        .udelay                 = 2,            /* ~100 kHz */
-};
-
-static struct platform_device at572d940hf_twi_device {
-        .name                   = "i2c-gpio",
-        .id                     = -1,
-        .dev.platform_data      = &pdata,
-};
-
-void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices)
-{
-        at91_set_GPIO_periph(AT91_PIN_PC7, 1);          /* TWD (SDA) */
-        at91_set_multi_drive(AT91_PIN_PC7, 1);
-
-        at91_set_GPIO_periph(AT91_PIN_PA8, 1);          /* TWCK (SCL) */
-        at91_set_multi_drive(AT91_PIN_PC8, 1);
-
-        i2c_register_board_info(0, devices, nr_devices);
-        platform_device_register(&at572d940hf_twi_device);
-}
-
-#elif defined(CONFIG_I2C_AT91) || defined(CONFIG_I2C_AT91_MODULE)
-
-static struct resource twi0_resources[] = {
-        [0] = {
-                .start  = AT572D940HF_BASE_TWI0,
-                .end    = AT572D940HF_BASE_TWI0 + SZ_16K - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = AT572D940HF_ID_TWI0,
-                .end    = AT572D940HF_ID_TWI0,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device at572d940hf_twi0_device = {
-        .name           = "at91_i2c",
-        .id             = 0,
-        .resource       = twi0_resources,
-        .num_resources  = ARRAY_SIZE(twi0_resources),
-};
-
-static struct resource twi1_resources[] = {
-        [0] = {
-                .start  = AT572D940HF_BASE_TWI1,
-                .end    = AT572D940HF_BASE_TWI1 + SZ_16K - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = AT572D940HF_ID_TWI1,
-                .end    = AT572D940HF_ID_TWI1,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device at572d940hf_twi1_device = {
-        .name           = "at91_i2c",
-        .id             = 1,
-        .resource       = twi1_resources,
-        .num_resources  = ARRAY_SIZE(twi1_resources),
-};
-
-void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices)
-{
-        /* pins used for TWI0 interface */
-        at91_set_A_periph(AT91_PIN_PC7, 0);             /* TWD */
-        at91_set_multi_drive(AT91_PIN_PC7, 1);
-
-        at91_set_A_periph(AT91_PIN_PC8, 0);             /* TWCK */
-        at91_set_multi_drive(AT91_PIN_PC8, 1);
-
-        /* pins used for TWI1 interface */
-        at91_set_A_periph(AT91_PIN_PC20, 0);            /* TWD */
-        at91_set_multi_drive(AT91_PIN_PC20, 1);
-
-        at91_set_A_periph(AT91_PIN_PC21, 0);            /* TWCK */
-        at91_set_multi_drive(AT91_PIN_PC21, 1);
-
-        i2c_register_board_info(0, devices, nr_devices);
-        platform_device_register(&at572d940hf_twi0_device);
-        platform_device_register(&at572d940hf_twi1_device);
-}
-#else
-void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices) {}
-#endif
-
-
-/* --------------------------------------------------------------------
- *  SPI
- * -------------------------------------------------------------------- */
-
-#if defined(CONFIG_SPI_ATMEL) || defined(CONFIG_SPI_ATMEL_MODULE)
-static u64 spi_dmamask = DMA_BIT_MASK(32);
-
-static struct resource spi0_resources[] = {
-        [0] = {
-                .start  = AT572D940HF_BASE_SPI0,
-                .end    = AT572D940HF_BASE_SPI0 + SZ_16K - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = AT572D940HF_ID_SPI0,
-                .end    = AT572D940HF_ID_SPI0,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device at572d940hf_spi0_device = {
-        .name           = "atmel_spi",
-        .id             = 0,
-        .dev            = {
-                                .dma_mask               = &spi_dmamask,
-                                .coherent_dma_mask      = DMA_BIT_MASK(32),
-        },
-        .resource       = spi0_resources,
-        .num_resources  = ARRAY_SIZE(spi0_resources),
-};
-
-static const unsigned spi0_standard_cs[4] = { AT91_PIN_PA3, AT91_PIN_PA4, AT91_PIN_PA5, AT91_PIN_PA6 };
-
-static struct resource spi1_resources[] = {
-        [0] = {
-                .start  = AT572D940HF_BASE_SPI1,
-                .end    = AT572D940HF_BASE_SPI1 + SZ_16K - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = AT572D940HF_ID_SPI1,
-                .end    = AT572D940HF_ID_SPI1,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device at572d940hf_spi1_device = {
-        .name           = "atmel_spi",
-        .id             = 1,
-        .dev            = {
-                                .dma_mask               = &spi_dmamask,
-                                .coherent_dma_mask      = DMA_BIT_MASK(32),
-        },
-        .resource       = spi1_resources,
-        .num_resources  = ARRAY_SIZE(spi1_resources),
-};
-
-static const unsigned spi1_standard_cs[4] = { AT91_PIN_PC3, AT91_PIN_PC4, AT91_PIN_PC5, AT91_PIN_PC6 };
-
-void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
-{
-        int i;
-        unsigned long cs_pin;
-        short enable_spi0 = 0;
-        short enable_spi1 = 0;
-
-        /* Choose SPI chip-selects */
-        for (i = 0; i < nr_devices; i++) {
-                if (devices[i].controller_data)
-                        cs_pin = (unsigned long) devices[i].controller_data;
-                else if (devices[i].bus_num == 0)
-                        cs_pin = spi0_standard_cs[devices[i].chip_select];
-                else
-                        cs_pin = spi1_standard_cs[devices[i].chip_select];
-
-                if (devices[i].bus_num == 0)
-                        enable_spi0 = 1;
-                else
-                        enable_spi1 = 1;
-
-                /* enable chip-select pin */
-                at91_set_gpio_output(cs_pin, 1);
-
-                /* pass chip-select pin to driver */
-                devices[i].controller_data = (void *) cs_pin;
-        }
-
-        spi_register_board_info(devices, nr_devices);
-
-        /* Configure SPI bus(es) */
-        if (enable_spi0) {
-                at91_set_A_periph(AT91_PIN_PA0, 0);     /* SPI0_MISO */
-                at91_set_A_periph(AT91_PIN_PA1, 0);     /* SPI0_MOSI */
-                at91_set_A_periph(AT91_PIN_PA2, 0);     /* SPI0_SPCK */
-
-                at91_clock_associate("spi0_clk", &at572d940hf_spi0_device.dev, "spi_clk");
-                platform_device_register(&at572d940hf_spi0_device);
-        }
-        if (enable_spi1) {
-                at91_set_A_periph(AT91_PIN_PC0, 0);     /* SPI1_MISO */
-                at91_set_A_periph(AT91_PIN_PC1, 0);     /* SPI1_MOSI */
-                at91_set_A_periph(AT91_PIN_PC2, 0);     /* SPI1_SPCK */
-
-                at91_clock_associate("spi1_clk", &at572d940hf_spi1_device.dev, "spi_clk");
-                platform_device_register(&at572d940hf_spi1_device);
-        }
-}
-#else
-void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices) {}
-#endif
-
-
-/* --------------------------------------------------------------------
- *  Timer/Counter blocks
- * -------------------------------------------------------------------- */
-
-#ifdef CONFIG_ATMEL_TCLIB
-
-static struct resource tcb_resources[] = {
-        [0] = {
-                .start  = AT572D940HF_BASE_TCB,
-                .end    = AT572D940HF_BASE_TCB + SZ_16K - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = AT572D940HF_ID_TC0,
-                .end    = AT572D940HF_ID_TC0,
-                .flags  = IORESOURCE_IRQ,
-        },
-        [2] = {
-                .start  = AT572D940HF_ID_TC1,
-                .end    = AT572D940HF_ID_TC1,
-                .flags  = IORESOURCE_IRQ,
-        },
-        [3] = {
-                .start  = AT572D940HF_ID_TC2,
-                .end    = AT572D940HF_ID_TC2,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device at572d940hf_tcb_device = {
-        .name           = "atmel_tcb",
-        .id             = 0,
-        .resource       = tcb_resources,
-        .num_resources  = ARRAY_SIZE(tcb_resources),
-};
-
-static void __init at91_add_device_tc(void)
-{
-        /* this chip has a separate clock and irq for each TC channel */
-        at91_clock_associate("tc0_clk", &at572d940hf_tcb_device.dev, "t0_clk");
-        at91_clock_associate("tc1_clk", &at572d940hf_tcb_device.dev, "t1_clk");
-        at91_clock_associate("tc2_clk", &at572d940hf_tcb_device.dev, "t2_clk");
-        platform_device_register(&at572d940hf_tcb_device);
-}
-#else
-static void __init at91_add_device_tc(void) { }
-#endif
-
-
-/* --------------------------------------------------------------------
- *  RTT
- * -------------------------------------------------------------------- */
-
-static struct resource rtt_resources[] = {
-        {
-                .start  = AT91_BASE_SYS + AT91_RTT,
-                .end    = AT91_BASE_SYS + AT91_RTT + SZ_16 - 1,
-                .flags  = IORESOURCE_MEM,
-        }
-};
-
-static struct platform_device at572d940hf_rtt_device = {
-        .name           = "at91_rtt",
-        .id             = 0,
-        .resource       = rtt_resources,
-        .num_resources  = ARRAY_SIZE(rtt_resources),
-};
-
-static void __init at91_add_device_rtt(void)
-{
-        platform_device_register(&at572d940hf_rtt_device);
-}
-
-
-/* --------------------------------------------------------------------
- *  Watchdog
- * -------------------------------------------------------------------- */
-
-#if defined(CONFIG_AT91SAM9X_WATCHDOG) || defined(CONFIG_AT91SAM9X_WATCHDOG_MODULE)
-static struct platform_device at572d940hf_wdt_device = {
-        .name           = "at91_wdt",
-        .id             = -1,
-        .num_resources  = 0,
-};
-
-static void __init at91_add_device_watchdog(void)
-{
-        platform_device_register(&at572d940hf_wdt_device);
-}
-#else
-static void __init at91_add_device_watchdog(void) {}
-#endif
-
-
-/* --------------------------------------------------------------------
- *  UART
- * -------------------------------------------------------------------- */
-
-#if defined(CONFIG_SERIAL_ATMEL)
-static struct resource dbgu_resources[] = {
-        [0] = {
-                .start  = AT91_VA_BASE_SYS + AT91_DBGU,
-                .end    = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = AT91_ID_SYS,
-                .end    = AT91_ID_SYS,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct atmel_uart_data dbgu_data = {
-        .use_dma_tx     = 0,
-        .use_dma_rx     = 0,            /* DBGU not capable of receive DMA */
-        .regs           = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),
-};
-
-static u64 dbgu_dmamask = DMA_BIT_MASK(32);
-
-static struct platform_device at572d940hf_dbgu_device = {
-        .name           = "atmel_usart",
-        .id             = 0,
-        .dev            = {
-                                .dma_mask               = &dbgu_dmamask,
-                                .coherent_dma_mask      = DMA_BIT_MASK(32),
-                                .platform_data          = &dbgu_data,
-        },
-        .resource       = dbgu_resources,
-        .num_resources  = ARRAY_SIZE(dbgu_resources),
-};
-
-static inline void configure_dbgu_pins(void)
-{
-        at91_set_A_periph(AT91_PIN_PC31, 1);            /* DTXD */
-        at91_set_A_periph(AT91_PIN_PC30, 0);            /* DRXD */
-}
-
-static struct resource uart0_resources[] = {
-        [0] = {
-                .start  = AT572D940HF_BASE_US0,
-                .end    = AT572D940HF_BASE_US0 + SZ_16K - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = AT572D940HF_ID_US0,
-                .end    = AT572D940HF_ID_US0,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct atmel_uart_data uart0_data = {
-        .use_dma_tx     = 1,
-        .use_dma_rx     = 1,
-};
-
-static u64 uart0_dmamask = DMA_BIT_MASK(32);
-
-static struct platform_device at572d940hf_uart0_device = {
-        .name           = "atmel_usart",
-        .id             = 1,
-        .dev            = {
-                                .dma_mask               = &uart0_dmamask,
-                                .coherent_dma_mask      = DMA_BIT_MASK(32),
-                                .platform_data          = &uart0_data,
-        },
-        .resource       = uart0_resources,
-        .num_resources  = ARRAY_SIZE(uart0_resources),
-};
-
-static inline void configure_usart0_pins(unsigned pins)
-{
-        at91_set_A_periph(AT91_PIN_PA8, 1);             /* TXD0 */
-        at91_set_A_periph(AT91_PIN_PA7, 0);             /* RXD0 */
-
-        if (pins & ATMEL_UART_RTS)
-                at91_set_A_periph(AT91_PIN_PA10, 0);    /* RTS0 */
-        if (pins & ATMEL_UART_CTS)
-                at91_set_A_periph(AT91_PIN_PA9, 0);     /* CTS0 */
-}
-
-static struct resource uart1_resources[] = {
-        [0] = {
-                .start  = AT572D940HF_BASE_US1,
-                .end    = AT572D940HF_BASE_US1 + SZ_16K - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = AT572D940HF_ID_US1,
-                .end    = AT572D940HF_ID_US1,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct atmel_uart_data uart1_data = {
-        .use_dma_tx     = 1,
-        .use_dma_rx     = 1,
-};
-
-static u64 uart1_dmamask = DMA_BIT_MASK(32);
-
-static struct platform_device at572d940hf_uart1_device = {
-        .name           = "atmel_usart",
-        .id             = 2,
-        .dev            = {
-                                .dma_mask               = &uart1_dmamask,
-                                .coherent_dma_mask      = DMA_BIT_MASK(32),
-                                .platform_data          = &uart1_data,
-        },
-        .resource       = uart1_resources,
-        .num_resources  = ARRAY_SIZE(uart1_resources),
-};
-
-static inline void configure_usart1_pins(unsigned pins)
-{
-        at91_set_A_periph(AT91_PIN_PC10, 1);            /* TXD1 */
-        at91_set_A_periph(AT91_PIN_PC9 , 0);            /* RXD1 */
-
-        if (pins & ATMEL_UART_RTS)
-                at91_set_A_periph(AT91_PIN_PC12, 0);    /* RTS1 */
-        if (pins & ATMEL_UART_CTS)
-                at91_set_A_periph(AT91_PIN_PC11, 0);    /* CTS1 */
-}
-
-static struct resource uart2_resources[] = {
-        [0] = {
-                .start  = AT572D940HF_BASE_US2,
-                .end    = AT572D940HF_BASE_US2 + SZ_16K - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = AT572D940HF_ID_US2,
-                .end    = AT572D940HF_ID_US2,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct atmel_uart_data uart2_data = {
-        .use_dma_tx     = 1,
-        .use_dma_rx     = 1,
-};
-
-static u64 uart2_dmamask = DMA_BIT_MASK(32);
-
-static struct platform_device at572d940hf_uart2_device = {
-        .name           = "atmel_usart",
-        .id             = 3,
-        .dev            = {
-                                .dma_mask               = &uart2_dmamask,
-                                .coherent_dma_mask      = DMA_BIT_MASK(32),
-                                .platform_data          = &uart2_data,
-        },
-        .resource       = uart2_resources,
-        .num_resources  = ARRAY_SIZE(uart2_resources),
-};
-
-static inline void configure_usart2_pins(unsigned pins)
-{
-        at91_set_A_periph(AT91_PIN_PC15, 1);            /* TXD2 */
-        at91_set_A_periph(AT91_PIN_PC14, 0);            /* RXD2 */
-
-        if (pins & ATMEL_UART_RTS)
-                at91_set_A_periph(AT91_PIN_PC17, 0);    /* RTS2 */
-        if (pins & ATMEL_UART_CTS)
-                at91_set_A_periph(AT91_PIN_PC16, 0);    /* CTS2 */
-}
-
-static struct platform_device *__initdata at91_uarts[ATMEL_MAX_UART];   /* the UARTs to use */
-struct platform_device *atmel_default_console_device;   /* the serial console device */
-
-void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
-{
-        struct platform_device *pdev;
-
-        switch (id) {
-                case 0:         /* DBGU */
-                        pdev = &at572d940hf_dbgu_device;
-                        configure_dbgu_pins();
-                        at91_clock_associate("mck", &pdev->dev, "usart");
-                        break;
-                case AT572D940HF_ID_US0:
-                        pdev = &at572d940hf_uart0_device;
-                        configure_usart0_pins(pins);
-                        at91_clock_associate("usart0_clk", &pdev->dev, "usart");
-                        break;
-                case AT572D940HF_ID_US1:
-                        pdev = &at572d940hf_uart1_device;
-                        configure_usart1_pins(pins);
-                        at91_clock_associate("usart1_clk", &pdev->dev, "usart");
-                        break;
-                case AT572D940HF_ID_US2:
-                        pdev = &at572d940hf_uart2_device;
-                        configure_usart2_pins(pins);
-                        at91_clock_associate("usart2_clk", &pdev->dev, "usart");
-                        break;
-                default:
-                        return;
-        }
-        pdev->id = portnr;              /* update to mapped ID */
-
-        if (portnr < ATMEL_MAX_UART)
-                at91_uarts[portnr] = pdev;
-}
-
-void __init at91_set_serial_console(unsigned portnr)
-{
-        if (portnr < ATMEL_MAX_UART)
-                atmel_default_console_device = at91_uarts[portnr];
-}
-
-void __init at91_add_device_serial(void)
-{
-        int i;
-
-        for (i = 0; i < ATMEL_MAX_UART; i++) {
-                if (at91_uarts[i])
-                        platform_device_register(at91_uarts[i]);
-        }
-
-        if (!atmel_default_console_device)
-                printk(KERN_INFO "AT91: No default serial console defined.\n");
-}
-
-#else
-void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) {}
-void __init at91_set_serial_console(unsigned portnr) {}
-void __init at91_add_device_serial(void) {}
-#endif
-
-
-/* --------------------------------------------------------------------
- *  mAgic
- * -------------------------------------------------------------------- */
-
-#ifdef CONFIG_MAGICV
-static struct resource mAgic_resources[] = {
-        {
-                .start = AT91_MAGIC_PM_BASE,
-                .end   = AT91_MAGIC_PM_BASE + AT91_MAGIC_PM_SIZE - 1,
-                .flags = IORESOURCE_MEM,
-        },
-        {
-                .start = AT91_MAGIC_DM_I_BASE,
-                .end   = AT91_MAGIC_DM_I_BASE + AT91_MAGIC_DM_I_SIZE - 1,
-                .flags = IORESOURCE_MEM,
-        },
-        {
-                .start = AT91_MAGIC_DM_F_BASE,
-                .end   = AT91_MAGIC_DM_F_BASE + AT91_MAGIC_DM_F_SIZE - 1,
-                .flags = IORESOURCE_MEM,
-        },
-        {
-                .start = AT91_MAGIC_DM_DB_BASE,
-                .end   = AT91_MAGIC_DM_DB_BASE + AT91_MAGIC_DM_DB_SIZE - 1,
-                .flags = IORESOURCE_MEM,
-        },
-        {
-                .start = AT91_MAGIC_REGS_BASE,
-                .end   = AT91_MAGIC_REGS_BASE + AT91_MAGIC_REGS_SIZE - 1,
-                .flags = IORESOURCE_MEM,
-        },
-        {
-                .start = AT91_MAGIC_EXTPAGE_BASE,
-                .end   = AT91_MAGIC_EXTPAGE_BASE + AT91_MAGIC_EXTPAGE_SIZE - 1,
-                .flags = IORESOURCE_MEM,
-        },
-        {
-                .start  = AT572D940HF_ID_MSIRQ0,
-                .end    = AT572D940HF_ID_MSIRQ0,
-                .flags  = IORESOURCE_IRQ,
-        },
-        {
-                .start  = AT572D940HF_ID_MHALT,
-                .end    = AT572D940HF_ID_MHALT,
-                .flags  = IORESOURCE_IRQ,
-        },
-        {
-                .start  = AT572D940HF_ID_MEXC,
-                .end    = AT572D940HF_ID_MEXC,
-                .flags  = IORESOURCE_IRQ,
-        },
-        {
-                .start  = AT572D940HF_ID_MEDMA,
-                .end    = AT572D940HF_ID_MEDMA,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device mAgic_device = {
-        .name           = "mAgic",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(mAgic_resources),
-        .resource       = mAgic_resources,
-};
-
-void __init at91_add_device_mAgic(void)
-{
-        platform_device_register(&mAgic_device);
-}
-#else
-void __init at91_add_device_mAgic(void) {}
-#endif
-
-
-/* -------------------------------------------------------------------- */
-
-/*
- * These devices are always present and don't need any board-specific
- * setup.
- */
-static int __init at91_add_standard_devices(void)
-{
-        at91_add_device_rtt();
-        at91_add_device_watchdog();
-        at91_add_device_tc();
-        return 0;
-}
-
-arch_initcall(at91_add_standard_devices);
diff --git a/arch/arm/mach-at91/at91cap9.c b/arch/arm/mach-at91/at91cap9.c
index 73376170fb91..17fae4a42ab5 100644
--- a/arch/arm/mach-at91/at91cap9.c
+++ b/arch/arm/mach-at91/at91cap9.c
@@ -222,6 +222,25 @@ static struct clk *periph_clocks[] __initdata = {
         // irq0 .. irq1
 };
 
+static struct clk_lookup periph_clocks_lookups[] = {
+        CLKDEV_CON_DEV_ID("hclk", "atmel_usba_udc.0", &utmi_clk),
+        CLKDEV_CON_DEV_ID("pclk", "atmel_usba_udc.0", &udphs_clk),
+        CLKDEV_CON_DEV_ID("mci_clk", "at91_mci.0", &mmc0_clk),
+        CLKDEV_CON_DEV_ID("mci_clk", "at91_mci.1", &mmc1_clk),
+        CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk),
+        CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk),
+        CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk),
+        CLKDEV_CON_DEV_ID("ssc", "ssc.0", &ssc0_clk),
+        CLKDEV_CON_DEV_ID("ssc", "ssc.1", &ssc1_clk),
+};
+
+static struct clk_lookup usart_clocks_lookups[] = {
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.0", &mck),
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.1", &usart0_clk),
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.2", &usart1_clk),
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.3", &usart2_clk),
+};
+
 /*
  * The four programmable clocks.
  * You must configure pin multiplexing to bring these signals out.
@@ -258,12 +277,29 @@ static void __init at91cap9_register_clocks(void)
         for (i = 0; i < ARRAY_SIZE(periph_clocks); i++)
                 clk_register(periph_clocks[i]);
 
+        clkdev_add_table(periph_clocks_lookups,
+                         ARRAY_SIZE(periph_clocks_lookups));
+        clkdev_add_table(usart_clocks_lookups,
+                         ARRAY_SIZE(usart_clocks_lookups));
+
         clk_register(&pck0);
         clk_register(&pck1);
         clk_register(&pck2);
         clk_register(&pck3);
 }
 
+static struct clk_lookup console_clock_lookup;
+
+void __init at91cap9_set_console_clock(int id)
+{
+        if (id >= ARRAY_SIZE(usart_clocks_lookups))
+                return;
+
+        console_clock_lookup.con_id = "usart";
+        console_clock_lookup.clk = usart_clocks_lookups[id].clk;
+        clkdev_add(&console_clock_lookup);
+}
+
 /* --------------------------------------------------------------------
  *  GPIO
  * -------------------------------------------------------------------- */
@@ -303,11 +339,14 @@ static void at91cap9_poweroff(void)
  *  AT91CAP9 processor initialization
  * -------------------------------------------------------------------- */
 
-void __init at91cap9_initialize(unsigned long main_clock)
+void __init at91cap9_map_io(void)
 {
         /* Map peripherals */
         iotable_init(at91cap9_io_desc, ARRAY_SIZE(at91cap9_io_desc));
+}
 
+void __init at91cap9_initialize(unsigned long main_clock)
+{
         at91_arch_reset = at91cap9_reset;
         pm_power_off = at91cap9_poweroff;
         at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) | (1 << AT91CAP9_ID_IRQ1);
diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c
index 21020ceb2f3a..cd850ed6f335 100644
--- a/arch/arm/mach-at91/at91cap9_devices.c
+++ b/arch/arm/mach-at91/at91cap9_devices.c
@@ -181,10 +181,6 @@ void __init at91_add_device_usba(struct usba_platform_data *data)
 
         /* Pullup pin is handled internally by USB device peripheral */
 
-        /* Clocks */
-        at91_clock_associate("utmi_clk", &at91_usba_udc_device.dev, "hclk");
-        at91_clock_associate("udphs_clk", &at91_usba_udc_device.dev, "pclk");
-
         platform_device_register(&at91_usba_udc_device);
 }
 #else
@@ -355,7 +351,6 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)
                 }
 
                 mmc0_data = *data;
-                at91_clock_associate("mci0_clk", &at91cap9_mmc0_device.dev, "mci_clk");
                 platform_device_register(&at91cap9_mmc0_device);
         } else {                        /* MCI1 */
                 /* CLK */
@@ -373,7 +368,6 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)
                 }
 
                 mmc1_data = *data;
-                at91_clock_associate("mci1_clk", &at91cap9_mmc1_device.dev, "mci_clk");
                 platform_device_register(&at91cap9_mmc1_device);
         }
 }
@@ -614,7 +608,6 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
                 at91_set_B_periph(AT91_PIN_PA1, 0);     /* SPI0_MOSI */
                 at91_set_B_periph(AT91_PIN_PA2, 0);     /* SPI0_SPCK */
 
-                at91_clock_associate("spi0_clk", &at91cap9_spi0_device.dev, "spi_clk");
                 platform_device_register(&at91cap9_spi0_device);
         }
         if (enable_spi1) {
@@ -622,7 +615,6 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
                 at91_set_A_periph(AT91_PIN_PB13, 0);    /* SPI1_MOSI */
                 at91_set_A_periph(AT91_PIN_PB14, 0);    /* SPI1_SPCK */
 
-                at91_clock_associate("spi1_clk", &at91cap9_spi1_device.dev, "spi_clk");
                 platform_device_register(&at91cap9_spi1_device);
         }
 }
@@ -659,8 +651,6 @@ static struct platform_device at91cap9_tcb_device = {
 
 static void __init at91_add_device_tc(void)
 {
-        /* this chip has one clock and irq for all three TC channels */
-        at91_clock_associate("tcb_clk", &at91cap9_tcb_device.dev, "t0_clk");
         platform_device_register(&at91cap9_tcb_device);
 }
 #else
@@ -1001,12 +991,10 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins)
         case AT91CAP9_ID_SSC0:
                 pdev = &at91cap9_ssc0_device;
                 configure_ssc0_pins(pins);
-                at91_clock_associate("ssc0_clk", &pdev->dev, "ssc");
                 break;
         case AT91CAP9_ID_SSC1:
                 pdev = &at91cap9_ssc1_device;
                 configure_ssc1_pins(pins);
-                at91_clock_associate("ssc1_clk", &pdev->dev, "ssc");
                 break;
         default:
                 return;
@@ -1199,32 +1187,30 @@ struct platform_device *atmel_default_console_device;	/* the serial console devi
 void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
 {
         struct platform_device *pdev;
+        struct atmel_uart_data *pdata;
 
         switch (id) {
                 case 0:         /* DBGU */
                         pdev = &at91cap9_dbgu_device;
                         configure_dbgu_pins();
-                        at91_clock_associate("mck", &pdev->dev, "usart");
                         break;
                 case AT91CAP9_ID_US0:
                         pdev = &at91cap9_uart0_device;
                         configure_usart0_pins(pins);
-                        at91_clock_associate("usart0_clk", &pdev->dev, "usart");
                         break;
                 case AT91CAP9_ID_US1:
                         pdev = &at91cap9_uart1_device;
                         configure_usart1_pins(pins);
-                        at91_clock_associate("usart1_clk", &pdev->dev, "usart");
                         break;
                 case AT91CAP9_ID_US2:
                         pdev = &at91cap9_uart2_device;
                         configure_usart2_pins(pins);
-                        at91_clock_associate("usart2_clk", &pdev->dev, "usart");
                         break;
                 default:
                         return;
         }
-        pdev->id = portnr;              /* update to mapped ID */
+        pdata = pdev->dev.platform_data;
+        pdata->num = portnr;            /* update to mapped ID */
 
         if (portnr < ATMEL_MAX_UART)
                 at91_uarts[portnr] = pdev;
@@ -1232,8 +1218,10 @@ void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
 
 void __init at91_set_serial_console(unsigned portnr)
 {
-        if (portnr < ATMEL_MAX_UART)
+        if (portnr < ATMEL_MAX_UART) {
                 atmel_default_console_device = at91_uarts[portnr];
+                at91cap9_set_console_clock(portnr);
+        }
 }
 
 void __init at91_add_device_serial(void)
diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
index 2e9ecad97f3d..b228ce9e21a1 100644
--- a/arch/arm/mach-at91/at91rm9200.c
+++ b/arch/arm/mach-at91/at91rm9200.c
@@ -18,6 +18,7 @@
 #include <mach/at91rm9200.h>
 #include <mach/at91_pmc.h>
 #include <mach/at91_st.h>
+#include <mach/cpu.h>
 
 #include "generic.h"
 #include "clock.h"
@@ -191,6 +192,26 @@ static struct clk *periph_clocks[] __initdata = {
         // irq0 .. irq6
 };
 
+static struct clk_lookup periph_clocks_lookups[] = {
+        CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk),
+        CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.0", &tc1_clk),
+        CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc2_clk),
+        CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tc3_clk),
+        CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.1", &tc4_clk),
+        CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.1", &tc5_clk),
+        CLKDEV_CON_DEV_ID("ssc", "ssc.0", &ssc0_clk),
+        CLKDEV_CON_DEV_ID("ssc", "ssc.1", &ssc1_clk),
+        CLKDEV_CON_DEV_ID("ssc", "ssc.2", &ssc2_clk),
+};
+
+static struct clk_lookup usart_clocks_lookups[] = {
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.0", &mck),
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.1", &usart0_clk),
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.2", &usart1_clk),
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.3", &usart2_clk),
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.4", &usart3_clk),
+};
+
 /*
  * The four programmable clocks.
  * You must configure pin multiplexing to bring these signals out.
@@ -227,12 +248,29 @@ static void __init at91rm9200_register_clocks(void)
         for (i = 0; i < ARRAY_SIZE(periph_clocks); i++)
                 clk_register(periph_clocks[i]);
 
+        clkdev_add_table(periph_clocks_lookups,
+                         ARRAY_SIZE(periph_clocks_lookups));
+        clkdev_add_table(usart_clocks_lookups,
+                         ARRAY_SIZE(usart_clocks_lookups));
+
         clk_register(&pck0);
         clk_register(&pck1);
         clk_register(&pck2);
         clk_register(&pck3);
 }
 
+static struct clk_lookup console_clock_lookup;
+
+void __init at91rm9200_set_console_clock(int id)
+{
+        if (id >= ARRAY_SIZE(usart_clocks_lookups))
+                return;
+
+        console_clock_lookup.con_id = "usart";
+        console_clock_lookup.clk = usart_clocks_lookups[id].clk;
+        clkdev_add(&console_clock_lookup);
+}
+
 /* --------------------------------------------------------------------
  *  GPIO
  * -------------------------------------------------------------------- */
@@ -266,15 +304,25 @@ static void at91rm9200_reset(void)
         at91_sys_write(AT91_ST_CR, AT91_ST_WDRST);
 }
 
+int rm9200_type;
+EXPORT_SYMBOL(rm9200_type);
+
+void __init at91rm9200_set_type(int type)
+{
+        rm9200_type = type;
+}
 
 /* --------------------------------------------------------------------
  *  AT91RM9200 processor initialization
  * -------------------------------------------------------------------- */
-void __init at91rm9200_initialize(unsigned long main_clock, unsigned short banks)
+void __init at91rm9200_map_io(void)
 {
         /* Map peripherals */
         iotable_init(at91rm9200_io_desc, ARRAY_SIZE(at91rm9200_io_desc));
+}
 
+void __init at91rm9200_initialize(unsigned long main_clock)
+{
         at91_arch_reset = at91rm9200_reset;
         at91_extern_irq = (1 << AT91RM9200_ID_IRQ0) | (1 << AT91RM9200_ID_IRQ1)
                         | (1 << AT91RM9200_ID_IRQ2) | (1 << AT91RM9200_ID_IRQ3)
@@ -288,7 +336,8 @@ void __init at91rm9200_initialize(unsigned long main_clock, unsigned short banks
         at91rm9200_register_clocks();
 
         /* Initialize GPIO subsystem */
-        at91_gpio_init(at91rm9200_gpio, banks);
+        at91_gpio_init(at91rm9200_gpio,
+                cpu_is_at91rm9200_bga() ? AT91RM9200_BGA : AT91RM9200_PQFP);
 }
 
 
diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c
index 7b539228e0ef..a0ba475be04c 100644
--- a/arch/arm/mach-at91/at91rm9200_devices.c
+++ b/arch/arm/mach-at91/at91rm9200_devices.c
@@ -644,15 +644,7 @@ static struct platform_device at91rm9200_tcb1_device = {
 
 static void __init at91_add_device_tc(void)
 {
-        /* this chip has a separate clock and irq for each TC channel */
-        at91_clock_associate("tc0_clk", &at91rm9200_tcb0_device.dev, "t0_clk");
-        at91_clock_associate("tc1_clk", &at91rm9200_tcb0_device.dev, "t1_clk");
-        at91_clock_associate("tc2_clk", &at91rm9200_tcb0_device.dev, "t2_clk");
         platform_device_register(&at91rm9200_tcb0_device);
-
-        at91_clock_associate("tc3_clk", &at91rm9200_tcb1_device.dev, "t0_clk");
-        at91_clock_associate("tc4_clk", &at91rm9200_tcb1_device.dev, "t1_clk");
-        at91_clock_associate("tc5_clk", &at91rm9200_tcb1_device.dev, "t2_clk");
         platform_device_register(&at91rm9200_tcb1_device);
 }
 #else
@@ -849,17 +841,14 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins)
         case AT91RM9200_ID_SSC0:
                 pdev = &at91rm9200_ssc0_device;
                 configure_ssc0_pins(pins);
-                at91_clock_associate("ssc0_clk", &pdev->dev, "ssc");
                 break;
         case AT91RM9200_ID_SSC1:
                 pdev = &at91rm9200_ssc1_device;
                 configure_ssc1_pins(pins);
-                at91_clock_associate("ssc1_clk", &pdev->dev, "ssc");
                 break;
         case AT91RM9200_ID_SSC2:
                 pdev = &at91rm9200_ssc2_device;
                 configure_ssc2_pins(pins);
-                at91_clock_associate("ssc2_clk", &pdev->dev, "ssc");
                 break;
         default:
                 return;
@@ -1109,37 +1098,34 @@ struct platform_device *atmel_default_console_device;	/* the serial console devi
 void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
 {
         struct platform_device *pdev;
+        struct atmel_uart_data *pdata;
 
         switch (id) {
                 case 0:         /* DBGU */
                         pdev = &at91rm9200_dbgu_device;
                         configure_dbgu_pins();
-                        at91_clock_associate("mck", &pdev->dev, "usart");
                         break;
                 case AT91RM9200_ID_US0:
                         pdev = &at91rm9200_uart0_device;
                         configure_usart0_pins(pins);
-                        at91_clock_associate("usart0_clk", &pdev->dev, "usart");
                         break;
                 case AT91RM9200_ID_US1:
                         pdev = &at91rm9200_uart1_device;
                         configure_usart1_pins(pins);
-                        at91_clock_associate("usart1_clk", &pdev->dev, "usart");
                         break;
                 case AT91RM9200_ID_US2:
                         pdev = &at91rm9200_uart2_device;
                         configure_usart2_pins(pins);
-                        at91_clock_associate("usart2_clk", &pdev->dev, "usart");
                         break;
                 case AT91RM9200_ID_US3:
                         pdev = &at91rm9200_uart3_device;
                         configure_usart3_pins(pins);
-                        at91_clock_associate("usart3_clk", &pdev->dev, "usart");
                         break;
                 default:
                         return;
         }
-        pdev->id = portnr;              /* update to mapped ID */
+        pdata = pdev->dev.platform_data;
+        pdata->num = portnr;            /* update to mapped ID */
 
         if (portnr < ATMEL_MAX_UART)
                 at91_uarts[portnr] = pdev;
@@ -1147,8 +1133,10 @@ void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
 
 void __init at91_set_serial_console(unsigned portnr)
 {
-        if (portnr < ATMEL_MAX_UART)
+        if (portnr < ATMEL_MAX_UART) {
                 atmel_default_console_device = at91_uarts[portnr];
+                at91rm9200_set_console_clock(portnr);
+        }
 }
 
 void __init at91_add_device_serial(void)
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
index 195208b30024..7d606b04d313 100644
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@ -231,6 +231,28 @@ static struct clk *periph_clocks[] __initdata = {
         // irq0 .. irq2
 };
 
+static struct clk_lookup periph_clocks_lookups[] = {
+        CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk),
+        CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk),
+        CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk),
+        CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.0", &tc1_clk),
+        CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc2_clk),
+        CLKDEV_CON_DEV_ID("t3_clk", "atmel_tcb.1", &tc3_clk),
+        CLKDEV_CON_DEV_ID("t4_clk", "atmel_tcb.1", &tc4_clk),
+        CLKDEV_CON_DEV_ID("t5_clk", "atmel_tcb.1", &tc5_clk),
+        CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc_clk),
+};
+
+static struct clk_lookup usart_clocks_lookups[] = {
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.0", &mck),
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.1", &usart0_clk),
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.2", &usart1_clk),
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.3", &usart2_clk),
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.4", &usart3_clk),
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.5", &usart4_clk),
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.6", &usart5_clk),
+};
+
 /*
  * The two programmable clocks.
  * You must configure pin multiplexing to bring these signals out.
@@ -255,10 +277,27 @@ static void __init at91sam9260_register_clocks(void)
         for (i = 0; i < ARRAY_SIZE(periph_clocks); i++)
                 clk_register(periph_clocks[i]);
 
+        clkdev_add_table(periph_clocks_lookups,
+                         ARRAY_SIZE(periph_clocks_lookups));
+        clkdev_add_table(usart_clocks_lookups,
+                         ARRAY_SIZE(usart_clocks_lookups));
+
         clk_register(&pck0);
         clk_register(&pck1);
 }
 
+static struct clk_lookup console_clock_lookup;
+
+void __init at91sam9260_set_console_clock(int id)
+{
+        if (id >= ARRAY_SIZE(usart_clocks_lookups))
+                return;
+
+        console_clock_lookup.con_id = "usart";
+        console_clock_lookup.clk = usart_clocks_lookups[id].clk;
+        clkdev_add(&console_clock_lookup);
+}
+
 /* --------------------------------------------------------------------
  *  GPIO
  * -------------------------------------------------------------------- */
@@ -289,7 +328,7 @@ static void at91sam9260_poweroff(void)
  *  AT91SAM9260 processor initialization
  * -------------------------------------------------------------------- */
 
-static void __init at91sam9xe_initialize(void)
+static void __init at91sam9xe_map_io(void)
 {
         unsigned long cidr, sram_size;
 
@@ -310,18 +349,21 @@ static void __init at91sam9xe_initialize(void)
         iotable_init(at91sam9xe_sram_desc, ARRAY_SIZE(at91sam9xe_sram_desc));
 }
 
-void __init at91sam9260_initialize(unsigned long main_clock)
+void __init at91sam9260_map_io(void)
 {
         /* Map peripherals */
         iotable_init(at91sam9260_io_desc, ARRAY_SIZE(at91sam9260_io_desc));
 
         if (cpu_is_at91sam9xe())
-                at91sam9xe_initialize();
+                at91sam9xe_map_io();
         else if (cpu_is_at91sam9g20())
                 iotable_init(at91sam9g20_sram_desc, ARRAY_SIZE(at91sam9g20_sram_desc));
         else
                 iotable_init(at91sam9260_sram_desc, ARRAY_SIZE(at91sam9260_sram_desc));
+}
 
+void __init at91sam9260_initialize(unsigned long main_clock)
+{
         at91_arch_reset = at91sam9_alt_reset;
         pm_power_off = at91sam9260_poweroff;
         at91_extern_irq = (1 << AT91SAM9260_ID_IRQ0) | (1 << AT91SAM9260_ID_IRQ1)
diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
index 07eb7b07e442..1fdeb9058a76 100644
--- a/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@ -609,7 +609,6 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
                 at91_set_A_periph(AT91_PIN_PA1, 0);     /* SPI0_MOSI */
                 at91_set_A_periph(AT91_PIN_PA2, 0);     /* SPI1_SPCK */
 
-                at91_clock_associate("spi0_clk", &at91sam9260_spi0_device.dev, "spi_clk");
                 platform_device_register(&at91sam9260_spi0_device);
         }
         if (enable_spi1) {
@@ -617,7 +616,6 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
                 at91_set_A_periph(AT91_PIN_PB1, 0);     /* SPI1_MOSI */
                 at91_set_A_periph(AT91_PIN_PB2, 0);     /* SPI1_SPCK */
 
-                at91_clock_associate("spi1_clk", &at91sam9260_spi1_device.dev, "spi_clk");
                 platform_device_register(&at91sam9260_spi1_device);
         }
 }
@@ -694,15 +692,7 @@ static struct platform_device at91sam9260_tcb1_device = {
 
 static void __init at91_add_device_tc(void)
 {
-        /* this chip has a separate clock and irq for each TC channel */
-        at91_clock_associate("tc0_clk", &at91sam9260_tcb0_device.dev, "t0_clk");
-        at91_clock_associate("tc1_clk", &at91sam9260_tcb0_device.dev, "t1_clk");
-        at91_clock_associate("tc2_clk", &at91sam9260_tcb0_device.dev, "t2_clk");
         platform_device_register(&at91sam9260_tcb0_device);
-
-        at91_clock_associate("tc3_clk", &at91sam9260_tcb1_device.dev, "t0_clk");
-        at91_clock_associate("tc4_clk", &at91sam9260_tcb1_device.dev, "t1_clk");
-        at91_clock_associate("tc5_clk", &at91sam9260_tcb1_device.dev, "t2_clk");
         platform_device_register(&at91sam9260_tcb1_device);
 }
 #else
@@ -820,7 +810,6 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins)
         case AT91SAM9260_ID_SSC:
                 pdev = &at91sam9260_ssc_device;
                 configure_ssc_pins(pins);
-                at91_clock_associate("ssc_clk", &pdev->dev, "pclk");
                 break;
         default:
                 return;
@@ -1139,47 +1128,42 @@ struct platform_device *atmel_default_console_device;	/* the serial console devi
 void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
 {
         struct platform_device *pdev;
+        struct atmel_uart_data *pdata;
 
         switch (id) {
                 case 0:         /* DBGU */
                         pdev = &at91sam9260_dbgu_device;
                         configure_dbgu_pins();
-                        at91_clock_associate("mck", &pdev->dev, "usart");
                         break;
                 case AT91SAM9260_ID_US0:
                         pdev = &at91sam9260_uart0_device;
                         configure_usart0_pins(pins);
-                        at91_clock_associate("usart0_clk", &pdev->dev, "usart");
                         break;
                 case AT91SAM9260_ID_US1:
                         pdev = &at91sam9260_uart1_device;
                         configure_usart1_pins(pins);
-                        at91_clock_associate("usart1_clk", &pdev->dev, "usart");
                         break;
                 case AT91SAM9260_ID_US2:
                         pdev = &at91sam9260_uart2_device;
                         configure_usart2_pins(pins);
-                        at91_clock_associate("usart2_clk", &pdev->dev, "usart");
                         break;
                 case AT91SAM9260_ID_US3:
                         pdev = &at91sam9260_uart3_device;
                         configure_usart3_pins(pins);
-                        at91_clock_associate("usart3_clk", &pdev->dev, "usart");
                         break;
                 case AT91SAM9260_ID_US4:
                         pdev = &at91sam9260_uart4_device;
                         configure_usart4_pins();
-                        at91_clock_associate("usart4_clk", &pdev->dev, "usart");
                         break;
                 case AT91SAM9260_ID_US5:
                         pdev = &at91sam9260_uart5_device;
                         configure_usart5_pins();
-                        at91_clock_associate("usart5_clk", &pdev->dev, "usart");
                         break;
                 default:
                         return;
         }
-        pdev->id = portnr;              /* update to mapped ID */
+        pdata = pdev->dev.platform_data;
+        pdata->num = portnr;            /* update to mapped ID */
 
         if (portnr < ATMEL_MAX_UART)
                 at91_uarts[portnr] = pdev;
@@ -1187,8 +1171,10 @@ void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
 
 void __init at91_set_serial_console(unsigned portnr)
 {
-        if (portnr < ATMEL_MAX_UART)
+        if (portnr < ATMEL_MAX_UART) {
                 atmel_default_console_device = at91_uarts[portnr];
+                at91sam9260_set_console_clock(portnr);
+        }
 }
 
 void __init at91_add_device_serial(void)
diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c
index fcad88668504..c1483168c97a 100644
--- a/arch/arm/mach-at91/at91sam9261.c
+++ b/arch/arm/mach-at91/at91sam9261.c
@@ -178,6 +178,24 @@ static struct clk *periph_clocks[] __initdata = {
         // irq0 .. irq2
 };
 
+static struct clk_lookup periph_clocks_lookups[] = {
+        CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk),
+        CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk),
+        CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk),
+        CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.0", &tc1_clk),
+        CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc1_clk),
+        CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
+        CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
+        CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk),
+};
+
+static struct clk_lookup usart_clocks_lookups[] = {
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.0", &mck),
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.1", &usart0_clk),
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.2", &usart1_clk),
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.3", &usart2_clk),
+};
+
 /*
  * The four programmable clocks.
  * You must configure pin multiplexing to bring these signals out.
@@ -228,6 +246,11 @@ static void __init at91sam9261_register_clocks(void)
         for (i = 0; i < ARRAY_SIZE(periph_clocks); i++)
                 clk_register(periph_clocks[i]);
 
+        clkdev_add_table(periph_clocks_lookups,
+                         ARRAY_SIZE(periph_clocks_lookups));
+        clkdev_add_table(usart_clocks_lookups,
+                         ARRAY_SIZE(usart_clocks_lookups));
+
         clk_register(&pck0);
         clk_register(&pck1);
         clk_register(&pck2);
@@ -237,6 +260,18 @@ static void __init at91sam9261_register_clocks(void)
         clk_register(&hck1);
 }
 
+static struct clk_lookup console_clock_lookup;
+
+void __init at91sam9261_set_console_clock(int id)
+{
+        if (id >= ARRAY_SIZE(usart_clocks_lookups))
+                return;
+
+        console_clock_lookup.con_id = "usart";
+        console_clock_lookup.clk = usart_clocks_lookups[id].clk;
+        clkdev_add(&console_clock_lookup);
+}
+
 /* --------------------------------------------------------------------
  *  GPIO
  * -------------------------------------------------------------------- */
@@ -267,7 +302,7 @@ static void at91sam9261_poweroff(void)
  *  AT91SAM9261 processor initialization
  * -------------------------------------------------------------------- */
 
-void __init at91sam9261_initialize(unsigned long main_clock)
+void __init at91sam9261_map_io(void)
 {
         /* Map peripherals */
         iotable_init(at91sam9261_io_desc, ARRAY_SIZE(at91sam9261_io_desc));
@@ -276,8 +311,10 @@ void __init at91sam9261_initialize(unsigned long main_clock)
                 iotable_init(at91sam9g10_sram_desc, ARRAY_SIZE(at91sam9g10_sram_desc));
         else
                 iotable_init(at91sam9261_sram_desc, ARRAY_SIZE(at91sam9261_sram_desc));
+}
 
-
+void __init at91sam9261_initialize(unsigned long main_clock)
+{
         at91_arch_reset = at91sam9_alt_reset;
         pm_power_off = at91sam9261_poweroff;
         at91_extern_irq = (1 << AT91SAM9261_ID_IRQ0) | (1 << AT91SAM9261_ID_IRQ1)
diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c
index 59fc48311fb0..3eb4538fceeb 100644
--- a/arch/arm/mach-at91/at91sam9261_devices.c
+++ b/arch/arm/mach-at91/at91sam9261_devices.c
@@ -426,7 +426,6 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
                 at91_set_A_periph(AT91_PIN_PA1, 0);     /* SPI0_MOSI */
                 at91_set_A_periph(AT91_PIN_PA2, 0);     /* SPI0_SPCK */
 
-                at91_clock_associate("spi0_clk", &at91sam9261_spi0_device.dev, "spi_clk");
                 platform_device_register(&at91sam9261_spi0_device);
         }
         if (enable_spi1) {
@@ -434,7 +433,6 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
                 at91_set_A_periph(AT91_PIN_PB31, 0);    /* SPI1_MOSI */
                 at91_set_A_periph(AT91_PIN_PB29, 0);    /* SPI1_SPCK */
 
-                at91_clock_associate("spi1_clk", &at91sam9261_spi1_device.dev, "spi_clk");
                 platform_device_register(&at91sam9261_spi1_device);
         }
 }
@@ -581,10 +579,6 @@ static struct platform_device at91sam9261_tcb_device = {
 
 static void __init at91_add_device_tc(void)
 {
-        /* this chip has a separate clock and irq for each TC channel */
-        at91_clock_associate("tc0_clk", &at91sam9261_tcb_device.dev, "t0_clk");
-        at91_clock_associate("tc1_clk", &at91sam9261_tcb_device.dev, "t1_clk");
-        at91_clock_associate("tc2_clk", &at91sam9261_tcb_device.dev, "t2_clk");
         platform_device_register(&at91sam9261_tcb_device);
 }
 #else
@@ -786,17 +780,14 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins)
         case AT91SAM9261_ID_SSC0:
                 pdev = &at91sam9261_ssc0_device;
                 configure_ssc0_pins(pins);
-                at91_clock_associate("ssc0_clk", &pdev->dev, "pclk");
                 break;
         case AT91SAM9261_ID_SSC1:
                 pdev = &at91sam9261_ssc1_device;
                 configure_ssc1_pins(pins);
-                at91_clock_associate("ssc1_clk", &pdev->dev, "pclk");
                 break;
         case AT91SAM9261_ID_SSC2:
                 pdev = &at91sam9261_ssc2_device;
                 configure_ssc2_pins(pins);
-                at91_clock_associate("ssc2_clk", &pdev->dev, "pclk");
                 break;
         default:
                 return;
@@ -989,32 +980,30 @@ struct platform_device *atmel_default_console_device;	/* the serial console devi
 void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
 {
         struct platform_device *pdev;
+        struct atmel_uart_data *pdata;
 
         switch (id) {
                 case 0:         /* DBGU */
                         pdev = &at91sam9261_dbgu_device;
                         configure_dbgu_pins();
-                        at91_clock_associate("mck", &pdev->dev, "usart");
                         break;
                 case AT91SAM9261_ID_US0:
                         pdev = &at91sam9261_uart0_device;
                         configure_usart0_pins(pins);
-                        at91_clock_associate("usart0_clk", &pdev->dev, "usart");
                         break;
                 case AT91SAM9261_ID_US1:
                         pdev = &at91sam9261_uart1_device;
                         configure_usart1_pins(pins);
-                        at91_clock_associate("usart1_clk", &pdev->dev, "usart");
                         break;
                 case AT91SAM9261_ID_US2:
                         pdev = &at91sam9261_uart2_device;
                         configure_usart2_pins(pins);
-                        at91_clock_associate("usart2_clk", &pdev->dev, "usart");
                         break;
                 default:
                         return;
         }
-        pdev->id = portnr;              /* update to mapped ID */
+        pdata = pdev->dev.platform_data;
+        pdata->num = portnr;            /* update to mapped ID */
 
         if (portnr < ATMEL_MAX_UART)
                 at91_uarts[portnr] = pdev;
@@ -1022,8 +1011,10 @@ void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
 
 void __init at91_set_serial_console(unsigned portnr)
 {
-        if (portnr < ATMEL_MAX_UART)
+        if (portnr < ATMEL_MAX_UART) {
                 atmel_default_console_device = at91_uarts[portnr];
+                at91sam9261_set_console_clock(portnr);
+        }
 }
 
 void __init at91_add_device_serial(void)
diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c
index 249f900954d8..dc28477d14ff 100644
--- a/arch/arm/mach-at91/at91sam9263.c
+++ b/arch/arm/mach-at91/at91sam9263.c
@@ -199,6 +199,23 @@ static struct clk *periph_clocks[] __initdata = {
         // irq0 .. irq1
 };
 
+static struct clk_lookup periph_clocks_lookups[] = {
+        CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
+        CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
+        CLKDEV_CON_DEV_ID("mci_clk", "at91_mci.0", &mmc0_clk),
+        CLKDEV_CON_DEV_ID("mci_clk", "at91_mci.1", &mmc1_clk),
+        CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk),
+        CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk),
+        CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk),
+};
+
+static struct clk_lookup usart_clocks_lookups[] = {
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.0", &mck),
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.1", &usart0_clk),
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.2", &usart1_clk),
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.3", &usart2_clk),
+};
+
 /*
  * The four programmable clocks.
  * You must configure pin multiplexing to bring these signals out.
@@ -235,12 +252,29 @@ static void __init at91sam9263_register_clocks(void)
         for (i = 0; i < ARRAY_SIZE(periph_clocks); i++)
                 clk_register(periph_clocks[i]);
 
+        clkdev_add_table(periph_clocks_lookups,
+                         ARRAY_SIZE(periph_clocks_lookups));
+        clkdev_add_table(usart_clocks_lookups,
+                         ARRAY_SIZE(usart_clocks_lookups));
+
         clk_register(&pck0);
         clk_register(&pck1);
         clk_register(&pck2);
         clk_register(&pck3);
 }
 
+static struct clk_lookup console_clock_lookup;
+
+void __init at91sam9263_set_console_clock(int id)
+{
+        if (id >= ARRAY_SIZE(usart_clocks_lookups))
+                return;
+
+        console_clock_lookup.con_id = "usart";
+        console_clock_lookup.clk = usart_clocks_lookups[id].clk;
+        clkdev_add(&console_clock_lookup);
+}
+
 /* --------------------------------------------------------------------
  *  GPIO
  * -------------------------------------------------------------------- */
@@ -279,11 +313,14 @@ static void at91sam9263_poweroff(void)
  *  AT91SAM9263 processor initialization
  * -------------------------------------------------------------------- */
 
-void __init at91sam9263_initialize(unsigned long main_clock)
+void __init at91sam9263_map_io(void)
 {
         /* Map peripherals */
         iotable_init(at91sam9263_io_desc, ARRAY_SIZE(at91sam9263_io_desc));
+}
 
+void __init at91sam9263_initialize(unsigned long main_clock)
+{
         at91_arch_reset = at91sam9_alt_reset;
         pm_power_off = at91sam9263_poweroff;
         at91_extern_irq = (1 << AT91SAM9263_ID_IRQ0) | (1 << AT91SAM9263_ID_IRQ1);
diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c
index fb5c23af1017..ffe081b77ed0 100644
--- a/arch/arm/mach-at91/at91sam9263_devices.c
+++ b/arch/arm/mach-at91/at91sam9263_devices.c
@@ -308,7 +308,6 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)
                 }
 
                 mmc0_data = *data;
-                at91_clock_associate("mci0_clk", &at91sam9263_mmc0_device.dev, "mci_clk");
                 platform_device_register(&at91sam9263_mmc0_device);
         } else {                        /* MCI1 */
                 /* CLK */
@@ -339,7 +338,6 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)
                 }
 
                 mmc1_data = *data;
-                at91_clock_associate("mci1_clk", &at91sam9263_mmc1_device.dev, "mci_clk");
                 platform_device_register(&at91sam9263_mmc1_device);
         }
 }
@@ -686,7 +684,6 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
                 at91_set_B_periph(AT91_PIN_PA1, 0);     /* SPI0_MOSI */
                 at91_set_B_periph(AT91_PIN_PA2, 0);     /* SPI0_SPCK */
 
-                at91_clock_associate("spi0_clk", &at91sam9263_spi0_device.dev, "spi_clk");
                 platform_device_register(&at91sam9263_spi0_device);
         }
         if (enable_spi1) {
@@ -694,7 +691,6 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
                 at91_set_A_periph(AT91_PIN_PB13, 0);    /* SPI1_MOSI */
                 at91_set_A_periph(AT91_PIN_PB14, 0);    /* SPI1_SPCK */
 
-                at91_clock_associate("spi1_clk", &at91sam9263_spi1_device.dev, "spi_clk");
                 platform_device_register(&at91sam9263_spi1_device);
         }
 }
@@ -941,8 +937,6 @@ static struct platform_device at91sam9263_tcb_device = {
 
 static void __init at91_add_device_tc(void)
 {
-        /* this chip has one clock and irq for all three TC channels */
-        at91_clock_associate("tcb_clk", &at91sam9263_tcb_device.dev, "t0_clk");
         platform_device_register(&at91sam9263_tcb_device);
 }
 #else
@@ -1171,12 +1165,10 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins)
         case AT91SAM9263_ID_SSC0:
                 pdev = &at91sam9263_ssc0_device;
                 configure_ssc0_pins(pins);
-                at91_clock_associate("ssc0_clk", &pdev->dev, "pclk");
                 break;
         case AT91SAM9263_ID_SSC1:
                 pdev = &at91sam9263_ssc1_device;
                 configure_ssc1_pins(pins);
-                at91_clock_associate("ssc1_clk", &pdev->dev, "pclk");
                 break;
         default:
                 return;
@@ -1370,32 +1362,30 @@ struct platform_device *atmel_default_console_device;	/* the serial console devi
 void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
 {
         struct platform_device *pdev;
+        struct atmel_uart_data *pdata;
 
         switch (id) {
                 case 0:         /* DBGU */
                         pdev = &at91sam9263_dbgu_device;
                         configure_dbgu_pins();
-                        at91_clock_associate("mck", &pdev->dev, "usart");
                         break;
                 case AT91SAM9263_ID_US0:
                         pdev = &at91sam9263_uart0_device;
                         configure_usart0_pins(pins);
-                        at91_clock_associate("usart0_clk", &pdev->dev, "usart");
                         break;
                 case AT91SAM9263_ID_US1:
                         pdev = &at91sam9263_uart1_device;
                         configure_usart1_pins(pins);
-                        at91_clock_associate("usart1_clk", &pdev->dev, "usart");
                         break;
                 case AT91SAM9263_ID_US2:
                         pdev = &at91sam9263_uart2_device;
                         configure_usart2_pins(pins);
-                        at91_clock_associate("usart2_clk", &pdev->dev, "usart");
                         break;
                 default:
                         return;
         }
-        pdev->id = portnr;              /* update to mapped ID */
+        pdata = pdev->dev.platform_data;
+        pdata->num = portnr;            /* update to mapped ID */
 
         if (portnr < ATMEL_MAX_UART)
                 at91_uarts[portnr] = pdev;
@@ -1403,8 +1393,10 @@ void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
 
 void __init at91_set_serial_console(unsigned portnr)
 {
-        if (portnr < ATMEL_MAX_UART)
+        if (portnr < ATMEL_MAX_UART) {
                 atmel_default_console_device = at91_uarts[portnr];
+                at91sam9263_set_console_clock(portnr);
+        }
 }
 
 void __init at91_add_device_serial(void)
diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
index c67b47f1c0fd..2bb6ff9af1c7 100644
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@ -184,22 +184,6 @@ static struct clk vdec_clk = {
         .type           = CLK_TYPE_PERIPHERAL,
 };
 
-/* One additional fake clock for ohci */
-static struct clk ohci_clk = {
-        .name           = "ohci_clk",
-        .pmc_mask       = 0,
-        .type           = CLK_TYPE_PERIPHERAL,
-        .parent         = &uhphs_clk,
-};
-
-/* One additional fake clock for second TC block */
-static struct clk tcb1_clk = {
-        .name           = "tcb1_clk",
-        .pmc_mask       = 0,
-        .type           = CLK_TYPE_PERIPHERAL,
-        .parent         = &tcb0_clk,
-};
-
 static struct clk *periph_clocks[] __initdata = {
         &pioA_clk,
         &pioB_clk,
@@ -228,8 +212,30 @@ static struct clk *periph_clocks[] __initdata = {
         &udphs_clk,
         &mmc1_clk,
         // irq0
-        &ohci_clk,
-        &tcb1_clk,
+};
+
+static struct clk_lookup periph_clocks_lookups[] = {
+        /* One additional fake clock for ohci */
+        CLKDEV_CON_ID("ohci_clk", &uhphs_clk),
+        CLKDEV_CON_DEV_ID("ehci_clk", "atmel-ehci.0", &uhphs_clk),
+        CLKDEV_CON_DEV_ID("hclk", "atmel_usba_udc.0", &utmi_clk),
+        CLKDEV_CON_DEV_ID("pclk", "atmel_usba_udc.0", &udphs_clk),
+        CLKDEV_CON_DEV_ID("mci_clk", "at91_mci.0", &mmc0_clk),
+        CLKDEV_CON_DEV_ID("mci_clk", "at91_mci.1", &mmc1_clk),
+        CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk),
+        CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk),
+        CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb0_clk),
+        CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tcb0_clk),
+        CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
+        CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
+};
+
+static struct clk_lookup usart_clocks_lookups[] = {
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.0", &mck),
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.1", &usart0_clk),
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.2", &usart1_clk),
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.3", &usart2_clk),
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.4", &usart3_clk),
 };
 
 /*
@@ -256,6 +262,11 @@ static void __init at91sam9g45_register_clocks(void)
         for (i = 0; i < ARRAY_SIZE(periph_clocks); i++)
                 clk_register(periph_clocks[i]);
 
+        clkdev_add_table(periph_clocks_lookups,
+                         ARRAY_SIZE(periph_clocks_lookups));
+        clkdev_add_table(usart_clocks_lookups,
+                         ARRAY_SIZE(usart_clocks_lookups));
+
         if (cpu_is_at91sam9m10() || cpu_is_at91sam9m11())
                 clk_register(&vdec_clk);
 
@@ -263,6 +274,18 @@ static void __init at91sam9g45_register_clocks(void)
         clk_register(&pck1);
 }
 
+static struct clk_lookup console_clock_lookup;
+
+void __init at91sam9g45_set_console_clock(int id)
+{
+        if (id >= ARRAY_SIZE(usart_clocks_lookups))
+                return;
+
+        console_clock_lookup.con_id = "usart";
+        console_clock_lookup.clk = usart_clocks_lookups[id].clk;
+        clkdev_add(&console_clock_lookup);
+}
+
 /* --------------------------------------------------------------------
  *  GPIO
  * -------------------------------------------------------------------- */
@@ -306,11 +329,14 @@ static void at91sam9g45_poweroff(void)
  *  AT91SAM9G45 processor initialization
  * -------------------------------------------------------------------- */
 
-void __init at91sam9g45_initialize(unsigned long main_clock)
+void __init at91sam9g45_map_io(void)
 {
         /* Map peripherals */
         iotable_init(at91sam9g45_io_desc, ARRAY_SIZE(at91sam9g45_io_desc));
+}
 
+void __init at91sam9g45_initialize(unsigned long main_clock)
+{
         at91_arch_reset = at91sam9g45_reset;
         pm_power_off = at91sam9g45_poweroff;
         at91_extern_irq = (1 << AT91SAM9G45_ID_IRQ0);
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c
index 5e9f8a4c38df..05674865bc21 100644
--- a/arch/arm/mach-at91/at91sam9g45_devices.c
+++ b/arch/arm/mach-at91/at91sam9g45_devices.c
@@ -180,7 +180,6 @@ void __init at91_add_device_usbh_ehci(struct at91_usbh_data *data)
         }
 
         usbh_ehci_data = *data;
-        at91_clock_associate("uhphs_clk", &at91_usbh_ehci_device.dev, "ehci_clk");
         platform_device_register(&at91_usbh_ehci_device);
 }
 #else
@@ -266,10 +265,6 @@ void __init at91_add_device_usba(struct usba_platform_data *data)
 
         /* Pullup pin is handled internally by USB device peripheral */
 
-        /* Clocks */
-        at91_clock_associate("utmi_clk", &at91_usba_udc_device.dev, "hclk");
-        at91_clock_associate("udphs_clk", &at91_usba_udc_device.dev, "pclk");
-
         platform_device_register(&at91_usba_udc_device);
 }
 #else
@@ -478,7 +473,6 @@ void __init at91_add_device_mci(short mmc_id, struct mci_platform_data *data)
                 }
 
                 mmc0_data = *data;
-                at91_clock_associate("mci0_clk", &at91sam9g45_mmc0_device.dev, "mci_clk");
                 platform_device_register(&at91sam9g45_mmc0_device);
 
         } else {                        /* MCI1 */
@@ -504,7 +498,6 @@ void __init at91_add_device_mci(short mmc_id, struct mci_platform_data *data)
                 }
 
                 mmc1_data = *data;
-                at91_clock_associate("mci1_clk", &at91sam9g45_mmc1_device.dev, "mci_clk");
                 platform_device_register(&at91sam9g45_mmc1_device);
 
         }
@@ -801,7 +794,6 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
                 at91_set_A_periph(AT91_PIN_PB1, 0);     /* SPI0_MOSI */
                 at91_set_A_periph(AT91_PIN_PB2, 0);     /* SPI0_SPCK */
 
-                at91_clock_associate("spi0_clk", &at91sam9g45_spi0_device.dev, "spi_clk");
                 platform_device_register(&at91sam9g45_spi0_device);
         }
         if (enable_spi1) {
@@ -809,7 +801,6 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
                 at91_set_A_periph(AT91_PIN_PB15, 0);    /* SPI1_MOSI */
                 at91_set_A_periph(AT91_PIN_PB16, 0);    /* SPI1_SPCK */
 
-                at91_clock_associate("spi1_clk", &at91sam9g45_spi1_device.dev, "spi_clk");
                 platform_device_register(&at91sam9g45_spi1_device);
         }
 }
@@ -999,10 +990,7 @@ static struct platform_device at91sam9g45_tcb1_device = {
 
 static void __init at91_add_device_tc(void)
 {
-        /* this chip has one clock and irq for all six TC channels */
-        at91_clock_associate("tcb0_clk", &at91sam9g45_tcb0_device.dev, "t0_clk");
         platform_device_register(&at91sam9g45_tcb0_device);
-        at91_clock_associate("tcb1_clk", &at91sam9g45_tcb1_device.dev, "t0_clk");
         platform_device_register(&at91sam9g45_tcb1_device);
 }
 #else
@@ -1286,12 +1274,10 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins)
         case AT91SAM9G45_ID_SSC0:
                 pdev = &at91sam9g45_ssc0_device;
                 configure_ssc0_pins(pins);
-                at91_clock_associate("ssc0_clk", &pdev->dev, "pclk");
                 break;
         case AT91SAM9G45_ID_SSC1:
                 pdev = &at91sam9g45_ssc1_device;
                 configure_ssc1_pins(pins);
-                at91_clock_associate("ssc1_clk", &pdev->dev, "pclk");
                 break;
         default:
                 return;
@@ -1527,37 +1513,34 @@ struct platform_device *atmel_default_console_device;	/* the serial console devi
 void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
 {
         struct platform_device *pdev;
+        struct atmel_uart_data *pdata;
 
         switch (id) {
                 case 0:         /* DBGU */
                         pdev = &at91sam9g45_dbgu_device;
                         configure_dbgu_pins();
-                        at91_clock_associate("mck", &pdev->dev, "usart");
                         break;
                 case AT91SAM9G45_ID_US0:
                         pdev = &at91sam9g45_uart0_device;
                         configure_usart0_pins(pins);
-                        at91_clock_associate("usart0_clk", &pdev->dev, "usart");
                         break;
                 case AT91SAM9G45_ID_US1:
                         pdev = &at91sam9g45_uart1_device;
                         configure_usart1_pins(pins);
-                        at91_clock_associate("usart1_clk", &pdev->dev, "usart");
                         break;
                 case AT91SAM9G45_ID_US2:
                         pdev = &at91sam9g45_uart2_device;
                         configure_usart2_pins(pins);
-                        at91_clock_associate("usart2_clk", &pdev->dev, "usart");
                         break;
                 case AT91SAM9G45_ID_US3:
                         pdev = &at91sam9g45_uart3_device;
                         configure_usart3_pins(pins);
-                        at91_clock_associate("usart3_clk", &pdev->dev, "usart");
                         break;
                 default:
                         return;
         }
-        pdev->id = portnr;              /* update to mapped ID */
+        pdata = pdev->dev.platform_data;
+        pdata->num = portnr;            /* update to mapped ID */
 
         if (portnr < ATMEL_MAX_UART)
                 at91_uarts[portnr] = pdev;
@@ -1565,8 +1548,10 @@ void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
 
 void __init at91_set_serial_console(unsigned portnr)
 {
-        if (portnr < ATMEL_MAX_UART)
+        if (portnr < ATMEL_MAX_UART) {
                 atmel_default_console_device = at91_uarts[portnr];
+                at91sam9g45_set_console_clock(portnr);
+        }
 }
 
 void __init at91_add_device_serial(void)
diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c
index 6a9d24e5ed8e..1a40f16b66c8 100644
--- a/arch/arm/mach-at91/at91sam9rl.c
+++ b/arch/arm/mach-at91/at91sam9rl.c
@@ -190,6 +190,24 @@ static struct clk *periph_clocks[] __initdata = {
         // irq0
 };
 
+static struct clk_lookup periph_clocks_lookups[] = {
+        CLKDEV_CON_DEV_ID("hclk", "atmel_usba_udc.0", &utmi_clk),
+        CLKDEV_CON_DEV_ID("pclk", "atmel_usba_udc.0", &udphs_clk),
+        CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk),
+        CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.0", &tc1_clk),
+        CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc2_clk),
+        CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
+        CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
+};
+
+static struct clk_lookup usart_clocks_lookups[] = {
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.0", &mck),
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.1", &usart0_clk),
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.2", &usart1_clk),
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.3", &usart2_clk),
+        CLKDEV_CON_DEV_ID("usart", "atmel_usart.4", &usart3_clk),
+};
+
 /*
  * The two programmable clocks.
  * You must configure pin multiplexing to bring these signals out.
@@ -214,10 +232,27 @@ static void __init at91sam9rl_register_clocks(void)
         for (i = 0; i < ARRAY_SIZE(periph_clocks); i++)
                 clk_register(periph_clocks[i]);
 
+        clkdev_add_table(periph_clocks_lookups,
+                         ARRAY_SIZE(periph_clocks_lookups));
+        clkdev_add_table(usart_clocks_lookups,
+                         ARRAY_SIZE(usart_clocks_lookups));
+
         clk_register(&pck0);
         clk_register(&pck1);
 }
 
+static struct clk_lookup console_clock_lookup;
+
+void __init at91sam9rl_set_console_clock(int id)
+{
+        if (id >= ARRAY_SIZE(usart_clocks_lookups))
+                return;
+
+        console_clock_lookup.con_id = "usart";
+        console_clock_lookup.clk = usart_clocks_lookups[id].clk;
+        clkdev_add(&console_clock_lookup);
+}
+
 /* --------------------------------------------------------------------
  *  GPIO
  * -------------------------------------------------------------------- */
@@ -252,7 +287,7 @@ static void at91sam9rl_poweroff(void)
  *  AT91SAM9RL processor initialization
  * -------------------------------------------------------------------- */
 
-void __init at91sam9rl_initialize(unsigned long main_clock)
+void __init at91sam9rl_map_io(void)
 {
         unsigned long cidr, sram_size;
 
@@ -275,7 +310,10 @@ void __init at91sam9rl_initialize(unsigned long main_clock)
 
         /* Map SRAM */
         iotable_init(at91sam9rl_sram_desc, ARRAY_SIZE(at91sam9rl_sram_desc));
+}
 
+void __init at91sam9rl_initialize(unsigned long main_clock)
+{
         at91_arch_reset = at91sam9_alt_reset;
         pm_power_off = at91sam9rl_poweroff;
         at91_extern_irq = (1 << AT91SAM9RL_ID_IRQ0);
diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c
index c49262bddd85..c296045f2b6a 100644
--- a/arch/arm/mach-at91/at91sam9rl_devices.c
+++ b/arch/arm/mach-at91/at91sam9rl_devices.c
@@ -155,10 +155,6 @@ void __init at91_add_device_usba(struct usba_platform_data *data)
 
         /* Pullup pin is handled internally by USB device peripheral */
 
-        /* Clocks */
-        at91_clock_associate("utmi_clk", &at91_usba_udc_device.dev, "hclk");
-        at91_clock_associate("udphs_clk", &at91_usba_udc_device.dev, "pclk");
-
         platform_device_register(&at91_usba_udc_device);
 }
 #else
@@ -605,10 +601,6 @@ static struct platform_device at91sam9rl_tcb_device = {
 
 static void __init at91_add_device_tc(void)
 {
-        /* this chip has a separate clock and irq for each TC channel */
-        at91_clock_associate("tc0_clk", &at91sam9rl_tcb_device.dev, "t0_clk");
-        at91_clock_associate("tc1_clk", &at91sam9rl_tcb_device.dev, "t1_clk");
-        at91_clock_associate("tc2_clk", &at91sam9rl_tcb_device.dev, "t2_clk");
         platform_device_register(&at91sam9rl_tcb_device);
 }
 #else
@@ -892,12 +884,10 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins)
         case AT91SAM9RL_ID_SSC0:
                 pdev = &at91sam9rl_ssc0_device;
                 configure_ssc0_pins(pins);
-                at91_clock_associate("ssc0_clk", &pdev->dev, "pclk");
                 break;
         case AT91SAM9RL_ID_SSC1:
                 pdev = &at91sam9rl_ssc1_device;
                 configure_ssc1_pins(pins);
-                at91_clock_associate("ssc1_clk", &pdev->dev, "pclk");
                 break;
         default:
                 return;
@@ -1141,37 +1131,34 @@ struct platform_device *atmel_default_console_device;	/* the serial console devi
 void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
 {
         struct platform_device *pdev;
+        struct atmel_uart_data *pdata;
 
         switch (id) {
                 case 0:         /* DBGU */
                         pdev = &at91sam9rl_dbgu_device;
                         configure_dbgu_pins();
-                        at91_clock_associate("mck", &pdev->dev, "usart");
                         break;
                 case AT91SAM9RL_ID_US0:
                         pdev = &at91sam9rl_uart0_device;
                         configure_usart0_pins(pins);
-                        at91_clock_associate("usart0_clk", &pdev->dev, "usart");
                         break;
                 case AT91SAM9RL_ID_US1:
                         pdev = &at91sam9rl_uart1_device;
                         configure_usart1_pins(pins);
-                        at91_clock_associate("usart1_clk", &pdev->dev, "usart");
                         break;
                 case AT91SAM9RL_ID_US2:
                         pdev = &at91sam9rl_uart2_device;
                         configure_usart2_pins(pins);
-                        at91_clock_associate("usart2_clk", &pdev->dev, "usart");
                         break;
                 case AT91SAM9RL_ID_US3:
                         pdev = &at91sam9rl_uart3_device;
                         configure_usart3_pins(pins);
-                        at91_clock_associate("usart3_clk", &pdev->dev, "usart");
                         break;
                 default:
                         return;
         }
-        pdev->id = portnr;              /* update to mapped ID */
+        pdata = pdev->dev.platform_data;
+        pdata->num = portnr;            /* update to mapped ID */
 
         if (portnr < ATMEL_MAX_UART)
                 at91_uarts[portnr] = pdev;
@@ -1179,8 +1166,10 @@ void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
 
 void __init at91_set_serial_console(unsigned portnr)
 {
-        if (portnr < ATMEL_MAX_UART)
+        if (portnr < ATMEL_MAX_UART) {
                 atmel_default_console_device = at91_uarts[portnr];
+                at91sam9rl_set_console_clock(portnr);
+        }
 }
 
 void __init at91_add_device_serial(void)
diff --git a/arch/arm/mach-at91/at91x40.c b/arch/arm/mach-at91/at91x40.c
index ad3ec85b2790..56ba3bd035ae 100644
--- a/arch/arm/mach-at91/at91x40.c
+++ b/arch/arm/mach-at91/at91x40.c
@@ -37,11 +37,6 @@ unsigned long clk_get_rate(struct clk *clk)
         return AT91X40_MASTER_CLOCK;
 }
 
-struct clk *clk_get(struct device *dev, const char *id)
-{
-        return NULL;
-}
-
 void __init at91x40_initialize(unsigned long main_clock)
 {
         at91_extern_irq = (1 << AT91X40_ID_IRQ0) | (1 << AT91X40_ID_IRQ1)
diff --git a/arch/arm/mach-at91/board-1arm.c b/arch/arm/mach-at91/board-1arm.c
index 8a3fc84847c1..ab1d463aa47d 100644
--- a/arch/arm/mach-at91/board-1arm.c
+++ b/arch/arm/mach-at91/board-1arm.c
@@ -35,14 +35,18 @@
 
 #include <mach/board.h>
 #include <mach/gpio.h>
+#include <mach/cpu.h>
 
 #include "generic.h"
 
 
-static void __init onearm_map_io(void)
+static void __init onearm_init_early(void)
 {
+        /* Set cpu type: PQFP */
+        at91rm9200_set_type(ARCH_REVISON_9200_PQFP);
+
         /* Initialize processor: 18.432 MHz crystal */
-        at91rm9200_initialize(18432000, AT91RM9200_PQFP);
+        at91rm9200_initialize(18432000);
 
         /* DBGU on ttyS0. (Rx & Tx only) */
         at91_register_uart(0, 0, 0);
@@ -92,9 +96,9 @@ static void __init onearm_board_init(void)
 
 MACHINE_START(ONEARM, "Ajeco 1ARM single board computer")
         /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91rm9200_timer,
-        .map_io         = onearm_map_io,
+        .map_io         = at91rm9200_map_io,
+        .init_early     = onearm_init_early,
         .init_irq       = onearm_init_irq,
         .init_machine   = onearm_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-afeb-9260v1.c b/arch/arm/mach-at91/board-afeb-9260v1.c
index cba7f7771fee..a4924de48c36 100644
--- a/arch/arm/mach-at91/board-afeb-9260v1.c
+++ b/arch/arm/mach-at91/board-afeb-9260v1.c
@@ -48,7 +48,7 @@
 #include "generic.h"
 
 
-static void __init afeb9260_map_io(void)
+static void __init afeb9260_init_early(void)
 {
         /* Initialize processor: 18.432 MHz crystal */
         at91sam9260_initialize(18432000);
@@ -218,9 +218,9 @@ static void __init afeb9260_board_init(void)
 
 MACHINE_START(AFEB9260, "Custom afeb9260 board")
         /* Maintainer: Sergey Lapin <slapin@ossfans.org> */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91sam926x_timer,
-        .map_io         = afeb9260_map_io,
+        .map_io         = at91sam9260_map_io,
+        .init_early     = afeb9260_init_early,
         .init_irq       = afeb9260_init_irq,
         .init_machine   = afeb9260_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-at572d940hf_ek.c b/arch/arm/mach-at91/board-at572d940hf_ek.c
deleted file mode 100644
index 3929f1c9e4e5..000000000000
--- a/arch/arm/mach-at91/board-at572d940hf_ek.c
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- * linux/arch/arm/mach-at91/board-at572d940hf_ek.c
- *
- * Copyright (C) 2008 Atmel Antonio R. Costa <costa.antonior@gmail.com>
- * Copyright (C) 2005 SAN People
- *
- * 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 program 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
- */
-
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/spi/spi.h>
-#include <linux/spi/ds1305.h>
-#include <linux/irq.h>
-#include <linux/mtd/physmap.h>
-
-#include <mach/hardware.h>
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-#include <asm/irq.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/mach/irq.h>
-
-#include <mach/board.h>
-#include <mach/gpio.h>
-#include <mach/at91sam9_smc.h>
-
-#include "sam9_smc.h"
-#include "generic.h"
-
-
-static void __init eb_map_io(void)
-{
-        /* Initialize processor: 12.500 MHz crystal */
-        at572d940hf_initialize(12000000);
-
-        /* DBGU on ttyS0. (Rx & Tx only) */
-        at91_register_uart(0, 0, 0);
-
-        /* USART0 on ttyS1. (Rx & Tx only) */
-        at91_register_uart(AT572D940HF_ID_US0, 1, 0);
-
-        /* USART1 on ttyS2. (Rx & Tx only) */
-        at91_register_uart(AT572D940HF_ID_US1, 2, 0);
-
-        /* USART2 on ttyS3. (Tx & Rx only */
-        at91_register_uart(AT572D940HF_ID_US2, 3, 0);
-
-        /* set serial console to ttyS0 (ie, DBGU) */
-        at91_set_serial_console(0);
-}
-
-static void __init eb_init_irq(void)
-{
-        at572d940hf_init_interrupts(NULL);
-}
-
-
-/*
- * USB Host Port
- */
-static struct at91_usbh_data __initdata eb_usbh_data = {
-        .ports          = 2,
-};
-
-
-/*
- * USB Device Port
- */
-static struct at91_udc_data __initdata eb_udc_data = {
-        .vbus_pin       = 0,            /* no VBUS detection,UDC always on */
-        .pullup_pin     = 0,            /* pull-up driven by UDC */
-};
-
-
-/*
- * MCI (SD/MMC)
- */
-static struct at91_mmc_data __initdata eb_mmc_data = {
-        .wire4          = 1,
-/*      .det_pin        = ... not connected */
-/*      .wp_pin         = ... not connected */
-/*      .vcc_pin        = ... not connected */
-};
-
-
-/*
- * MACB Ethernet device
- */
-static struct at91_eth_data __initdata eb_eth_data = {
-        .phy_irq_pin    = AT91_PIN_PB25,
-        .is_rmii        = 1,
-};
-
-/*
- * NOR flash
- */
-
-static struct mtd_partition eb_nor_partitions[] = {
-        {
-                .name           = "Raw Environment",
-                .offset         = 0,
-                .size           = SZ_4M,
-                .mask_flags     = 0,
-        },
-        {
-                .name           = "OS FS",
-                .offset         = MTDPART_OFS_APPEND,
-                .size           = 3 * SZ_1M,
-                .mask_flags     = 0,
-        },
-        {
-                .name           = "APP FS",
-                .offset         = MTDPART_OFS_APPEND,
-                .size           = MTDPART_SIZ_FULL,
-                .mask_flags     = 0,
-        },
-};
-
-static void nor_flash_set_vpp(struct map_info* mi, int i) {
-};
-
-static struct physmap_flash_data nor_flash_data = {
-        .width          = 4,
-        .parts          = eb_nor_partitions,
-        .nr_parts       = ARRAY_SIZE(eb_nor_partitions),
-        .set_vpp        = nor_flash_set_vpp,
-};
-
-static struct resource nor_flash_resources[] = {
-        {
-                .start  = AT91_CHIPSELECT_0,
-                .end    = AT91_CHIPSELECT_0 + SZ_16M - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device nor_flash = {
-        .name           = "physmap-flash",
-        .id             = 0,
-        .dev            = {
-                                .platform_data = &nor_flash_data,
-                        },
-        .resource       = nor_flash_resources,
-        .num_resources  = ARRAY_SIZE(nor_flash_resources),
-};
-
-static struct sam9_smc_config __initdata eb_nor_smc_config = {
-        .ncs_read_setup         = 1,
-        .nrd_setup              = 1,
-        .ncs_write_setup        = 1,
-        .nwe_setup              = 1,
-
-        .ncs_read_pulse         = 7,
-        .nrd_pulse              = 7,
-        .ncs_write_pulse        = 7,
-        .nwe_pulse              = 7,
-
-        .read_cycle             = 9,
-        .write_cycle            = 9,
-
-        .mode                   = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_BAT_WRITE | AT91_SMC_DBW_32,
-        .tdf_cycles             = 1,
-};
-
-static void __init eb_add_device_nor(void)
-{
-        /* configure chip-select 0 (NOR) */
-        sam9_smc_configure(0, &eb_nor_smc_config);
-        platform_device_register(&nor_flash);
-}
-
-/*
- * NAND flash
- */
-static struct mtd_partition __initdata eb_nand_partition[] = {
-        {
-                .name   = "Partition 1",
-                .offset = 0,
-                .size   = SZ_16M,
-        },
-        {
-                .name   = "Partition 2",
-                .offset = MTDPART_OFS_NXTBLK,
-                .size   = MTDPART_SIZ_FULL,
-        }
-};
-
-static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
-{
-        *num_partitions = ARRAY_SIZE(eb_nand_partition);
-        return eb_nand_partition;
-}
-
-static struct atmel_nand_data __initdata eb_nand_data = {
-        .ale            = 22,
-        .cle            = 21,
-/*      .det_pin        = ... not connected */
-/*      .rdy_pin        = AT91_PIN_PC16, */
-        .enable_pin     = AT91_PIN_PA15,
-        .partition_info = nand_partitions,
-#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
-        .bus_width_16   = 1,
-#else
-        .bus_width_16   = 0,
-#endif
-};
-
-static struct sam9_smc_config __initdata eb_nand_smc_config = {
-        .ncs_read_setup         = 0,
-        .nrd_setup              = 0,
-        .ncs_write_setup        = 1,
-        .nwe_setup              = 1,
-
-        .ncs_read_pulse         = 3,
-        .nrd_pulse              = 3,
-        .ncs_write_pulse        = 3,
-        .nwe_pulse              = 3,
-
-        .read_cycle             = 5,
-        .write_cycle            = 5,
-
-        .mode                   = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE,
-        .tdf_cycles             = 12,
-};
-
-static void __init eb_add_device_nand(void)
-{
-        /* setup bus-width (8 or 16) */
-        if (eb_nand_data.bus_width_16)
-                eb_nand_smc_config.mode |= AT91_SMC_DBW_16;
-        else
-                eb_nand_smc_config.mode |= AT91_SMC_DBW_8;
-
-        /* configure chip-select 3 (NAND) */
-        sam9_smc_configure(3, &eb_nand_smc_config);
-
-        at91_add_device_nand(&eb_nand_data);
-}
-
-
-/*
- * SPI devices
- */
-static struct resource rtc_resources[] = {
-        [0] = {
-                .start  = AT572D940HF_ID_IRQ1,
-                .end    = AT572D940HF_ID_IRQ1,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct ds1305_platform_data ds1306_data = {
-        .is_ds1306      = true,
-        .en_1hz         = false,
-};
-
-static struct spi_board_info eb_spi_devices[] = {
-        {       /* RTC Dallas DS1306 */
-                .modalias       = "rtc-ds1305",
-                .chip_select    = 3,
-                .mode           = SPI_CS_HIGH | SPI_CPOL | SPI_CPHA,
-                .max_speed_hz   = 500000,
-                .bus_num        = 0,
-                .irq            = AT572D940HF_ID_IRQ1,
-                .platform_data  = (void *) &ds1306_data,
-        },
-#if defined(CONFIG_MTD_AT91_DATAFLASH_CARD)
-        {       /* Dataflash card */
-                .modalias       = "mtd_dataflash",
-                .chip_select    = 0,
-                .max_speed_hz   = 15 * 1000 * 1000,
-                .bus_num        = 0,
-        },
-#endif
-};
-
-static void __init eb_board_init(void)
-{
-        /* Serial */
-        at91_add_device_serial();
-        /* USB Host */
-        at91_add_device_usbh(&eb_usbh_data);
-        /* USB Device */
-        at91_add_device_udc(&eb_udc_data);
-        /* I2C */
-        at91_add_device_i2c(NULL, 0);
-        /* NOR */
-        eb_add_device_nor();
-        /* NAND */
-        eb_add_device_nand();
-        /* SPI */
-        at91_add_device_spi(eb_spi_devices, ARRAY_SIZE(eb_spi_devices));
-        /* MMC */
-        at91_add_device_mmc(0, &eb_mmc_data);
-        /* Ethernet */
-        at91_add_device_eth(&eb_eth_data);
-        /* mAgic */
-        at91_add_device_mAgic();
-}
-
-MACHINE_START(AT572D940HFEB, "Atmel AT91D940HF-EB")
-        /* Maintainer: Atmel <costa.antonior@gmail.com> */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
-        .timer          = &at91sam926x_timer,
-        .map_io         = eb_map_io,
-        .init_irq       = eb_init_irq,
-        .init_machine   = eb_board_init,
-MACHINE_END
diff --git a/arch/arm/mach-at91/board-cam60.c b/arch/arm/mach-at91/board-cam60.c
index b54e3e6fceb6..148fccb9a25a 100644
--- a/arch/arm/mach-at91/board-cam60.c
+++ b/arch/arm/mach-at91/board-cam60.c
@@ -45,7 +45,7 @@
 #include "generic.h"
 
 
-static void __init cam60_map_io(void)
+static void __init cam60_init_early(void)
 {
         /* Initialize processor: 10 MHz crystal */
         at91sam9260_initialize(10000000);
@@ -198,9 +198,9 @@ static void __init cam60_board_init(void)
 
 MACHINE_START(CAM60, "KwikByte CAM60")
         /* Maintainer: KwikByte */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91sam926x_timer,
-        .map_io         = cam60_map_io,
+        .map_io         = at91sam9260_map_io,
+        .init_early     = cam60_init_early,
         .init_irq       = cam60_init_irq,
         .init_machine   = cam60_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-cap9adk.c b/arch/arm/mach-at91/board-cap9adk.c
index e7274440ead9..1904fdf87613 100644
--- a/arch/arm/mach-at91/board-cap9adk.c
+++ b/arch/arm/mach-at91/board-cap9adk.c
@@ -44,12 +44,13 @@
 #include <mach/gpio.h>
 #include <mach/at91cap9_matrix.h>
 #include <mach/at91sam9_smc.h>
+#include <mach/system_rev.h>
 
 #include "sam9_smc.h"
 #include "generic.h"
 
 
-static void __init cap9adk_map_io(void)
+static void __init cap9adk_init_early(void)
 {
         /* Initialize processor: 12 MHz crystal */
         at91cap9_initialize(12000000);
@@ -187,11 +188,6 @@ static struct atmel_nand_data __initdata cap9adk_nand_data = {
 //      .rdy_pin        = ... not connected
         .enable_pin     = AT91_PIN_PD15,
         .partition_info = nand_partitions,
-#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
-        .bus_width_16   = 1,
-#else
-        .bus_width_16   = 0,
-#endif
 };
 
 static struct sam9_smc_config __initdata cap9adk_nand_smc_config = {
@@ -219,6 +215,7 @@ static void __init cap9adk_add_device_nand(void)
         csa = at91_sys_read(AT91_MATRIX_EBICSA);
         at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_EBI_VDDIOMSEL_3_3V);
 
+        cap9adk_nand_data.bus_width_16 = !board_have_nand_8bit();
         /* setup bus-width (8 or 16) */
         if (cap9adk_nand_data.bus_width_16)
                 cap9adk_nand_smc_config.mode |= AT91_SMC_DBW_16;
@@ -399,9 +396,9 @@ static void __init cap9adk_board_init(void)
 
 MACHINE_START(AT91CAP9ADK, "Atmel AT91CAP9A-DK")
         /* Maintainer: Stelian Pop <stelian.pop@leadtechdesign.com> */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91sam926x_timer,
-        .map_io         = cap9adk_map_io,
+        .map_io         = at91cap9_map_io,
+        .init_early     = cap9adk_init_early,
         .init_irq       = cap9adk_init_irq,
         .init_machine   = cap9adk_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-carmeva.c b/arch/arm/mach-at91/board-carmeva.c
index 295e1e77fa60..f36b18687494 100644
--- a/arch/arm/mach-at91/board-carmeva.c
+++ b/arch/arm/mach-at91/board-carmeva.c
@@ -40,10 +40,10 @@
 #include "generic.h"
 
 
-static void __init carmeva_map_io(void)
+static void __init carmeva_init_early(void)
 {
         /* Initialize processor: 20.000 MHz crystal */
-        at91rm9200_initialize(20000000, AT91RM9200_BGA);
+        at91rm9200_initialize(20000000);
 
         /* DBGU on ttyS0. (Rx & Tx only) */
         at91_register_uart(0, 0, 0);
@@ -162,9 +162,9 @@ static void __init carmeva_board_init(void)
 
 MACHINE_START(CARMEVA, "Carmeva")
         /* Maintainer: Conitec Datasystems */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91rm9200_timer,
-        .map_io         = carmeva_map_io,
+        .map_io         = at91rm9200_map_io,
+        .init_early     = carmeva_init_early,
         .init_irq       = carmeva_init_irq,
         .init_machine   = carmeva_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-cpu9krea.c b/arch/arm/mach-at91/board-cpu9krea.c
index 3838594578f3..980511084fe4 100644
--- a/arch/arm/mach-at91/board-cpu9krea.c
+++ b/arch/arm/mach-at91/board-cpu9krea.c
@@ -47,7 +47,7 @@
 #include "sam9_smc.h"
 #include "generic.h"
 
-static void __init cpu9krea_map_io(void)
+static void __init cpu9krea_init_early(void)
 {
         /* Initialize processor: 18.432 MHz crystal */
         at91sam9260_initialize(18432000);
@@ -375,9 +375,9 @@ MACHINE_START(CPUAT9260, "Eukrea CPU9260")
 MACHINE_START(CPUAT9G20, "Eukrea CPU9G20")
 #endif
         /* Maintainer: Eric Benard - EUKREA Electromatique */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91sam926x_timer,
-        .map_io         = cpu9krea_map_io,
+        .map_io         = at91sam9260_map_io,
+        .init_early     = cpu9krea_init_early,
         .init_irq       = cpu9krea_init_irq,
         .init_machine   = cpu9krea_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-cpuat91.c b/arch/arm/mach-at91/board-cpuat91.c
index 2f4dd8cdd484..6daabe3907a1 100644
--- a/arch/arm/mach-at91/board-cpuat91.c
+++ b/arch/arm/mach-at91/board-cpuat91.c
@@ -38,6 +38,7 @@
 #include <mach/board.h>
 #include <mach/gpio.h>
 #include <mach/at91rm9200_mc.h>
+#include <mach/cpu.h>
 
 #include "generic.h"
 
@@ -50,10 +51,13 @@ static struct gpio_led cpuat91_leds[] = {
         },
 };
 
-static void __init cpuat91_map_io(void)
+static void __init cpuat91_init_early(void)
 {
+        /* Set cpu type: PQFP */
+        at91rm9200_set_type(ARCH_REVISON_9200_PQFP);
+
         /* Initialize processor: 18.432 MHz crystal */
-        at91rm9200_initialize(18432000, AT91RM9200_PQFP);
+        at91rm9200_initialize(18432000);
 
         /* DBGU on ttyS0. (Rx & Tx only) */
         at91_register_uart(0, 0, 0);
@@ -175,9 +179,9 @@ static void __init cpuat91_board_init(void)
 
 MACHINE_START(CPUAT91, "Eukrea")
         /* Maintainer: Eric Benard - EUKREA Electromatique */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91rm9200_timer,
-        .map_io         = cpuat91_map_io,
+        .map_io         = at91rm9200_map_io,
+        .init_early     = cpuat91_init_early,
         .init_irq       = cpuat91_init_irq,
         .init_machine   = cpuat91_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-csb337.c b/arch/arm/mach-at91/board-csb337.c
index 464839dc39bd..d98bcec1dfe0 100644
--- a/arch/arm/mach-at91/board-csb337.c
+++ b/arch/arm/mach-at91/board-csb337.c
@@ -43,10 +43,10 @@
 #include "generic.h"
 
 
-static void __init csb337_map_io(void)
+static void __init csb337_init_early(void)
 {
         /* Initialize processor: 3.6864 MHz crystal */
-        at91rm9200_initialize(3686400, AT91RM9200_BGA);
+        at91rm9200_initialize(3686400);
 
         /* Setup the LEDs */
         at91_init_leds(AT91_PIN_PB0, AT91_PIN_PB1);
@@ -257,9 +257,9 @@ static void __init csb337_board_init(void)
 
 MACHINE_START(CSB337, "Cogent CSB337")
         /* Maintainer: Bill Gatliff */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91rm9200_timer,
-        .map_io         = csb337_map_io,
+        .map_io         = at91rm9200_map_io,
+        .init_early     = csb337_init_early,
         .init_irq       = csb337_init_irq,
         .init_machine   = csb337_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-csb637.c b/arch/arm/mach-at91/board-csb637.c
index 431688c61412..019aab4e20b0 100644
--- a/arch/arm/mach-at91/board-csb637.c
+++ b/arch/arm/mach-at91/board-csb637.c
@@ -40,10 +40,10 @@
 #include "generic.h"
 
 
-static void __init csb637_map_io(void)
+static void __init csb637_init_early(void)
 {
         /* Initialize processor: 3.6864 MHz crystal */
-        at91rm9200_initialize(3686400, AT91RM9200_BGA);
+        at91rm9200_initialize(3686400);
 
         /* DBGU on ttyS0. (Rx & Tx only) */
         at91_register_uart(0, 0, 0);
@@ -138,9 +138,9 @@ static void __init csb637_board_init(void)
 
 MACHINE_START(CSB637, "Cogent CSB637")
         /* Maintainer: Bill Gatliff */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91rm9200_timer,
-        .map_io         = csb637_map_io,
+        .map_io         = at91rm9200_map_io,
+        .init_early     = csb637_init_early,
         .init_irq       = csb637_init_irq,
         .init_machine   = csb637_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-eb01.c b/arch/arm/mach-at91/board-eb01.c
index d8df59a3426d..d2023f27c652 100644
--- a/arch/arm/mach-at91/board-eb01.c
+++ b/arch/arm/mach-at91/board-eb01.c
@@ -35,7 +35,7 @@ static void __init at91eb01_init_irq(void)
         at91x40_init_interrupts(NULL);
 }
 
-static void __init at91eb01_map_io(void)
+static void __init at91eb01_init_early(void)
 {
         at91x40_initialize(40000000);
 }
@@ -43,7 +43,7 @@ static void __init at91eb01_map_io(void)
 MACHINE_START(AT91EB01, "Atmel AT91 EB01")
         /* Maintainer: Greg Ungerer <gerg@snapgear.com> */
         .timer          = &at91x40_timer,
+        .init_early     = at91eb01_init_early,
         .init_irq       = at91eb01_init_irq,
-        .map_io         = at91eb01_map_io,
 MACHINE_END
 
diff --git a/arch/arm/mach-at91/board-eb9200.c b/arch/arm/mach-at91/board-eb9200.c
index 6cf6566ae346..e9484535cbc8 100644
--- a/arch/arm/mach-at91/board-eb9200.c
+++ b/arch/arm/mach-at91/board-eb9200.c
@@ -40,10 +40,10 @@
 #include "generic.h"
 
 
-static void __init eb9200_map_io(void)
+static void __init eb9200_init_early(void)
 {
         /* Initialize processor: 18.432 MHz crystal */
-        at91rm9200_initialize(18432000, AT91RM9200_BGA);
+        at91rm9200_initialize(18432000);
 
         /* DBGU on ttyS0. (Rx & Tx only) */
         at91_register_uart(0, 0, 0);
@@ -120,9 +120,9 @@ static void __init eb9200_board_init(void)
 }
 
 MACHINE_START(ATEB9200, "Embest ATEB9200")
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91rm9200_timer,
-        .map_io         = eb9200_map_io,
+        .map_io         = at91rm9200_map_io,
+        .init_early     = eb9200_init_early,
         .init_irq       = eb9200_init_irq,
         .init_machine   = eb9200_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-ecbat91.c b/arch/arm/mach-at91/board-ecbat91.c
index de2fd04e7c8a..a6f57faa10a7 100644
--- a/arch/arm/mach-at91/board-ecbat91.c
+++ b/arch/arm/mach-at91/board-ecbat91.c
@@ -38,14 +38,18 @@
 
 #include <mach/board.h>
 #include <mach/gpio.h>
+#include <mach/cpu.h>
 
 #include "generic.h"
 
 
-static void __init ecb_at91map_io(void)
+static void __init ecb_at91init_early(void)
 {
+        /* Set cpu type: PQFP */
+        at91rm9200_set_type(ARCH_REVISON_9200_PQFP);
+
         /* Initialize processor: 18.432 MHz crystal */
-        at91rm9200_initialize(18432000, AT91RM9200_PQFP);
+        at91rm9200_initialize(18432000);
 
         /* Setup the LEDs */
         at91_init_leds(AT91_PIN_PC7, AT91_PIN_PC7);
@@ -168,9 +172,9 @@ static void __init ecb_at91board_init(void)
 
 MACHINE_START(ECBAT91, "emQbit's ECB_AT91")
         /* Maintainer: emQbit.com */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91rm9200_timer,
-        .map_io         = ecb_at91map_io,
+        .map_io         = at91rm9200_map_io,
+        .init_early     = ecb_at91init_early,
         .init_irq       = ecb_at91init_irq,
         .init_machine   = ecb_at91board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-eco920.c b/arch/arm/mach-at91/board-eco920.c
index a158a0ce458f..bfc0062d1483 100644
--- a/arch/arm/mach-at91/board-eco920.c
+++ b/arch/arm/mach-at91/board-eco920.c
@@ -26,11 +26,16 @@
 
 #include <mach/board.h>
 #include <mach/at91rm9200_mc.h>
+#include <mach/cpu.h>
+
 #include "generic.h"
 
-static void __init eco920_map_io(void)
+static void __init eco920_init_early(void)
 {
-        at91rm9200_initialize(18432000, AT91RM9200_PQFP);
+        /* Set cpu type: PQFP */
+        at91rm9200_set_type(ARCH_REVISON_9200_PQFP);
+
+        at91rm9200_initialize(18432000);
 
         /* Setup the LEDs */
         at91_init_leds(AT91_PIN_PB0, AT91_PIN_PB1);
@@ -86,21 +91,6 @@ static struct platform_device eco920_flash = {
         .num_resources  = 1,
 };
 
-static struct resource at91_beeper_resources[] = {
-        [0] = {
-                .start          = AT91RM9200_BASE_TC3,
-                .end            = AT91RM9200_BASE_TC3 + 0x39,
-                .flags          = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device at91_beeper = {
-        .name           = "at91_beeper",
-        .id             = 0,
-        .resource       = at91_beeper_resources,
-        .num_resources  = ARRAY_SIZE(at91_beeper_resources),
-};
-
 static struct spi_board_info eco920_spi_devices[] = {
         {       /* CAN controller */
                 .modalias       = "tlv5638",
@@ -139,18 +129,14 @@ static void __init eco920_board_init(void)
                 AT91_SMC_TDF_(1)        /* float time */
         );
 
-        at91_clock_associate("tc3_clk", &at91_beeper.dev, "at91_beeper");
-        at91_set_B_periph(AT91_PIN_PB6, 0);
-        platform_device_register(&at91_beeper);
-
         at91_add_device_spi(eco920_spi_devices, ARRAY_SIZE(eco920_spi_devices));
 }
 
 MACHINE_START(ECO920, "eco920")
         /* Maintainer: Sascha Hauer */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91rm9200_timer,
-        .map_io         = eco920_map_io,
+        .map_io         = at91rm9200_map_io,
+        .init_early     = eco920_init_early,
         .init_irq       = eco920_init_irq,
         .init_machine   = eco920_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-flexibity.c b/arch/arm/mach-at91/board-flexibity.c
index c8a62dc8fa65..466c063b8d21 100644
--- a/arch/arm/mach-at91/board-flexibity.c
+++ b/arch/arm/mach-at91/board-flexibity.c
@@ -37,7 +37,7 @@
 
 #include "generic.h"
 
-static void __init flexibity_map_io(void)
+static void __init flexibity_init_early(void)
 {
         /* Initialize processor: 18.432 MHz crystal */
         at91sam9260_initialize(18432000);
@@ -154,9 +154,9 @@ static void __init flexibity_board_init(void)
 
 MACHINE_START(FLEXIBITY, "Flexibity Connect")
         /* Maintainer: Maxim Osipov */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91sam926x_timer,
-        .map_io         = flexibity_map_io,
+        .map_io         = at91sam9260_map_io,
+        .init_early     = flexibity_init_early,
         .init_irq       = flexibity_init_irq,
         .init_machine   = flexibity_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-foxg20.c b/arch/arm/mach-at91/board-foxg20.c
index dfc7dfe738e4..e2d1dc9eff45 100644
--- a/arch/arm/mach-at91/board-foxg20.c
+++ b/arch/arm/mach-at91/board-foxg20.c
@@ -57,7 +57,7 @@
  */
 
 
-static void __init foxg20_map_io(void)
+static void __init foxg20_init_early(void)
 {
         /* Initialize processor: 18.432 MHz crystal */
         at91sam9260_initialize(18432000);
@@ -266,9 +266,9 @@ static void __init foxg20_board_init(void)
 
 MACHINE_START(ACMENETUSFOXG20, "Acme Systems srl FOX Board G20")
         /* Maintainer: Sergio Tanzilli */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91sam926x_timer,
-        .map_io         = foxg20_map_io,
+        .map_io         = at91sam9260_map_io,
+        .init_early     = foxg20_init_early,
         .init_irq       = foxg20_init_irq,
         .init_machine   = foxg20_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-gsia18s.c b/arch/arm/mach-at91/board-gsia18s.c
index bc28136ee249..1d4f36b3cb27 100644
--- a/arch/arm/mach-at91/board-gsia18s.c
+++ b/arch/arm/mach-at91/board-gsia18s.c
@@ -38,9 +38,9 @@
 #include "sam9_smc.h"
 #include "generic.h"
 
-static void __init gsia18s_map_io(void)
+static void __init gsia18s_init_early(void)
 {
-        stamp9g20_map_io();
+        stamp9g20_init_early();
 
         /*
          * USART0 on ttyS1 (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI).
@@ -576,9 +576,9 @@ static void __init gsia18s_board_init(void)
 }
 
 MACHINE_START(GSIA18S, "GS_IA18_S")
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91sam926x_timer,
-        .map_io         = gsia18s_map_io,
+        .map_io         = at91sam9260_map_io,
+        .init_early     = gsia18s_init_early,
         .init_irq       = init_irq,
         .init_machine   = gsia18s_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-kafa.c b/arch/arm/mach-at91/board-kafa.c
index d2e1f4ec1fcc..9b003ff744ba 100644
--- a/arch/arm/mach-at91/board-kafa.c
+++ b/arch/arm/mach-at91/board-kafa.c
@@ -35,14 +35,18 @@
 
 #include <mach/board.h>
 #include <mach/gpio.h>
+#include <mach/cpu.h>
 
 #include "generic.h"
 
 
-static void __init kafa_map_io(void)
+static void __init kafa_init_early(void)
 {
+        /* Set cpu type: PQFP */
+        at91rm9200_set_type(ARCH_REVISON_9200_PQFP);
+
         /* Initialize processor: 18.432 MHz crystal */
-        at91rm9200_initialize(18432000, AT91RM9200_PQFP);
+        at91rm9200_initialize(18432000);
 
         /* Set up the LEDs */
         at91_init_leds(AT91_PIN_PB4, AT91_PIN_PB4);
@@ -94,9 +98,9 @@ static void __init kafa_board_init(void)
 
 MACHINE_START(KAFA, "Sperry-Sun KAFA")
         /* Maintainer: Sergei Sharonov */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91rm9200_timer,
-        .map_io         = kafa_map_io,
+        .map_io         = at91rm9200_map_io,
+        .init_early     = kafa_init_early,
         .init_irq       = kafa_init_irq,
         .init_machine   = kafa_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-kb9202.c b/arch/arm/mach-at91/board-kb9202.c
index a13d2063faff..a813a74b65f9 100644
--- a/arch/arm/mach-at91/board-kb9202.c
+++ b/arch/arm/mach-at91/board-kb9202.c
@@ -36,16 +36,19 @@
 
 #include <mach/board.h>
 #include <mach/gpio.h>
-
+#include <mach/cpu.h>
 #include <mach/at91rm9200_mc.h>
 
 #include "generic.h"
 
 
-static void __init kb9202_map_io(void)
+static void __init kb9202_init_early(void)
 {
+        /* Set cpu type: PQFP */
+        at91rm9200_set_type(ARCH_REVISON_9200_PQFP);
+
         /* Initialize processor: 10 MHz crystal */
-        at91rm9200_initialize(10000000, AT91RM9200_PQFP);
+        at91rm9200_initialize(10000000);
 
         /* Set up the LEDs */
         at91_init_leds(AT91_PIN_PC19, AT91_PIN_PC18);
@@ -136,9 +139,9 @@ static void __init kb9202_board_init(void)
 
 MACHINE_START(KB9200, "KB920x")
         /* Maintainer: KwikByte, Inc. */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91rm9200_timer,
-        .map_io         = kb9202_map_io,
+        .map_io         = at91rm9200_map_io,
+        .init_early     = kb9202_init_early,
         .init_irq       = kb9202_init_irq,
         .init_machine   = kb9202_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-neocore926.c b/arch/arm/mach-at91/board-neocore926.c
index fe5f1d47e6e2..961e805db68c 100644
--- a/arch/arm/mach-at91/board-neocore926.c
+++ b/arch/arm/mach-at91/board-neocore926.c
@@ -51,7 +51,7 @@
 #include "generic.h"
 
 
-static void __init neocore926_map_io(void)
+static void __init neocore926_init_early(void)
 {
         /* Initialize processor: 20 MHz crystal */
         at91sam9263_initialize(20000000);
@@ -387,9 +387,9 @@ static void __init neocore926_board_init(void)
 
 MACHINE_START(NEOCORE926, "ADENEO NEOCORE 926")
         /* Maintainer: ADENEO */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91sam926x_timer,
-        .map_io         = neocore926_map_io,
+        .map_io         = at91sam9263_map_io,
+        .init_early     = neocore926_init_early,
         .init_irq       = neocore926_init_irq,
         .init_machine   = neocore926_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-pcontrol-g20.c b/arch/arm/mach-at91/board-pcontrol-g20.c
index feb65787c30b..21a21af25878 100644
--- a/arch/arm/mach-at91/board-pcontrol-g20.c
+++ b/arch/arm/mach-at91/board-pcontrol-g20.c
@@ -37,9 +37,9 @@
 #include "generic.h"
 
 
-static void __init pcontrol_g20_map_io(void)
+static void __init pcontrol_g20_init_early(void)
 {
-        stamp9g20_map_io();
+        stamp9g20_init_early();
 
         /* USART0 on ttyS1. (Rx, Tx, CTS, RTS) piggyback  A2 */
         at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS
@@ -222,9 +222,9 @@ static void __init pcontrol_g20_board_init(void)
 
 MACHINE_START(PCONTROL_G20, "PControl G20")
         /* Maintainer: pgsellmann@portner-elektronik.at */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91sam926x_timer,
-        .map_io         = pcontrol_g20_map_io,
+        .map_io         = at91sam9260_map_io,
+        .init_early     = pcontrol_g20_init_early,
         .init_irq       = init_irq,
         .init_machine   = pcontrol_g20_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-picotux200.c b/arch/arm/mach-at91/board-picotux200.c
index 55dad3a46547..756cc2a745dd 100644
--- a/arch/arm/mach-at91/board-picotux200.c
+++ b/arch/arm/mach-at91/board-picotux200.c
@@ -43,10 +43,10 @@
 #include "generic.h"
 
 
-static void __init picotux200_map_io(void)
+static void __init picotux200_init_early(void)
 {
         /* Initialize processor: 18.432 MHz crystal */
-        at91rm9200_initialize(18432000, AT91RM9200_BGA);
+        at91rm9200_initialize(18432000);
 
         /* DBGU on ttyS0. (Rx & Tx only) */
         at91_register_uart(0, 0, 0);
@@ -123,9 +123,9 @@ static void __init picotux200_board_init(void)
 
 MACHINE_START(PICOTUX2XX, "picotux 200")
         /* Maintainer: Kleinhenz Elektronik GmbH */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91rm9200_timer,
-        .map_io         = picotux200_map_io,
+        .map_io         = at91rm9200_map_io,
+        .init_early     = picotux200_init_early,
         .init_irq       = picotux200_init_irq,
         .init_machine   = picotux200_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-qil-a9260.c b/arch/arm/mach-at91/board-qil-a9260.c
index 69d15a875b66..d1a6001b0bd8 100644
--- a/arch/arm/mach-at91/board-qil-a9260.c
+++ b/arch/arm/mach-at91/board-qil-a9260.c
@@ -48,7 +48,7 @@
 #include "generic.h"
 
 
-static void __init ek_map_io(void)
+static void __init ek_init_early(void)
 {
         /* Initialize processor: 12.000 MHz crystal */
         at91sam9260_initialize(12000000);
@@ -268,9 +268,9 @@ static void __init ek_board_init(void)
 
 MACHINE_START(QIL_A9260, "CALAO QIL_A9260")
         /* Maintainer: calao-systems */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91sam926x_timer,
-        .map_io         = ek_map_io,
+        .map_io         = at91sam9260_map_io,
+        .init_early     = ek_init_early,
         .init_irq       = ek_init_irq,
         .init_machine   = ek_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-rm9200dk.c b/arch/arm/mach-at91/board-rm9200dk.c
index 4c1047c8200d..aef9627710b0 100644
--- a/arch/arm/mach-at91/board-rm9200dk.c
+++ b/arch/arm/mach-at91/board-rm9200dk.c
@@ -45,10 +45,10 @@
 #include "generic.h"
 
 
-static void __init dk_map_io(void)
+static void __init dk_init_early(void)
 {
         /* Initialize processor: 18.432 MHz crystal */
-        at91rm9200_initialize(18432000, AT91RM9200_BGA);
+        at91rm9200_initialize(18432000);
 
         /* Setup the LEDs */
         at91_init_leds(AT91_PIN_PB2, AT91_PIN_PB2);
@@ -227,9 +227,9 @@ static void __init dk_board_init(void)
 
 MACHINE_START(AT91RM9200DK, "Atmel AT91RM9200-DK")
         /* Maintainer: SAN People/Atmel */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91rm9200_timer,
-        .map_io         = dk_map_io,
+        .map_io         = at91rm9200_map_io,
+        .init_early     = dk_init_early,
         .init_irq       = dk_init_irq,
         .init_machine   = dk_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-rm9200ek.c b/arch/arm/mach-at91/board-rm9200ek.c
index 9df1be8818c0..015a02183080 100644
--- a/arch/arm/mach-at91/board-rm9200ek.c
+++ b/arch/arm/mach-at91/board-rm9200ek.c
@@ -45,10 +45,10 @@
 #include "generic.h"
 
 
-static void __init ek_map_io(void)
+static void __init ek_init_early(void)
 {
         /* Initialize processor: 18.432 MHz crystal */
-        at91rm9200_initialize(18432000, AT91RM9200_BGA);
+        at91rm9200_initialize(18432000);
 
         /* Setup the LEDs */
         at91_init_leds(AT91_PIN_PB1, AT91_PIN_PB2);
@@ -193,9 +193,9 @@ static void __init ek_board_init(void)
 
 MACHINE_START(AT91RM9200EK, "Atmel AT91RM9200-EK")
         /* Maintainer: SAN People/Atmel */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91rm9200_timer,
-        .map_io         = ek_map_io,
+        .map_io         = at91rm9200_map_io,
+        .init_early     = ek_init_early,
         .init_irq       = ek_init_irq,
         .init_machine   = ek_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-sam9-l9260.c b/arch/arm/mach-at91/board-sam9-l9260.c
index 25a26beaa728..aaf1bf0989b3 100644
--- a/arch/arm/mach-at91/board-sam9-l9260.c
+++ b/arch/arm/mach-at91/board-sam9-l9260.c
@@ -44,7 +44,7 @@
 #include "generic.h"
 
 
-static void __init ek_map_io(void)
+static void __init ek_init_early(void)
 {
         /* Initialize processor: 18.432 MHz crystal */
         at91sam9260_initialize(18432000);
@@ -212,9 +212,9 @@ static void __init ek_board_init(void)
 
 MACHINE_START(SAM9_L9260, "Olimex SAM9-L9260")
         /* Maintainer: Olimex */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91sam926x_timer,
-        .map_io         = ek_map_io,
+        .map_io         = at91sam9260_map_io,
+        .init_early     = ek_init_early,
         .init_irq       = ek_init_irq,
         .init_machine   = ek_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-sam9260ek.c b/arch/arm/mach-at91/board-sam9260ek.c
index de1816e0e1d9..d600dc123227 100644
--- a/arch/arm/mach-at91/board-sam9260ek.c
+++ b/arch/arm/mach-at91/board-sam9260ek.c
@@ -44,12 +44,13 @@
 #include <mach/gpio.h>
 #include <mach/at91sam9_smc.h>
 #include <mach/at91_shdwc.h>
+#include <mach/system_rev.h>
 
 #include "sam9_smc.h"
 #include "generic.h"
 
 
-static void __init ek_map_io(void)
+static void __init ek_init_early(void)
 {
         /* Initialize processor: 18.432 MHz crystal */
         at91sam9260_initialize(18432000);
@@ -191,11 +192,6 @@ static struct atmel_nand_data __initdata ek_nand_data = {
         .rdy_pin        = AT91_PIN_PC13,
         .enable_pin     = AT91_PIN_PC14,
         .partition_info = nand_partitions,
-#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
-        .bus_width_16   = 1,
-#else
-        .bus_width_16   = 0,
-#endif
 };
 
 static struct sam9_smc_config __initdata ek_nand_smc_config = {
@@ -218,6 +214,7 @@ static struct sam9_smc_config __initdata ek_nand_smc_config = {
 
 static void __init ek_add_device_nand(void)
 {
+        ek_nand_data.bus_width_16 = !board_have_nand_8bit();
         /* setup bus-width (8 or 16) */
         if (ek_nand_data.bus_width_16)
                 ek_nand_smc_config.mode |= AT91_SMC_DBW_16;
@@ -356,9 +353,9 @@ static void __init ek_board_init(void)
 
 MACHINE_START(AT91SAM9260EK, "Atmel AT91SAM9260-EK")
         /* Maintainer: Atmel */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91sam926x_timer,
-        .map_io         = ek_map_io,
+        .map_io         = at91sam9260_map_io,
+        .init_early     = ek_init_early,
         .init_irq       = ek_init_irq,
         .init_machine   = ek_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c
index 14acc901e24c..f897f84d43dc 100644
--- a/arch/arm/mach-at91/board-sam9261ek.c
+++ b/arch/arm/mach-at91/board-sam9261ek.c
@@ -48,12 +48,13 @@
 #include <mach/gpio.h>
 #include <mach/at91sam9_smc.h>
 #include <mach/at91_shdwc.h>
+#include <mach/system_rev.h>
 
 #include "sam9_smc.h"
 #include "generic.h"
 
 
-static void __init ek_map_io(void)
+static void __init ek_init_early(void)
 {
         /* Initialize processor: 18.432 MHz crystal */
         at91sam9261_initialize(18432000);
@@ -197,11 +198,6 @@ static struct atmel_nand_data __initdata ek_nand_data = {
         .rdy_pin        = AT91_PIN_PC15,
         .enable_pin     = AT91_PIN_PC14,
         .partition_info = nand_partitions,
-#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
-        .bus_width_16   = 1,
-#else
-        .bus_width_16   = 0,
-#endif
 };
 
 static struct sam9_smc_config __initdata ek_nand_smc_config = {
@@ -224,6 +220,7 @@ static struct sam9_smc_config __initdata ek_nand_smc_config = {
 
 static void __init ek_add_device_nand(void)
 {
+        ek_nand_data.bus_width_16 = !board_have_nand_8bit();
         /* setup bus-width (8 or 16) */
         if (ek_nand_data.bus_width_16)
                 ek_nand_smc_config.mode |= AT91_SMC_DBW_16;
@@ -623,9 +620,9 @@ MACHINE_START(AT91SAM9261EK, "Atmel AT91SAM9261-EK")
 MACHINE_START(AT91SAM9G10EK, "Atmel AT91SAM9G10-EK")
 #endif
         /* Maintainer: Atmel */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91sam926x_timer,
-        .map_io         = ek_map_io,
+        .map_io         = at91sam9261_map_io,
+        .init_early     = ek_init_early,
         .init_irq       = ek_init_irq,
         .init_machine   = ek_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c
index bfe490df58be..605b26f40a4c 100644
--- a/arch/arm/mach-at91/board-sam9263ek.c
+++ b/arch/arm/mach-at91/board-sam9263ek.c
@@ -47,12 +47,13 @@
 #include <mach/gpio.h>
 #include <mach/at91sam9_smc.h>
 #include <mach/at91_shdwc.h>
+#include <mach/system_rev.h>
 
 #include "sam9_smc.h"
 #include "generic.h"
 
 
-static void __init ek_map_io(void)
+static void __init ek_init_early(void)
 {
         /* Initialize processor: 16.367 MHz crystal */
         at91sam9263_initialize(16367660);
@@ -198,11 +199,6 @@ static struct atmel_nand_data __initdata ek_nand_data = {
         .rdy_pin        = AT91_PIN_PA22,
         .enable_pin     = AT91_PIN_PD15,
         .partition_info = nand_partitions,
-#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
-        .bus_width_16   = 1,
-#else
-        .bus_width_16   = 0,
-#endif
 };
 
 static struct sam9_smc_config __initdata ek_nand_smc_config = {
@@ -225,6 +221,7 @@ static struct sam9_smc_config __initdata ek_nand_smc_config = {
 
 static void __init ek_add_device_nand(void)
 {
+        ek_nand_data.bus_width_16 = !board_have_nand_8bit();
         /* setup bus-width (8 or 16) */
         if (ek_nand_data.bus_width_16)
                 ek_nand_smc_config.mode |= AT91_SMC_DBW_16;
@@ -454,9 +451,9 @@ static void __init ek_board_init(void)
 
 MACHINE_START(AT91SAM9263EK, "Atmel AT91SAM9263-EK")
         /* Maintainer: Atmel */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91sam926x_timer,
-        .map_io         = ek_map_io,
+        .map_io         = at91sam9263_map_io,
+        .init_early     = ek_init_early,
         .init_irq       = ek_init_irq,
         .init_machine   = ek_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c
index ca8198b3c168..7624cf0d006b 100644
--- a/arch/arm/mach-at91/board-sam9g20ek.c
+++ b/arch/arm/mach-at91/board-sam9g20ek.c
@@ -43,6 +43,7 @@
 #include <mach/board.h>
 #include <mach/gpio.h>
 #include <mach/at91sam9_smc.h>
+#include <mach/system_rev.h>
 
 #include "sam9_smc.h"
 #include "generic.h"
@@ -60,7 +61,7 @@ static int inline ek_have_2mmc(void)
 }
 
 
-static void __init ek_map_io(void)
+static void __init ek_init_early(void)
 {
         /* Initialize processor: 18.432 MHz crystal */
         at91sam9260_initialize(18432000);
@@ -175,11 +176,6 @@ static struct atmel_nand_data __initdata ek_nand_data = {
         .rdy_pin        = AT91_PIN_PC13,
         .enable_pin     = AT91_PIN_PC14,
         .partition_info = nand_partitions,
-#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
-        .bus_width_16   = 1,
-#else
-        .bus_width_16   = 0,
-#endif
 };
 
 static struct sam9_smc_config __initdata ek_nand_smc_config = {
@@ -202,6 +198,7 @@ static struct sam9_smc_config __initdata ek_nand_smc_config = {
 
 static void __init ek_add_device_nand(void)
 {
+        ek_nand_data.bus_width_16 = !board_have_nand_8bit();
         /* setup bus-width (8 or 16) */
         if (ek_nand_data.bus_width_16)
                 ek_nand_smc_config.mode |= AT91_SMC_DBW_16;
@@ -406,18 +403,18 @@ static void __init ek_board_init(void)
 
 MACHINE_START(AT91SAM9G20EK, "Atmel AT91SAM9G20-EK")
         /* Maintainer: Atmel */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91sam926x_timer,
-        .map_io         = ek_map_io,
+        .map_io         = at91sam9260_map_io,
+        .init_early     = ek_init_early,
         .init_irq       = ek_init_irq,
         .init_machine   = ek_board_init,
 MACHINE_END
 
 MACHINE_START(AT91SAM9G20EK_2MMC, "Atmel AT91SAM9G20-EK 2 MMC Slot Mod")
         /* Maintainer: Atmel */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91sam926x_timer,
-        .map_io         = ek_map_io,
+        .map_io         = at91sam9260_map_io,
+        .init_early     = ek_init_early,
         .init_irq       = ek_init_irq,
         .init_machine   = ek_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
index 6c999dbd2bcf..063c95d0e8f0 100644
--- a/arch/arm/mach-at91/board-sam9m10g45ek.c
+++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
@@ -41,12 +41,13 @@
 #include <mach/gpio.h>
 #include <mach/at91sam9_smc.h>
 #include <mach/at91_shdwc.h>
+#include <mach/system_rev.h>
 
 #include "sam9_smc.h"
 #include "generic.h"
 
 
-static void __init ek_map_io(void)
+static void __init ek_init_early(void)
 {
         /* Initialize processor: 12.000 MHz crystal */
         at91sam9g45_initialize(12000000);
@@ -155,11 +156,6 @@ static struct atmel_nand_data __initdata ek_nand_data = {
         .rdy_pin        = AT91_PIN_PC8,
         .enable_pin     = AT91_PIN_PC14,
         .partition_info = nand_partitions,
-#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
-        .bus_width_16   = 1,
-#else
-        .bus_width_16   = 0,
-#endif
 };
 
 static struct sam9_smc_config __initdata ek_nand_smc_config = {
@@ -182,6 +178,7 @@ static struct sam9_smc_config __initdata ek_nand_smc_config = {
 
 static void __init ek_add_device_nand(void)
 {
+        ek_nand_data.bus_width_16 = !board_have_nand_8bit();
         /* setup bus-width (8 or 16) */
         if (ek_nand_data.bus_width_16)
                 ek_nand_smc_config.mode |= AT91_SMC_DBW_16;
@@ -424,9 +421,9 @@ static void __init ek_board_init(void)
 
 MACHINE_START(AT91SAM9M10G45EK, "Atmel AT91SAM9M10G45-EK")
         /* Maintainer: Atmel */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91sam926x_timer,
-        .map_io         = ek_map_io,
+        .map_io         = at91sam9g45_map_io,
+        .init_early     = ek_init_early,
         .init_irq       = ek_init_irq,
         .init_machine   = ek_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-sam9rlek.c b/arch/arm/mach-at91/board-sam9rlek.c
index 3bf3408e94c1..effb399a80a6 100644
--- a/arch/arm/mach-at91/board-sam9rlek.c
+++ b/arch/arm/mach-at91/board-sam9rlek.c
@@ -38,7 +38,7 @@
 #include "generic.h"
 
 
-static void __init ek_map_io(void)
+static void __init ek_init_early(void)
 {
         /* Initialize processor: 12.000 MHz crystal */
         at91sam9rl_initialize(12000000);
@@ -329,9 +329,9 @@ static void __init ek_board_init(void)
 
 MACHINE_START(AT91SAM9RLEK, "Atmel AT91SAM9RL-EK")
         /* Maintainer: Atmel */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91sam926x_timer,
-        .map_io         = ek_map_io,
+        .map_io         = at91sam9rl_map_io,
+        .init_early     = ek_init_early,
         .init_irq       = ek_init_irq,
         .init_machine   = ek_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-snapper9260.c b/arch/arm/mach-at91/board-snapper9260.c
index 17f7d9b32142..3eb0a1153cc8 100644
--- a/arch/arm/mach-at91/board-snapper9260.c
+++ b/arch/arm/mach-at91/board-snapper9260.c
@@ -40,7 +40,7 @@
 
 #define SNAPPER9260_IO_EXP_GPIO(x)      (NR_BUILTIN_GPIO + (x))
 
-static void __init snapper9260_map_io(void)
+static void __init snapper9260_init_early(void)
 {
         at91sam9260_initialize(18432000);
 
@@ -178,9 +178,9 @@ static void __init snapper9260_board_init(void)
 }
 
 MACHINE_START(SNAPPER_9260, "Bluewater Systems Snapper 9260/9G20 module")
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91sam926x_timer,
-        .map_io         = snapper9260_map_io,
+        .map_io         = at91sam9260_map_io,
+        .init_early     = snapper9260_init_early,
         .init_irq       = snapper9260_init_irq,
         .init_machine   = snapper9260_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-stamp9g20.c b/arch/arm/mach-at91/board-stamp9g20.c
index f8902b118960..5e5c85688f5f 100644
--- a/arch/arm/mach-at91/board-stamp9g20.c
+++ b/arch/arm/mach-at91/board-stamp9g20.c
@@ -32,7 +32,7 @@
 #include "generic.h"
 
 
-void __init stamp9g20_map_io(void)
+void __init stamp9g20_init_early(void)
 {
         /* Initialize processor: 18.432 MHz crystal */
         at91sam9260_initialize(18432000);
@@ -44,9 +44,9 @@ void __init stamp9g20_map_io(void)
         at91_set_serial_console(0);
 }
 
-static void __init stamp9g20evb_map_io(void)
+static void __init stamp9g20evb_init_early(void)
 {
-        stamp9g20_map_io();
+        stamp9g20_init_early();
 
         /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */
         at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS
@@ -54,9 +54,9 @@ static void __init stamp9g20evb_map_io(void)
                                                 | ATMEL_UART_DCD | ATMEL_UART_RI);
 }
 
-static void __init portuxg20_map_io(void)
+static void __init portuxg20_init_early(void)
 {
-        stamp9g20_map_io();
+        stamp9g20_init_early();
 
         /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */
         at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS
@@ -298,18 +298,18 @@ static void __init stamp9g20evb_board_init(void)
 
 MACHINE_START(PORTUXG20, "taskit PortuxG20")
         /* Maintainer: taskit GmbH */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91sam926x_timer,
-        .map_io         = portuxg20_map_io,
+        .map_io         = at91sam9260_map_io,
+        .init_early     = portuxg20_init_early,
         .init_irq       = init_irq,
         .init_machine   = portuxg20_board_init,
 MACHINE_END
 
 MACHINE_START(STAMP9G20, "taskit Stamp9G20")
         /* Maintainer: taskit GmbH */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91sam926x_timer,
-        .map_io         = stamp9g20evb_map_io,
+        .map_io         = at91sam9260_map_io,
+        .init_early     = stamp9g20evb_init_early,
         .init_irq       = init_irq,
         .init_machine   = stamp9g20evb_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-usb-a9260.c b/arch/arm/mach-at91/board-usb-a9260.c
index 07784baeae84..0e784e6fedec 100644
--- a/arch/arm/mach-at91/board-usb-a9260.c
+++ b/arch/arm/mach-at91/board-usb-a9260.c
@@ -48,7 +48,7 @@
 #include "generic.h"
 
 
-static void __init ek_map_io(void)
+static void __init ek_init_early(void)
 {
         /* Initialize processor: 12.000 MHz crystal */
         at91sam9260_initialize(12000000);
@@ -228,9 +228,9 @@ static void __init ek_board_init(void)
 
 MACHINE_START(USB_A9260, "CALAO USB_A9260")
         /* Maintainer: calao-systems */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91sam926x_timer,
-        .map_io         = ek_map_io,
+        .map_io         = at91sam9260_map_io,
+        .init_early     = ek_init_early,
         .init_irq       = ek_init_irq,
         .init_machine   = ek_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-usb-a9263.c b/arch/arm/mach-at91/board-usb-a9263.c
index b614508931fd..cf626dd14b2c 100644
--- a/arch/arm/mach-at91/board-usb-a9263.c
+++ b/arch/arm/mach-at91/board-usb-a9263.c
@@ -47,7 +47,7 @@
 #include "generic.h"
 
 
-static void __init ek_map_io(void)
+static void __init ek_init_early(void)
 {
         /* Initialize processor: 12.00 MHz crystal */
         at91sam9263_initialize(12000000);
@@ -244,9 +244,9 @@ static void __init ek_board_init(void)
 
 MACHINE_START(USB_A9263, "CALAO USB_A9263")
         /* Maintainer: calao-systems */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91sam926x_timer,
-        .map_io         = ek_map_io,
+        .map_io         = at91sam9263_map_io,
+        .init_early     = ek_init_early,
         .init_irq       = ek_init_irq,
         .init_machine   = ek_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/board-yl-9200.c b/arch/arm/mach-at91/board-yl-9200.c
index e0f0080eb639..c208cc334d7d 100644
--- a/arch/arm/mach-at91/board-yl-9200.c
+++ b/arch/arm/mach-at91/board-yl-9200.c
@@ -45,14 +45,18 @@
 #include <mach/board.h>
 #include <mach/gpio.h>
 #include <mach/at91rm9200_mc.h>
+#include <mach/cpu.h>
 
 #include "generic.h"
 
 
-static void __init yl9200_map_io(void)
+static void __init yl9200_init_early(void)
 {
+        /* Set cpu type: PQFP */
+        at91rm9200_set_type(ARCH_REVISON_9200_PQFP);
+
         /* Initialize processor: 18.432 MHz crystal */
-        at91rm9200_initialize(18432000, AT91RM9200_PQFP);
+        at91rm9200_initialize(18432000);
 
         /* Setup the LEDs D2=PB17 (timer), D3=PB16 (cpu) */
         at91_init_leds(AT91_PIN_PB16, AT91_PIN_PB17);
@@ -594,9 +598,9 @@ static void __init yl9200_board_init(void)
 
 MACHINE_START(YL9200, "uCdragon YL-9200")
         /* Maintainer: S.Birtles */
-        .boot_params    = AT91_SDRAM_BASE + 0x100,
         .timer          = &at91rm9200_timer,
-        .map_io         = yl9200_map_io,
+        .map_io         = at91rm9200_map_io,
+        .init_early     = yl9200_init_early,
         .init_irq       = yl9200_init_irq,
         .init_machine   = yl9200_board_init,
 MACHINE_END
diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
index 9113da6845f1..61873f3aa92d 100644
--- a/arch/arm/mach-at91/clock.c
+++ b/arch/arm/mach-at91/clock.c
@@ -163,7 +163,7 @@ static struct clk udpck = {
         .parent         = &pllb,
         .mode           = pmc_sys_mode,
 };
-static struct clk utmi_clk = {
+struct clk utmi_clk = {
         .name           = "utmi_clk",
         .parent         = &main_clk,
         .pmc_mask       = AT91_PMC_UPLLEN,      /* in CKGR_UCKR */
@@ -182,7 +182,7 @@ static struct clk uhpck = {
  * memory, interfaces to on-chip peripherals, the AIC, and sometimes more
  * (e.g baud rate generation).  It's sourced from one of the primary clocks.
  */
-static struct clk mck = {
+struct clk mck = {
         .name           = "mck",
         .pmc_mask       = AT91_PMC_MCKRDY,      /* in PMC_SR */
 };
@@ -215,43 +215,6 @@ static struct clk __init *at91_css_to_clk(unsigned long css)
         return NULL;
 }
 
-/*
- * Associate a particular clock with a function (eg, "uart") and device.
- * The drivers can then request the same 'function' with several different
- * devices and not care about which clock name to use.
- */
-void __init at91_clock_associate(const char *id, struct device *dev, const char *func)
-{
-        struct clk *clk = clk_get(NULL, id);
-
-        if (!dev || !clk || !IS_ERR(clk_get(dev, func)))
-                return;
-
-        clk->function = func;
-        clk->dev = dev;
-}
-
-/* clocks cannot be de-registered no refcounting necessary */
-struct clk *clk_get(struct device *dev, const char *id)
-{
-        struct clk *clk;
-
-        list_for_each_entry(clk, &clocks, node) {
-                if (strcmp(id, clk->name) == 0)
-                        return clk;
-                if (clk->function && (dev == clk->dev) && strcmp(id, clk->function) == 0)
-                        return clk;
-        }
-
-        return ERR_PTR(-ENOENT);
-}
-EXPORT_SYMBOL(clk_get);
-
-void clk_put(struct clk *clk)
-{
-}
-EXPORT_SYMBOL(clk_put);
-
 static void __clk_enable(struct clk *clk)
 {
         if (clk->parent)
@@ -498,32 +461,38 @@ postcore_initcall(at91_clk_debugfs_init);
 /*------------------------------------------------------------------------*/
 
 /* Register a new clock */
+static void __init at91_clk_add(struct clk *clk)
+{
+        list_add_tail(&clk->node, &clocks);
+
+        clk->cl.con_id = clk->name;
+        clk->cl.clk = clk;
+        clkdev_add(&clk->cl);
+}
+
 int __init clk_register(struct clk *clk)
 {
         if (clk_is_peripheral(clk)) {
                 if (!clk->parent)
                         clk->parent = &mck;
                 clk->mode = pmc_periph_mode;
-                list_add_tail(&clk->node, &clocks);
         }
         else if (clk_is_sys(clk)) {
                 clk->parent = &mck;
                 clk->mode = pmc_sys_mode;
-
-                list_add_tail(&clk->node, &clocks);
         }
 #ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS
         else if (clk_is_programmable(clk)) {
                 clk->mode = pmc_sys_mode;
                 init_programmable_clock(clk);
-                list_add_tail(&clk->node, &clocks);
         }
 #endif
 
+        at91_clk_add(clk);
+
         return 0;
 }
 
-
 /*------------------------------------------------------------------------*/
 
 static u32 __init at91_pll_rate(struct clk *pll, u32 freq, u32 reg)
@@ -630,7 +599,7 @@ static void __init at91_pllb_usbfs_clock_init(unsigned long main_clock)
                 at91_sys_write(AT91_PMC_SCER, AT91RM9200_PMC_MCKUDP);
         } else if (cpu_is_at91sam9260() || cpu_is_at91sam9261() ||
                    cpu_is_at91sam9263() || cpu_is_at91sam9g20() ||
-                   cpu_is_at91sam9g10() || cpu_is_at572d940hf()) {
+                   cpu_is_at91sam9g10()) {
                 uhpck.pmc_mask = AT91SAM926x_PMC_UHP;
                 udpck.pmc_mask = AT91SAM926x_PMC_UDP;
         } else if (cpu_is_at91cap9()) {
@@ -754,19 +723,19 @@ int __init at91_clock_init(unsigned long main_clock)
 
         /* Register the PMC's standard clocks */
         for (i = 0; i < ARRAY_SIZE(standard_pmc_clocks); i++)
-                list_add_tail(&standard_pmc_clocks[i]->node, &clocks);
+                at91_clk_add(standard_pmc_clocks[i]);
 
         if (cpu_has_pllb())
-                list_add_tail(&pllb.node, &clocks);
+                at91_clk_add(&pllb);
 
         if (cpu_has_uhp())
-                list_add_tail(&uhpck.node, &clocks);
+                at91_clk_add(&uhpck);
 
         if (cpu_has_udpfs())
-                list_add_tail(&udpck.node, &clocks);
+                at91_clk_add(&udpck);
 
         if (cpu_has_utmi())
-                list_add_tail(&utmi_clk.node, &clocks);
+                at91_clk_add(&utmi_clk);
 
         /* MCK and CPU clock are "always on" */
         clk_enable(&mck);
diff --git a/arch/arm/mach-at91/clock.h b/arch/arm/mach-at91/clock.h
index 6cf4b78e175d..c2e63e47dcbe 100644
--- a/arch/arm/mach-at91/clock.h
+++ b/arch/arm/mach-at91/clock.h
@@ -6,6 +6,8 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/clkdev.h>
+
 #define CLK_TYPE_PRIMARY        0x1
 #define CLK_TYPE_PLL            0x2
 #define CLK_TYPE_PROGRAMMABLE   0x4
@@ -16,8 +18,7 @@
 struct clk {
         struct list_head node;
         const char      *name;          /* unique clock name */
-        const char      *function;      /* function of the clock */
-        struct device   *dev;           /* device associated with function */
+        struct clk_lookup cl;
         unsigned long   rate_hz;
         struct clk      *parent;
         u32             pmc_mask;
@@ -29,3 +30,18 @@ struct clk {
 
 
 extern int __init clk_register(struct clk *clk);
+extern struct clk mck;
+extern struct clk utmi_clk;
+
+#define CLKDEV_CON_ID(_id, _clk)                        \
+        {                                               \
+                .con_id = _id,                          \
+                .clk = _clk,                            \
+        }
+
+#define CLKDEV_CON_DEV_ID(_con_id, _dev_id, _clk)       \
+        {                                               \
+                .con_id = _con_id,                      \
+                .dev_id = _dev_id,                      \
+                .clk = _clk,                            \
+        }
diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h
index 0c66deb2db39..8ff3418f3430 100644
--- a/arch/arm/mach-at91/generic.h
+++ b/arch/arm/mach-at91/generic.h
@@ -8,8 +8,21 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/clkdev.h>
+
+ /* Map io */
+extern void __init at91rm9200_map_io(void);
+extern void __init at91sam9260_map_io(void);
+extern void __init at91sam9261_map_io(void);
+extern void __init at91sam9263_map_io(void);
+extern void __init at91sam9rl_map_io(void);
+extern void __init at91sam9g45_map_io(void);
+extern void __init at91x40_map_io(void);
+extern void __init at91cap9_map_io(void);
+
  /* Processors */
-extern void __init at91rm9200_initialize(unsigned long main_clock, unsigned short banks);
+extern void __init at91rm9200_set_type(int type);
+extern void __init at91rm9200_initialize(unsigned long main_clock);
 extern void __init at91sam9260_initialize(unsigned long main_clock);
 extern void __init at91sam9261_initialize(unsigned long main_clock);
 extern void __init at91sam9263_initialize(unsigned long main_clock);
@@ -17,7 +30,6 @@ extern void __init at91sam9rl_initialize(unsigned long main_clock);
 extern void __init at91sam9g45_initialize(unsigned long main_clock);
 extern void __init at91x40_initialize(unsigned long main_clock);
 extern void __init at91cap9_initialize(unsigned long main_clock);
-extern void __init at572d940hf_initialize(unsigned long main_clock);
 
  /* Interrupts */
 extern void __init at91rm9200_init_interrupts(unsigned int priority[]);
@@ -28,7 +40,6 @@ extern void __init at91sam9rl_init_interrupts(unsigned int priority[]);
 extern void __init at91sam9g45_init_interrupts(unsigned int priority[]);
 extern void __init at91x40_init_interrupts(unsigned int priority[]);
 extern void __init at91cap9_init_interrupts(unsigned int priority[]);
-extern void __init at572d940hf_init_interrupts(unsigned int priority[]);
 extern void __init at91_aic_init(unsigned int priority[]);
 
  /* Timer */
@@ -39,8 +50,19 @@ extern struct sys_timer at91x40_timer;
 
  /* Clocks */
 extern int __init at91_clock_init(unsigned long main_clock);
+/*
+ * function to specify the clock of the default console. As we do not
+ * use the device/driver bus, the dev_name is not intialize. So we need
+ * to link the clock to a specific con_id only "usart"
+ */
+extern void __init at91rm9200_set_console_clock(int id);
+extern void __init at91sam9260_set_console_clock(int id);
+extern void __init at91sam9261_set_console_clock(int id);
+extern void __init at91sam9263_set_console_clock(int id);
+extern void __init at91sam9rl_set_console_clock(int id);
+extern void __init at91sam9g45_set_console_clock(int id);
+extern void __init at91cap9_set_console_clock(int id);
 struct device;
-extern void __init at91_clock_associate(const char *id, struct device *dev, const char *func);
 
  /* Power Management */
 extern void at91_irq_suspend(void);
diff --git a/arch/arm/mach-at91/include/mach/at572d940hf.h b/arch/arm/mach-at91/include/mach/at572d940hf.h
deleted file mode 100644
index be510cfc56be..000000000000
--- a/arch/arm/mach-at91/include/mach/at572d940hf.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * include/mach/at572d940hf.h
- *
- * Antonio R. Costa <costa.antonior@gmail.com>
- * Copyright (C) 2008 Atmel
- *
- * 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 program 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
- *
- */
-
-#ifndef AT572D940HF_H
-#define AT572D940HF_H
-
-/*
- * Peripheral identifiers/interrupts.
- */
-#define AT91_ID_FIQ             0       /* Advanced Interrupt Controller (FIQ) */
-#define AT91_ID_SYS             1       /* System Peripherals */
-#define AT572D940HF_ID_PIOA     2       /* Parallel IO Controller A */
-#define AT572D940HF_ID_PIOB     3       /* Parallel IO Controller B */
-#define AT572D940HF_ID_PIOC     4       /* Parallel IO Controller C */
-#define AT572D940HF_ID_EMAC     5       /* MACB ethernet controller */
-#define AT572D940HF_ID_US0      6       /* USART 0 */
-#define AT572D940HF_ID_US1      7       /* USART 1 */
-#define AT572D940HF_ID_US2      8       /* USART 2 */
-#define AT572D940HF_ID_MCI      9       /* Multimedia Card Interface */
-#define AT572D940HF_ID_UDP      10      /* USB Device Port */
-#define AT572D940HF_ID_TWI0     11      /* Two-Wire Interface 0 */
-#define AT572D940HF_ID_SPI0     12      /* Serial Peripheral Interface 0 */
-#define AT572D940HF_ID_SPI1     13      /* Serial Peripheral Interface 1 */
-#define AT572D940HF_ID_SSC0     14      /* Serial Synchronous Controller 0 */
-#define AT572D940HF_ID_SSC1     15      /* Serial Synchronous Controller 1 */
-#define AT572D940HF_ID_SSC2     16      /* Serial Synchronous Controller 2 */
-#define AT572D940HF_ID_TC0      17      /* Timer Counter 0 */
-#define AT572D940HF_ID_TC1      18      /* Timer Counter 1 */
-#define AT572D940HF_ID_TC2      19      /* Timer Counter 2 */
-#define AT572D940HF_ID_UHP      20      /* USB Host port */
-#define AT572D940HF_ID_SSC3     21      /* Serial Synchronous Controller 3 */
-#define AT572D940HF_ID_TWI1     22      /* Two-Wire Interface 1 */
-#define AT572D940HF_ID_CAN0     23      /* CAN Controller 0 */
-#define AT572D940HF_ID_CAN1     24      /* CAN Controller 1 */
-#define AT572D940HF_ID_MHALT    25      /* mAgicV HALT line */
-#define AT572D940HF_ID_MSIRQ0   26      /* mAgicV SIRQ0 line */
-#define AT572D940HF_ID_MEXC     27      /* mAgicV exception line */
-#define AT572D940HF_ID_MEDMA    28      /* mAgicV end of DMA line */
-#define AT572D940HF_ID_IRQ0     29      /* External Interrupt Source (IRQ0) */
-#define AT572D940HF_ID_IRQ1     30      /* External Interrupt Source (IRQ1) */
-#define AT572D940HF_ID_IRQ2     31      /* External Interrupt Source (IRQ2) */
-
-
-/*
- * User Peripheral physical base addresses.
- */
-#define AT572D940HF_BASE_TCB    0xfffa0000
-#define AT572D940HF_BASE_TC0    0xfffa0000
-#define AT572D940HF_BASE_TC1    0xfffa0040
-#define AT572D940HF_BASE_TC2    0xfffa0080
-#define AT572D940HF_BASE_UDP    0xfffa4000
-#define AT572D940HF_BASE_MCI    0xfffa8000
-#define AT572D940HF_BASE_TWI0   0xfffac000
-#define AT572D940HF_BASE_US0    0xfffb0000
-#define AT572D940HF_BASE_US1    0xfffb4000
-#define AT572D940HF_BASE_US2    0xfffb8000
-#define AT572D940HF_BASE_SSC0   0xfffbc000
-#define AT572D940HF_BASE_SSC1   0xfffc0000
-#define AT572D940HF_BASE_SSC2   0xfffc4000
-#define AT572D940HF_BASE_SPI0   0xfffc8000
-#define AT572D940HF_BASE_SPI1   0xfffcc000
-#define AT572D940HF_BASE_SSC3   0xfffd0000
-#define AT572D940HF_BASE_TWI1   0xfffd4000
-#define AT572D940HF_BASE_EMAC   0xfffd8000
-#define AT572D940HF_BASE_CAN0   0xfffdc000
-#define AT572D940HF_BASE_CAN1   0xfffe0000
-#define AT91_BASE_SYS           0xffffea00
-
-
-/*
- * System Peripherals (offset from AT91_BASE_SYS)
- */
-#define AT91_SDRAMC0    (0xffffea00 - AT91_BASE_SYS)
-#define AT91_SMC        (0xffffec00 - AT91_BASE_SYS)
-#define AT91_MATRIX     (0xffffee00 - AT91_BASE_SYS)
-#define AT91_AIC        (0xfffff000 - AT91_BASE_SYS)
-#define AT91_DBGU       (0xfffff200 - AT91_BASE_SYS)
-#define AT91_PIOA       (0xfffff400 - AT91_BASE_SYS)
-#define AT91_PIOB       (0xfffff600 - AT91_BASE_SYS)
-#define AT91_PIOC       (0xfffff800 - AT91_BASE_SYS)
-#define AT91_PMC        (0xfffffc00 - AT91_BASE_SYS)
-#define AT91_RSTC       (0xfffffd00 - AT91_BASE_SYS)
-#define AT91_RTT        (0xfffffd20 - AT91_BASE_SYS)
-#define AT91_PIT        (0xfffffd30 - AT91_BASE_SYS)
-#define AT91_WDT        (0xfffffd40 - AT91_BASE_SYS)
-
-#define AT91_USART0     AT572D940HF_ID_US0
-#define AT91_USART1     AT572D940HF_ID_US1
-#define AT91_USART2     AT572D940HF_ID_US2
-
-
-/*
- * Internal Memory.
- */
-#define AT572D940HF_SRAM_BASE   0x00300000      /* Internal SRAM base address */
-#define AT572D940HF_SRAM_SIZE   (48 * SZ_1K)    /* Internal SRAM size (48Kb) */
-
-#define AT572D940HF_ROM_BASE    0x00400000      /* Internal ROM base address */
-#define AT572D940HF_ROM_SIZE    SZ_32K          /* Internal ROM size (32Kb) */
-
-#define AT572D940HF_UHP_BASE    0x00500000      /* USB Host controller */
-
-
-#endif
diff --git a/arch/arm/mach-at91/include/mach/at572d940hf_matrix.h b/arch/arm/mach-at91/include/mach/at572d940hf_matrix.h
deleted file mode 100644
index b6751df09488..000000000000
--- a/arch/arm/mach-at91/include/mach/at572d940hf_matrix.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * include/mach//at572d940hf_matrix.h
- *
- * Antonio R. Costa <costa.antonior@gmail.com>
- * Copyright (C) 2008 Atmel
- *
- * Copyright (C) 2005 SAN People
- *
- * 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 program 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
- */
-
-#ifndef AT572D940HF_MATRIX_H
-#define AT572D940HF_MATRIX_H
-
-#define AT91_MATRIX_MCFG0       (AT91_MATRIX + 0x00)    /* Master Configuration Register 0 */
-#define AT91_MATRIX_MCFG1       (AT91_MATRIX + 0x04)    /* Master Configuration Register 1 */
-#define AT91_MATRIX_MCFG2       (AT91_MATRIX + 0x08)    /* Master Configuration Register 2 */
-#define AT91_MATRIX_MCFG3       (AT91_MATRIX + 0x0C)    /* Master Configuration Register 3 */
-#define AT91_MATRIX_MCFG4       (AT91_MATRIX + 0x10)    /* Master Configuration Register 4 */
-#define AT91_MATRIX_MCFG5       (AT91_MATRIX + 0x14)    /* Master Configuration Register 5 */
-
-#define         AT91_MATRIX_ULBT        (7 << 0)        /* Undefined Length Burst Type */
-#define                 AT91_MATRIX_ULBT_INFINITE       (0 << 0)
-#define                 AT91_MATRIX_ULBT_SINGLE         (1 << 0)
-#define                 AT91_MATRIX_ULBT_FOUR           (2 << 0)
-#define                 AT91_MATRIX_ULBT_EIGHT          (3 << 0)
-#define                 AT91_MATRIX_ULBT_SIXTEEN        (4 << 0)
-
-#define AT91_MATRIX_SCFG0       (AT91_MATRIX + 0x40)    /* Slave Configuration Register 0 */
-#define AT91_MATRIX_SCFG1       (AT91_MATRIX + 0x44)    /* Slave Configuration Register 1 */
-#define AT91_MATRIX_SCFG2       (AT91_MATRIX + 0x48)    /* Slave Configuration Register 2 */
-#define AT91_MATRIX_SCFG3       (AT91_MATRIX + 0x4C)    /* Slave Configuration Register 3 */
-#define AT91_MATRIX_SCFG4       (AT91_MATRIX + 0x50)    /* Slave Configuration Register 4 */
-#define         AT91_MATRIX_SLOT_CYCLE          (0xff << 0)     /* Maximum Number of Allowed Cycles for a Burst */
-#define         AT91_MATRIX_DEFMSTR_TYPE        (3    << 16)    /* Default Master Type */
-#define                 AT91_MATRIX_DEFMSTR_TYPE_NONE   (0 << 16)
-#define                 AT91_MATRIX_DEFMSTR_TYPE_LAST   (1 << 16)
-#define                 AT91_MATRIX_DEFMSTR_TYPE_FIXED  (2 << 16)
-#define         AT91_MATRIX_FIXED_DEFMSTR       (0x7  << 18)    /* Fixed Index of Default Master */
-#define         AT91_MATRIX_ARBT                (3    << 24)    /* Arbitration Type */
-#define                 AT91_MATRIX_ARBT_ROUND_ROBIN    (0 << 24)
-#define                 AT91_MATRIX_ARBT_FIXED_PRIORITY (1 << 24)
-
-#define AT91_MATRIX_PRAS0       (AT91_MATRIX + 0x80)    /* Priority Register A for Slave 0 */
-#define AT91_MATRIX_PRAS1       (AT91_MATRIX + 0x88)    /* Priority Register A for Slave 1 */
-#define AT91_MATRIX_PRAS2       (AT91_MATRIX + 0x90)    /* Priority Register A for Slave 2 */
-#define AT91_MATRIX_PRAS3       (AT91_MATRIX + 0x98)    /* Priority Register A for Slave 3 */
-#define AT91_MATRIX_PRAS4       (AT91_MATRIX + 0xA0)    /* Priority Register A for Slave 4 */
-
-#define         AT91_MATRIX_M0PR                (3 << 0)        /* Master 0 Priority */
-#define         AT91_MATRIX_M1PR                (3 << 4)        /* Master 1 Priority */
-#define         AT91_MATRIX_M2PR                (3 << 8)        /* Master 2 Priority */
-#define         AT91_MATRIX_M3PR                (3 << 12)       /* Master 3 Priority */
-#define         AT91_MATRIX_M4PR                (3 << 16)       /* Master 4 Priority */
-#define         AT91_MATRIX_M5PR                (3 << 20)       /* Master 5 Priority */
-#define         AT91_MATRIX_M6PR                (3 << 24)       /* Master 6 Priority */
-
-#define AT91_MATRIX_MRCR        (AT91_MATRIX + 0x100)   /* Master Remap Control Register */
-#define         AT91_MATRIX_RCB0                (1 << 0)        /* Remap Command for AHB Master 0 (ARM926EJ-S Instruction Master) */
-#define         AT91_MATRIX_RCB1                (1 << 1)        /* Remap Command for AHB Master 1 (ARM926EJ-S Data Master) */
-
-#define AT91_MATRIX_SFR0        (AT91_MATRIX + 0x110)   /* Special Function Register 0 */
-#define AT91_MATRIX_SFR1        (AT91_MATRIX + 0x114)   /* Special Function Register 1 */
-#define AT91_MATRIX_SFR2        (AT91_MATRIX + 0x118)   /* Special Function Register 2 */
-#define AT91_MATRIX_SFR3        (AT91_MATRIX + 0x11C)   /* Special Function Register 3 */
-#define AT91_MATRIX_SFR4        (AT91_MATRIX + 0x120)   /* Special Function Register 4 */
-#define AT91_MATRIX_SFR5        (AT91_MATRIX + 0x124)   /* Special Function Register 5 */
-#define AT91_MATRIX_SFR6        (AT91_MATRIX + 0x128)   /* Special Function Register 6 */
-#define AT91_MATRIX_SFR7        (AT91_MATRIX + 0x12C)   /* Special Function Register 7 */
-#define AT91_MATRIX_SFR8        (AT91_MATRIX + 0x130)   /* Special Function Register 8 */
-#define AT91_MATRIX_SFR9        (AT91_MATRIX + 0x134)   /* Special Function Register 9 */
-#define AT91_MATRIX_SFR10       (AT91_MATRIX + 0x138)   /* Special Function Register 10 */
-#define AT91_MATRIX_SFR11       (AT91_MATRIX + 0x13C)   /* Special Function Register 11 */
-#define AT91_MATRIX_SFR12       (AT91_MATRIX + 0x140)   /* Special Function Register 12 */
-#define AT91_MATRIX_SFR13       (AT91_MATRIX + 0x144)   /* Special Function Register 13 */
-#define AT91_MATRIX_SFR14       (AT91_MATRIX + 0x148)   /* Special Function Register 14 */
-#define AT91_MATRIX_SFR15       (AT91_MATRIX + 0x14C)   /* Special Function Register 15 */
-
-
-/*
- * The following registers / bits are not defined in the Datasheet (Revision A)
- */
-
-#define AT91_MATRIX_TCR         (AT91_MATRIX + 0x100)   /* TCM Configuration Register */
-#define         AT91_MATRIX_ITCM_SIZE           (0xf << 0)      /* Size of ITCM enabled memory block */
-#define                 AT91_MATRIX_ITCM_0              (0 << 0)
-#define                 AT91_MATRIX_ITCM_16             (5 << 0)
-#define                 AT91_MATRIX_ITCM_32             (6 << 0)
-#define                 AT91_MATRIX_ITCM_64             (7 << 0)
-#define         AT91_MATRIX_DTCM_SIZE           (0xf << 4)      /* Size of DTCM enabled memory block */
-#define                 AT91_MATRIX_DTCM_0              (0 << 4)
-#define                 AT91_MATRIX_DTCM_16             (5 << 4)
-#define                 AT91_MATRIX_DTCM_32             (6 << 4)
-#define                 AT91_MATRIX_DTCM_64             (7 << 4)
-
-#define AT91_MATRIX_EBICSA      (AT91_MATRIX + 0x11C)   /* EBI Chip Select Assignment Register */
-#define         AT91_MATRIX_CS1A                (1 << 1)        /* Chip Select 1 Assignment */
-#define                 AT91_MATRIX_CS1A_SMC            (0 << 1)
-#define                 AT91_MATRIX_CS1A_SDRAMC         (1 << 1)
-#define         AT91_MATRIX_CS3A                (1 << 3)        /* Chip Select 3 Assignment */
-#define                 AT91_MATRIX_CS3A_SMC            (0 << 3)
-#define                 AT91_MATRIX_CS3A_SMC_SMARTMEDIA (1 << 3)
-#define         AT91_MATRIX_CS4A                (1 << 4)        /* Chip Select 4 Assignment */
-#define                 AT91_MATRIX_CS4A_SMC            (0 << 4)
-#define                 AT91_MATRIX_CS4A_SMC_CF1        (1 << 4)
-#define         AT91_MATRIX_CS5A                (1 << 5)        /* Chip Select 5 Assignment */
-#define                 AT91_MATRIX_CS5A_SMC            (0 << 5)
-#define                 AT91_MATRIX_CS5A_SMC_CF2        (1 << 5)
-#define         AT91_MATRIX_DBPUC               (1 << 8)        /* Data Bus Pull-up Configuration */
-
-#endif
diff --git a/arch/arm/mach-at91/include/mach/at91cap9.h b/arch/arm/mach-at91/include/mach/at91cap9.h
index 9c6af9737485..665993849a7b 100644
--- a/arch/arm/mach-at91/include/mach/at91cap9.h
+++ b/arch/arm/mach-at91/include/mach/at91cap9.h
@@ -20,8 +20,6 @@
 /*
  * Peripheral identifiers/interrupts.
  */
-#define AT91_ID_FIQ             0       /* Advanced Interrupt Controller (FIQ) */
-#define AT91_ID_SYS             1       /* System Peripherals */
 #define AT91CAP9_ID_PIOABCD     2       /* Parallel IO Controller A, B, C and D */
 #define AT91CAP9_ID_MPB0        3       /* MP Block Peripheral 0 */
 #define AT91CAP9_ID_MPB1        4       /* MP Block Peripheral 1 */
@@ -123,6 +121,4 @@
 #define AT91CAP9_UDPHS_FIFO     0x00600000      /* USB High Speed Device Port */
 #define AT91CAP9_UHP_BASE       0x00700000      /* USB Host controller */
 
-#define CONFIG_DRAM_BASE        AT91_CHIPSELECT_6
-
 #endif
diff --git a/arch/arm/mach-at91/include/mach/at91rm9200.h b/arch/arm/mach-at91/include/mach/at91rm9200.h
index 78983155a074..99e0f8d02d7b 100644
--- a/arch/arm/mach-at91/include/mach/at91rm9200.h
+++ b/arch/arm/mach-at91/include/mach/at91rm9200.h
@@ -19,8 +19,6 @@
 /*
  * Peripheral identifiers/interrupts.
  */
-#define AT91_ID_FIQ             0       /* Advanced Interrupt Controller (FIQ) */
-#define AT91_ID_SYS             1       /* System Peripheral */
 #define AT91RM9200_ID_PIOA      2       /* Parallel IO Controller A */
 #define AT91RM9200_ID_PIOB      3       /* Parallel IO Controller B */
 #define AT91RM9200_ID_PIOC      4       /* Parallel IO Controller C */
diff --git a/arch/arm/mach-at91/include/mach/at91sam9260.h b/arch/arm/mach-at91/include/mach/at91sam9260.h
index 4e79036d3b80..8b6bf835cd73 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9260.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9260.h
@@ -20,8 +20,6 @@
 /*
  * Peripheral identifiers/interrupts.
  */
-#define AT91_ID_FIQ             0       /* Advanced Interrupt Controller (FIQ) */
-#define AT91_ID_SYS             1       /* System Peripherals */
 #define AT91SAM9260_ID_PIOA     2       /* Parallel IO Controller A */
 #define AT91SAM9260_ID_PIOB     3       /* Parallel IO Controller B */
 #define AT91SAM9260_ID_PIOC     4       /* Parallel IO Controller C */
diff --git a/arch/arm/mach-at91/include/mach/at91sam9261.h b/arch/arm/mach-at91/include/mach/at91sam9261.h
index 2b5618518129..eafbddaf523c 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9261.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9261.h
@@ -18,8 +18,6 @@
 /*
  * Peripheral identifiers/interrupts.
  */
-#define AT91_ID_FIQ             0       /* Advanced Interrupt Controller (FIQ) */
-#define AT91_ID_SYS             1       /* System Peripherals */
 #define AT91SAM9261_ID_PIOA     2       /* Parallel IO Controller A */
 #define AT91SAM9261_ID_PIOB     3       /* Parallel IO Controller B */
 #define AT91SAM9261_ID_PIOC     4       /* Parallel IO Controller C */
diff --git a/arch/arm/mach-at91/include/mach/at91sam9263.h b/arch/arm/mach-at91/include/mach/at91sam9263.h
index 2091f1e42d43..e2d348213a7b 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9263.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9263.h
@@ -18,8 +18,6 @@
 /*
  * Peripheral identifiers/interrupts.
  */
-#define AT91_ID_FIQ             0       /* Advanced Interrupt Controller (FIQ) */
-#define AT91_ID_SYS             1       /* System Peripherals */
 #define AT91SAM9263_ID_PIOA     2       /* Parallel IO Controller A */
 #define AT91SAM9263_ID_PIOB     3       /* Parallel IO Controller B */
 #define AT91SAM9263_ID_PIOCDE   4       /* Parallel IO Controller C, D and E */
diff --git a/arch/arm/mach-at91/include/mach/at91sam9g45.h b/arch/arm/mach-at91/include/mach/at91sam9g45.h
index a526869aee37..659304aa73d9 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9g45.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9g45.h
@@ -18,8 +18,6 @@
 /*
  * Peripheral identifiers/interrupts.
  */
-#define AT91_ID_FIQ             0       /* Advanced Interrupt Controller (FIQ) */
-#define AT91_ID_SYS             1       /* System Controller Interrupt */
 #define AT91SAM9G45_ID_PIOA     2       /* Parallel I/O Controller A */
 #define AT91SAM9G45_ID_PIOB     3       /* Parallel I/O Controller B */
 #define AT91SAM9G45_ID_PIOC     4       /* Parallel I/O Controller C */
@@ -131,8 +129,6 @@
 #define AT91SAM9G45_EHCI_BASE   0x00800000      /* USB Host controller (EHCI) */
 #define AT91SAM9G45_VDEC_BASE   0x00900000      /* Video Decoder Controller */
 
-#define CONFIG_DRAM_BASE        AT91_CHIPSELECT_6
-
 #define CONSISTENT_DMA_SIZE     SZ_4M
 
 /*
diff --git a/arch/arm/mach-at91/include/mach/at91sam9rl.h b/arch/arm/mach-at91/include/mach/at91sam9rl.h
index 87ba8517ad98..41dbbe61055c 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9rl.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9rl.h
@@ -17,8 +17,6 @@
 /*
  * Peripheral identifiers/interrupts.
  */
-#define AT91_ID_FIQ             0       /* Advanced Interrupt Controller (FIQ) */
-#define AT91_ID_SYS             1       /* System Controller */
 #define AT91SAM9RL_ID_PIOA      2       /* Parallel IO Controller A */
 #define AT91SAM9RL_ID_PIOB      3       /* Parallel IO Controller B */
 #define AT91SAM9RL_ID_PIOC      4       /* Parallel IO Controller C */
diff --git a/arch/arm/mach-at91/include/mach/at91x40.h b/arch/arm/mach-at91/include/mach/at91x40.h
index 063ac44a0204..a152ff87e688 100644
--- a/arch/arm/mach-at91/include/mach/at91x40.h
+++ b/arch/arm/mach-at91/include/mach/at91x40.h
@@ -15,8 +15,6 @@
 /*
  *      IRQ list.
  */
-#define AT91_ID_FIQ             0       /* FIQ */
-#define AT91_ID_SYS             1       /* System Peripheral */
 #define AT91X40_ID_USART0       2       /* USART port 0 */
 #define AT91X40_ID_USART1       3       /* USART port 1 */
 #define AT91X40_ID_TC0          4       /* Timer/Counter 0 */
diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h
index 2b499eb343a1..ed544a0d5a1d 100644
--- a/arch/arm/mach-at91/include/mach/board.h
+++ b/arch/arm/mach-at91/include/mach/board.h
@@ -90,7 +90,7 @@ struct at91_eth_data {
 extern void __init at91_add_device_eth(struct at91_eth_data *data);
 
 #if defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9263) || defined(CONFIG_ARCH_AT91SAM9G20) || defined(CONFIG_ARCH_AT91CAP9) \
-        || defined(CONFIG_ARCH_AT91SAM9G45) || defined(CONFIG_ARCH_AT572D940HF)
+        || defined(CONFIG_ARCH_AT91SAM9G45)
 #define eth_platform_data       at91_eth_data
 #endif
 
@@ -140,6 +140,7 @@ extern void __init at91_set_serial_console(unsigned portnr);
 extern struct platform_device *atmel_default_console_device;
 
 struct atmel_uart_data {
+        int                     num;            /* port num */
         short                   use_dma_tx;     /* use transmit DMA? */
         short                   use_dma_rx;     /* use receive DMA? */
         void __iomem            *regs;          /* virt. base address, if any */
@@ -203,9 +204,6 @@ extern void __init at91_init_leds(u8 cpu_led, u8 timer_led);
 extern void __init at91_gpio_leds(struct gpio_led *leds, int nr);
 extern void __init at91_pwm_leds(struct gpio_led *leds, int nr);
 
- /* AT572D940HF DSP */
-extern void __init at91_add_device_mAgic(void);
-
 /* FIXME: this needs a better location, but gets stuff building again */
 extern int at91_suspend_entering_slow_clock(void);
 
diff --git a/arch/arm/mach-at91/include/mach/clkdev.h b/arch/arm/mach-at91/include/mach/clkdev.h
new file mode 100644
index 000000000000..04b37a89801c
--- /dev/null
+++ b/arch/arm/mach-at91/include/mach/clkdev.h
@@ -0,0 +1,7 @@
+#ifndef __ASM_MACH_CLKDEV_H
+#define __ASM_MACH_CLKDEV_H
+
+#define __clk_get(clk) ({ 1; })
+#define __clk_put(clk) do { } while (0)
+
+#endif
diff --git a/arch/arm/mach-at91/include/mach/cpu.h b/arch/arm/mach-at91/include/mach/cpu.h
index 0700f2125305..df966c2bc2d4 100644
--- a/arch/arm/mach-at91/include/mach/cpu.h
+++ b/arch/arm/mach-at91/include/mach/cpu.h
@@ -34,8 +34,6 @@
 #define ARCH_ID_AT91SAM9XE256   0x329a93a0
 #define ARCH_ID_AT91SAM9XE512   0x329aa3a0
 
-#define ARCH_ID_AT572D940HF     0x0e0303e0
-
 #define ARCH_ID_AT91M40800      0x14080044
 #define ARCH_ID_AT91R40807      0x44080746
 #define ARCH_ID_AT91M40807      0x14080745
@@ -90,9 +88,16 @@ static inline unsigned long at91cap9_rev_identify(void)
 #endif
 
 #ifdef CONFIG_ARCH_AT91RM9200
+extern int rm9200_type;
+#define ARCH_REVISON_9200_BGA   (0 << 0)
+#define ARCH_REVISON_9200_PQFP  (1 << 0)
 #define cpu_is_at91rm9200()     (at91_cpu_identify() == ARCH_ID_AT91RM9200)
+#define cpu_is_at91rm9200_bga() (!cpu_is_at91rm9200_pqfp())
+#define cpu_is_at91rm9200_pqfp() (cpu_is_at91rm9200() && rm9200_type & ARCH_REVISON_9200_PQFP)
 #else
 #define cpu_is_at91rm9200()     (0)
+#define cpu_is_at91rm9200_bga() (0)
+#define cpu_is_at91rm9200_pqfp() (0)
 #endif
 
 #ifdef CONFIG_ARCH_AT91SAM9260
@@ -181,12 +186,6 @@ static inline unsigned long at91cap9_rev_identify(void)
 #define cpu_is_at91cap9_revC()  (0)
 #endif
 
-#ifdef CONFIG_ARCH_AT572D940HF
-#define cpu_is_at572d940hf() (at91_cpu_identify() == ARCH_ID_AT572D940HF)
-#else
-#define cpu_is_at572d940hf() (0)
-#endif
-
 /*
  * Since this is ARM, we will never run on any AVR32 CPU. But these
  * definitions may reduce clutter in common drivers.
diff --git a/arch/arm/mach-at91/include/mach/hardware.h b/arch/arm/mach-at91/include/mach/hardware.h
index 3d64a75e3ed5..1008b9fb5074 100644
--- a/arch/arm/mach-at91/include/mach/hardware.h
+++ b/arch/arm/mach-at91/include/mach/hardware.h
@@ -32,13 +32,17 @@
 #include <mach/at91cap9.h>
 #elif defined(CONFIG_ARCH_AT91X40)
 #include <mach/at91x40.h>
-#elif defined(CONFIG_ARCH_AT572D940HF)
-#include <mach/at572d940hf.h>
 #else
 #error "Unsupported AT91 processor"
 #endif
 
 
+/*
+ * Peripheral identifiers/interrupts.
+ */
+#define AT91_ID_FIQ             0       /* Advanced Interrupt Controller (FIQ) */
+#define AT91_ID_SYS             1       /* System Peripherals */
+
 #ifdef CONFIG_MMU
 /*
  * Remap the peripherals from address 0xFFF78000 .. 0xFFFFFFFF
@@ -82,13 +86,6 @@
 #define AT91_CHIPSELECT_6       0x70000000
 #define AT91_CHIPSELECT_7       0x80000000
 
-/* SDRAM */
-#ifdef CONFIG_DRAM_BASE
-#define AT91_SDRAM_BASE         CONFIG_DRAM_BASE
-#else
-#define AT91_SDRAM_BASE         AT91_CHIPSELECT_1
-#endif
-
 /* Clocks */
 #define AT91_SLOW_CLOCK         32768           /* slow clock */
 
diff --git a/arch/arm/mach-at91/include/mach/memory.h b/arch/arm/mach-at91/include/mach/memory.h
index c2cfe5040642..401c207f2f39 100644
--- a/arch/arm/mach-at91/include/mach/memory.h
+++ b/arch/arm/mach-at91/include/mach/memory.h
@@ -23,6 +23,4 @@
 
 #include <mach/hardware.h>
 
-#define PLAT_PHYS_OFFSET        (AT91_SDRAM_BASE)
-
 #endif
diff --git a/arch/arm/mach-at91/include/mach/stamp9g20.h b/arch/arm/mach-at91/include/mach/stamp9g20.h
index 6120f9c46d59..f62c0abca4b4 100644
--- a/arch/arm/mach-at91/include/mach/stamp9g20.h
+++ b/arch/arm/mach-at91/include/mach/stamp9g20.h
@@ -1,7 +1,7 @@
 #ifndef __MACH_STAMP9G20_H
 #define __MACH_STAMP9G20_H
 
-void stamp9g20_map_io(void);
+void stamp9g20_init_early(void);
 void stamp9g20_board_init(void);
 
 #endif
diff --git a/arch/arm/mach-at91/include/mach/system_rev.h b/arch/arm/mach-at91/include/mach/system_rev.h
new file mode 100644
index 000000000000..b855ee75f72c
--- /dev/null
+++ b/arch/arm/mach-at91/include/mach/system_rev.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+ *
+ * Under GPLv2 only
+ */
+
+#ifndef __ARCH_SYSTEM_REV_H__
+#define __ARCH_SYSTEM_REV_H__
+
+/*
+ * board revision encoding
+ * mach specific
+ * the 16-31 bit are reserved for at91 generic information
+ *
+ * bit 31:
+ *      0 => nand 16 bit
+ *      1 => nand 8 bit
+ */
+#define BOARD_HAVE_NAND_8BIT    (1 << 31)
+static int inline board_have_nand_8bit(void)
+{
+        return system_rev & BOARD_HAVE_NAND_8BIT;
+}
+
+#endif /* __ARCH_SYSTEM_REV_H__ */
diff --git a/arch/arm/mach-at91/include/mach/timex.h b/arch/arm/mach-at91/include/mach/timex.h
index 05a6e8af80c4..31ac2d97f14c 100644
--- a/arch/arm/mach-at91/include/mach/timex.h
+++ b/arch/arm/mach-at91/include/mach/timex.h
@@ -82,11 +82,6 @@
 #define AT91X40_MASTER_CLOCK    40000000
 #define CLOCK_TICK_RATE         (AT91X40_MASTER_CLOCK)
 
-#elif defined(CONFIG_ARCH_AT572D940HF)
-
-#define AT572D940HF_MASTER_CLOCK        80000000
-#define CLOCK_TICK_RATE         (AT572D940HF_MASTER_CLOCK/16)
-
 #endif
 
 #endif
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index b95b9196deed..133aac405853 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -1055,7 +1055,7 @@ int da850_register_pm(struct platform_device *pdev)
         if (!pdata->cpupll_reg_base)
                 return -ENOMEM;
 
-        pdata->ddrpll_reg_base = ioremap(DA8XX_PLL1_BASE, SZ_4K);
+        pdata->ddrpll_reg_base = ioremap(DA850_PLL1_BASE, SZ_4K);
         if (!pdata->ddrpll_reg_base) {
                 ret = -ENOMEM;
                 goto no_ddrpll_mem;
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index 58a02dc7b15a..4e66881c7aee 100644
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -24,23 +24,25 @@
 #include "clock.h"
 
 #define DA8XX_TPCC_BASE                 0x01c00000
-#define DA850_MMCSD1_BASE               0x01e1b000
-#define DA850_TPCC1_BASE                0x01e30000
 #define DA8XX_TPTC0_BASE                0x01c08000
 #define DA8XX_TPTC1_BASE                0x01c08400
-#define DA850_TPTC2_BASE                0x01e38000
 #define DA8XX_WDOG_BASE                 0x01c21000 /* DA8XX_TIMER64P1_BASE */
 #define DA8XX_I2C0_BASE                 0x01c22000
-#define DA8XX_RTC_BASE                  0x01C23000
+#define DA8XX_RTC_BASE                  0x01c23000
+#define DA8XX_MMCSD0_BASE               0x01c40000
+#define DA8XX_SPI0_BASE                 0x01c41000
+#define DA830_SPI1_BASE                 0x01e12000
+#define DA8XX_LCD_CNTRL_BASE            0x01e13000
+#define DA850_MMCSD1_BASE               0x01e1b000
 #define DA8XX_EMAC_CPPI_PORT_BASE       0x01e20000
 #define DA8XX_EMAC_CPGMACSS_BASE        0x01e22000
 #define DA8XX_EMAC_CPGMAC_BASE          0x01e23000
 #define DA8XX_EMAC_MDIO_BASE            0x01e24000
-#define DA8XX_GPIO_BASE                 0x01e26000
 #define DA8XX_I2C1_BASE                 0x01e28000
-#define DA8XX_SPI0_BASE                 0x01c41000
-#define DA830_SPI1_BASE                 0x01e12000
+#define DA850_TPCC1_BASE                0x01e30000
+#define DA850_TPTC2_BASE                0x01e38000
 #define DA850_SPI1_BASE                 0x01f0e000
+#define DA8XX_DDR2_CTL_BASE             0xb0000000
 
 #define DA8XX_EMAC_CTRL_REG_OFFSET      0x3000
 #define DA8XX_EMAC_MOD_REG_OFFSET       0x2000
diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c
index 22ebc64bc9d9..8f4f736aa267 100644
--- a/arch/arm/mach-davinci/devices.c
+++ b/arch/arm/mach-davinci/devices.c
@@ -33,6 +33,9 @@
 #define DM365_MMCSD0_BASE            0x01D11000
 #define DM365_MMCSD1_BASE            0x01D00000
 
+/* System control register offsets */
+#define DM64XX_VDD3P3V_PWDN     0x48
+
 static struct resource i2c_resources[] = {
         {
                 .start          = DAVINCI_I2C_BASE,
diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h
index e4fc1af8500e..ad64da713fc8 100644
--- a/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/arch/arm/mach-davinci/include/mach/da8xx.h
@@ -64,13 +64,9 @@ extern unsigned int da850_max_speed;
 #define DA8XX_TIMER64P1_BASE    0x01c21000
 #define DA8XX_GPIO_BASE         0x01e26000
 #define DA8XX_PSC1_BASE         0x01e27000
-#define DA8XX_LCD_CNTRL_BASE    0x01e13000
-#define DA8XX_PLL1_BASE         0x01e1a000
-#define DA8XX_MMCSD0_BASE       0x01c40000
 #define DA8XX_AEMIF_CS2_BASE    0x60000000
 #define DA8XX_AEMIF_CS3_BASE    0x62000000
 #define DA8XX_AEMIF_CTL_BASE    0x68000000
-#define DA8XX_DDR2_CTL_BASE     0xb0000000
 #define DA8XX_ARM_RAM_BASE      0xffff0000
 
 void __init da830_init(void);
diff --git a/arch/arm/mach-davinci/include/mach/hardware.h b/arch/arm/mach-davinci/include/mach/hardware.h
index c45ba1f62a11..414e0b93e741 100644
--- a/arch/arm/mach-davinci/include/mach/hardware.h
+++ b/arch/arm/mach-davinci/include/mach/hardware.h
@@ -21,9 +21,6 @@
  */
 #define DAVINCI_SYSTEM_MODULE_BASE        0x01C40000
 
-/* System control register offsets */
-#define DM64XX_VDD3P3V_PWDN     0x48
-
 /*
  * I/O mapping
  */
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
index 805196207ce8..b92c1e557145 100644
--- a/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@ -169,9 +169,11 @@ config MACH_NURI
         select S3C_DEV_HSMMC2
         select S3C_DEV_HSMMC3
         select S3C_DEV_I2C1
+        select S3C_DEV_I2C3
         select S3C_DEV_I2C5
         select S5P_DEV_USB_EHCI
         select EXYNOS4_SETUP_I2C1
+        select EXYNOS4_SETUP_I2C3
         select EXYNOS4_SETUP_I2C5
         select EXYNOS4_SETUP_SDHCI
         select SAMSUNG_DEV_PWM
diff --git a/arch/arm/mach-exynos4/Makefile b/arch/arm/mach-exynos4/Makefile
index 777897551e42..a9bb94fabaa7 100644
--- a/arch/arm/mach-exynos4/Makefile
+++ b/arch/arm/mach-exynos4/Makefile
@@ -13,9 +13,10 @@ obj-				:=
 # Core support for EXYNOS4 system
 
 obj-$(CONFIG_CPU_EXYNOS4210)    += cpu.o init.o clock.o irq-combiner.o
-obj-$(CONFIG_CPU_EXYNOS4210)    += setup-i2c0.o gpiolib.o irq-eint.o dma.o
+obj-$(CONFIG_CPU_EXYNOS4210)    += setup-i2c0.o irq-eint.o dma.o
 obj-$(CONFIG_PM)                += pm.o sleep.o
 obj-$(CONFIG_CPU_FREQ)          += cpufreq.o
+obj-$(CONFIG_CPU_IDLE)          += cpuidle.o
 
 obj-$(CONFIG_SMP)               += platsmp.o headsmp.o
 
diff --git a/arch/arm/mach-exynos4/cpuidle.c b/arch/arm/mach-exynos4/cpuidle.c
new file mode 100644
index 000000000000..bf7e96f2793a
--- /dev/null
+++ b/arch/arm/mach-exynos4/cpuidle.c
@@ -0,0 +1,86 @@
+/* linux/arch/arm/mach-exynos4/cpuidle.c
+ *
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.
+ *              http://www.samsung.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/kernel.h>
+#include <linux/init.h>
+#include <linux/cpuidle.h>
+#include <linux/io.h>
+
+#include <asm/proc-fns.h>
+
+static int exynos4_enter_idle(struct cpuidle_device *dev,
+                              struct cpuidle_state *state);
+
+static struct cpuidle_state exynos4_cpuidle_set[] = {
+        [0] = {
+                .enter                  = exynos4_enter_idle,
+                .exit_latency           = 1,
+                .target_residency       = 100000,
+                .flags                  = CPUIDLE_FLAG_TIME_VALID,
+                .name                   = "IDLE",
+                .desc                   = "ARM clock gating(WFI)",
+        },
+};
+
+static DEFINE_PER_CPU(struct cpuidle_device, exynos4_cpuidle_device);
+
+static struct cpuidle_driver exynos4_idle_driver = {
+        .name           = "exynos4_idle",
+        .owner          = THIS_MODULE,
+};
+
+static int exynos4_enter_idle(struct cpuidle_device *dev,
+                              struct cpuidle_state *state)
+{
+        struct timeval before, after;
+        int idle_time;
+
+        local_irq_disable();
+        do_gettimeofday(&before);
+
+        cpu_do_idle();
+
+        do_gettimeofday(&after);
+        local_irq_enable();
+        idle_time = (after.tv_sec - before.tv_sec) * USEC_PER_SEC +
+                    (after.tv_usec - before.tv_usec);
+
+        return idle_time;
+}
+
+static int __init exynos4_init_cpuidle(void)
+{
+        int i, max_cpuidle_state, cpu_id;
+        struct cpuidle_device *device;
+
+        cpuidle_register_driver(&exynos4_idle_driver);
+
+        for_each_cpu(cpu_id, cpu_online_mask) {
+                device = &per_cpu(exynos4_cpuidle_device, cpu_id);
+                device->cpu = cpu_id;
+
+                device->state_count = (sizeof(exynos4_cpuidle_set) /
+                                               sizeof(struct cpuidle_state));
+
+                max_cpuidle_state = device->state_count;
+
+                for (i = 0; i < max_cpuidle_state; i++) {
+                        memcpy(&device->states[i], &exynos4_cpuidle_set[i],
+                                        sizeof(struct cpuidle_state));
+                }
+
+                if (cpuidle_register_device(device)) {
+                        printk(KERN_ERR "CPUidle register device failed\n,");
+                        return -EIO;
+                }
+        }
+        return 0;
+}
+device_initcall(exynos4_init_cpuidle);
diff --git a/arch/arm/mach-exynos4/gpiolib.c b/arch/arm/mach-exynos4/gpiolib.c
deleted file mode 100644
index d54ca6adb660..000000000000
--- a/arch/arm/mach-exynos4/gpiolib.c
+++ /dev/null
@@ -1,365 +0,0 @@
-/* linux/arch/arm/mach-exynos4/gpiolib.c
- *
- * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * EXYNOS4 - GPIOlib support
- *
- * 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/irq.h>
-#include <linux/io.h>
-#include <linux/gpio.h>
-
-#include <mach/map.h>
-
-#include <plat/gpio-core.h>
-#include <plat/gpio-cfg.h>
-#include <plat/gpio-cfg-helpers.h>
-
-static struct s3c_gpio_cfg gpio_cfg = {
-        .set_config     = s3c_gpio_setcfg_s3c64xx_4bit,
-        .set_pull       = s3c_gpio_setpull_updown,
-        .get_pull       = s3c_gpio_getpull_updown,
-};
-
-static struct s3c_gpio_cfg gpio_cfg_noint = {
-        .set_config     = s3c_gpio_setcfg_s3c64xx_4bit,
-        .set_pull       = s3c_gpio_setpull_updown,
-        .get_pull       = s3c_gpio_getpull_updown,
-};
-
-/*
- * Following are the gpio banks in v310.
- *
- * The 'config' member when left to NULL, is initialized to the default
- * structure gpio_cfg in the init function below.
- *
- * The 'base' member is also initialized in the init function below.
- * Note: The initialization of 'base' member of s3c_gpio_chip structure
- * uses the above macro and depends on the banks being listed in order here.
- */
-static struct s3c_gpio_chip exynos4_gpio_part1_4bit[] = {
-        {
-                .chip   = {
-                        .base   = EXYNOS4_GPA0(0),
-                        .ngpio  = EXYNOS4_GPIO_A0_NR,
-                        .label  = "GPA0",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPA1(0),
-                        .ngpio  = EXYNOS4_GPIO_A1_NR,
-                        .label  = "GPA1",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPB(0),
-                        .ngpio  = EXYNOS4_GPIO_B_NR,
-                        .label  = "GPB",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPC0(0),
-                        .ngpio  = EXYNOS4_GPIO_C0_NR,
-                        .label  = "GPC0",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPC1(0),
-                        .ngpio  = EXYNOS4_GPIO_C1_NR,
-                        .label  = "GPC1",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPD0(0),
-                        .ngpio  = EXYNOS4_GPIO_D0_NR,
-                        .label  = "GPD0",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPD1(0),
-                        .ngpio  = EXYNOS4_GPIO_D1_NR,
-                        .label  = "GPD1",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPE0(0),
-                        .ngpio  = EXYNOS4_GPIO_E0_NR,
-                        .label  = "GPE0",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPE1(0),
-                        .ngpio  = EXYNOS4_GPIO_E1_NR,
-                        .label  = "GPE1",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPE2(0),
-                        .ngpio  = EXYNOS4_GPIO_E2_NR,
-                        .label  = "GPE2",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPE3(0),
-                        .ngpio  = EXYNOS4_GPIO_E3_NR,
-                        .label  = "GPE3",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPE4(0),
-                        .ngpio  = EXYNOS4_GPIO_E4_NR,
-                        .label  = "GPE4",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPF0(0),
-                        .ngpio  = EXYNOS4_GPIO_F0_NR,
-                        .label  = "GPF0",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPF1(0),
-                        .ngpio  = EXYNOS4_GPIO_F1_NR,
-                        .label  = "GPF1",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPF2(0),
-                        .ngpio  = EXYNOS4_GPIO_F2_NR,
-                        .label  = "GPF2",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPF3(0),
-                        .ngpio  = EXYNOS4_GPIO_F3_NR,
-                        .label  = "GPF3",
-                },
-        },
-};
-
-static struct s3c_gpio_chip exynos4_gpio_part2_4bit[] = {
-        {
-                .chip   = {
-                        .base   = EXYNOS4_GPJ0(0),
-                        .ngpio  = EXYNOS4_GPIO_J0_NR,
-                        .label  = "GPJ0",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPJ1(0),
-                        .ngpio  = EXYNOS4_GPIO_J1_NR,
-                        .label  = "GPJ1",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPK0(0),
-                        .ngpio  = EXYNOS4_GPIO_K0_NR,
-                        .label  = "GPK0",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPK1(0),
-                        .ngpio  = EXYNOS4_GPIO_K1_NR,
-                        .label  = "GPK1",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPK2(0),
-                        .ngpio  = EXYNOS4_GPIO_K2_NR,
-                        .label  = "GPK2",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPK3(0),
-                        .ngpio  = EXYNOS4_GPIO_K3_NR,
-                        .label  = "GPK3",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPL0(0),
-                        .ngpio  = EXYNOS4_GPIO_L0_NR,
-                        .label  = "GPL0",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPL1(0),
-                        .ngpio  = EXYNOS4_GPIO_L1_NR,
-                        .label  = "GPL1",
-                },
-        }, {
-                .chip   = {
-                        .base   = EXYNOS4_GPL2(0),
-                        .ngpio  = EXYNOS4_GPIO_L2_NR,
-                        .label  = "GPL2",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = EXYNOS4_GPY0(0),
-                        .ngpio  = EXYNOS4_GPIO_Y0_NR,
-                        .label  = "GPY0",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = EXYNOS4_GPY1(0),
-                        .ngpio  = EXYNOS4_GPIO_Y1_NR,
-                        .label  = "GPY1",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = EXYNOS4_GPY2(0),
-                        .ngpio  = EXYNOS4_GPIO_Y2_NR,
-                        .label  = "GPY2",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = EXYNOS4_GPY3(0),
-                        .ngpio  = EXYNOS4_GPIO_Y3_NR,
-                        .label  = "GPY3",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = EXYNOS4_GPY4(0),
-                        .ngpio  = EXYNOS4_GPIO_Y4_NR,
-                        .label  = "GPY4",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = EXYNOS4_GPY5(0),
-                        .ngpio  = EXYNOS4_GPIO_Y5_NR,
-                        .label  = "GPY5",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = EXYNOS4_GPY6(0),
-                        .ngpio  = EXYNOS4_GPIO_Y6_NR,
-                        .label  = "GPY6",
-                },
-        }, {
-                .base   = (S5P_VA_GPIO2 + 0xC00),
-                .config = &gpio_cfg_noint,
-                .irq_base = IRQ_EINT(0),
-                .chip   = {
-                        .base   = EXYNOS4_GPX0(0),
-                        .ngpio  = EXYNOS4_GPIO_X0_NR,
-                        .label  = "GPX0",
-                        .to_irq = samsung_gpiolib_to_irq,
-                },
-        }, {
-                .base   = (S5P_VA_GPIO2 + 0xC20),
-                .config = &gpio_cfg_noint,
-                .irq_base = IRQ_EINT(8),
-                .chip   = {
-                        .base   = EXYNOS4_GPX1(0),
-                        .ngpio  = EXYNOS4_GPIO_X1_NR,
-                        .label  = "GPX1",
-                        .to_irq = samsung_gpiolib_to_irq,
-                },
-        }, {
-                .base   = (S5P_VA_GPIO2 + 0xC40),
-                .config = &gpio_cfg_noint,
-                .irq_base = IRQ_EINT(16),
-                .chip   = {
-                        .base   = EXYNOS4_GPX2(0),
-                        .ngpio  = EXYNOS4_GPIO_X2_NR,
-                        .label  = "GPX2",
-                        .to_irq = samsung_gpiolib_to_irq,
-                },
-        }, {
-                .base   = (S5P_VA_GPIO2 + 0xC60),
-                .config = &gpio_cfg_noint,
-                .irq_base = IRQ_EINT(24),
-                .chip   = {
-                        .base   = EXYNOS4_GPX3(0),
-                        .ngpio  = EXYNOS4_GPIO_X3_NR,
-                        .label  = "GPX3",
-                        .to_irq = samsung_gpiolib_to_irq,
-                },
-        },
-};
-
-static struct s3c_gpio_chip exynos4_gpio_part3_4bit[] = {
-        {
-                .chip   = {
-                        .base   = EXYNOS4_GPZ(0),
-                        .ngpio  = EXYNOS4_GPIO_Z_NR,
-                        .label  = "GPZ",
-                },
-        },
-};
-
-static __init int exynos4_gpiolib_init(void)
-{
-        struct s3c_gpio_chip *chip;
-        int i;
-        int group = 0;
-        int nr_chips;
-
-        /* GPIO part 1 */
-
-        chip = exynos4_gpio_part1_4bit;
-        nr_chips = ARRAY_SIZE(exynos4_gpio_part1_4bit);
-
-        for (i = 0; i < nr_chips; i++, chip++) {
-                if (chip->config == NULL) {
-                        chip->config = &gpio_cfg;
-                        /* Assign the GPIO interrupt group */
-                        chip->group = group++;
-                }
-                if (chip->base == NULL)
-                        chip->base = S5P_VA_GPIO1 + (i) * 0x20;
-        }
-
-        samsung_gpiolib_add_4bit_chips(exynos4_gpio_part1_4bit, nr_chips);
-
-        /* GPIO part 2 */
-
-        chip = exynos4_gpio_part2_4bit;
-        nr_chips = ARRAY_SIZE(exynos4_gpio_part2_4bit);
-
-        for (i = 0; i < nr_chips; i++, chip++) {
-                if (chip->config == NULL) {
-                        chip->config = &gpio_cfg;
-                        /* Assign the GPIO interrupt group */
-                        chip->group = group++;
-                }
-                if (chip->base == NULL)
-                        chip->base = S5P_VA_GPIO2 + (i) * 0x20;
-        }
-
-        samsung_gpiolib_add_4bit_chips(exynos4_gpio_part2_4bit, nr_chips);
-
-        /* GPIO part 3 */
-
-        chip = exynos4_gpio_part3_4bit;
-        nr_chips = ARRAY_SIZE(exynos4_gpio_part3_4bit);
-
-        for (i = 0; i < nr_chips; i++, chip++) {
-                if (chip->config == NULL) {
-                        chip->config = &gpio_cfg;
-                        /* Assign the GPIO interrupt group */
-                        chip->group = group++;
-                }
-                if (chip->base == NULL)
-                        chip->base = S5P_VA_GPIO3 + (i) * 0x20;
-        }
-
-        samsung_gpiolib_add_4bit_chips(exynos4_gpio_part3_4bit, nr_chips);
-        s5p_register_gpioint_bank(IRQ_GPIO_XA, 0, IRQ_GPIO1_NR_GROUPS);
-        s5p_register_gpioint_bank(IRQ_GPIO_XB, IRQ_GPIO1_NR_GROUPS, IRQ_GPIO2_NR_GROUPS);
-
-        return 0;
-}
-core_initcall(exynos4_gpiolib_init);
diff --git a/arch/arm/mach-exynos4/mach-nuri.c b/arch/arm/mach-exynos4/mach-nuri.c
index bb5d12f43af8..642702bb5b12 100644
--- a/arch/arm/mach-exynos4/mach-nuri.c
+++ b/arch/arm/mach-exynos4/mach-nuri.c
@@ -12,6 +12,7 @@
 #include <linux/serial_core.h>
 #include <linux/input.h>
 #include <linux/i2c.h>
+#include <linux/i2c/atmel_mxt_ts.h>
 #include <linux/gpio_keys.h>
 #include <linux/gpio.h>
 #include <linux/regulator/machine.h>
@@ -32,6 +33,8 @@
 #include <plat/sdhci.h>
 #include <plat/ehci.h>
 #include <plat/clock.h>
+#include <plat/gpio-cfg.h>
+#include <plat/iic.h>
 
 #include <mach/map.h>
 
@@ -259,6 +262,88 @@ static struct i2c_board_info i2c1_devs[] __initdata = {
         /* Gyro, To be updated */
 };
 
+/* TSP */
+static u8 mxt_init_vals[] = {
+        /* MXT_GEN_COMMAND(6) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        /* MXT_GEN_POWER(7) */
+        0x20, 0xff, 0x32,
+        /* MXT_GEN_ACQUIRE(8) */
+        0x0a, 0x00, 0x05, 0x00, 0x00, 0x00, 0x09, 0x23,
+        /* MXT_TOUCH_MULTI(9) */
+        0x00, 0x00, 0x00, 0x13, 0x0b, 0x00, 0x00, 0x00, 0x02, 0x00,
+        0x00, 0x01, 0x01, 0x0e, 0x0a, 0x0a, 0x0a, 0x0a, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00,
+        /* MXT_TOUCH_KEYARRAY(15) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00,
+        0x00,
+        /* MXT_SPT_GPIOPWM(19) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        /* MXT_PROCI_GRIPFACE(20) */
+        0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x28, 0x04,
+        0x0f, 0x0a,
+        /* MXT_PROCG_NOISE(22) */
+        0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x23, 0x00,
+        0x00, 0x05, 0x0f, 0x19, 0x23, 0x2d, 0x03,
+        /* MXT_TOUCH_PROXIMITY(23) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00,
+        /* MXT_PROCI_ONETOUCH(24) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        /* MXT_SPT_SELFTEST(25) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00,
+        /* MXT_PROCI_TWOTOUCH(27) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        /* MXT_SPT_CTECONFIG(28) */
+        0x00, 0x00, 0x02, 0x08, 0x10, 0x00,
+};
+
+static struct mxt_platform_data mxt_platform_data = {
+        .config                 = mxt_init_vals,
+        .config_length          = ARRAY_SIZE(mxt_init_vals),
+
+        .x_line                 = 18,
+        .y_line                 = 11,
+        .x_size                 = 1024,
+        .y_size                 = 600,
+        .blen                   = 0x1,
+        .threshold              = 0x28,
+        .voltage                = 2800000,              /* 2.8V */
+        .orient                 = MXT_DIAGONAL_COUNTER,
+        .irqflags               = IRQF_TRIGGER_FALLING,
+};
+
+static struct s3c2410_platform_i2c i2c3_data __initdata = {
+        .flags          = 0,
+        .bus_num        = 3,
+        .slave_addr     = 0x10,
+        .frequency      = 400 * 1000,
+        .sda_delay      = 100,
+};
+
+static struct i2c_board_info i2c3_devs[] __initdata = {
+        {
+                I2C_BOARD_INFO("atmel_mxt_ts", 0x4a),
+                .platform_data  = &mxt_platform_data,
+                .irq            = IRQ_EINT(4),
+        },
+};
+
+static void __init nuri_tsp_init(void)
+{
+        int gpio;
+
+        /* TOUCH_INT: XEINT_4 */
+        gpio = EXYNOS4_GPX0(4);
+        gpio_request(gpio, "TOUCH_INT");
+        s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(0xf));
+        s3c_gpio_setpull(gpio, S3C_GPIO_PULL_UP);
+}
+
 /* GPIO I2C 5 (PMIC) */
 static struct i2c_board_info i2c5_devs[] __initdata = {
         /* max8997, To be updated */
@@ -283,6 +368,7 @@ static struct platform_device *nuri_devices[] __initdata = {
         &s3c_device_wdt,
         &s3c_device_timer[0],
         &s5p_device_ehci,
+        &s3c_device_i2c3,
 
         /* NURI Devices */
         &nuri_gpio_keys,
@@ -300,8 +386,11 @@ static void __init nuri_map_io(void)
 static void __init nuri_machine_init(void)
 {
         nuri_sdhci_init();
+        nuri_tsp_init();
 
         i2c_register_board_info(1, i2c1_devs, ARRAY_SIZE(i2c1_devs));
+        s3c_i2c3_set_platdata(&i2c3_data);
+        i2c_register_board_info(3, i2c3_devs, ARRAY_SIZE(i2c3_devs));
         i2c_register_board_info(5, i2c5_devs, ARRAY_SIZE(i2c5_devs));
 
         nuri_ehci_init();
diff --git a/arch/arm/mach-gemini/board-wbd111.c b/arch/arm/mach-gemini/board-wbd111.c
index af7b68a6b258..88cc422ee444 100644
--- a/arch/arm/mach-gemini/board-wbd111.c
+++ b/arch/arm/mach-gemini/board-wbd111.c
@@ -84,7 +84,6 @@ static struct sys_timer wbd111_timer = {
         .init   = gemini_timer_init,
 };
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition wbd111_partitions[] = {
         {
                 .name           = "RedBoot",
@@ -116,11 +115,7 @@ static struct mtd_partition wbd111_partitions[] = {
                 .mask_flags     = MTD_WRITEABLE,
         }
 };
-#define wbd111_num_partitions   ARRAY_SIZE(wbd111_partitions)
-#else
-#define wbd111_partitions       NULL
-#define wbd111_num_partitions   0
-#endif /* CONFIG_MTD_PARTITIONS */
+#define wbd111_num_partitions  ARRAY_SIZE(wbd111_partitions)
 
 static void __init wbd111_init(void)
 {
diff --git a/arch/arm/mach-gemini/board-wbd222.c b/arch/arm/mach-gemini/board-wbd222.c
index 99e5bbecf923..3a220347bc88 100644
--- a/arch/arm/mach-gemini/board-wbd222.c
+++ b/arch/arm/mach-gemini/board-wbd222.c
@@ -84,7 +84,6 @@ static struct sys_timer wbd222_timer = {
         .init   = gemini_timer_init,
 };
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition wbd222_partitions[] = {
         {
                 .name           = "RedBoot",
@@ -116,11 +115,7 @@ static struct mtd_partition wbd222_partitions[] = {
                 .mask_flags     = MTD_WRITEABLE,
         }
 };
-#define wbd222_num_partitions   ARRAY_SIZE(wbd222_partitions)
-#else
-#define wbd222_partitions       NULL
-#define wbd222_num_partitions   0
-#endif /* CONFIG_MTD_PARTITIONS */
+#define wbd222_num_partitions  ARRAY_SIZE(wbd222_partitions)
 
 static void __init wbd222_init(void)
 {
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c
index 140783386785..dca4f7f9f4f7 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -60,7 +60,6 @@ static struct platform_device ixdp425_flash = {
 #if defined(CONFIG_MTD_NAND_PLATFORM) || \
     defined(CONFIG_MTD_NAND_PLATFORM_MODULE)
 
-#ifdef CONFIG_MTD_PARTITIONS
 const char *part_probes[] = { "cmdlinepart", NULL };
 
 static struct mtd_partition ixdp425_partitions[] = {
@@ -74,7 +73,6 @@ static struct mtd_partition ixdp425_partitions[] = {
                 .size   = MTDPART_SIZ_FULL
         },
 };
-#endif
 
 static void
 ixdp425_flash_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
@@ -103,11 +101,9 @@ static struct platform_nand_data ixdp425_flash_nand_data = {
                 .nr_chips               = 1,
                 .chip_delay             = 30,
                 .options                = NAND_NO_AUTOINCR,
-#ifdef CONFIG_MTD_PARTITIONS
                 .part_probe_types       = part_probes,
                 .partitions             = ixdp425_partitions,
                 .nr_partitions          = ARRAY_SIZE(ixdp425_partitions),
-#endif
         },
         .ctrl = {
                 .cmd_ctrl               = ixdp425_flash_nand_cmd_ctrl
diff --git a/arch/arm/mach-netx/fb.c b/arch/arm/mach-netx/fb.c
index 5b84bcd30271..b9913234bbf6 100644
--- a/arch/arm/mach-netx/fb.c
+++ b/arch/arm/mach-netx/fb.c
@@ -103,7 +103,6 @@ static struct amba_device fb_device = {
                 .flags  = IORESOURCE_MEM,
         },
         .irq            = { NETX_IRQ_LCD, NO_IRQ },
-        .periphid       = 0x10112400,
 };
 
 int netx_fb_init(struct clcd_board *board, struct clcd_panel *panel)
diff --git a/arch/arm/mach-nomadik/Kconfig b/arch/arm/mach-nomadik/Kconfig
index 71f3ea623974..3c5e0f522e9c 100644
--- a/arch/arm/mach-nomadik/Kconfig
+++ b/arch/arm/mach-nomadik/Kconfig
@@ -6,7 +6,6 @@ config MACH_NOMADIK_8815NHK
         bool "ST 8815 Nomadik Hardware Kit (evaluation board)"
         select NOMADIK_8815
         select HAS_MTU
-        select NOMADIK_GPIO
 
 endmenu
 
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index b997a35830fc..19d5891c48e3 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -288,6 +288,7 @@ config MACH_IGEP0030
         depends on ARCH_OMAP3
         default y
         select OMAP_PACKAGE_CBB
+        select MACH_IGEP0020
 
 config MACH_SBC3530
         bool "OMAP3 SBC STALKER board"
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 66dfbccacd25..b14807794401 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -229,8 +229,6 @@ obj-$(CONFIG_MACH_CM_T35)		+= board-cm-t35.o \
 obj-$(CONFIG_MACH_CM_T3517)             += board-cm-t3517.o
 obj-$(CONFIG_MACH_IGEP0020)             += board-igep0020.o \
                                            hsmmc.o
-obj-$(CONFIG_MACH_IGEP0030)             += board-igep0030.o \
-                                           hsmmc.o
 obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK)      += board-omap3touchbook.o \
                                            hsmmc.o
 obj-$(CONFIG_MACH_OMAP_4430SDP)         += board-4430sdp.o \
@@ -270,3 +268,5 @@ obj-$(CONFIG_ARCH_OMAP4)		+= hwspinlock.o
 
 disp-$(CONFIG_OMAP2_DSS)                := display.o
 obj-y                                   += $(disp-m) $(disp-y)
+
+obj-y                                   += common-board-devices.o
diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c
index 1fa6bb896f41..d54969be0a54 100644
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@ -41,6 +41,7 @@
 
 #include "mux.h"
 #include "hsmmc.h"
+#include "common-board-devices.h"
 
 #define SDP2430_CS0_BASE        0x04000000
 #define SECONDARY_LCD_GPIO              147
@@ -180,15 +181,6 @@ static struct twl4030_platform_data sdp2430_twldata = {
         .vmmc1          = &sdp2430_vmmc1,
 };
 
-static struct i2c_board_info __initdata sdp2430_i2c_boardinfo[] = {
-        {
-                I2C_BOARD_INFO("twl4030", 0x48),
-                .flags = I2C_CLIENT_WAKE,
-                .irq = INT_24XX_SYS_NIRQ,
-                .platform_data = &sdp2430_twldata,
-        },
-};
-
 static struct i2c_board_info __initdata sdp2430_i2c1_boardinfo[] = {
         {
                 I2C_BOARD_INFO("isp1301_omap", 0x2D),
@@ -201,8 +193,7 @@ static int __init omap2430_i2c_init(void)
 {
         omap_register_i2c_bus(1, 100, sdp2430_i2c1_boardinfo,
                         ARRAY_SIZE(sdp2430_i2c1_boardinfo));
-        omap_register_i2c_bus(2, 2600, sdp2430_i2c_boardinfo,
-                        ARRAY_SIZE(sdp2430_i2c_boardinfo));
+        omap2_pmic_init("twl4030", &sdp2430_twldata);
         return 0;
 }
 
@@ -217,11 +208,6 @@ static struct omap2_hsmmc_info mmc[] __initdata = {
         {}      /* Terminator */
 };
 
-static struct omap_musb_board_data musb_board_data = {
-        .interface_type         = MUSB_INTERFACE_ULPI,
-        .mode                   = MUSB_OTG,
-        .power                  = 100,
-};
 static struct omap_usb_config sdp2430_usb_config __initdata = {
         .otg            = 1,
 #ifdef  CONFIG_USB_GADGET_OMAP
@@ -240,8 +226,6 @@ static struct omap_board_mux board_mux[] __initdata = {
 
 static void __init omap_2430sdp_init(void)
 {
-        int ret;
-
         omap2430_mux_init(board_mux, OMAP_PACKAGE_ZAC);
 
         omap_board_config = sdp2430_config;
@@ -255,14 +239,13 @@ static void __init omap_2430sdp_init(void)
         omap2_usbfs_init(&sdp2430_usb_config);
 
         omap_mux_init_signal("usb0hs_stp", OMAP_PULL_ENA | OMAP_PULL_UP);
-        usb_musb_init(&musb_board_data);
+        usb_musb_init(NULL);
 
         board_smc91x_init();
 
         /* Turn off secondary LCD backlight */
-        ret = gpio_request(SECONDARY_LCD_GPIO, "Secondary LCD backlight");
-        if (ret == 0)
-                gpio_direction_output(SECONDARY_LCD_GPIO, 0);
+        gpio_request_one(SECONDARY_LCD_GPIO, GPIOF_OUT_INIT_LOW,
+                         "Secondary LCD backlight");
 }
 
 static void __init omap_2430sdp_map_io(void)
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index 23244cd0a5b6..ae2963a98041 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -19,7 +19,6 @@
 #include <linux/input.h>
 #include <linux/input/matrix_keypad.h>
 #include <linux/spi/spi.h>
-#include <linux/spi/ads7846.h>
 #include <linux/i2c/twl.h>
 #include <linux/regulator/machine.h>
 #include <linux/io.h>
@@ -48,6 +47,7 @@
 #include "hsmmc.h"
 #include "pm.h"
 #include "control.h"
+#include "common-board-devices.h"
 
 #define CONFIG_DISABLE_HFCLK 1
 
@@ -59,24 +59,6 @@
 
 #define TWL4030_MSECURE_GPIO 22
 
-/* FIXME: These values need to be updated based on more profiling on 3430sdp*/
-static struct cpuidle_params omap3_cpuidle_params_table[] = {
-        /* C1 */
-        {1, 2, 2, 5},
-        /* C2 */
-        {1, 10, 10, 30},
-        /* C3 */
-        {1, 50, 50, 300},
-        /* C4 */
-        {1, 1500, 1800, 4000},
-        /* C5 */
-        {1, 2500, 7500, 12000},
-        /* C6 */
-        {1, 3000, 8500, 15000},
-        /* C7 */
-        {1, 10000, 30000, 300000},
-};
-
 static uint32_t board_keymap[] = {
         KEY(0, 0, KEY_LEFT),
         KEY(0, 1, KEY_RIGHT),
@@ -123,63 +105,14 @@ static struct twl4030_keypad_data sdp3430_kp_data = {
         .rep            = 1,
 };
 
-static int ts_gpio;     /* Needed for ads7846_get_pendown_state */
-
-/**
- * @brief ads7846_dev_init : Requests & sets GPIO line for pen-irq
- *
- * @return - void. If request gpio fails then Flag KERN_ERR.
- */
-static void ads7846_dev_init(void)
-{
-        if (gpio_request(ts_gpio, "ADS7846 pendown") < 0) {
-                printk(KERN_ERR "can't get ads746 pen down GPIO\n");
-                return;
-        }
-
-        gpio_direction_input(ts_gpio);
-        gpio_set_debounce(ts_gpio, 310);
-}
-
-static int ads7846_get_pendown_state(void)
-{
-        return !gpio_get_value(ts_gpio);
-}
-
-static struct ads7846_platform_data tsc2046_config __initdata = {
-        .get_pendown_state      = ads7846_get_pendown_state,
-        .keep_vref_on           = 1,
-        .wakeup                         = true,
-};
-
-
-static struct omap2_mcspi_device_config tsc2046_mcspi_config = {
-        .turbo_mode     = 0,
-        .single_channel = 1,    /* 0: slave, 1: master */
-};
-
-static struct spi_board_info sdp3430_spi_board_info[] __initdata = {
-        [0] = {
-                /*
-                 * TSC2046 operates at a max freqency of 2MHz, so
-                 * operate slightly below at 1.5MHz
-                 */
-                .modalias               = "ads7846",
-                .bus_num                = 1,
-                .chip_select            = 0,
-                .max_speed_hz           = 1500000,
-                .controller_data        = &tsc2046_mcspi_config,
-                .irq                    = 0,
-                .platform_data          = &tsc2046_config,
-        },
-};
-
-
 #define SDP3430_LCD_PANEL_BACKLIGHT_GPIO        8
 #define SDP3430_LCD_PANEL_ENABLE_GPIO           5
 
-static unsigned backlight_gpio;
-static unsigned enable_gpio;
+static struct gpio sdp3430_dss_gpios[] __initdata = {
+        {SDP3430_LCD_PANEL_ENABLE_GPIO,    GPIOF_OUT_INIT_LOW, "LCD reset"    },
+        {SDP3430_LCD_PANEL_BACKLIGHT_GPIO, GPIOF_OUT_INIT_LOW, "LCD Backlight"},
+};
+
 static int lcd_enabled;
 static int dvi_enabled;
 
@@ -187,29 +120,11 @@ static void __init sdp3430_display_init(void)
 {
         int r;
 
-        enable_gpio    = SDP3430_LCD_PANEL_ENABLE_GPIO;
-        backlight_gpio = SDP3430_LCD_PANEL_BACKLIGHT_GPIO;
-
-        r = gpio_request(enable_gpio, "LCD reset");
-        if (r) {
-                printk(KERN_ERR "failed to get LCD reset GPIO\n");
-                goto err0;
-        }
-
-        r = gpio_request(backlight_gpio, "LCD Backlight");
-        if (r) {
-                printk(KERN_ERR "failed to get LCD backlight GPIO\n");
-                goto err1;
-        }
-
-        gpio_direction_output(enable_gpio, 0);
-        gpio_direction_output(backlight_gpio, 0);
+        r = gpio_request_array(sdp3430_dss_gpios,
+                               ARRAY_SIZE(sdp3430_dss_gpios));
+        if (r)
+                printk(KERN_ERR "failed to get LCD control GPIOs\n");
 
-        return;
-err1:
-        gpio_free(enable_gpio);
-err0:
-        return;
 }
 
 static int sdp3430_panel_enable_lcd(struct omap_dss_device *dssdev)
@@ -219,8 +134,8 @@ static int sdp3430_panel_enable_lcd(struct omap_dss_device *dssdev)
                 return -EINVAL;
         }
 
-        gpio_direction_output(enable_gpio, 1);
-        gpio_direction_output(backlight_gpio, 1);
+        gpio_direction_output(SDP3430_LCD_PANEL_ENABLE_GPIO, 1);
+        gpio_direction_output(SDP3430_LCD_PANEL_BACKLIGHT_GPIO, 1);
 
         lcd_enabled = 1;
 
@@ -231,8 +146,8 @@ static void sdp3430_panel_disable_lcd(struct omap_dss_device *dssdev)
 {
         lcd_enabled = 0;
 
-        gpio_direction_output(enable_gpio, 0);
-        gpio_direction_output(backlight_gpio, 0);
+        gpio_direction_output(SDP3430_LCD_PANEL_ENABLE_GPIO, 0);
+        gpio_direction_output(SDP3430_LCD_PANEL_BACKLIGHT_GPIO, 0);
 }
 
 static int sdp3430_panel_enable_dvi(struct omap_dss_device *dssdev)
@@ -360,12 +275,10 @@ static int sdp3430_twl_gpio_setup(struct device *dev,
         omap2_hsmmc_init(mmc);
 
         /* gpio + 7 is "sub_lcd_en_bkl" (output/PWM1) */
-        gpio_request(gpio + 7, "sub_lcd_en_bkl");
-        gpio_direction_output(gpio + 7, 0);
+        gpio_request_one(gpio + 7, GPIOF_OUT_INIT_LOW, "sub_lcd_en_bkl");
 
         /* gpio + 15 is "sub_lcd_nRST" (output) */
-        gpio_request(gpio + 15, "sub_lcd_nRST");
-        gpio_direction_output(gpio + 15, 0);
+        gpio_request_one(gpio + 15, GPIOF_OUT_INIT_LOW, "sub_lcd_nRST");
 
         return 0;
 }
@@ -580,20 +493,10 @@ static struct twl4030_platform_data sdp3430_twldata = {
         .vpll2          = &sdp3430_vpll2,
 };
 
-static struct i2c_board_info __initdata sdp3430_i2c_boardinfo[] = {
-        {
-                I2C_BOARD_INFO("twl4030", 0x48),
-                .flags = I2C_CLIENT_WAKE,
-                .irq = INT_34XX_SYS_NIRQ,
-                .platform_data = &sdp3430_twldata,
-        },
-};
-
 static int __init omap3430_i2c_init(void)
 {
         /* i2c1 for PMIC only */
-        omap_register_i2c_bus(1, 2600, sdp3430_i2c_boardinfo,
-                        ARRAY_SIZE(sdp3430_i2c_boardinfo));
+        omap3_pmic_init("twl4030", &sdp3430_twldata);
         /* i2c2 on camera connector (for sensor control) and optional isp1301 */
         omap_register_i2c_bus(2, 400, NULL, 0);
         /* i2c3 on display connector (for DVI, tfp410) */
@@ -872,30 +775,22 @@ static struct flash_partitions sdp_flash_partitions[] = {
         },
 };
 
-static struct omap_musb_board_data musb_board_data = {
-        .interface_type         = MUSB_INTERFACE_ULPI,
-        .mode                   = MUSB_OTG,
-        .power                  = 100,
-};
-
 static void __init omap_3430sdp_init(void)
 {
+        int gpio_pendown;
+
         omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
         omap_board_config = sdp3430_config;
         omap_board_config_size = ARRAY_SIZE(sdp3430_config);
-        omap3_pm_init_cpuidle(omap3_cpuidle_params_table);
         omap3430_i2c_init();
         omap_display_init(&sdp3430_dss_data);
         if (omap_rev() > OMAP3430_REV_ES1_0)
-                ts_gpio = SDP3430_TS_GPIO_IRQ_SDPV2;
+                gpio_pendown = SDP3430_TS_GPIO_IRQ_SDPV2;
         else
-                ts_gpio = SDP3430_TS_GPIO_IRQ_SDPV1;
-        sdp3430_spi_board_info[0].irq = gpio_to_irq(ts_gpio);
-        spi_register_board_info(sdp3430_spi_board_info,
-                                ARRAY_SIZE(sdp3430_spi_board_info));
-        ads7846_dev_init();
+                gpio_pendown = SDP3430_TS_GPIO_IRQ_SDPV1;
+        omap_ads7846_init(1, gpio_pendown, 310, NULL);
         board_serial_init();
-        usb_musb_init(&musb_board_data);
+        usb_musb_init(NULL);
         board_smc91x_init();
         board_flash_init(sdp_flash_partitions, chip_sel_3430, 0);
         sdp3430_display_init();
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index 93edd7fcf451..73fa90bb6953 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -42,6 +42,7 @@
 #include "hsmmc.h"
 #include "timer-gp.h"
 #include "control.h"
+#include "common-board-devices.h"
 
 #define ETH_KS8851_IRQ                  34
 #define ETH_KS8851_POWER_ON             48
@@ -251,58 +252,22 @@ static struct spi_board_info sdp4430_spi_board_info[] __initdata = {
         },
 };
 
+static struct gpio sdp4430_eth_gpios[] __initdata = {
+        { ETH_KS8851_POWER_ON,  GPIOF_OUT_INIT_HIGH,    "eth_power"     },
+        { ETH_KS8851_QUART,     GPIOF_OUT_INIT_HIGH,    "quart"         },
+        { ETH_KS8851_IRQ,       GPIOF_IN,               "eth_irq"       },
+};
+
 static int omap_ethernet_init(void)
 {
         int status;
 
         /* Request of GPIO lines */
+        status = gpio_request_array(sdp4430_eth_gpios,
+                                    ARRAY_SIZE(sdp4430_eth_gpios));
+        if (status)
+                pr_err("Cannot request ETH GPIOs\n");
 
-        status = gpio_request(ETH_KS8851_POWER_ON, "eth_power");
-        if (status) {
-                pr_err("Cannot request GPIO %d\n", ETH_KS8851_POWER_ON);
-                return status;
-        }
-
-        status = gpio_request(ETH_KS8851_QUART, "quart");
-        if (status) {
-                pr_err("Cannot request GPIO %d\n", ETH_KS8851_QUART);
-                goto error1;
-        }
-
-        status = gpio_request(ETH_KS8851_IRQ, "eth_irq");
-        if (status) {
-                pr_err("Cannot request GPIO %d\n", ETH_KS8851_IRQ);
-                goto error2;
-        }
-
-        /* Configuration of requested GPIO lines */
-
-        status = gpio_direction_output(ETH_KS8851_POWER_ON, 1);
-        if (status) {
-                pr_err("Cannot set output GPIO %d\n", ETH_KS8851_IRQ);
-                goto error3;
-        }
-
-        status = gpio_direction_output(ETH_KS8851_QUART, 1);
-        if (status) {
-                pr_err("Cannot set output GPIO %d\n", ETH_KS8851_QUART);
-                goto error3;
-        }
-
-        status = gpio_direction_input(ETH_KS8851_IRQ);
-        if (status) {
-                pr_err("Cannot set input GPIO %d\n", ETH_KS8851_IRQ);
-                goto error3;
-        }
-
-        return 0;
-
-error3:
-        gpio_free(ETH_KS8851_IRQ);
-error2:
-        gpio_free(ETH_KS8851_QUART);
-error1:
-        gpio_free(ETH_KS8851_POWER_ON);
         return status;
 }
 
@@ -575,14 +540,6 @@ static struct twl4030_platform_data sdp4430_twldata = {
         .usb            = &omap4_usbphy_data
 };
 
-static struct i2c_board_info __initdata sdp4430_i2c_boardinfo[] = {
-        {
-                I2C_BOARD_INFO("twl6030", 0x48),
-                .flags = I2C_CLIENT_WAKE,
-                .irq = OMAP44XX_IRQ_SYS_1N,
-                .platform_data = &sdp4430_twldata,
-        },
-};
 static struct i2c_board_info __initdata sdp4430_i2c_3_boardinfo[] = {
         {
                 I2C_BOARD_INFO("tmp105", 0x48),
@@ -598,12 +555,7 @@ static struct i2c_board_info __initdata sdp4430_i2c_4_boardinfo[] = {
 };
 static int __init omap4_i2c_init(void)
 {
-        /*
-         * Phoenix Audio IC needs I2C1 to
-         * start with 400 KHz or less
-         */
-        omap_register_i2c_bus(1, 400, sdp4430_i2c_boardinfo,
-                        ARRAY_SIZE(sdp4430_i2c_boardinfo));
+        omap4_pmic_init("twl6030", &sdp4430_twldata);
         omap_register_i2c_bus(2, 400, NULL, 0);
         omap_register_i2c_bus(3, 400, sdp4430_i2c_3_boardinfo,
                                 ARRAY_SIZE(sdp4430_i2c_3_boardinfo));
@@ -614,21 +566,13 @@ static int __init omap4_i2c_init(void)
 
 static void __init omap_sfh7741prox_init(void)
 {
-        int  error;
+        int error;
 
-        error = gpio_request(OMAP4_SFH7741_ENABLE_GPIO, "sfh7741");
-        if (error < 0) {
+        error = gpio_request_one(OMAP4_SFH7741_ENABLE_GPIO,
+                                 GPIOF_OUT_INIT_LOW, "sfh7741");
+        if (error < 0)
                 pr_err("%s:failed to request GPIO %d, error %d\n",
                         __func__, OMAP4_SFH7741_ENABLE_GPIO, error);
-                return;
-        }
-
-        error = gpio_direction_output(OMAP4_SFH7741_ENABLE_GPIO , 0);
-        if (error < 0) {
-                pr_err("%s: GPIO configuration failed: GPIO %d,error %d\n",
-                         __func__, OMAP4_SFH7741_ENABLE_GPIO, error);
-                gpio_free(OMAP4_SFH7741_ENABLE_GPIO);
-        }
 }
 
 static void sdp4430_hdmi_mux_init(void)
@@ -645,27 +589,19 @@ static void sdp4430_hdmi_mux_init(void)
                         OMAP_PIN_INPUT_PULLUP);
 }
 
+static struct gpio sdp4430_hdmi_gpios[] = {
+        { HDMI_GPIO_HPD,        GPIOF_OUT_INIT_HIGH,    "hdmi_gpio_hpd"   },
+        { HDMI_GPIO_LS_OE,      GPIOF_OUT_INIT_HIGH,    "hdmi_gpio_ls_oe" },
+};
+
 static int sdp4430_panel_enable_hdmi(struct omap_dss_device *dssdev)
 {
         int status;
 
-        status = gpio_request_one(HDMI_GPIO_HPD, GPIOF_OUT_INIT_HIGH,
-                                                        "hdmi_gpio_hpd");
-        if (status) {
-                pr_err("Cannot request GPIO %d\n", HDMI_GPIO_HPD);
-                return status;
-        }
-        status = gpio_request_one(HDMI_GPIO_LS_OE, GPIOF_OUT_INIT_HIGH,
-                                                        "hdmi_gpio_ls_oe");
-        if (status) {
-                pr_err("Cannot request GPIO %d\n", HDMI_GPIO_LS_OE);
-                goto error1;
-        }
-
-        return 0;
-
-error1:
-        gpio_free(HDMI_GPIO_HPD);
+        status = gpio_request_array(sdp4430_hdmi_gpios,
+                                    ARRAY_SIZE(sdp4430_hdmi_gpios));
+        if (status)
+                pr_err("%s: Cannot request HDMI GPIOs\n", __func__);
 
         return status;
 }
diff --git a/arch/arm/mach-omap2/board-am3517crane.c b/arch/arm/mach-omap2/board-am3517crane.c
index a890d244fec6..5e438a77cd72 100644
--- a/arch/arm/mach-omap2/board-am3517crane.c
+++ b/arch/arm/mach-omap2/board-am3517crane.c
@@ -89,19 +89,13 @@ static void __init am3517_crane_init(void)
                 return;
         }
 
-        ret = gpio_request(GPIO_USB_POWER, "usb_ehci_enable");
+        ret = gpio_request_one(GPIO_USB_POWER, GPIOF_OUT_INIT_HIGH,
+                               "usb_ehci_enable");
         if (ret < 0) {
                 pr_err("Can not request GPIO %d\n", GPIO_USB_POWER);
                 return;
         }
 
-        ret = gpio_direction_output(GPIO_USB_POWER, 1);
-        if (ret < 0) {
-                gpio_free(GPIO_USB_POWER);
-                pr_err("Unable to initialize EHCI power\n");
-                return;
-        }
-
         usbhs_init(&usbhs_bdata);
 }
 
diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c
index ff8c59be36e5..63af4171c043 100644
--- a/arch/arm/mach-omap2/board-am3517evm.c
+++ b/arch/arm/mach-omap2/board-am3517evm.c
@@ -174,19 +174,14 @@ static void __init am3517_evm_rtc_init(void)
         int r;
 
         omap_mux_init_gpio(GPIO_RTCS35390A_IRQ, OMAP_PIN_INPUT_PULLUP);
-        r = gpio_request(GPIO_RTCS35390A_IRQ, "rtcs35390a-irq");
+
+        r = gpio_request_one(GPIO_RTCS35390A_IRQ, GPIOF_IN, "rtcs35390a-irq");
         if (r < 0) {
                 printk(KERN_WARNING "failed to request GPIO#%d\n",
                                 GPIO_RTCS35390A_IRQ);
                 return;
         }
-        r = gpio_direction_input(GPIO_RTCS35390A_IRQ);
-        if (r < 0) {
-                printk(KERN_WARNING "GPIO#%d cannot be configured as input\n",
-                                GPIO_RTCS35390A_IRQ);
-                gpio_free(GPIO_RTCS35390A_IRQ);
-                return;
-        }
+
         am3517evm_i2c1_boardinfo[0].irq = gpio_to_irq(GPIO_RTCS35390A_IRQ);
 }
 
@@ -242,6 +237,15 @@ static int dvi_enabled;
 
 #if defined(CONFIG_PANEL_SHARP_LQ043T1DG01) || \
                 defined(CONFIG_PANEL_SHARP_LQ043T1DG01_MODULE)
+static struct gpio am3517_evm_dss_gpios[] __initdata = {
+        /* GPIO 182 = LCD Backlight Power */
+        { LCD_PANEL_BKLIGHT_PWR, GPIOF_OUT_INIT_HIGH, "lcd_backlight_pwr" },
+        /* GPIO 181 = LCD Panel PWM */
+        { LCD_PANEL_PWM,         GPIOF_OUT_INIT_HIGH, "lcd bl enable"     },
+        /* GPIO 176 = LCD Panel Power enable pin */
+        { LCD_PANEL_PWR,         GPIOF_OUT_INIT_HIGH, "dvi enable"        },
+};
+
 static void __init am3517_evm_display_init(void)
 {
         int r;
@@ -249,41 +253,15 @@ static void __init am3517_evm_display_init(void)
         omap_mux_init_gpio(LCD_PANEL_PWR, OMAP_PIN_INPUT_PULLUP);
         omap_mux_init_gpio(LCD_PANEL_BKLIGHT_PWR, OMAP_PIN_INPUT_PULLDOWN);
         omap_mux_init_gpio(LCD_PANEL_PWM, OMAP_PIN_INPUT_PULLDOWN);
-        /*
-         * Enable GPIO 182 = LCD Backlight Power
-         */
-        r = gpio_request(LCD_PANEL_BKLIGHT_PWR, "lcd_backlight_pwr");
+
+        r = gpio_request_array(am3517_evm_dss_gpios,
+                               ARRAY_SIZE(am3517_evm_dss_gpios));
         if (r) {
-                printk(KERN_ERR "failed to get lcd_backlight_pwr\n");
+                printk(KERN_ERR "failed to get DSS panel control GPIOs\n");
                 return;
         }
-        gpio_direction_output(LCD_PANEL_BKLIGHT_PWR, 1);
-        /*
-         * Enable GPIO 181 = LCD Panel PWM
-         */
-        r = gpio_request(LCD_PANEL_PWM, "lcd_pwm");
-        if (r) {
-                printk(KERN_ERR "failed to get lcd_pwm\n");
-                goto err_1;
-        }
-        gpio_direction_output(LCD_PANEL_PWM, 1);
-        /*
-         * Enable GPIO 176 = LCD Panel Power enable pin
-         */
-        r = gpio_request(LCD_PANEL_PWR, "lcd_panel_pwr");
-        if (r) {
-                printk(KERN_ERR "failed to get lcd_panel_pwr\n");
-                goto err_2;
-        }
-        gpio_direction_output(LCD_PANEL_PWR, 1);
 
         printk(KERN_INFO "Display initialized successfully\n");
-        return;
-
-err_2:
-        gpio_free(LCD_PANEL_PWM);
-err_1:
-        gpio_free(LCD_PANEL_BKLIGHT_PWR);
 }
 #else
 static void __init am3517_evm_display_init(void) {}
@@ -396,7 +374,7 @@ static struct omap_musb_board_data musb_board_data = {
         .power                  = 500,
         .set_phy_power          = am35x_musb_phy_power,
         .clear_irq              = am35x_musb_clear_irq,
-        .set_mode               = am35x_musb_set_mode,
+        .set_mode               = am35x_set_mode,
         .reset                  = am35x_musb_reset,
 };
 
diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c
index f4f8374a0298..f3beb8eeef77 100644
--- a/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@ -202,6 +202,7 @@ static inline void __init apollon_init_smc91x(void)
         unsigned int rate;
         struct clk *gpmc_fck;
         int eth_cs;
+        int err;
 
         gpmc_fck = clk_get(NULL, "gpmc_fck");   /* Always on ENABLE_ON_INIT */
         if (IS_ERR(gpmc_fck)) {
@@ -245,15 +246,13 @@ static inline void __init apollon_init_smc91x(void)
         apollon_smc91x_resources[0].end   = base + 0x30f;
         udelay(100);
 
-        omap_mux_init_gpio(74, 0);
-        if (gpio_request(APOLLON_ETHR_GPIO_IRQ, "SMC91x irq") < 0) {
+        omap_mux_init_gpio(APOLLON_ETHR_GPIO_IRQ, 0);
+        err = gpio_request_one(APOLLON_ETHR_GPIO_IRQ, GPIOF_IN, "SMC91x irq");
+        if (err) {
                 printk(KERN_ERR "Failed to request GPIO%d for smc91x IRQ\n",
                         APOLLON_ETHR_GPIO_IRQ);
                 gpmc_cs_free(APOLLON_ETH_CS);
-                goto out;
         }
-        gpio_direction_input(APOLLON_ETHR_GPIO_IRQ);
-
 out:
         clk_disable(gpmc_fck);
         clk_put(gpmc_fck);
@@ -280,20 +279,19 @@ static void __init omap_apollon_init_early(void)
         omap2_init_common_devices(NULL, NULL);
 }
 
+static struct gpio apollon_gpio_leds[] __initdata = {
+        { LED0_GPIO13, GPIOF_OUT_INIT_LOW, "LED0" }, /* LED0 - AA10 */
+        { LED1_GPIO14, GPIOF_OUT_INIT_LOW, "LED1" }, /* LED1 - AA6  */
+        { LED2_GPIO15, GPIOF_OUT_INIT_LOW, "LED2" }, /* LED2 - AA4  */
+};
+
 static void __init apollon_led_init(void)
 {
-        /* LED0 - AA10 */
         omap_mux_init_signal("vlynq_clk.gpio_13", 0);
-        gpio_request(LED0_GPIO13, "LED0");
-        gpio_direction_output(LED0_GPIO13, 0);
-        /* LED1  - AA6 */
         omap_mux_init_signal("vlynq_rx1.gpio_14", 0);
-        gpio_request(LED1_GPIO14, "LED1");
-        gpio_direction_output(LED1_GPIO14, 0);
-        /* LED2  - AA4 */
         omap_mux_init_signal("vlynq_rx0.gpio_15", 0);
-        gpio_request(LED2_GPIO15, "LED2");
-        gpio_direction_output(LED2_GPIO15, 0);
+
+        gpio_request_array(apollon_gpio_leds, ARRAY_SIZE(apollon_gpio_leds));
 }
 
 static void __init apollon_usb_init(void)
@@ -301,8 +299,7 @@ static void __init apollon_usb_init(void)
         /* USB device */
         /* DEVICE_SUSPEND */
         omap_mux_init_signal("mcbsp2_clkx.gpio_12", 0);
-        gpio_request(12, "USB suspend");
-        gpio_direction_output(12, 0);
+        gpio_request_one(12, GPIOF_OUT_INIT_LOW, "USB suspend");
         omap2_usbfs_init(&apollon_usb_config);
 }
 
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index 9340f6a06f4a..c63115bc1536 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -54,6 +54,7 @@
 #include "mux.h"
 #include "sdram-micron-mt46h32m32lf-6.h"
 #include "hsmmc.h"
+#include "common-board-devices.h"
 
 #define CM_T35_GPIO_PENDOWN     57
 
@@ -66,86 +67,28 @@
 
 #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
 #include <linux/smsc911x.h>
+#include <plat/gpmc-smsc911x.h>
 
-static struct smsc911x_platform_config cm_t35_smsc911x_config = {
-        .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
-        .irq_type       = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
-        .flags          = SMSC911X_USE_32BIT | SMSC911X_SAVE_MAC_ADDRESS,
-        .phy_interface  = PHY_INTERFACE_MODE_MII,
-};
-
-static struct resource cm_t35_smsc911x_resources[] = {
-        {
-                .flags  = IORESOURCE_MEM,
-        },
-        {
-                .start  = OMAP_GPIO_IRQ(CM_T35_SMSC911X_GPIO),
-                .end    = OMAP_GPIO_IRQ(CM_T35_SMSC911X_GPIO),
-                .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
-        },
-};
-
-static struct platform_device cm_t35_smsc911x_device = {
-        .name           = "smsc911x",
+static struct omap_smsc911x_platform_data cm_t35_smsc911x_cfg = {
         .id             = 0,
-        .num_resources  = ARRAY_SIZE(cm_t35_smsc911x_resources),
-        .resource       = cm_t35_smsc911x_resources,
-        .dev            = {
-                .platform_data = &cm_t35_smsc911x_config,
-        },
-};
-
-static struct resource sb_t35_smsc911x_resources[] = {
-        {
-                .flags  = IORESOURCE_MEM,
-        },
-        {
-                .start  = OMAP_GPIO_IRQ(SB_T35_SMSC911X_GPIO),
-                .end    = OMAP_GPIO_IRQ(SB_T35_SMSC911X_GPIO),
-                .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
-        },
+        .cs             = CM_T35_SMSC911X_CS,
+        .gpio_irq       = CM_T35_SMSC911X_GPIO,
+        .gpio_reset     = -EINVAL,
+        .flags          = SMSC911X_USE_32BIT | SMSC911X_SAVE_MAC_ADDRESS,
 };
 
-static struct platform_device sb_t35_smsc911x_device = {
-        .name           = "smsc911x",
+static struct omap_smsc911x_platform_data sb_t35_smsc911x_cfg = {
         .id             = 1,
-        .num_resources  = ARRAY_SIZE(sb_t35_smsc911x_resources),
-        .resource       = sb_t35_smsc911x_resources,
-        .dev            = {
-                .platform_data = &cm_t35_smsc911x_config,
-        },
+        .cs             = SB_T35_SMSC911X_CS,
+        .gpio_irq       = SB_T35_SMSC911X_GPIO,
+        .gpio_reset     = -EINVAL,
+        .flags          = SMSC911X_USE_32BIT | SMSC911X_SAVE_MAC_ADDRESS,
 };
 
-static void __init cm_t35_init_smsc911x(struct platform_device *dev,
-                                        int cs, int irq_gpio)
-{
-        unsigned long cs_mem_base;
-
-        if (gpmc_cs_request(cs, SZ_16M, &cs_mem_base) < 0) {
-                pr_err("CM-T35: Failed request for GPMC mem for smsc911x\n");
-                return;
-        }
-
-        dev->resource[0].start = cs_mem_base + 0x0;
-        dev->resource[0].end   = cs_mem_base + 0xff;
-
-        if ((gpio_request(irq_gpio, "ETH IRQ") == 0) &&
-            (gpio_direction_input(irq_gpio) == 0)) {
-                gpio_export(irq_gpio, 0);
-        } else {
-                pr_err("CM-T35: could not obtain gpio for SMSC911X IRQ\n");
-                return;
-        }
-
-        platform_device_register(dev);
-}
-
 static void __init cm_t35_init_ethernet(void)
 {
-        cm_t35_init_smsc911x(&cm_t35_smsc911x_device,
-                             CM_T35_SMSC911X_CS, CM_T35_SMSC911X_GPIO);
-        cm_t35_init_smsc911x(&sb_t35_smsc911x_device,
-                             SB_T35_SMSC911X_CS, SB_T35_SMSC911X_GPIO);
+        gpmc_smsc911x_init(&cm_t35_smsc911x_cfg);
+        gpmc_smsc911x_init(&sb_t35_smsc911x_cfg);
 }
 #else
 static inline void __init cm_t35_init_ethernet(void) { return; }
@@ -235,69 +178,10 @@ static void __init cm_t35_init_nand(void)
 static inline void cm_t35_init_nand(void) {}
 #endif
 
-#if defined(CONFIG_TOUCHSCREEN_ADS7846) || \
-        defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)
-#include <linux/spi/ads7846.h>
-
-static struct omap2_mcspi_device_config ads7846_mcspi_config = {
-        .turbo_mode     = 0,
-        .single_channel = 1,    /* 0: slave, 1: master */
-};
-
-static int ads7846_get_pendown_state(void)
-{
-        return !gpio_get_value(CM_T35_GPIO_PENDOWN);
-}
-
-static struct ads7846_platform_data ads7846_config = {
-        .x_max                  = 0x0fff,
-        .y_max                  = 0x0fff,
-        .x_plate_ohms           = 180,
-        .pressure_max           = 255,
-        .debounce_max           = 10,
-        .debounce_tol           = 3,
-        .debounce_rep           = 1,
-        .get_pendown_state      = ads7846_get_pendown_state,
-        .keep_vref_on           = 1,
-};
-
-static struct spi_board_info cm_t35_spi_board_info[] __initdata = {
-        {
-                .modalias               = "ads7846",
-                .bus_num                = 1,
-                .chip_select            = 0,
-                .max_speed_hz           = 1500000,
-                .controller_data        = &ads7846_mcspi_config,
-                .irq                    = OMAP_GPIO_IRQ(CM_T35_GPIO_PENDOWN),
-                .platform_data          = &ads7846_config,
-        },
-};
-
-static void __init cm_t35_init_ads7846(void)
-{
-        if ((gpio_request(CM_T35_GPIO_PENDOWN, "ADS7846_PENDOWN") == 0) &&
-            (gpio_direction_input(CM_T35_GPIO_PENDOWN) == 0)) {
-                gpio_export(CM_T35_GPIO_PENDOWN, 0);
-        } else {
-                pr_err("CM-T35: could not obtain gpio for ADS7846_PENDOWN\n");
-                return;
-        }
-
-        spi_register_board_info(cm_t35_spi_board_info,
-                                ARRAY_SIZE(cm_t35_spi_board_info));
-}
-#else
-static inline void cm_t35_init_ads7846(void) {}
-#endif
-
 #define CM_T35_LCD_EN_GPIO 157
 #define CM_T35_LCD_BL_GPIO 58
 #define CM_T35_DVI_EN_GPIO 54
 
-static int lcd_bl_gpio;
-static int lcd_en_gpio;
-static int dvi_en_gpio;
-
 static int lcd_enabled;
 static int dvi_enabled;
 
@@ -308,8 +192,8 @@ static int cm_t35_panel_enable_lcd(struct omap_dss_device *dssdev)
                 return -EINVAL;
         }
 
-        gpio_set_value(lcd_en_gpio, 1);
-        gpio_set_value(lcd_bl_gpio, 1);
+        gpio_set_value(CM_T35_LCD_EN_GPIO, 1);
+        gpio_set_value(CM_T35_LCD_BL_GPIO, 1);
 
         lcd_enabled = 1;
 
@@ -320,8 +204,8 @@ static void cm_t35_panel_disable_lcd(struct omap_dss_device *dssdev)
 {
         lcd_enabled = 0;
 
-        gpio_set_value(lcd_bl_gpio, 0);
-        gpio_set_value(lcd_en_gpio, 0);
+        gpio_set_value(CM_T35_LCD_BL_GPIO, 0);
+        gpio_set_value(CM_T35_LCD_EN_GPIO, 0);
 }
 
 static int cm_t35_panel_enable_dvi(struct omap_dss_device *dssdev)
@@ -331,7 +215,7 @@ static int cm_t35_panel_enable_dvi(struct omap_dss_device *dssdev)
                 return -EINVAL;
         }
 
-        gpio_set_value(dvi_en_gpio, 0);
+        gpio_set_value(CM_T35_DVI_EN_GPIO, 0);
         dvi_enabled = 1;
 
         return 0;
@@ -339,7 +223,7 @@ static int cm_t35_panel_enable_dvi(struct omap_dss_device *dssdev)
 
 static void cm_t35_panel_disable_dvi(struct omap_dss_device *dssdev)
 {
-        gpio_set_value(dvi_en_gpio, 1);
+        gpio_set_value(CM_T35_DVI_EN_GPIO, 1);
         dvi_enabled = 0;
 }
 
@@ -421,62 +305,38 @@ static struct spi_board_info cm_t35_lcd_spi_board_info[] __initdata = {
         },
 };
 
+static struct gpio cm_t35_dss_gpios[] __initdata = {
+        { CM_T35_LCD_EN_GPIO, GPIOF_OUT_INIT_LOW,  "lcd enable"    },
+        { CM_T35_LCD_BL_GPIO, GPIOF_OUT_INIT_LOW,  "lcd bl enable" },
+        { CM_T35_DVI_EN_GPIO, GPIOF_OUT_INIT_HIGH, "dvi enable"    },
+};
+
 static void __init cm_t35_init_display(void)
 {
         int err;
 
-        lcd_en_gpio = CM_T35_LCD_EN_GPIO;
-        lcd_bl_gpio = CM_T35_LCD_BL_GPIO;
-        dvi_en_gpio = CM_T35_DVI_EN_GPIO;
-
         spi_register_board_info(cm_t35_lcd_spi_board_info,
                                 ARRAY_SIZE(cm_t35_lcd_spi_board_info));
 
-        err = gpio_request(lcd_en_gpio, "LCD RST");
-        if (err) {
-                pr_err("CM-T35: failed to get LCD reset GPIO\n");
-                goto out;
-        }
-
-        err = gpio_request(lcd_bl_gpio, "LCD BL");
+        err = gpio_request_array(cm_t35_dss_gpios,
+                                 ARRAY_SIZE(cm_t35_dss_gpios));
         if (err) {
-                pr_err("CM-T35: failed to get LCD backlight control GPIO\n");
-                goto err_lcd_bl;
-        }
-
-        err = gpio_request(dvi_en_gpio, "DVI EN");
-        if (err) {
-                pr_err("CM-T35: failed to get DVI reset GPIO\n");
-                goto err_dvi_en;
+                pr_err("CM-T35: failed to request DSS control GPIOs\n");
+                return;
         }
 
-        gpio_export(lcd_en_gpio, 0);
-        gpio_export(lcd_bl_gpio, 0);
-        gpio_export(dvi_en_gpio, 0);
-        gpio_direction_output(lcd_en_gpio, 0);
-        gpio_direction_output(lcd_bl_gpio, 0);
-        gpio_direction_output(dvi_en_gpio, 1);
+        gpio_export(CM_T35_LCD_EN_GPIO, 0);
+        gpio_export(CM_T35_LCD_BL_GPIO, 0);
+        gpio_export(CM_T35_DVI_EN_GPIO, 0);
 
         msleep(50);
-        gpio_set_value(lcd_en_gpio, 1);
+        gpio_set_value(CM_T35_LCD_EN_GPIO, 1);
 
         err = omap_display_init(&cm_t35_dss_data);
         if (err) {
                 pr_err("CM-T35: failed to register DSS device\n");
-                goto err_dev_reg;
+                gpio_free_array(cm_t35_dss_gpios, ARRAY_SIZE(cm_t35_dss_gpios));
         }
-
-        return;
-
-err_dev_reg:
-        gpio_free(dvi_en_gpio);
-err_dvi_en:
-        gpio_free(lcd_bl_gpio);
-err_lcd_bl:
-        gpio_free(lcd_en_gpio);
-out:
-
-        return;
 }
 
 static struct regulator_consumer_supply cm_t35_vmmc1_supply = {
@@ -609,10 +469,8 @@ static int cm_t35_twl_gpio_setup(struct device *dev, unsigned gpio,
 {
         int wlan_rst = gpio + 2;
 
-        if ((gpio_request(wlan_rst, "WLAN RST") == 0) &&
-            (gpio_direction_output(wlan_rst, 1) == 0)) {
+        if (gpio_request_one(wlan_rst, GPIOF_OUT_INIT_HIGH, "WLAN RST") == 0) {
                 gpio_export(wlan_rst, 0);
-
                 udelay(10);
                 gpio_set_value(wlan_rst, 0);
                 udelay(10);
@@ -653,19 +511,9 @@ static struct twl4030_platform_data cm_t35_twldata = {
         .vpll2          = &cm_t35_vpll2,
 };
 
-static struct i2c_board_info __initdata cm_t35_i2c_boardinfo[] = {
-        {
-                I2C_BOARD_INFO("tps65930", 0x48),
-                .flags          = I2C_CLIENT_WAKE,
-                .irq            = INT_34XX_SYS_NIRQ,
-                .platform_data  = &cm_t35_twldata,
-        },
-};
-
 static void __init cm_t35_init_i2c(void)
 {
-        omap_register_i2c_bus(1, 2600, cm_t35_i2c_boardinfo,
-                              ARRAY_SIZE(cm_t35_i2c_boardinfo));
+        omap3_pmic_init("tps65930", &cm_t35_twldata);
 }
 
 static void __init cm_t35_init_early(void)
@@ -775,12 +623,6 @@ static struct omap_board_mux board_mux[] __initdata = {
 };
 #endif
 
-static struct omap_musb_board_data musb_board_data = {
-        .interface_type         = MUSB_INTERFACE_ULPI,
-        .mode                   = MUSB_OTG,
-        .power                  = 100,
-};
-
 static struct omap_board_config_kernel cm_t35_config[] __initdata = {
 };
 
@@ -792,12 +634,12 @@ static void __init cm_t35_init(void)
         omap_serial_init();
         cm_t35_init_i2c();
         cm_t35_init_nand();
-        cm_t35_init_ads7846();
+        omap_ads7846_init(1, CM_T35_GPIO_PENDOWN, 0, NULL);
         cm_t35_init_ethernet();
         cm_t35_init_led();
         cm_t35_init_display();
 
-        usb_musb_init(&musb_board_data);
+        usb_musb_init(NULL);
         usbhs_init(&usbhs_bdata);
 }
 
diff --git a/arch/arm/mach-omap2/board-cm-t3517.c b/arch/arm/mach-omap2/board-cm-t3517.c
index a27e3eee8292..08f08e812492 100644
--- a/arch/arm/mach-omap2/board-cm-t3517.c
+++ b/arch/arm/mach-omap2/board-cm-t3517.c
@@ -148,14 +148,13 @@ static void __init cm_t3517_init_rtc(void)
 {
         int err;
 
-        err = gpio_request(RTC_CS_EN_GPIO, "rtc cs en");
+        err = gpio_request_one(RTC_CS_EN_GPIO, GPIOF_OUT_INIT_HIGH,
+                               "rtc cs en");
         if (err) {
                 pr_err("CM-T3517: rtc cs en gpio request failed: %d\n", err);
                 return;
         }
 
-        gpio_direction_output(RTC_CS_EN_GPIO, 1);
-
         platform_device_register(&cm_t3517_rtc_device);
 }
 #else
@@ -182,11 +181,11 @@ static int cm_t3517_init_usbh(void)
 {
         int err;
 
-        err = gpio_request(USB_HUB_RESET_GPIO, "usb hub rst");
+        err = gpio_request_one(USB_HUB_RESET_GPIO, GPIOF_OUT_INIT_LOW,
+                               "usb hub rst");
         if (err) {
                 pr_err("CM-T3517: usb hub rst gpio request failed: %d\n", err);
         } else {
-                gpio_direction_output(USB_HUB_RESET_GPIO, 0);
                 udelay(10);
                 gpio_set_value(USB_HUB_RESET_GPIO, 1);
                 msleep(1);
diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c
index 1d1b56a29fb1..cf520d7dd614 100644
--- a/arch/arm/mach-omap2/board-devkit8000.c
+++ b/arch/arm/mach-omap2/board-devkit8000.c
@@ -51,7 +51,6 @@
 #include <plat/mcspi.h>
 #include <linux/input/matrix_keypad.h>
 #include <linux/spi/spi.h>
-#include <linux/spi/ads7846.h>
 #include <linux/dm9000.h>
 #include <linux/interrupt.h>
 
@@ -60,6 +59,7 @@
 #include "mux.h"
 #include "hsmmc.h"
 #include "timer-gp.h"
+#include "common-board-devices.h"
 
 #define NAND_BLOCK_SIZE         SZ_128K
 
@@ -97,13 +97,6 @@ static struct mtd_partition devkit8000_nand_partitions[] = {
         },
 };
 
-static struct omap_nand_platform_data devkit8000_nand_data = {
-        .options        = NAND_BUSWIDTH_16,
-        .parts          = devkit8000_nand_partitions,
-        .nr_parts       = ARRAY_SIZE(devkit8000_nand_partitions),
-        .dma_channel    = -1,           /* disable DMA in OMAP NAND driver */
-};
-
 static struct omap2_hsmmc_info mmc[] = {
         {
                 .mmc            = 1,
@@ -249,7 +242,7 @@ static int devkit8000_twl_gpio_setup(struct device *dev,
         /* TWL4030_GPIO_MAX + 0 is "LCD_PWREN" (out, active high) */
         devkit8000_lcd_device.reset_gpio = gpio + TWL4030_GPIO_MAX + 0;
         ret = gpio_request_one(devkit8000_lcd_device.reset_gpio,
-                        GPIOF_DIR_OUT | GPIOF_INIT_LOW, "LCD_PWREN");
+                               GPIOF_OUT_INIT_LOW, "LCD_PWREN");
         if (ret < 0) {
                 devkit8000_lcd_device.reset_gpio = -EINVAL;
                 printk(KERN_ERR "Failed to request GPIO for LCD_PWRN\n");
@@ -258,7 +251,7 @@ static int devkit8000_twl_gpio_setup(struct device *dev,
         /* gpio + 7 is "DVI_PD" (out, active low) */
         devkit8000_dvi_device.reset_gpio = gpio + 7;
         ret = gpio_request_one(devkit8000_dvi_device.reset_gpio,
-                        GPIOF_DIR_OUT | GPIOF_INIT_LOW, "DVI PowerDown");
+                               GPIOF_OUT_INIT_LOW, "DVI PowerDown");
         if (ret < 0) {
                 devkit8000_dvi_device.reset_gpio = -EINVAL;
                 printk(KERN_ERR "Failed to request GPIO for DVI PowerDown\n");
@@ -366,19 +359,9 @@ static struct twl4030_platform_data devkit8000_twldata = {
         .keypad         = &devkit8000_kp_data,
 };
 
-static struct i2c_board_info __initdata devkit8000_i2c_boardinfo[] = {
-        {
-                I2C_BOARD_INFO("tps65930", 0x48),
-                .flags = I2C_CLIENT_WAKE,
-                .irq = INT_34XX_SYS_NIRQ,
-                .platform_data = &devkit8000_twldata,
-        },
-};
-
 static int __init devkit8000_i2c_init(void)
 {
-        omap_register_i2c_bus(1, 2600, devkit8000_i2c_boardinfo,
-                        ARRAY_SIZE(devkit8000_i2c_boardinfo));
+        omap3_pmic_init("tps65930", &devkit8000_twldata);
         /* Bus 3 is attached to the DVI port where devices like the pico DLP
          * projector don't work reliably with 400kHz */
         omap_register_i2c_bus(3, 400, NULL, 0);
@@ -463,56 +446,6 @@ static void __init devkit8000_init_irq(void)
 #endif
 }
 
-static void __init devkit8000_ads7846_init(void)
-{
-        int gpio = OMAP3_DEVKIT_TS_GPIO;
-        int ret;
-
-        ret = gpio_request(gpio, "ads7846_pen_down");
-        if (ret < 0) {
-                printk(KERN_ERR "Failed to request GPIO %d for "
-                                "ads7846 pen down IRQ\n", gpio);
-                return;
-        }
-
-        gpio_direction_input(gpio);
-}
-
-static int ads7846_get_pendown_state(void)
-{
-        return !gpio_get_value(OMAP3_DEVKIT_TS_GPIO);
-}
-
-static struct ads7846_platform_data ads7846_config = {
-        .x_max                  = 0x0fff,
-        .y_max                  = 0x0fff,
-        .x_plate_ohms           = 180,
-        .pressure_max           = 255,
-        .debounce_max           = 10,
-        .debounce_tol           = 5,
-        .debounce_rep           = 1,
-        .get_pendown_state      = ads7846_get_pendown_state,
-        .keep_vref_on           = 1,
-        .settle_delay_usecs     = 150,
-};
-
-static struct omap2_mcspi_device_config ads7846_mcspi_config = {
-        .turbo_mode     = 0,
-        .single_channel = 1,    /* 0: slave, 1: master */
-};
-
-static struct spi_board_info devkit8000_spi_board_info[] __initdata = {
-        {
-                .modalias               = "ads7846",
-                .bus_num                = 2,
-                .chip_select            = 0,
-                .max_speed_hz           = 1500000,
-                .controller_data        = &ads7846_mcspi_config,
-                .irq                    = OMAP_GPIO_IRQ(OMAP3_DEVKIT_TS_GPIO),
-                .platform_data          = &ads7846_config,
-        }
-};
-
 #define OMAP_DM9000_BASE        0x2c000000
 
 static struct resource omap_dm9000_resources[] = {
@@ -550,14 +483,14 @@ static void __init omap_dm9000_init(void)
 {
         unsigned char *eth_addr = omap_dm9000_platdata.dev_addr;
         struct omap_die_id odi;
+        int ret;
 
-        if (gpio_request(OMAP_DM9000_GPIO_IRQ, "dm9000 irq") < 0) {
+        ret = gpio_request_one(OMAP_DM9000_GPIO_IRQ, GPIOF_IN, "dm9000 irq");
+        if (ret < 0) {
                 printk(KERN_ERR "Failed to request GPIO%d for dm9000 IRQ\n",
                         OMAP_DM9000_GPIO_IRQ);
                 return;
-                }
-
-        gpio_direction_input(OMAP_DM9000_GPIO_IRQ);
+        }
 
         /* init the mac address using DIE id */
         omap_get_die_id(&odi);
@@ -576,45 +509,6 @@ static struct platform_device *devkit8000_devices[] __initdata = {
         &omap_dm9000_dev,
 };
 
-static void __init devkit8000_flash_init(void)
-{
-        u8 cs = 0;
-        u8 nandcs = GPMC_CS_NUM + 1;
-
-        /* find out the chip-select on which NAND exists */
-        while (cs < GPMC_CS_NUM) {
-                u32 ret = 0;
-                ret = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1);
-
-                if ((ret & 0xC00) == 0x800) {
-                        printk(KERN_INFO "Found NAND on CS%d\n", cs);
-                        if (nandcs > GPMC_CS_NUM)
-                                nandcs = cs;
-                }
-                cs++;
-        }
-
-        if (nandcs > GPMC_CS_NUM) {
-                printk(KERN_INFO "NAND: Unable to find configuration "
-                                 "in GPMC\n ");
-                return;
-        }
-
-        if (nandcs < GPMC_CS_NUM) {
-                devkit8000_nand_data.cs = nandcs;
-
-                printk(KERN_INFO "Registering NAND on CS%d\n", nandcs);
-                if (gpmc_nand_init(&devkit8000_nand_data) < 0)
-                        printk(KERN_ERR "Unable to register NAND device\n");
-        }
-}
-
-static struct omap_musb_board_data musb_board_data = {
-        .interface_type         = MUSB_INTERFACE_ULPI,
-        .mode                   = MUSB_OTG,
-        .power                  = 100,
-};
-
 static const struct usbhs_omap_board_data usbhs_bdata __initconst = {
 
         .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
@@ -795,14 +689,13 @@ static void __init devkit8000_init(void)
                         ARRAY_SIZE(devkit8000_devices));
 
         omap_display_init(&devkit8000_dss_data);
-        spi_register_board_info(devkit8000_spi_board_info,
-        ARRAY_SIZE(devkit8000_spi_board_info));
 
-        devkit8000_ads7846_init();
+        omap_ads7846_init(2, OMAP3_DEVKIT_TS_GPIO, 0, NULL);
 
-        usb_musb_init(&musb_board_data);
+        usb_musb_init(NULL);
         usbhs_init(&usbhs_bdata);
-        devkit8000_flash_init();
+        omap_nand_flash_init(NAND_BUSWIDTH_16, devkit8000_nand_partitions,
+                             ARRAY_SIZE(devkit8000_nand_partitions));
 
         /* Ensure SDRC pins are mux'd for self-refresh */
         omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 3da64d361651..0c1bfca3f731 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -38,6 +38,7 @@
 #include "mux.h"
 #include "hsmmc.h"
 #include "sdram-numonyx-m65kxxxxam.h"
+#include "common-board-devices.h"
 
 #define IGEP2_SMSC911X_CS       5
 #define IGEP2_SMSC911X_GPIO     176
@@ -54,6 +55,11 @@
 #define IGEP2_RC_GPIO_WIFI_NRESET  139
 #define IGEP2_RC_GPIO_BT_NRESET    137
 
+#define IGEP3_GPIO_LED0_GREEN   54
+#define IGEP3_GPIO_LED0_RED     53
+#define IGEP3_GPIO_LED1_RED     16
+#define IGEP3_GPIO_USBH_NRESET  183
+
 /*
  * IGEP2 Hardware Revision Table
  *
@@ -68,6 +74,7 @@
 
 #define IGEP2_BOARD_HWREV_B     0
 #define IGEP2_BOARD_HWREV_C     1
+#define IGEP3_BOARD_HWREV       2
 
 static u8 hwrev;
 
@@ -75,24 +82,29 @@ static void __init igep2_get_revision(void)
 {
         u8 ret;
 
+        if (machine_is_igep0030()) {
+                hwrev = IGEP3_BOARD_HWREV;
+                return;
+        }
+
         omap_mux_init_gpio(IGEP2_GPIO_LED1_RED, OMAP_PIN_INPUT);
 
-        if ((gpio_request(IGEP2_GPIO_LED1_RED, "GPIO_HW0_REV") == 0) &&
-            (gpio_direction_input(IGEP2_GPIO_LED1_RED) == 0)) {
-                ret = gpio_get_value(IGEP2_GPIO_LED1_RED);
-                if (ret == 0) {
-                        pr_info("IGEP2: Hardware Revision C (B-NON compatible)\n");
-                        hwrev = IGEP2_BOARD_HWREV_C;
-                } else if (ret ==  1) {
-                        pr_info("IGEP2: Hardware Revision B/C (B compatible)\n");
-                        hwrev = IGEP2_BOARD_HWREV_B;
-                } else {
-                        pr_err("IGEP2: Unknown Hardware Revision\n");
-                        hwrev = -1;
-                }
-        } else {
+        if (gpio_request_one(IGEP2_GPIO_LED1_RED, GPIOF_IN, "GPIO_HW0_REV")) {
                 pr_warning("IGEP2: Could not obtain gpio GPIO_HW0_REV\n");
                 pr_err("IGEP2: Unknown Hardware Revision\n");
+                return;
+        }
+
+        ret = gpio_get_value(IGEP2_GPIO_LED1_RED);
+        if (ret == 0) {
+                pr_info("IGEP2: Hardware Revision C (B-NON compatible)\n");
+                hwrev = IGEP2_BOARD_HWREV_C;
+        } else if (ret ==  1) {
+                pr_info("IGEP2: Hardware Revision B/C (B compatible)\n");
+                hwrev = IGEP2_BOARD_HWREV_B;
+        } else {
+                pr_err("IGEP2: Unknown Hardware Revision\n");
+                hwrev = -1;
         }
 
         gpio_free(IGEP2_GPIO_LED1_RED);
@@ -111,7 +123,7 @@ static void __init igep2_get_revision(void)
  * So MTD regards it as 4KiB page size and 256KiB block size 64*(2*2048)
  */
 
-static struct mtd_partition igep2_onenand_partitions[] = {
+static struct mtd_partition igep_onenand_partitions[] = {
         {
                 .name           = "X-Loader",
                 .offset         = 0,
@@ -139,21 +151,21 @@ static struct mtd_partition igep2_onenand_partitions[] = {
         },
 };
 
-static struct omap_onenand_platform_data igep2_onenand_data = {
-        .parts = igep2_onenand_partitions,
-        .nr_parts = ARRAY_SIZE(igep2_onenand_partitions),
+static struct omap_onenand_platform_data igep_onenand_data = {
+        .parts = igep_onenand_partitions,
+        .nr_parts = ARRAY_SIZE(igep_onenand_partitions),
         .dma_channel    = -1,   /* disable DMA in OMAP OneNAND driver */
 };
 
-static struct platform_device igep2_onenand_device = {
+static struct platform_device igep_onenand_device = {
         .name           = "omap2-onenand",
         .id             = -1,
         .dev = {
-                .platform_data = &igep2_onenand_data,
+                .platform_data = &igep_onenand_data,
         },
 };
 
-static void __init igep2_flash_init(void)
+static void __init igep_flash_init(void)
 {
         u8 cs = 0;
         u8 onenandcs = GPMC_CS_NUM + 1;
@@ -165,7 +177,7 @@ static void __init igep2_flash_init(void)
                 /* Check if NAND/oneNAND is configured */
                 if ((ret & 0xC00) == 0x800)
                         /* NAND found */
-                        pr_err("IGEP2: Unsupported NAND found\n");
+                        pr_err("IGEP: Unsupported NAND found\n");
                 else {
                         ret = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG7);
                         if ((ret & 0x3F) == (ONENAND_MAP >> 24))
@@ -175,85 +187,46 @@ static void __init igep2_flash_init(void)
         }
 
         if (onenandcs > GPMC_CS_NUM) {
-                pr_err("IGEP2: Unable to find configuration in GPMC\n");
+                pr_err("IGEP: Unable to find configuration in GPMC\n");
                 return;
         }
 
-        igep2_onenand_data.cs = onenandcs;
+        igep_onenand_data.cs = onenandcs;
 
-        if (platform_device_register(&igep2_onenand_device) < 0)
-                pr_err("IGEP2: Unable to register OneNAND device\n");
+        if (platform_device_register(&igep_onenand_device) < 0)
+                pr_err("IGEP: Unable to register OneNAND device\n");
 }
 
 #else
-static void __init igep2_flash_init(void) {}
+static void __init igep_flash_init(void) {}
 #endif
 
 #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
 
 #include <linux/smsc911x.h>
+#include <plat/gpmc-smsc911x.h>
 
-static struct smsc911x_platform_config igep2_smsc911x_config = {
-        .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
-        .irq_type       = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
-        .flags          = SMSC911X_USE_32BIT | SMSC911X_SAVE_MAC_ADDRESS  ,
-        .phy_interface  = PHY_INTERFACE_MODE_MII,
-};
-
-static struct resource igep2_smsc911x_resources[] = {
-        {
-                .flags  = IORESOURCE_MEM,
-        },
-        {
-                .start  = OMAP_GPIO_IRQ(IGEP2_SMSC911X_GPIO),
-                .end    = OMAP_GPIO_IRQ(IGEP2_SMSC911X_GPIO),
-                .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
-        },
-};
-
-static struct platform_device igep2_smsc911x_device = {
-        .name           = "smsc911x",
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(igep2_smsc911x_resources),
-        .resource       = igep2_smsc911x_resources,
-        .dev            = {
-                .platform_data = &igep2_smsc911x_config,
-        },
+static struct omap_smsc911x_platform_data smsc911x_cfg = {
+        .cs             = IGEP2_SMSC911X_CS,
+        .gpio_irq       = IGEP2_SMSC911X_GPIO,
+        .gpio_reset     = -EINVAL,
+        .flags          = SMSC911X_USE_32BIT | SMSC911X_SAVE_MAC_ADDRESS,
 };
 
 static inline void __init igep2_init_smsc911x(void)
 {
-        unsigned long cs_mem_base;
-
-        if (gpmc_cs_request(IGEP2_SMSC911X_CS, SZ_16M, &cs_mem_base) < 0) {
-                pr_err("IGEP v2: Failed request for GPMC mem for smsc911x\n");
-                gpmc_cs_free(IGEP2_SMSC911X_CS);
-                return;
-        }
-
-        igep2_smsc911x_resources[0].start = cs_mem_base + 0x0;
-        igep2_smsc911x_resources[0].end   = cs_mem_base + 0xff;
-
-        if ((gpio_request(IGEP2_SMSC911X_GPIO, "SMSC911X IRQ") == 0) &&
-            (gpio_direction_input(IGEP2_SMSC911X_GPIO) == 0)) {
-                gpio_export(IGEP2_SMSC911X_GPIO, 0);
-        } else {
-                pr_err("IGEP v2: Could not obtain gpio for for SMSC911X IRQ\n");
-                return;
-        }
-
-        platform_device_register(&igep2_smsc911x_device);
+        gpmc_smsc911x_init(&smsc911x_cfg);
 }
 
 #else
 static inline void __init igep2_init_smsc911x(void) { }
 #endif
 
-static struct regulator_consumer_supply igep2_vmmc1_supply =
+static struct regulator_consumer_supply igep_vmmc1_supply =
         REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0");
 
 /* VMMC1 for OMAP VDD_MMC1 (i/o) and MMC1 card */
-static struct regulator_init_data igep2_vmmc1 = {
+static struct regulator_init_data igep_vmmc1 = {
         .constraints = {
                 .min_uV                 = 1850000,
                 .max_uV                 = 3150000,
@@ -264,13 +237,13 @@ static struct regulator_init_data igep2_vmmc1 = {
                                         | REGULATOR_CHANGE_STATUS,
         },
         .num_consumer_supplies  = 1,
-        .consumer_supplies      = &igep2_vmmc1_supply,
+        .consumer_supplies      = &igep_vmmc1_supply,
 };
 
-static struct regulator_consumer_supply igep2_vio_supply =
+static struct regulator_consumer_supply igep_vio_supply =
         REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.1");
 
-static struct regulator_init_data igep2_vio = {
+static struct regulator_init_data igep_vio = {
         .constraints = {
                 .min_uV                 = 1800000,
                 .max_uV                 = 1800000,
@@ -282,34 +255,34 @@ static struct regulator_init_data igep2_vio = {
                                         | REGULATOR_CHANGE_STATUS,
         },
         .num_consumer_supplies  = 1,
-        .consumer_supplies      = &igep2_vio_supply,
+        .consumer_supplies      = &igep_vio_supply,
 };
 
-static struct regulator_consumer_supply igep2_vmmc2_supply =
+static struct regulator_consumer_supply igep_vmmc2_supply =
         REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1");
 
-static struct regulator_init_data igep2_vmmc2 = {
+static struct regulator_init_data igep_vmmc2 = {
         .constraints            = {
                 .valid_modes_mask       = REGULATOR_MODE_NORMAL,
                 .always_on              = 1,
         },
         .num_consumer_supplies  = 1,
-        .consumer_supplies      = &igep2_vmmc2_supply,
+        .consumer_supplies      = &igep_vmmc2_supply,
 };
 
-static struct fixed_voltage_config igep2_vwlan = {
+static struct fixed_voltage_config igep_vwlan = {
         .supply_name            = "vwlan",
         .microvolts             = 3300000,
         .gpio                   = -EINVAL,
         .enabled_at_boot        = 1,
-        .init_data              = &igep2_vmmc2,
+        .init_data              = &igep_vmmc2,
 };
 
-static struct platform_device igep2_vwlan_device = {
+static struct platform_device igep_vwlan_device = {
         .name           = "reg-fixed-voltage",
         .id             = 0,
         .dev = {
-                .platform_data  = &igep2_vwlan,
+                .platform_data  = &igep_vwlan,
         },
 };
 
@@ -334,20 +307,17 @@ static struct omap2_hsmmc_info mmc[] = {
 #if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE)
 #include <linux/leds.h>
 
-static struct gpio_led igep2_gpio_leds[] = {
+static struct gpio_led igep_gpio_leds[] = {
         [0] = {
                 .name                   = "gpio-led:red:d0",
-                .gpio                   = IGEP2_GPIO_LED0_RED,
                 .default_trigger        = "default-off"
         },
         [1] = {
                 .name                   = "gpio-led:green:d0",
-                .gpio                   = IGEP2_GPIO_LED0_GREEN,
                 .default_trigger        = "default-off",
         },
         [2] = {
                 .name                   = "gpio-led:red:d1",
-                .gpio                   = IGEP2_GPIO_LED1_RED,
                 .default_trigger        = "default-off",
         },
         [3] = {
@@ -358,94 +328,119 @@ static struct gpio_led igep2_gpio_leds[] = {
         },
 };
 
-static struct gpio_led_platform_data igep2_led_pdata = {
-        .leds           = igep2_gpio_leds,
-        .num_leds       = ARRAY_SIZE(igep2_gpio_leds),
+static struct gpio_led_platform_data igep_led_pdata = {
+        .leds           = igep_gpio_leds,
+        .num_leds       = ARRAY_SIZE(igep_gpio_leds),
 };
 
-static struct platform_device igep2_led_device = {
+static struct platform_device igep_led_device = {
          .name   = "leds-gpio",
          .id     = -1,
          .dev    = {
-                 .platform_data  =  &igep2_led_pdata,
+                 .platform_data  =  &igep_led_pdata,
         },
 };
 
-static void __init igep2_leds_init(void)
+static void __init igep_leds_init(void)
 {
-        platform_device_register(&igep2_led_device);
+        if (machine_is_igep0020()) {
+                igep_gpio_leds[0].gpio = IGEP2_GPIO_LED0_RED;
+                igep_gpio_leds[1].gpio = IGEP2_GPIO_LED0_GREEN;
+                igep_gpio_leds[2].gpio = IGEP2_GPIO_LED1_RED;
+        } else {
+                igep_gpio_leds[0].gpio = IGEP3_GPIO_LED0_RED;
+                igep_gpio_leds[1].gpio = IGEP3_GPIO_LED0_GREEN;
+                igep_gpio_leds[2].gpio = IGEP3_GPIO_LED1_RED;
+        }
+
+        platform_device_register(&igep_led_device);
 }
 
 #else
-static inline void igep2_leds_init(void)
+static struct gpio igep_gpio_leds[] __initdata = {
+        { -EINVAL,      GPIOF_OUT_INIT_LOW, "gpio-led:red:d0"   },
+        { -EINVAL,      GPIOF_OUT_INIT_LOW, "gpio-led:green:d0" },
+        { -EINVAL,      GPIOF_OUT_INIT_LOW, "gpio-led:red:d1"   },
+};
+
+static inline void igep_leds_init(void)
 {
-        if ((gpio_request(IGEP2_GPIO_LED0_RED, "gpio-led:red:d0") == 0) &&
-            (gpio_direction_output(IGEP2_GPIO_LED0_RED, 0) == 0))
-                gpio_export(IGEP2_GPIO_LED0_RED, 0);
-        else
-                pr_warning("IGEP v2: Could not obtain gpio GPIO_LED0_RED\n");
+        int i;
 
-        if ((gpio_request(IGEP2_GPIO_LED0_GREEN, "gpio-led:green:d0") == 0) &&
-            (gpio_direction_output(IGEP2_GPIO_LED0_GREEN, 0) == 0))
-                gpio_export(IGEP2_GPIO_LED0_GREEN, 0);
-        else
-                pr_warning("IGEP v2: Could not obtain gpio GPIO_LED0_GREEN\n");
+        if (machine_is_igep0020()) {
+                igep_gpio_leds[0].gpio = IGEP2_GPIO_LED0_RED;
+                igep_gpio_leds[1].gpio = IGEP2_GPIO_LED0_GREEN;
+                igep_gpio_leds[2].gpio = IGEP2_GPIO_LED1_RED;
+        } else {
+                igep_gpio_leds[0].gpio = IGEP3_GPIO_LED0_RED;
+                igep_gpio_leds[1].gpio = IGEP3_GPIO_LED0_GREEN;
+                igep_gpio_leds[2].gpio = IGEP3_GPIO_LED1_RED;
+        }
 
-        if ((gpio_request(IGEP2_GPIO_LED1_RED, "gpio-led:red:d1") == 0) &&
-            (gpio_direction_output(IGEP2_GPIO_LED1_RED, 0) == 0))
-                gpio_export(IGEP2_GPIO_LED1_RED, 0);
-        else
-                pr_warning("IGEP v2: Could not obtain gpio GPIO_LED1_RED\n");
+        if (gpio_request_array(igep_gpio_leds, ARRAY_SIZE(igep_gpio_leds))) {
+                pr_warning("IGEP v2: Could not obtain leds gpios\n");
+                return;
+        }
 
+        for (i = 0; i < ARRAY_SIZE(igep_gpio_leds); i++)
+                gpio_export(igep_gpio_leds[i].gpio, 0);
 }
 #endif
 
-static int igep2_twl_gpio_setup(struct device *dev,
+static struct gpio igep2_twl_gpios[] = {
+        { -EINVAL, GPIOF_IN,            "GPIO_EHCI_NOC"  },
+        { -EINVAL, GPIOF_OUT_INIT_LOW,  "GPIO_USBH_CPEN" },
+};
+
+static int igep_twl_gpio_setup(struct device *dev,
                 unsigned gpio, unsigned ngpio)
 {
+        int ret;
+
         /* gpio + 0 is "mmc0_cd" (input/IRQ) */
         mmc[0].gpio_cd = gpio + 0;
         omap2_hsmmc_init(mmc);
 
-        /*
-         * REVISIT: need ehci-omap hooks for external VBUS
-         * power switch and overcurrent detect
-         */
-        if ((gpio_request(gpio + 1, "GPIO_EHCI_NOC") < 0) ||
-            (gpio_direction_input(gpio + 1) < 0))
-                pr_err("IGEP2: Could not obtain gpio for EHCI NOC");
-
-        /*
-         * TWL4030_GPIO_MAX + 0 == ledA, GPIO_USBH_CPEN
-         * (out, active low)
-         */
-        if ((gpio_request(gpio + TWL4030_GPIO_MAX, "GPIO_USBH_CPEN") < 0) ||
-            (gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0) < 0))
-                pr_err("IGEP2: Could not obtain gpio for USBH_CPEN");
-
         /* TWL4030_GPIO_MAX + 1 == ledB (out, active low LED) */
 #if !defined(CONFIG_LEDS_GPIO) && !defined(CONFIG_LEDS_GPIO_MODULE)
-        if ((gpio_request(gpio+TWL4030_GPIO_MAX+1, "gpio-led:green:d1") == 0)
-            && (gpio_direction_output(gpio + TWL4030_GPIO_MAX + 1, 1) == 0))
+        ret = gpio_request_one(gpio + TWL4030_GPIO_MAX + 1, GPIOF_OUT_INIT_HIGH,
+                               "gpio-led:green:d1");
+        if (ret == 0)
                 gpio_export(gpio + TWL4030_GPIO_MAX + 1, 0);
         else
-                pr_warning("IGEP v2: Could not obtain gpio GPIO_LED1_GREEN\n");
+                pr_warning("IGEP: Could not obtain gpio GPIO_LED1_GREEN\n");
 #else
-        igep2_gpio_leds[3].gpio = gpio + TWL4030_GPIO_MAX + 1;
+        igep_gpio_leds[3].gpio = gpio + TWL4030_GPIO_MAX + 1;
 #endif
 
+        if (machine_is_igep0030())
+                return 0;
+
+        /*
+         * REVISIT: need ehci-omap hooks for external VBUS
+         * power switch and overcurrent detect
+         */
+        igep2_twl_gpios[0].gpio = gpio + 1;
+
+        /* TWL4030_GPIO_MAX + 0 == ledA, GPIO_USBH_CPEN (out, active low) */
+        igep2_twl_gpios[1].gpio = gpio + TWL4030_GPIO_MAX;
+
+        ret = gpio_request_array(igep2_twl_gpios, ARRAY_SIZE(igep2_twl_gpios));
+        if (ret < 0)
+                pr_err("IGEP2: Could not obtain gpio for USBH_CPEN");
+
         return 0;
 };
 
-static struct twl4030_gpio_platform_data igep2_twl4030_gpio_pdata = {
+static struct twl4030_gpio_platform_data igep_twl4030_gpio_pdata = {
         .gpio_base      = OMAP_MAX_GPIO_LINES,
         .irq_base       = TWL4030_GPIO_IRQ_BASE,
         .irq_end        = TWL4030_GPIO_IRQ_END,
         .use_leds       = true,
-        .setup          = igep2_twl_gpio_setup,
+        .setup          = igep_twl_gpio_setup,
 };
 
-static struct twl4030_usb_data igep2_usb_data = {
+static struct twl4030_usb_data igep_usb_data = {
         .usb_mode       = T2_USB_MODE_ULPI,
 };
 
@@ -507,16 +502,17 @@ static struct regulator_init_data igep2_vpll2 = {
 
 static void __init igep2_display_init(void)
 {
-        if (gpio_request(IGEP2_GPIO_DVI_PUP, "GPIO_DVI_PUP") &&
-            gpio_direction_output(IGEP2_GPIO_DVI_PUP, 1))
+        int err = gpio_request_one(IGEP2_GPIO_DVI_PUP, GPIOF_OUT_INIT_HIGH,
+                                   "GPIO_DVI_PUP");
+        if (err)
                 pr_err("IGEP v2: Could not obtain gpio GPIO_DVI_PUP\n");
 }
 
-static struct platform_device *igep2_devices[] __initdata = {
-        &igep2_vwlan_device,
+static struct platform_device *igep_devices[] __initdata = {
+        &igep_vwlan_device,
 };
 
-static void __init igep2_init_early(void)
+static void __init igep_init_early(void)
 {
         omap2_init_common_infrastructure();
         omap2_init_common_devices(m65kxxxxam_sdrc_params,
@@ -561,27 +557,15 @@ static struct twl4030_keypad_data igep2_keypad_pdata = {
         .rep            = 1,
 };
 
-static struct twl4030_platform_data igep2_twldata = {
+static struct twl4030_platform_data igep_twldata = {
         .irq_base       = TWL4030_IRQ_BASE,
         .irq_end        = TWL4030_IRQ_END,
 
         /* platform_data for children goes here */
-        .usb            = &igep2_usb_data,
-        .codec          = &igep2_codec_data,
-        .gpio           = &igep2_twl4030_gpio_pdata,
-        .keypad         = &igep2_keypad_pdata,
-        .vmmc1          = &igep2_vmmc1,
-        .vpll2          = &igep2_vpll2,
-        .vio            = &igep2_vio,
-};
-
-static struct i2c_board_info __initdata igep2_i2c1_boardinfo[] = {
-        {
-                I2C_BOARD_INFO("twl4030", 0x48),
-                .flags          = I2C_CLIENT_WAKE,
-                .irq            = INT_34XX_SYS_NIRQ,
-                .platform_data  = &igep2_twldata,
-        },
+        .usb            = &igep_usb_data,
+        .gpio           = &igep_twl4030_gpio_pdata,
+        .vmmc1          = &igep_vmmc1,
+        .vio            = &igep_vio,
 };
 
 static struct i2c_board_info __initdata igep2_i2c3_boardinfo[] = {
@@ -590,32 +574,29 @@ static struct i2c_board_info __initdata igep2_i2c3_boardinfo[] = {
         },
 };
 
-static void __init igep2_i2c_init(void)
+static void __init igep_i2c_init(void)
 {
         int ret;
 
-        ret = omap_register_i2c_bus(1, 2600, igep2_i2c1_boardinfo,
-                ARRAY_SIZE(igep2_i2c1_boardinfo));
-        if (ret)
-                pr_warning("IGEP2: Could not register I2C1 bus (%d)\n", ret);
+        if (machine_is_igep0020()) {
+                /*
+                 * Bus 3 is attached to the DVI port where devices like the
+                 * pico DLP projector don't work reliably with 400kHz
+                 */
+                ret = omap_register_i2c_bus(3, 100, igep2_i2c3_boardinfo,
+                                            ARRAY_SIZE(igep2_i2c3_boardinfo));
+                if (ret)
+                        pr_warning("IGEP2: Could not register I2C3 bus (%d)\n", ret);
+
+                igep_twldata.codec      = &igep2_codec_data;
+                igep_twldata.keypad     = &igep2_keypad_pdata;
+                igep_twldata.vpll2      = &igep2_vpll2;
+        }
 
-        /*
-         * Bus 3 is attached to the DVI port where devices like the pico DLP
-         * projector don't work reliably with 400kHz
-         */
-        ret = omap_register_i2c_bus(3, 100, igep2_i2c3_boardinfo,
-                ARRAY_SIZE(igep2_i2c3_boardinfo));
-        if (ret)
-                pr_warning("IGEP2: Could not register I2C3 bus (%d)\n", ret);
+        omap3_pmic_init("twl4030", &igep_twldata);
 }
 
-static struct omap_musb_board_data musb_board_data = {
-        .interface_type         = MUSB_INTERFACE_ULPI,
-        .mode                   = MUSB_OTG,
-        .power                  = 100,
-};
-
-static const struct usbhs_omap_board_data usbhs_bdata __initconst = {
+static const struct usbhs_omap_board_data igep2_usbhs_bdata __initconst = {
         .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
         .port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED,
         .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,
@@ -626,6 +607,17 @@ static const struct usbhs_omap_board_data usbhs_bdata __initconst = {
         .reset_gpio_port[2] = -EINVAL,
 };
 
+static const struct usbhs_omap_board_data igep3_usbhs_bdata __initconst = {
+        .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED,
+        .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,
+        .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,
+
+        .phy_reset = true,
+        .reset_gpio_port[0] = -EINVAL,
+        .reset_gpio_port[1] = IGEP3_GPIO_USBH_NRESET,
+        .reset_gpio_port[2] = -EINVAL,
+};
+
 #ifdef CONFIG_OMAP_MUX
 static struct omap_board_mux board_mux[] __initdata = {
         { .reg_offset = OMAP_MUX_TERMINATOR },
@@ -633,82 +625,95 @@ static struct omap_board_mux board_mux[] __initdata = {
 #endif
 
 #if defined(CONFIG_LIBERTAS_SDIO) || defined(CONFIG_LIBERTAS_SDIO_MODULE)
+static struct gpio igep_wlan_bt_gpios[] __initdata = {
+        { -EINVAL, GPIOF_OUT_INIT_HIGH, "GPIO_WIFI_NPD"    },
+        { -EINVAL, GPIOF_OUT_INIT_HIGH, "GPIO_WIFI_NRESET" },
+        { -EINVAL, GPIOF_OUT_INIT_HIGH, "GPIO_BT_NRESET"   },
+};
 
-static void __init igep2_wlan_bt_init(void)
+static void __init igep_wlan_bt_init(void)
 {
-        unsigned npd, wreset, btreset;
+        int err;
 
         /* GPIO's for WLAN-BT combo depends on hardware revision */
         if (hwrev == IGEP2_BOARD_HWREV_B) {
-                npd = IGEP2_RB_GPIO_WIFI_NPD;
-                wreset = IGEP2_RB_GPIO_WIFI_NRESET;
-                btreset = IGEP2_RB_GPIO_BT_NRESET;
-        } else if (hwrev == IGEP2_BOARD_HWREV_C) {
-                npd = IGEP2_RC_GPIO_WIFI_NPD;
-                wreset = IGEP2_RC_GPIO_WIFI_NRESET;
-                btreset = IGEP2_RC_GPIO_BT_NRESET;
+                igep_wlan_bt_gpios[0].gpio = IGEP2_RB_GPIO_WIFI_NPD;
+                igep_wlan_bt_gpios[1].gpio = IGEP2_RB_GPIO_WIFI_NRESET;
+                igep_wlan_bt_gpios[2].gpio = IGEP2_RB_GPIO_BT_NRESET;
+        } else if (hwrev == IGEP2_BOARD_HWREV_C || machine_is_igep0030()) {
+                igep_wlan_bt_gpios[0].gpio = IGEP2_RC_GPIO_WIFI_NPD;
+                igep_wlan_bt_gpios[1].gpio = IGEP2_RC_GPIO_WIFI_NRESET;
+                igep_wlan_bt_gpios[2].gpio = IGEP2_RC_GPIO_BT_NRESET;
         } else
                 return;
 
-        /* Set GPIO's for  WLAN-BT combo module */
-        if ((gpio_request(npd, "GPIO_WIFI_NPD") == 0) &&
-            (gpio_direction_output(npd, 1) == 0)) {
-                gpio_export(npd, 0);
-        } else
-                pr_warning("IGEP2: Could not obtain gpio GPIO_WIFI_NPD\n");
-
-        if ((gpio_request(wreset, "GPIO_WIFI_NRESET") == 0) &&
-            (gpio_direction_output(wreset, 1) == 0)) {
-                gpio_export(wreset, 0);
-                gpio_set_value(wreset, 0);
-                udelay(10);
-                gpio_set_value(wreset, 1);
-        } else
-                pr_warning("IGEP2: Could not obtain gpio GPIO_WIFI_NRESET\n");
+        err = gpio_request_array(igep_wlan_bt_gpios,
+                                 ARRAY_SIZE(igep_wlan_bt_gpios));
+        if (err) {
+                pr_warning("IGEP2: Could not obtain WIFI/BT gpios\n");
+                return;
+        }
+
+        gpio_export(igep_wlan_bt_gpios[0].gpio, 0);
+        gpio_export(igep_wlan_bt_gpios[1].gpio, 0);
+        gpio_export(igep_wlan_bt_gpios[2].gpio, 0);
+
+        gpio_set_value(igep_wlan_bt_gpios[1].gpio, 0);
+        udelay(10);
+        gpio_set_value(igep_wlan_bt_gpios[1].gpio, 1);
 
-        if ((gpio_request(btreset, "GPIO_BT_NRESET") == 0) &&
-            (gpio_direction_output(btreset, 1) == 0)) {
-                gpio_export(btreset, 0);
-        } else
-                pr_warning("IGEP2: Could not obtain gpio GPIO_BT_NRESET\n");
 }
 #else
-static inline void __init igep2_wlan_bt_init(void) { }
+static inline void __init igep_wlan_bt_init(void) { }
 #endif
 
-static void __init igep2_init(void)
+static void __init igep_init(void)
 {
         omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
 
         /* Get IGEP2 hardware revision */
         igep2_get_revision();
         /* Register I2C busses and drivers */
-        igep2_i2c_init();
-        platform_add_devices(igep2_devices, ARRAY_SIZE(igep2_devices));
-        omap_display_init(&igep2_dss_data);
+        igep_i2c_init();
+        platform_add_devices(igep_devices, ARRAY_SIZE(igep_devices));
         omap_serial_init();
-        usb_musb_init(&musb_board_data);
-        usbhs_init(&usbhs_bdata);
+        usb_musb_init(NULL);
 
-        igep2_flash_init();
-        igep2_leds_init();
-        igep2_display_init();
-        igep2_init_smsc911x();
+        igep_flash_init();
+        igep_leds_init();
 
         /*
          * WLAN-BT combo module from MuRata which has a Marvell WLAN
          * (88W8686) + CSR Bluetooth chipset. Uses SDIO interface.
          */
-        igep2_wlan_bt_init();
+        igep_wlan_bt_init();
 
+        if (machine_is_igep0020()) {
+                omap_display_init(&igep2_dss_data);
+                igep2_display_init();
+                igep2_init_smsc911x();
+                usbhs_init(&igep2_usbhs_bdata);
+        } else {
+                usbhs_init(&igep3_usbhs_bdata);
+        }
 }
 
 MACHINE_START(IGEP0020, "IGEP v2 board")
         .boot_params    = 0x80000100,
         .reserve        = omap_reserve,
         .map_io         = omap3_map_io,
-        .init_early     = igep2_init_early,
+        .init_early     = igep_init_early,
+        .init_irq       = omap_init_irq,
+        .init_machine   = igep_init,
+        .timer          = &omap_timer,
+MACHINE_END
+
+MACHINE_START(IGEP0030, "IGEP OMAP3 module")
+        .boot_params    = 0x80000100,
+        .reserve        = omap_reserve,
+        .map_io         = omap3_map_io,
+        .init_early     = igep_init_early,
         .init_irq       = omap_init_irq,
-        .init_machine   = igep2_init,
+        .init_machine   = igep_init,
         .timer          = &omap_timer,
 MACHINE_END
diff --git a/arch/arm/mach-omap2/board-igep0030.c b/arch/arm/mach-omap2/board-igep0030.c
deleted file mode 100644
index 2cf86c3cb1a3..000000000000
--- a/arch/arm/mach-omap2/board-igep0030.c
+++ /dev/null
@@ -1,458 +0,0 @@
-/*
- * Copyright (C) 2010 - ISEE 2007 SL
- *
- * Modified from mach-omap2/board-generic.c
- *
- * 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/init.h>
-#include <linux/platform_device.h>
-#include <linux/delay.h>
-#include <linux/err.h>
-#include <linux/clk.h>
-#include <linux/io.h>
-#include <linux/gpio.h>
-#include <linux/interrupt.h>
-
-#include <linux/regulator/machine.h>
-#include <linux/regulator/fixed.h>
-#include <linux/i2c/twl.h>
-#include <linux/mmc/host.h>
-
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-
-#include <plat/board.h>
-#include <plat/common.h>
-#include <plat/gpmc.h>
-#include <plat/usb.h>
-#include <plat/onenand.h>
-
-#include "mux.h"
-#include "hsmmc.h"
-#include "sdram-numonyx-m65kxxxxam.h"
-
-#define IGEP3_GPIO_LED0_GREEN   54
-#define IGEP3_GPIO_LED0_RED     53
-#define IGEP3_GPIO_LED1_RED     16
-
-#define IGEP3_GPIO_WIFI_NPD     138
-#define IGEP3_GPIO_WIFI_NRESET  139
-#define IGEP3_GPIO_BT_NRESET    137
-
-#define IGEP3_GPIO_USBH_NRESET  183
-
-
-#if defined(CONFIG_MTD_ONENAND_OMAP2) || \
-        defined(CONFIG_MTD_ONENAND_OMAP2_MODULE)
-
-#define ONENAND_MAP             0x20000000
-
-/*
- * x2 Flash built-in COMBO POP MEMORY
- * Since the device is equipped with two DataRAMs, and two-plane NAND
- * Flash memory array, these two component enables simultaneous program
- * of 4KiB. Plane1 has only even blocks such as block0, block2, block4
- * while Plane2 has only odd blocks such as block1, block3, block5.
- * So MTD regards it as 4KiB page size and 256KiB block size 64*(2*2048)
- */
-
-static struct mtd_partition igep3_onenand_partitions[] = {
-        {
-                .name           = "X-Loader",
-                .offset         = 0,
-                .size           = 2 * (64*(2*2048))
-        },
-        {
-                .name           = "U-Boot",
-                .offset         = MTDPART_OFS_APPEND,
-                .size           = 6 * (64*(2*2048)),
-        },
-        {
-                .name           = "Environment",
-                .offset         = MTDPART_OFS_APPEND,
-                .size           = 2 * (64*(2*2048)),
-        },
-        {
-                .name           = "Kernel",
-                .offset         = MTDPART_OFS_APPEND,
-                .size           = 12 * (64*(2*2048)),
-        },
-        {
-                .name           = "File System",
-                .offset         = MTDPART_OFS_APPEND,
-                .size           = MTDPART_SIZ_FULL,
-        },
-};
-
-static struct omap_onenand_platform_data igep3_onenand_pdata = {
-        .parts = igep3_onenand_partitions,
-        .nr_parts = ARRAY_SIZE(igep3_onenand_partitions),
-        .onenand_setup = NULL,
-        .dma_channel    = -1,   /* disable DMA in OMAP OneNAND driver */
-};
-
-static struct platform_device igep3_onenand_device = {
-        .name           = "omap2-onenand",
-        .id             = -1,
-        .dev = {
-                .platform_data = &igep3_onenand_pdata,
-        },
-};
-
-static void __init igep3_flash_init(void)
-{
-        u8 cs = 0;
-        u8 onenandcs = GPMC_CS_NUM + 1;
-
-        for (cs = 0; cs < GPMC_CS_NUM; cs++) {
-                u32 ret;
-                ret = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1);
-
-                /* Check if NAND/oneNAND is configured */
-                if ((ret & 0xC00) == 0x800)
-                        /* NAND found */
-                        pr_err("IGEP3: Unsupported NAND found\n");
-                else {
-                        ret = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG7);
-
-                        if ((ret & 0x3F) == (ONENAND_MAP >> 24))
-                                /* OneNAND found */
-                                onenandcs = cs;
-                }
-        }
-
-        if (onenandcs > GPMC_CS_NUM) {
-                pr_err("IGEP3: Unable to find configuration in GPMC\n");
-                return;
-        }
-
-        igep3_onenand_pdata.cs = onenandcs;
-
-        if (platform_device_register(&igep3_onenand_device) < 0)
-                pr_err("IGEP3: Unable to register OneNAND device\n");
-}
-
-#else
-static void __init igep3_flash_init(void) {}
-#endif
-
-static struct regulator_consumer_supply igep3_vmmc1_supply =
-        REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0");
-
-/* VMMC1 for OMAP VDD_MMC1 (i/o) and MMC1 card */
-static struct regulator_init_data igep3_vmmc1 = {
-        .constraints = {
-                .min_uV                 = 1850000,
-                .max_uV                 = 3150000,
-                .valid_modes_mask       = REGULATOR_MODE_NORMAL
-                                        | REGULATOR_MODE_STANDBY,
-                .valid_ops_mask         = REGULATOR_CHANGE_VOLTAGE
-                                        | REGULATOR_CHANGE_MODE
-                                        | REGULATOR_CHANGE_STATUS,
-        },
-        .num_consumer_supplies  = 1,
-        .consumer_supplies      = &igep3_vmmc1_supply,
-};
-
-static struct regulator_consumer_supply igep3_vio_supply =
-        REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.1");
-
-static struct regulator_init_data igep3_vio = {
-        .constraints = {
-                .min_uV                 = 1800000,
-                .max_uV                 = 1800000,
-                .apply_uV               = 1,
-                .valid_modes_mask       = REGULATOR_MODE_NORMAL
-                                        | REGULATOR_MODE_STANDBY,
-                .valid_ops_mask         = REGULATOR_CHANGE_VOLTAGE
-                                        | REGULATOR_CHANGE_MODE
-                                        | REGULATOR_CHANGE_STATUS,
-        },
-        .num_consumer_supplies  = 1,
-        .consumer_supplies      = &igep3_vio_supply,
-};
-
-static struct regulator_consumer_supply igep3_vmmc2_supply =
-        REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1");
-
-static struct regulator_init_data igep3_vmmc2 = {
-        .constraints    = {
-                .valid_modes_mask       = REGULATOR_MODE_NORMAL,
-                .always_on              = 1,
-        },
-        .num_consumer_supplies  = 1,
-        .consumer_supplies      = &igep3_vmmc2_supply,
-};
-
-static struct fixed_voltage_config igep3_vwlan = {
-        .supply_name            = "vwlan",
-        .microvolts             = 3300000,
-        .gpio                   = -EINVAL,
-        .enabled_at_boot        = 1,
-        .init_data              = &igep3_vmmc2,
-};
-
-static struct platform_device igep3_vwlan_device = {
-        .name   = "reg-fixed-voltage",
-        .id     = 0,
-        .dev    = {
-                .platform_data = &igep3_vwlan,
-        },
-};
-
-static struct omap2_hsmmc_info mmc[] = {
-        [0] = {
-                .mmc            = 1,
-                .caps           = MMC_CAP_4_BIT_DATA,
-                .gpio_cd        = -EINVAL,
-                .gpio_wp        = -EINVAL,
-        },
-#if defined(CONFIG_LIBERTAS_SDIO) || defined(CONFIG_LIBERTAS_SDIO_MODULE)
-        [1] = {
-                .mmc            = 2,
-                .caps           = MMC_CAP_4_BIT_DATA,
-                .gpio_cd        = -EINVAL,
-                .gpio_wp        = -EINVAL,
-        },
-#endif
-        {}      /* Terminator */
-};
-
-#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE)
-#include <linux/leds.h>
-
-static struct gpio_led igep3_gpio_leds[] = {
-        [0] = {
-                .name                   = "gpio-led:red:d0",
-                .gpio                   = IGEP3_GPIO_LED0_RED,
-                .default_trigger        = "default-off"
-        },
-        [1] = {
-                .name                   = "gpio-led:green:d0",
-                .gpio                   = IGEP3_GPIO_LED0_GREEN,
-                .default_trigger        = "default-off",
-        },
-        [2] = {
-                .name                   = "gpio-led:red:d1",
-                .gpio                   = IGEP3_GPIO_LED1_RED,
-                .default_trigger        = "default-off",
-        },
-        [3] = {
-                .name                   = "gpio-led:green:d1",
-                .default_trigger        = "heartbeat",
-                .gpio                   = -EINVAL, /* gets replaced */
-        },
-};
-
-static struct gpio_led_platform_data igep3_led_pdata = {
-        .leds           = igep3_gpio_leds,
-        .num_leds       = ARRAY_SIZE(igep3_gpio_leds),
-};
-
-static struct platform_device igep3_led_device = {
-         .name   = "leds-gpio",
-         .id     = -1,
-         .dev    = {
-                 .platform_data = &igep3_led_pdata,
-        },
-};
-
-static void __init igep3_leds_init(void)
-{
-        platform_device_register(&igep3_led_device);
-}
-
-#else
-static inline void igep3_leds_init(void)
-{
-        if ((gpio_request(IGEP3_GPIO_LED0_RED, "gpio-led:red:d0") == 0) &&
-            (gpio_direction_output(IGEP3_GPIO_LED0_RED, 1) == 0)) {
-                gpio_export(IGEP3_GPIO_LED0_RED, 0);
-                gpio_set_value(IGEP3_GPIO_LED0_RED, 1);
-        } else
-                pr_warning("IGEP3: Could not obtain gpio GPIO_LED0_RED\n");
-
-        if ((gpio_request(IGEP3_GPIO_LED0_GREEN, "gpio-led:green:d0") == 0) &&
-            (gpio_direction_output(IGEP3_GPIO_LED0_GREEN, 1) == 0)) {
-                gpio_export(IGEP3_GPIO_LED0_GREEN, 0);
-                gpio_set_value(IGEP3_GPIO_LED0_GREEN, 1);
-        } else
-                pr_warning("IGEP3: Could not obtain gpio GPIO_LED0_GREEN\n");
-
-        if ((gpio_request(IGEP3_GPIO_LED1_RED, "gpio-led:red:d1") == 0) &&
-                (gpio_direction_output(IGEP3_GPIO_LED1_RED, 1) == 0)) {
-                gpio_export(IGEP3_GPIO_LED1_RED, 0);
-                gpio_set_value(IGEP3_GPIO_LED1_RED, 1);
-        } else
-                pr_warning("IGEP3: Could not obtain gpio GPIO_LED1_RED\n");
-}
-#endif
-
-static int igep3_twl4030_gpio_setup(struct device *dev,
-                unsigned gpio, unsigned ngpio)
-{
-        /* gpio + 0 is "mmc0_cd" (input/IRQ) */
-        mmc[0].gpio_cd = gpio + 0;
-        omap2_hsmmc_init(mmc);
-
-        /* TWL4030_GPIO_MAX + 1 == ledB (out, active low LED) */
-#if !defined(CONFIG_LEDS_GPIO) && !defined(CONFIG_LEDS_GPIO_MODULE)
-        if ((gpio_request(gpio+TWL4030_GPIO_MAX+1, "gpio-led:green:d1") == 0)
-            && (gpio_direction_output(gpio + TWL4030_GPIO_MAX + 1, 1) == 0)) {
-                gpio_export(gpio + TWL4030_GPIO_MAX + 1, 0);
-                gpio_set_value(gpio + TWL4030_GPIO_MAX + 1, 0);
-        } else
-                pr_warning("IGEP3: Could not obtain gpio GPIO_LED1_GREEN\n");
-#else
-        igep3_gpio_leds[3].gpio = gpio + TWL4030_GPIO_MAX + 1;
-#endif
-
-        return 0;
-};
-
-static struct twl4030_gpio_platform_data igep3_twl4030_gpio_pdata = {
-        .gpio_base      = OMAP_MAX_GPIO_LINES,
-        .irq_base       = TWL4030_GPIO_IRQ_BASE,
-        .irq_end        = TWL4030_GPIO_IRQ_END,
-        .use_leds       = true,
-        .setup          = igep3_twl4030_gpio_setup,
-};
-
-static struct twl4030_usb_data igep3_twl4030_usb_data = {
-        .usb_mode       = T2_USB_MODE_ULPI,
-};
-
-static struct platform_device *igep3_devices[] __initdata = {
-        &igep3_vwlan_device,
-};
-
-static void __init igep3_init_early(void)
-{
-        omap2_init_common_infrastructure();
-        omap2_init_common_devices(m65kxxxxam_sdrc_params,
-                                  m65kxxxxam_sdrc_params);
-}
-
-static struct twl4030_platform_data igep3_twl4030_pdata = {
-        .irq_base       = TWL4030_IRQ_BASE,
-        .irq_end        = TWL4030_IRQ_END,
-
-        /* platform_data for children goes here */
-        .usb            = &igep3_twl4030_usb_data,
-        .gpio           = &igep3_twl4030_gpio_pdata,
-        .vmmc1          = &igep3_vmmc1,
-        .vio            = &igep3_vio,
-};
-
-static struct i2c_board_info __initdata igep3_i2c_boardinfo[] = {
-        {
-                I2C_BOARD_INFO("twl4030", 0x48),
-                .flags          = I2C_CLIENT_WAKE,
-                .irq            = INT_34XX_SYS_NIRQ,
-                .platform_data  = &igep3_twl4030_pdata,
-        },
-};
-
-static int __init igep3_i2c_init(void)
-{
-        omap_register_i2c_bus(1, 2600, igep3_i2c_boardinfo,
-                        ARRAY_SIZE(igep3_i2c_boardinfo));
-
-        return 0;
-}
-
-static struct omap_musb_board_data musb_board_data = {
-        .interface_type = MUSB_INTERFACE_ULPI,
-        .mode           = MUSB_OTG,
-        .power          = 100,
-};
-
-#if defined(CONFIG_LIBERTAS_SDIO) || defined(CONFIG_LIBERTAS_SDIO_MODULE)
-
-static void __init igep3_wifi_bt_init(void)
-{
-        /* Configure MUX values for W-LAN + Bluetooth GPIO's */
-        omap_mux_init_gpio(IGEP3_GPIO_WIFI_NPD, OMAP_PIN_OUTPUT);
-        omap_mux_init_gpio(IGEP3_GPIO_WIFI_NRESET, OMAP_PIN_OUTPUT);
-        omap_mux_init_gpio(IGEP3_GPIO_BT_NRESET, OMAP_PIN_OUTPUT);
-
-        /* Set GPIO's for  W-LAN + Bluetooth combo module */
-        if ((gpio_request(IGEP3_GPIO_WIFI_NPD, "GPIO_WIFI_NPD") == 0) &&
-            (gpio_direction_output(IGEP3_GPIO_WIFI_NPD, 1) == 0)) {
-                gpio_export(IGEP3_GPIO_WIFI_NPD, 0);
-        } else
-                pr_warning("IGEP3: Could not obtain gpio GPIO_WIFI_NPD\n");
-
-        if ((gpio_request(IGEP3_GPIO_WIFI_NRESET, "GPIO_WIFI_NRESET") == 0) &&
-            (gpio_direction_output(IGEP3_GPIO_WIFI_NRESET, 1) == 0)) {
-                gpio_export(IGEP3_GPIO_WIFI_NRESET, 0);
-                gpio_set_value(IGEP3_GPIO_WIFI_NRESET, 0);
-                udelay(10);
-                gpio_set_value(IGEP3_GPIO_WIFI_NRESET, 1);
-        } else
-                pr_warning("IGEP3: Could not obtain gpio GPIO_WIFI_NRESET\n");
-
-        if ((gpio_request(IGEP3_GPIO_BT_NRESET, "GPIO_BT_NRESET") == 0) &&
-            (gpio_direction_output(IGEP3_GPIO_BT_NRESET, 1) == 0)) {
-                gpio_export(IGEP3_GPIO_BT_NRESET, 0);
-        } else
-                pr_warning("IGEP3: Could not obtain gpio GPIO_BT_NRESET\n");
-}
-#else
-void __init igep3_wifi_bt_init(void) {}
-#endif
-
-static const struct usbhs_omap_board_data usbhs_bdata __initconst = {
-        .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED,
-        .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,
-        .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,
-
-        .phy_reset = true,
-        .reset_gpio_port[0] = -EINVAL,
-        .reset_gpio_port[1] = IGEP3_GPIO_USBH_NRESET,
-        .reset_gpio_port[2] = -EINVAL,
-};
-
-#ifdef CONFIG_OMAP_MUX
-static struct omap_board_mux board_mux[] __initdata = {
-        OMAP3_MUX(I2C2_SDA, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT),
-        { .reg_offset = OMAP_MUX_TERMINATOR },
-};
-#endif
-
-static void __init igep3_init(void)
-{
-        omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
-
-        /* Register I2C busses and drivers */
-        igep3_i2c_init();
-        platform_add_devices(igep3_devices, ARRAY_SIZE(igep3_devices));
-        omap_serial_init();
-        usb_musb_init(&musb_board_data);
-        usbhs_init(&usbhs_bdata);
-
-        igep3_flash_init();
-        igep3_leds_init();
-
-        /*
-         * WLAN-BT combo module from MuRata which has a Marvell WLAN
-         * (88W8686) + CSR Bluetooth chipset. Uses SDIO interface.
-         */
-        igep3_wifi_bt_init();
-
-}
-
-MACHINE_START(IGEP0030, "IGEP OMAP3 module")
-        .boot_params    = 0x80000100,
-        .reserve        = omap_reserve,
-        .map_io         = omap3_map_io,
-        .init_early     = igep3_init_early,
-        .init_irq       = omap_init_irq,
-        .init_machine   = igep3_init,
-        .timer          = &omap_timer,
-MACHINE_END
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index e2ba77957a8c..f7d6038075f0 100644
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@ -22,7 +22,6 @@
 #include <linux/err.h>
 #include <linux/clk.h>
 #include <linux/spi/spi.h>
-#include <linux/spi/ads7846.h>
 #include <linux/regulator/machine.h>
 #include <linux/i2c/twl.h>
 #include <linux/io.h>
@@ -43,47 +42,19 @@
 
 #include <asm/delay.h>
 #include <plat/usb.h>
+#include <plat/gpmc-smsc911x.h>
 
 #include "board-flash.h"
 #include "mux.h"
 #include "hsmmc.h"
 #include "control.h"
+#include "common-board-devices.h"
 
 #define LDP_SMSC911X_CS         1
 #define LDP_SMSC911X_GPIO       152
 #define DEBUG_BASE              0x08000000
 #define LDP_ETHR_START          DEBUG_BASE
 
-static struct resource ldp_smsc911x_resources[] = {
-        [0] = {
-                .start  = LDP_ETHR_START,
-                .end    = LDP_ETHR_START + SZ_4K,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = 0,
-                .end    = 0,
-                .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
-        },
-};
-
-static struct smsc911x_platform_config ldp_smsc911x_config = {
-        .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
-        .irq_type       = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
-        .flags          = SMSC911X_USE_32BIT,
-        .phy_interface  = PHY_INTERFACE_MODE_MII,
-};
-
-static struct platform_device ldp_smsc911x_device = {
-        .name           = "smsc911x",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(ldp_smsc911x_resources),
-        .resource       = ldp_smsc911x_resources,
-        .dev            = {
-                .platform_data = &ldp_smsc911x_config,
-        },
-};
-
 static uint32_t board_keymap[] = {
         KEY(0, 0, KEY_1),
         KEY(1, 0, KEY_2),
@@ -197,82 +168,16 @@ static struct platform_device ldp_gpio_keys_device = {
         },
 };
 
-static int ts_gpio;
-
-/**
- * @brief ads7846_dev_init : Requests & sets GPIO line for pen-irq
- *
- * @return - void. If request gpio fails then Flag KERN_ERR.
- */
-static void ads7846_dev_init(void)
-{
-        if (gpio_request(ts_gpio, "ads7846 irq") < 0) {
-                printk(KERN_ERR "can't get ads746 pen down GPIO\n");
-                return;
-        }
-
-        gpio_direction_input(ts_gpio);
-        gpio_set_debounce(ts_gpio, 310);
-}
-
-static int ads7846_get_pendown_state(void)
-{
-        return !gpio_get_value(ts_gpio);
-}
-
-static struct ads7846_platform_data tsc2046_config __initdata = {
-        .get_pendown_state      = ads7846_get_pendown_state,
-        .keep_vref_on           = 1,
-};
-
-static struct omap2_mcspi_device_config tsc2046_mcspi_config = {
-        .turbo_mode     = 0,
-        .single_channel = 1,    /* 0: slave, 1: master */
-};
-
-static struct spi_board_info ldp_spi_board_info[] __initdata = {
-        [0] = {
-                /*
-                 * TSC2046 operates at a max freqency of 2MHz, so
-                 * operate slightly below at 1.5MHz
-                 */
-                .modalias               = "ads7846",
-                .bus_num                = 1,
-                .chip_select            = 0,
-                .max_speed_hz           = 1500000,
-                .controller_data        = &tsc2046_mcspi_config,
-                .irq                    = 0,
-                .platform_data          = &tsc2046_config,
-        },
+static struct omap_smsc911x_platform_data smsc911x_cfg = {
+        .cs             = LDP_SMSC911X_CS,
+        .gpio_irq       = LDP_SMSC911X_GPIO,
+        .gpio_reset     = -EINVAL,
+        .flags          = SMSC911X_USE_32BIT,
 };
 
 static inline void __init ldp_init_smsc911x(void)
 {
-        int eth_cs;
-        unsigned long cs_mem_base;
-        int eth_gpio = 0;
-
-        eth_cs = LDP_SMSC911X_CS;
-
-        if (gpmc_cs_request(eth_cs, SZ_16M, &cs_mem_base) < 0) {
-                printk(KERN_ERR "Failed to request GPMC mem for smsc911x\n");
-                return;
-        }
-
-        ldp_smsc911x_resources[0].start = cs_mem_base + 0x0;
-        ldp_smsc911x_resources[0].end   = cs_mem_base + 0xff;
-        udelay(100);
-
-        eth_gpio = LDP_SMSC911X_GPIO;
-
-        ldp_smsc911x_resources[1].start = OMAP_GPIO_IRQ(eth_gpio);
-
-        if (gpio_request(eth_gpio, "smsc911x irq") < 0) {
-                printk(KERN_ERR "Failed to request GPIO%d for smsc911x IRQ\n",
-                                eth_gpio);
-                return;
-        }
-        gpio_direction_input(eth_gpio);
+        gpmc_smsc911x_init(&smsc911x_cfg);
 }
 
 static struct platform_device ldp_lcd_device = {
@@ -360,19 +265,9 @@ static struct twl4030_platform_data ldp_twldata = {
         .keypad         = &ldp_kp_twl4030_data,
 };
 
-static struct i2c_board_info __initdata ldp_i2c_boardinfo[] = {
-        {
-                I2C_BOARD_INFO("twl4030", 0x48),
-                .flags = I2C_CLIENT_WAKE,
-                .irq = INT_34XX_SYS_NIRQ,
-                .platform_data = &ldp_twldata,
-        },
-};
-
 static int __init omap_i2c_init(void)
 {
-        omap_register_i2c_bus(1, 2600, ldp_i2c_boardinfo,
-                        ARRAY_SIZE(ldp_i2c_boardinfo));
+        omap3_pmic_init("twl4030", &ldp_twldata);
         omap_register_i2c_bus(2, 400, NULL, 0);
         omap_register_i2c_bus(3, 400, NULL, 0);
         return 0;
@@ -389,7 +284,6 @@ static struct omap2_hsmmc_info mmc[] __initdata = {
 };
 
 static struct platform_device *ldp_devices[] __initdata = {
-        &ldp_smsc911x_device,
         &ldp_lcd_device,
         &ldp_gpio_keys_device,
 };
@@ -400,12 +294,6 @@ static struct omap_board_mux board_mux[] __initdata = {
 };
 #endif
 
-static struct omap_musb_board_data musb_board_data = {
-        .interface_type         = MUSB_INTERFACE_ULPI,
-        .mode                   = MUSB_OTG,
-        .power                  = 100,
-};
-
 static struct mtd_partition ldp_nand_partitions[] = {
         /* All the partition sizes are listed in terms of NAND block size */
         {
@@ -446,13 +334,9 @@ static void __init omap_ldp_init(void)
         ldp_init_smsc911x();
         omap_i2c_init();
         platform_add_devices(ldp_devices, ARRAY_SIZE(ldp_devices));
-        ts_gpio = 54;
-        ldp_spi_board_info[0].irq = gpio_to_irq(ts_gpio);
-        spi_register_board_info(ldp_spi_board_info,
-                                ARRAY_SIZE(ldp_spi_board_info));
-        ads7846_dev_init();
+        omap_ads7846_init(1, 54, 310, NULL);
         omap_serial_init();
-        usb_musb_init(&musb_board_data);
+        usb_musb_init(NULL);
         board_nand_init(ldp_nand_partitions,
                 ARRAY_SIZE(ldp_nand_partitions), ZOOM_NAND_CS, 0);
 
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
index e710cd9e079b..8d74318ed495 100644
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -106,14 +106,13 @@ static void __init n8x0_usb_init(void)
         static char     announce[] __initdata = KERN_INFO "TUSB 6010\n";
 
         /* PM companion chip power control pin */
-        ret = gpio_request(TUSB6010_GPIO_ENABLE, "TUSB6010 enable");
+        ret = gpio_request_one(TUSB6010_GPIO_ENABLE, GPIOF_OUT_INIT_LOW,
+                               "TUSB6010 enable");
         if (ret != 0) {
                 printk(KERN_ERR "Could not get TUSB power GPIO%i\n",
                        TUSB6010_GPIO_ENABLE);
                 return;
         }
-        gpio_direction_output(TUSB6010_GPIO_ENABLE, 0);
-
         tusb_set_power(0);
 
         ret = tusb6010_setup_interface(&tusb_data, TUSB6010_REFCLK_19, 2,
@@ -494,8 +493,12 @@ static struct omap_mmc_platform_data mmc1_data = {
 
 static struct omap_mmc_platform_data *mmc_data[OMAP24XX_NR_MMC];
 
-static void __init n8x0_mmc_init(void)
+static struct gpio n810_emmc_gpios[] __initdata = {
+        { N810_EMMC_VSD_GPIO, GPIOF_OUT_INIT_LOW,  "MMC slot 2 Vddf" },
+        { N810_EMMC_VIO_GPIO, GPIOF_OUT_INIT_LOW,  "MMC slot 2 Vdd"  },
+};
 
+static void __init n8x0_mmc_init(void)
 {
         int err;
 
@@ -512,27 +515,18 @@ static void __init n8x0_mmc_init(void)
                 mmc1_data.slots[1].ban_openended = 1;
         }
 
-        err = gpio_request(N8X0_SLOT_SWITCH_GPIO, "MMC slot switch");
+        err = gpio_request_one(N8X0_SLOT_SWITCH_GPIO, GPIOF_OUT_INIT_LOW,
+                               "MMC slot switch");
         if (err)
                 return;
 
-        gpio_direction_output(N8X0_SLOT_SWITCH_GPIO, 0);
-
         if (machine_is_nokia_n810()) {
-                err = gpio_request(N810_EMMC_VSD_GPIO, "MMC slot 2 Vddf");
-                if (err) {
-                        gpio_free(N8X0_SLOT_SWITCH_GPIO);
-                        return;
-                }
-                gpio_direction_output(N810_EMMC_VSD_GPIO, 0);
-
-                err = gpio_request(N810_EMMC_VIO_GPIO, "MMC slot 2 Vdd");
+                err = gpio_request_array(n810_emmc_gpios,
+                                         ARRAY_SIZE(n810_emmc_gpios));
                 if (err) {
                         gpio_free(N8X0_SLOT_SWITCH_GPIO);
-                        gpio_free(N810_EMMC_VSD_GPIO);
                         return;
                 }
-                gpio_direction_output(N810_EMMC_VIO_GPIO, 0);
         }
 
         mmc_data[0] = &mmc1_data;
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 97750d483a70..be71426359f2 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -52,6 +52,7 @@
 #include "hsmmc.h"
 #include "timer-gp.h"
 #include "pm.h"
+#include "common-board-devices.h"
 
 #define NAND_BLOCK_SIZE         SZ_128K
 
@@ -79,6 +80,12 @@ static u8 omap3_beagle_get_rev(void)
         return omap3_beagle_version;
 }
 
+static struct gpio omap3_beagle_rev_gpios[] __initdata = {
+        { 171, GPIOF_IN, "rev_id_0"    },
+        { 172, GPIOF_IN, "rev_id_1" },
+        { 173, GPIOF_IN, "rev_id_2"    },
+};
+
 static void __init omap3_beagle_init_rev(void)
 {
         int ret;
@@ -88,21 +95,13 @@ static void __init omap3_beagle_init_rev(void)
         omap_mux_init_gpio(172, OMAP_PIN_INPUT_PULLUP);
         omap_mux_init_gpio(173, OMAP_PIN_INPUT_PULLUP);
 
-        ret = gpio_request(171, "rev_id_0");
-        if (ret < 0)
-                goto fail0;
-
-        ret = gpio_request(172, "rev_id_1");
-        if (ret < 0)
-                goto fail1;
-
-        ret = gpio_request(173, "rev_id_2");
-        if (ret < 0)
-                goto fail2;
-
-        gpio_direction_input(171);
-        gpio_direction_input(172);
-        gpio_direction_input(173);
+        ret = gpio_request_array(omap3_beagle_rev_gpios,
+                                 ARRAY_SIZE(omap3_beagle_rev_gpios));
+        if (ret < 0) {
+                printk(KERN_ERR "Unable to get revision detection GPIO pins\n");
+                omap3_beagle_version = OMAP3BEAGLE_BOARD_UNKN;
+                return;
+        }
 
         beagle_rev = gpio_get_value(171) | (gpio_get_value(172) << 1)
                         | (gpio_get_value(173) << 2);
@@ -128,18 +127,6 @@ static void __init omap3_beagle_init_rev(void)
                 printk(KERN_INFO "OMAP3 Beagle Rev: unknown %hd\n", beagle_rev);
                 omap3_beagle_version = OMAP3BEAGLE_BOARD_UNKN;
         }
-
-        return;
-
-fail2:
-        gpio_free(172);
-fail1:
-        gpio_free(171);
-fail0:
-        printk(KERN_ERR "Unable to get revision detection GPIO pins\n");
-        omap3_beagle_version = OMAP3BEAGLE_BOARD_UNKN;
-
-        return;
 }
 
 static struct mtd_partition omap3beagle_nand_partitions[] = {
@@ -173,15 +160,6 @@ static struct mtd_partition omap3beagle_nand_partitions[] = {
         },
 };
 
-static struct omap_nand_platform_data omap3beagle_nand_data = {
-        .options        = NAND_BUSWIDTH_16,
-        .parts          = omap3beagle_nand_partitions,
-        .nr_parts       = ARRAY_SIZE(omap3beagle_nand_partitions),
-        .dma_channel    = -1,           /* disable DMA in OMAP NAND driver */
-        .nand_setup     = NULL,
-        .dev_ready      = NULL,
-};
-
 /* DSS */
 
 static int beagle_enable_dvi(struct omap_dss_device *dssdev)
@@ -243,13 +221,10 @@ static void __init beagle_display_init(void)
 {
         int r;
 
-        r = gpio_request(beagle_dvi_device.reset_gpio, "DVI reset");
-        if (r < 0) {
+        r = gpio_request_one(beagle_dvi_device.reset_gpio, GPIOF_OUT_INIT_LOW,
+                             "DVI reset");
+        if (r < 0)
                 printk(KERN_ERR "Unable to get DVI reset GPIO\n");
-                return;
-        }
-
-        gpio_direction_output(beagle_dvi_device.reset_gpio, 0);
 }
 
 #include "sdram-micron-mt46h32m32lf-6.h"
@@ -276,7 +251,7 @@ static struct gpio_led gpio_leds[];
 static int beagle_twl_gpio_setup(struct device *dev,
                 unsigned gpio, unsigned ngpio)
 {
-        int r;
+        int r, usb_pwr_level;
 
         if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) {
                 mmc[0].gpio_wp = -EINVAL;
@@ -295,66 +270,46 @@ static int beagle_twl_gpio_setup(struct device *dev,
         beagle_vmmc1_supply.dev = mmc[0].dev;
         beagle_vsim_supply.dev = mmc[0].dev;
 
-        /* REVISIT: need ehci-omap hooks for external VBUS
-         * power switch and overcurrent detect
-         */
-        if (omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XM) {
-                r = gpio_request(gpio + 1, "EHCI_nOC");
-                if (!r) {
-                        r = gpio_direction_input(gpio + 1);
-                        if (r)
-                                gpio_free(gpio + 1);
-                }
-                if (r)
-                        pr_err("%s: unable to configure EHCI_nOC\n", __func__);
-        }
-
         /*
          * TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, XM active
          * high / others active low)
-         */
-        gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR");
-        if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM)
-                gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1);
-        else
-                gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0);
-
-        /* DVI reset GPIO is different between beagle revisions */
-        if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM)
-                beagle_dvi_device.reset_gpio = 129;
-        else
-                beagle_dvi_device.reset_gpio = 170;
-
-        /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
-        gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
-
-        /*
-         * gpio + 1 on Xm controls the TFP410's enable line (active low)
-         * gpio + 2 control varies depending on the board rev as follows:
-         * P7/P8 revisions(prototype): Camera EN
-         * A2+ revisions (production): LDO (supplies DVI, serial, led blocks)
+         * DVI reset GPIO is different between beagle revisions
          */
         if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) {
-                r = gpio_request(gpio + 1, "nDVI_PWR_EN");
-                if (!r) {
-                        r = gpio_direction_output(gpio + 1, 0);
-                        if (r)
-                                gpio_free(gpio + 1);
-                }
+                usb_pwr_level = GPIOF_OUT_INIT_HIGH;
+                beagle_dvi_device.reset_gpio = 129;
+                /*
+                 * gpio + 1 on Xm controls the TFP410's enable line (active low)
+                 * gpio + 2 control varies depending on the board rev as below:
+                 * P7/P8 revisions(prototype): Camera EN
+                 * A2+ revisions (production): LDO (DVI, serial, led blocks)
+                 */
+                r = gpio_request_one(gpio + 1, GPIOF_OUT_INIT_LOW,
+                                     "nDVI_PWR_EN");
                 if (r)
                         pr_err("%s: unable to configure nDVI_PWR_EN\n",
                                 __func__);
-                r = gpio_request(gpio + 2, "DVI_LDO_EN");
-                if (!r) {
-                        r = gpio_direction_output(gpio + 2, 1);
-                        if (r)
-                                gpio_free(gpio + 2);
-                }
+                r = gpio_request_one(gpio + 2, GPIOF_OUT_INIT_HIGH,
+                                     "DVI_LDO_EN");
                 if (r)
                         pr_err("%s: unable to configure DVI_LDO_EN\n",
                                 __func__);
+        } else {
+                usb_pwr_level = GPIOF_OUT_INIT_LOW;
+                beagle_dvi_device.reset_gpio = 170;
+                /*
+                 * REVISIT: need ehci-omap hooks for external VBUS
+                 * power switch and overcurrent detect
+                 */
+                if (gpio_request_one(gpio + 1, GPIOF_IN, "EHCI_nOC"))
+                        pr_err("%s: unable to configure EHCI_nOC\n", __func__);
         }
 
+        gpio_request_one(gpio + TWL4030_GPIO_MAX, usb_pwr_level, "nEN_USB_PWR");
+
+        /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
+        gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
+
         return 0;
 }
 
@@ -453,15 +408,6 @@ static struct twl4030_platform_data beagle_twldata = {
         .vpll2          = &beagle_vpll2,
 };
 
-static struct i2c_board_info __initdata beagle_i2c_boardinfo[] = {
-        {
-                I2C_BOARD_INFO("twl4030", 0x48),
-                .flags = I2C_CLIENT_WAKE,
-                .irq = INT_34XX_SYS_NIRQ,
-                .platform_data = &beagle_twldata,
-        },
-};
-
 static struct i2c_board_info __initdata beagle_i2c_eeprom[] = {
        {
                I2C_BOARD_INFO("eeprom", 0x50),
@@ -470,8 +416,7 @@ static struct i2c_board_info __initdata beagle_i2c_eeprom[] = {
 
 static int __init omap3_beagle_i2c_init(void)
 {
-        omap_register_i2c_bus(1, 2600, beagle_i2c_boardinfo,
-                        ARRAY_SIZE(beagle_i2c_boardinfo));
+        omap3_pmic_init("twl4030", &beagle_twldata);
         /* Bus 3 is attached to the DVI port where devices like the pico DLP
          * projector don't work reliably with 400kHz */
         omap_register_i2c_bus(3, 100, beagle_i2c_eeprom, ARRAY_SIZE(beagle_i2c_eeprom));
@@ -551,39 +496,6 @@ static struct platform_device *omap3_beagle_devices[] __initdata = {
         &keys_gpio,
 };
 
-static void __init omap3beagle_flash_init(void)
-{
-        u8 cs = 0;
-        u8 nandcs = GPMC_CS_NUM + 1;
-
-        /* find out the chip-select on which NAND exists */
-        while (cs < GPMC_CS_NUM) {
-                u32 ret = 0;
-                ret = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1);
-
-                if ((ret & 0xC00) == 0x800) {
-                        printk(KERN_INFO "Found NAND on CS%d\n", cs);
-                        if (nandcs > GPMC_CS_NUM)
-                                nandcs = cs;
-                }
-                cs++;
-        }
-
-        if (nandcs > GPMC_CS_NUM) {
-                printk(KERN_INFO "NAND: Unable to find configuration "
-                                 "in GPMC\n ");
-                return;
-        }
-
-        if (nandcs < GPMC_CS_NUM) {
-                omap3beagle_nand_data.cs = nandcs;
-
-                printk(KERN_INFO "Registering NAND on CS%d\n", nandcs);
-                if (gpmc_nand_init(&omap3beagle_nand_data) < 0)
-                        printk(KERN_ERR "Unable to register NAND device\n");
-        }
-}
-
 static const struct usbhs_omap_board_data usbhs_bdata __initconst = {
 
         .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
@@ -602,12 +514,6 @@ static struct omap_board_mux board_mux[] __initdata = {
 };
 #endif
 
-static struct omap_musb_board_data musb_board_data = {
-        .interface_type         = MUSB_INTERFACE_ULPI,
-        .mode                   = MUSB_OTG,
-        .power                  = 100,
-};
-
 static void __init beagle_opp_init(void)
 {
         int r = 0;
@@ -665,13 +571,13 @@ static void __init omap3_beagle_init(void)
         omap_serial_init();
 
         omap_mux_init_gpio(170, OMAP_PIN_INPUT);
-        gpio_request(170, "DVI_nPD");
         /* REVISIT leave DVI powered down until it's needed ... */
-        gpio_direction_output(170, true);
+        gpio_request_one(170, GPIOF_OUT_INIT_HIGH, "DVI_nPD");
 
-        usb_musb_init(&musb_board_data);
+        usb_musb_init(NULL);
         usbhs_init(&usbhs_bdata);
-        omap3beagle_flash_init();
+        omap_nand_flash_init(NAND_BUSWIDTH_16, omap3beagle_nand_partitions,
+                             ARRAY_SIZE(omap3beagle_nand_partitions));
 
         /* Ensure SDRC pins are mux'd for self-refresh */
         omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 7f94cccdb076..b4d43464a303 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -50,6 +50,7 @@
 #include "mux.h"
 #include "sdram-micron-mt46h32m32lf-6.h"
 #include "hsmmc.h"
+#include "common-board-devices.h"
 
 #define OMAP3_EVM_TS_GPIO       175
 #define OMAP3_EVM_EHCI_VBUS     22
@@ -101,49 +102,20 @@ static void __init omap3_evm_get_revision(void)
 }
 
 #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
-static struct resource omap3evm_smsc911x_resources[] = {
-        [0] =   {
-                .start  = OMAP3EVM_ETHR_START,
-                .end    = (OMAP3EVM_ETHR_START + OMAP3EVM_ETHR_SIZE - 1),
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] =   {
-                .start  = OMAP_GPIO_IRQ(OMAP3EVM_ETHR_GPIO_IRQ),
-                .end    = OMAP_GPIO_IRQ(OMAP3EVM_ETHR_GPIO_IRQ),
-                .flags  = (IORESOURCE_IRQ | IRQF_TRIGGER_LOW),
-        },
-};
+#include <plat/gpmc-smsc911x.h>
 
-static struct smsc911x_platform_config smsc911x_config = {
-        .phy_interface  = PHY_INTERFACE_MODE_MII,
-        .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
-        .irq_type       = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
-        .flags          = (SMSC911X_USE_32BIT | SMSC911X_SAVE_MAC_ADDRESS),
-};
-
-static struct platform_device omap3evm_smsc911x_device = {
-        .name           = "smsc911x",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(omap3evm_smsc911x_resources),
-        .resource       = &omap3evm_smsc911x_resources[0],
-        .dev            = {
-                .platform_data = &smsc911x_config,
-        },
+static struct omap_smsc911x_platform_data smsc911x_cfg = {
+        .cs             = OMAP3EVM_SMSC911X_CS,
+        .gpio_irq       = OMAP3EVM_ETHR_GPIO_IRQ,
+        .gpio_reset     = -EINVAL,
+        .flags          = SMSC911X_USE_32BIT | SMSC911X_SAVE_MAC_ADDRESS,
 };
 
 static inline void __init omap3evm_init_smsc911x(void)
 {
-        int eth_cs, eth_rst;
         struct clk *l3ck;
         unsigned int rate;
 
-        if (get_omap3_evm_rev() == OMAP3EVM_BOARD_GEN_1)
-                eth_rst = OMAP3EVM_GEN1_ETHR_GPIO_RST;
-        else
-                eth_rst = OMAP3EVM_GEN2_ETHR_GPIO_RST;
-
-        eth_cs = OMAP3EVM_SMSC911X_CS;
-
         l3ck = clk_get(NULL, "l3_ck");
         if (IS_ERR(l3ck))
                 rate = 100000000;
@@ -152,33 +124,13 @@ static inline void __init omap3evm_init_smsc911x(void)
 
         /* Configure ethernet controller reset gpio */
         if (cpu_is_omap3430()) {
-                if (gpio_request(eth_rst, "SMSC911x gpio") < 0) {
-                        pr_err(KERN_ERR "Failed to request %d for smsc911x\n",
-                                        eth_rst);
-                        return;
-                }
-
-                if (gpio_direction_output(eth_rst, 1) < 0) {
-                        pr_err(KERN_ERR "Failed to set direction of %d for" \
-                                        " smsc911x\n", eth_rst);
-                        return;
-                }
-                /* reset pulse to ethernet controller*/
-                usleep_range(150, 220);
-                gpio_set_value(eth_rst, 0);
-                usleep_range(150, 220);
-                gpio_set_value(eth_rst, 1);
-                usleep_range(1, 2);
-        }
-
-        if (gpio_request(OMAP3EVM_ETHR_GPIO_IRQ, "SMSC911x irq") < 0) {
-                printk(KERN_ERR "Failed to request GPIO%d for smsc911x IRQ\n",
-                        OMAP3EVM_ETHR_GPIO_IRQ);
-                return;
+                if (get_omap3_evm_rev() == OMAP3EVM_BOARD_GEN_1)
+                        smsc911x_cfg.gpio_reset = OMAP3EVM_GEN1_ETHR_GPIO_RST;
+                else
+                        smsc911x_cfg.gpio_reset = OMAP3EVM_GEN2_ETHR_GPIO_RST;
         }
 
-        gpio_direction_input(OMAP3EVM_ETHR_GPIO_IRQ);
-        platform_device_register(&omap3evm_smsc911x_device);
+        gpmc_smsc911x_init(&smsc911x_cfg);
 }
 
 #else
@@ -197,6 +149,15 @@ static inline void __init omap3evm_init_smsc911x(void) { return; }
 #define OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO 210
 #define OMAP3EVM_DVI_PANEL_EN_GPIO      199
 
+static struct gpio omap3_evm_dss_gpios[] __initdata = {
+        { OMAP3EVM_LCD_PANEL_RESB,  GPIOF_OUT_INIT_HIGH, "lcd_panel_resb"  },
+        { OMAP3EVM_LCD_PANEL_INI,   GPIOF_OUT_INIT_HIGH, "lcd_panel_ini"   },
+        { OMAP3EVM_LCD_PANEL_QVGA,  GPIOF_OUT_INIT_LOW,  "lcd_panel_qvga"  },
+        { OMAP3EVM_LCD_PANEL_LR,    GPIOF_OUT_INIT_HIGH, "lcd_panel_lr"    },
+        { OMAP3EVM_LCD_PANEL_UD,    GPIOF_OUT_INIT_HIGH, "lcd_panel_ud"    },
+        { OMAP3EVM_LCD_PANEL_ENVDD, GPIOF_OUT_INIT_LOW,  "lcd_panel_envdd" },
+};
+
 static int lcd_enabled;
 static int dvi_enabled;
 
@@ -204,61 +165,10 @@ static void __init omap3_evm_display_init(void)
 {
         int r;
 
-        r = gpio_request(OMAP3EVM_LCD_PANEL_RESB, "lcd_panel_resb");
-        if (r) {
-                printk(KERN_ERR "failed to get lcd_panel_resb\n");
-                return;
-        }
-        gpio_direction_output(OMAP3EVM_LCD_PANEL_RESB, 1);
-
-        r = gpio_request(OMAP3EVM_LCD_PANEL_INI, "lcd_panel_ini");
-        if (r) {
-                printk(KERN_ERR "failed to get lcd_panel_ini\n");
-                goto err_1;
-        }
-        gpio_direction_output(OMAP3EVM_LCD_PANEL_INI, 1);
-
-        r = gpio_request(OMAP3EVM_LCD_PANEL_QVGA, "lcd_panel_qvga");
-        if (r) {
-                printk(KERN_ERR "failed to get lcd_panel_qvga\n");
-                goto err_2;
-        }
-        gpio_direction_output(OMAP3EVM_LCD_PANEL_QVGA, 0);
-
-        r = gpio_request(OMAP3EVM_LCD_PANEL_LR, "lcd_panel_lr");
-        if (r) {
-                printk(KERN_ERR "failed to get lcd_panel_lr\n");
-                goto err_3;
-        }
-        gpio_direction_output(OMAP3EVM_LCD_PANEL_LR, 1);
-
-        r = gpio_request(OMAP3EVM_LCD_PANEL_UD, "lcd_panel_ud");
-        if (r) {
-                printk(KERN_ERR "failed to get lcd_panel_ud\n");
-                goto err_4;
-        }
-        gpio_direction_output(OMAP3EVM_LCD_PANEL_UD, 1);
-
-        r = gpio_request(OMAP3EVM_LCD_PANEL_ENVDD, "lcd_panel_envdd");
-        if (r) {
-                printk(KERN_ERR "failed to get lcd_panel_envdd\n");
-                goto err_5;
-        }
-        gpio_direction_output(OMAP3EVM_LCD_PANEL_ENVDD, 0);
-
-        return;
-
-err_5:
-        gpio_free(OMAP3EVM_LCD_PANEL_UD);
-err_4:
-        gpio_free(OMAP3EVM_LCD_PANEL_LR);
-err_3:
-        gpio_free(OMAP3EVM_LCD_PANEL_QVGA);
-err_2:
-        gpio_free(OMAP3EVM_LCD_PANEL_INI);
-err_1:
-        gpio_free(OMAP3EVM_LCD_PANEL_RESB);
-
+        r = gpio_request_array(omap3_evm_dss_gpios,
+                               ARRAY_SIZE(omap3_evm_dss_gpios));
+        if (r)
+                printk(KERN_ERR "failed to get lcd_panel_* gpios\n");
 }
 
 static int omap3_evm_enable_lcd(struct omap_dss_device *dssdev)
@@ -448,7 +358,7 @@ static struct platform_device leds_gpio = {
 static int omap3evm_twl_gpio_setup(struct device *dev,
                 unsigned gpio, unsigned ngpio)
 {
-        int r;
+        int r, lcd_bl_en;
 
         /* gpio + 0 is "mmc0_cd" (input/IRQ) */
         omap_mux_init_gpio(63, OMAP_PIN_INPUT);
@@ -465,16 +375,14 @@ static int omap3evm_twl_gpio_setup(struct device *dev,
          */
 
         /* TWL4030_GPIO_MAX + 0 == ledA, LCD Backlight control */
-        r = gpio_request(gpio + TWL4030_GPIO_MAX, "EN_LCD_BKL");
-        if (!r)
-                r = gpio_direction_output(gpio + TWL4030_GPIO_MAX,
-                        (get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2) ? 1 : 0);
+        lcd_bl_en = get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2 ?
+                GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW;
+        r = gpio_request_one(gpio + TWL4030_GPIO_MAX, lcd_bl_en, "EN_LCD_BKL");
         if (r)
                 printk(KERN_ERR "failed to get/set lcd_bkl gpio\n");
 
         /* gpio + 7 == DVI Enable */
-        gpio_request(gpio + 7, "EN_DVI");
-        gpio_direction_output(gpio + 7, 0);
+        gpio_request_one(gpio + 7, GPIOF_OUT_INIT_LOW, "EN_DVI");
 
         /* TWL4030_GPIO_MAX + 1 == ledB (out, active low LED) */
         gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
@@ -652,78 +560,18 @@ static struct twl4030_platform_data omap3evm_twldata = {
         .vdac           = &omap3_evm_vdac,
         .vpll2          = &omap3_evm_vpll2,
         .vio            = &omap3evm_vio,
-};
-
-static struct i2c_board_info __initdata omap3evm_i2c_boardinfo[] = {
-        {
-                I2C_BOARD_INFO("twl4030", 0x48),
-                .flags = I2C_CLIENT_WAKE,
-                .irq = INT_34XX_SYS_NIRQ,
-                .platform_data = &omap3evm_twldata,
-        },
+        .vmmc1          = &omap3evm_vmmc1,
+        .vsim           = &omap3evm_vsim,
 };
 
 static int __init omap3_evm_i2c_init(void)
 {
-        /*
-         * REVISIT: These entries can be set in omap3evm_twl_data
-         * after a merge with MFD tree
-         */
-        omap3evm_twldata.vmmc1 = &omap3evm_vmmc1;
-        omap3evm_twldata.vsim = &omap3evm_vsim;
-
-        omap_register_i2c_bus(1, 2600, omap3evm_i2c_boardinfo,
-                        ARRAY_SIZE(omap3evm_i2c_boardinfo));
+        omap3_pmic_init("twl4030", &omap3evm_twldata);
         omap_register_i2c_bus(2, 400, NULL, 0);
         omap_register_i2c_bus(3, 400, NULL, 0);
         return 0;
 }
 
-static void ads7846_dev_init(void)
-{
-        if (gpio_request(OMAP3_EVM_TS_GPIO, "ADS7846 pendown") < 0)
-                printk(KERN_ERR "can't get ads7846 pen down GPIO\n");
-
-        gpio_direction_input(OMAP3_EVM_TS_GPIO);
-        gpio_set_debounce(OMAP3_EVM_TS_GPIO, 310);
-}
-
-static int ads7846_get_pendown_state(void)
-{
-        return !gpio_get_value(OMAP3_EVM_TS_GPIO);
-}
-
-static struct ads7846_platform_data ads7846_config = {
-        .x_max                  = 0x0fff,
-        .y_max                  = 0x0fff,
-        .x_plate_ohms           = 180,
-        .pressure_max           = 255,
-        .debounce_max           = 10,
-        .debounce_tol           = 3,
-        .debounce_rep           = 1,
-        .get_pendown_state      = ads7846_get_pendown_state,
-        .keep_vref_on           = 1,
-        .settle_delay_usecs     = 150,
-        .wakeup                         = true,
-};
-
-static struct omap2_mcspi_device_config ads7846_mcspi_config = {
-        .turbo_mode     = 0,
-        .single_channel = 1,    /* 0: slave, 1: master */
-};
-
-static struct spi_board_info omap3evm_spi_board_info[] = {
-        [0] = {
-                .modalias               = "ads7846",
-                .bus_num                = 1,
-                .chip_select            = 0,
-                .max_speed_hz           = 1500000,
-                .controller_data        = &ads7846_mcspi_config,
-                .irq                    = OMAP_GPIO_IRQ(OMAP3_EVM_TS_GPIO),
-                .platform_data          = &ads7846_config,
-        },
-};
-
 static struct omap_board_config_kernel omap3_evm_config[] __initdata = {
 };
 
@@ -825,6 +673,11 @@ static struct omap_musb_board_data musb_board_data = {
         .power                  = 100,
 };
 
+static struct gpio omap3_evm_ehci_gpios[] __initdata = {
+        { OMAP3_EVM_EHCI_VBUS,   GPIOF_OUT_INIT_HIGH,  "enable EHCI VBUS" },
+        { OMAP3_EVM_EHCI_SELECT, GPIOF_OUT_INIT_LOW,   "select EHCI port" },
+};
+
 static void __init omap3_evm_init(void)
 {
         omap3_evm_get_revision();
@@ -841,9 +694,6 @@ static void __init omap3_evm_init(void)
 
         omap_display_init(&omap3_evm_dss_data);
 
-        spi_register_board_info(omap3evm_spi_board_info,
-                                ARRAY_SIZE(omap3evm_spi_board_info));
-
         omap_serial_init();
 
         /* OMAP3EVM uses ISP1504 phy and so register nop transceiver */
@@ -851,16 +701,12 @@ static void __init omap3_evm_init(void)
 
         if (get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2) {
                 /* enable EHCI VBUS using GPIO22 */
-                omap_mux_init_gpio(22, OMAP_PIN_INPUT_PULLUP);
-                gpio_request(OMAP3_EVM_EHCI_VBUS, "enable EHCI VBUS");
-                gpio_direction_output(OMAP3_EVM_EHCI_VBUS, 0);
-                gpio_set_value(OMAP3_EVM_EHCI_VBUS, 1);
-
+                omap_mux_init_gpio(OMAP3_EVM_EHCI_VBUS, OMAP_PIN_INPUT_PULLUP);
                 /* Select EHCI port on main board */
-                omap_mux_init_gpio(61, OMAP_PIN_INPUT_PULLUP);
-                gpio_request(OMAP3_EVM_EHCI_SELECT, "select EHCI port");
-                gpio_direction_output(OMAP3_EVM_EHCI_SELECT, 0);
-                gpio_set_value(OMAP3_EVM_EHCI_SELECT, 0);
+                omap_mux_init_gpio(OMAP3_EVM_EHCI_SELECT,
+                                   OMAP_PIN_INPUT_PULLUP);
+                gpio_request_array(omap3_evm_ehci_gpios,
+                                   ARRAY_SIZE(omap3_evm_ehci_gpios));
 
                 /* setup EHCI phy reset config */
                 omap_mux_init_gpio(21, OMAP_PIN_INPUT_PULLUP);
@@ -876,7 +722,7 @@ static void __init omap3_evm_init(void)
         }
         usb_musb_init(&musb_board_data);
         usbhs_init(&usbhs_bdata);
-        ads7846_dev_init();
+        omap_ads7846_init(1, OMAP3_EVM_TS_GPIO, 310, NULL);
         omap3evm_init_smsc911x();
         omap3_evm_display_init();
 
diff --git a/arch/arm/mach-omap2/board-omap3logic.c b/arch/arm/mach-omap2/board-omap3logic.c
index b726943d7c93..60d9be49dbab 100644
--- a/arch/arm/mach-omap2/board-omap3logic.c
+++ b/arch/arm/mach-omap2/board-omap3logic.c
@@ -37,6 +37,7 @@
 #include "hsmmc.h"
 #include "timer-gp.h"
 #include "control.h"
+#include "common-board-devices.h"
 
 #include <plat/mux.h>
 #include <plat/board.h>
@@ -93,19 +94,9 @@ static struct twl4030_platform_data omap3logic_twldata = {
         .vmmc1          = &omap3logic_vmmc1,
 };
 
-static struct i2c_board_info __initdata omap3logic_i2c_boardinfo[] = {
-        {
-                I2C_BOARD_INFO("twl4030", 0x48),
-                .flags = I2C_CLIENT_WAKE,
-                .irq = INT_34XX_SYS_NIRQ,
-                .platform_data = &omap3logic_twldata,
-        },
-};
-
 static int __init omap3logic_i2c_init(void)
 {
-        omap_register_i2c_bus(1, 2600, omap3logic_i2c_boardinfo,
-                                ARRAY_SIZE(omap3logic_i2c_boardinfo));
+        omap3_pmic_init("twl4030", &omap3logic_twldata);
         return 0;
 }
 
@@ -147,7 +138,6 @@ static struct omap_smsc911x_platform_data __initdata board_smsc911x_data = {
         .cs             = OMAP3LOGIC_SMSC911X_CS,
         .gpio_irq       = -EINVAL,
         .gpio_reset     = -EINVAL,
-        .flags          = IORESOURCE_IRQ_LOWLEVEL,
 };
 
 /* TODO/FIXME (comment by Peter Barada, LogicPD):
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index 1db15492d82b..1d10736c6d3c 100644
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -22,7 +22,6 @@
 #include <linux/platform_device.h>
 
 #include <linux/spi/spi.h>
-#include <linux/spi/ads7846.h>
 #include <linux/regulator/machine.h>
 #include <linux/i2c/twl.h>
 #include <linux/wl12xx.h>
@@ -52,6 +51,7 @@
 #include "mux.h"
 #include "sdram-micron-mt46h32m32lf-6.h"
 #include "hsmmc.h"
+#include "common-board-devices.h"
 
 #define PANDORA_WIFI_IRQ_GPIO           21
 #define PANDORA_WIFI_NRESET_GPIO        23
@@ -305,24 +305,13 @@ static int omap3pandora_twl_gpio_setup(struct device *dev,
 
         /* gpio + 13 drives 32kHz buffer for wifi module */
         gpio_32khz = gpio + 13;
-        ret = gpio_request(gpio_32khz, "wifi 32kHz");
+        ret = gpio_request_one(gpio_32khz, GPIOF_OUT_INIT_HIGH, "wifi 32kHz");
         if (ret < 0) {
                 pr_err("Cannot get GPIO line %d, ret=%d\n", gpio_32khz, ret);
-                goto fail;
-        }
-
-        ret = gpio_direction_output(gpio_32khz, 1);
-        if (ret < 0) {
-                pr_err("Cannot set GPIO line %d, ret=%d\n", gpio_32khz, ret);
-                goto fail_direction;
+                return -ENODEV;
         }
 
         return 0;
-
-fail_direction:
-        gpio_free(gpio_32khz);
-fail:
-        return -ENODEV;
 }
 
 static struct twl4030_gpio_platform_data omap3pandora_gpio_data = {
@@ -544,15 +533,6 @@ static struct twl4030_platform_data omap3pandora_twldata = {
         .bci            = &pandora_bci_data,
 };
 
-static struct i2c_board_info __initdata omap3pandora_i2c_boardinfo[] = {
-        {
-                I2C_BOARD_INFO("tps65950", 0x48),
-                .flags = I2C_CLIENT_WAKE,
-                .irq = INT_34XX_SYS_NIRQ,
-                .platform_data = &omap3pandora_twldata,
-        },
-};
-
 static struct i2c_board_info __initdata omap3pandora_i2c3_boardinfo[] = {
         {
                 I2C_BOARD_INFO("bq27500", 0x55),
@@ -562,61 +542,15 @@ static struct i2c_board_info __initdata omap3pandora_i2c3_boardinfo[] = {
 
 static int __init omap3pandora_i2c_init(void)
 {
-        omap_register_i2c_bus(1, 2600, omap3pandora_i2c_boardinfo,
-                        ARRAY_SIZE(omap3pandora_i2c_boardinfo));
+        omap3_pmic_init("tps65950", &omap3pandora_twldata);
         /* i2c2 pins are not connected */
         omap_register_i2c_bus(3, 100, omap3pandora_i2c3_boardinfo,
                         ARRAY_SIZE(omap3pandora_i2c3_boardinfo));
         return 0;
 }
 
-static void __init omap3pandora_ads7846_init(void)
-{
-        int gpio = OMAP3_PANDORA_TS_GPIO;
-        int ret;
-
-        ret = gpio_request(gpio, "ads7846_pen_down");
-        if (ret < 0) {
-                printk(KERN_ERR "Failed to request GPIO %d for "
-                                "ads7846 pen down IRQ\n", gpio);
-                return;
-        }
-
-        gpio_direction_input(gpio);
-}
-
-static int ads7846_get_pendown_state(void)
-{
-        return !gpio_get_value(OMAP3_PANDORA_TS_GPIO);
-}
-
-static struct ads7846_platform_data ads7846_config = {
-        .x_max                  = 0x0fff,
-        .y_max                  = 0x0fff,
-        .x_plate_ohms           = 180,
-        .pressure_max           = 255,
-        .debounce_max           = 10,
-        .debounce_tol           = 3,
-        .debounce_rep           = 1,
-        .get_pendown_state      = ads7846_get_pendown_state,
-        .keep_vref_on           = 1,
-};
-
-static struct omap2_mcspi_device_config ads7846_mcspi_config = {
-        .turbo_mode     = 0,
-        .single_channel = 1,    /* 0: slave, 1: master */
-};
-
 static struct spi_board_info omap3pandora_spi_board_info[] __initdata = {
         {
-                .modalias               = "ads7846",
-                .bus_num                = 1,
-                .chip_select            = 0,
-                .max_speed_hz           = 1500000,
-                .controller_data        = &ads7846_mcspi_config,
-                .irq                    = OMAP_GPIO_IRQ(OMAP3_PANDORA_TS_GPIO),
-                .platform_data          = &ads7846_config,
-        }, {
                 .modalias               = "tpo_td043mtea1_panel_spi",
                 .bus_num                = 1,
                 .chip_select            = 1,
@@ -639,14 +573,10 @@ static void __init pandora_wl1251_init(void)
 
         memset(&pandora_wl1251_pdata, 0, sizeof(pandora_wl1251_pdata));
 
-        ret = gpio_request(PANDORA_WIFI_IRQ_GPIO, "wl1251 irq");
+        ret = gpio_request_one(PANDORA_WIFI_IRQ_GPIO, GPIOF_IN, "wl1251 irq");
         if (ret < 0)
                 goto fail;
 
-        ret = gpio_direction_input(PANDORA_WIFI_IRQ_GPIO);
-        if (ret < 0)
-                goto fail_irq;
-
         pandora_wl1251_pdata.irq = gpio_to_irq(PANDORA_WIFI_IRQ_GPIO);
         if (pandora_wl1251_pdata.irq < 0)
                 goto fail_irq;
@@ -688,12 +618,6 @@ static struct omap_board_mux board_mux[] __initdata = {
 };
 #endif
 
-static struct omap_musb_board_data musb_board_data = {
-        .interface_type         = MUSB_INTERFACE_ULPI,
-        .mode                   = MUSB_OTG,
-        .power                  = 100,
-};
-
 static void __init omap3pandora_init(void)
 {
         omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
@@ -705,9 +629,9 @@ static void __init omap3pandora_init(void)
         omap_serial_init();
         spi_register_board_info(omap3pandora_spi_board_info,
                         ARRAY_SIZE(omap3pandora_spi_board_info));
-        omap3pandora_ads7846_init();
+        omap_ads7846_init(1, OMAP3_PANDORA_TS_GPIO, 0, NULL);
         usbhs_init(&usbhs_bdata);
-        usb_musb_init(&musb_board_data);
+        usb_musb_init(NULL);
         gpmc_nand_init(&pandora_nand_data);
 
         /* Ensure SDRC pins are mux'd for self-refresh */
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
index a72c90a08c8a..0c108a212ea2 100644
--- a/arch/arm/mach-omap2/board-omap3stalker.c
+++ b/arch/arm/mach-omap2/board-omap3stalker.c
@@ -45,7 +45,6 @@
 #include <plat/mcspi.h>
 #include <linux/input/matrix_keypad.h>
 #include <linux/spi/spi.h>
-#include <linux/spi/ads7846.h>
 #include <linux/interrupt.h>
 #include <linux/smsc911x.h>
 #include <linux/i2c/at24.h>
@@ -54,52 +53,28 @@
 #include "mux.h"
 #include "hsmmc.h"
 #include "timer-gp.h"
+#include "common-board-devices.h"
 
 #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
+#include <plat/gpmc-smsc911x.h>
+
 #define OMAP3STALKER_ETHR_START 0x2c000000
 #define OMAP3STALKER_ETHR_SIZE  1024
 #define OMAP3STALKER_ETHR_GPIO_IRQ      19
 #define OMAP3STALKER_SMC911X_CS 5
 
-static struct resource omap3stalker_smsc911x_resources[] = {
-        [0] = {
-               .start   = OMAP3STALKER_ETHR_START,
-               .end     =
-               (OMAP3STALKER_ETHR_START + OMAP3STALKER_ETHR_SIZE - 1),
-               .flags   = IORESOURCE_MEM,
-        },
-        [1] = {
-               .start   = OMAP_GPIO_IRQ(OMAP3STALKER_ETHR_GPIO_IRQ),
-               .end     = OMAP_GPIO_IRQ(OMAP3STALKER_ETHR_GPIO_IRQ),
-               .flags   = (IORESOURCE_IRQ | IRQF_TRIGGER_LOW),
-        },
-};
-
-static struct smsc911x_platform_config smsc911x_config = {
-        .phy_interface  = PHY_INTERFACE_MODE_MII,
-        .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
-        .irq_type       = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
+static struct omap_smsc911x_platform_data smsc911x_cfg = {
+        .cs             = OMAP3STALKER_SMC911X_CS,
+        .gpio_irq       = OMAP3STALKER_ETHR_GPIO_IRQ,
+        .gpio_reset     = -EINVAL,
         .flags          = (SMSC911X_USE_32BIT | SMSC911X_SAVE_MAC_ADDRESS),
 };
 
-static struct platform_device omap3stalker_smsc911x_device = {
-        .name           = "smsc911x",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(omap3stalker_smsc911x_resources),
-        .resource       = &omap3stalker_smsc911x_resources[0],
-        .dev            = {
-                .platform_data  = &smsc911x_config,
-        },
-};
-
 static inline void __init omap3stalker_init_eth(void)
 {
-        int eth_cs;
         struct clk *l3ck;
         unsigned int rate;
 
-        eth_cs = OMAP3STALKER_SMC911X_CS;
-
         l3ck = clk_get(NULL, "l3_ck");
         if (IS_ERR(l3ck))
                 rate = 100000000;
@@ -107,16 +82,7 @@ static inline void __init omap3stalker_init_eth(void)
                 rate = clk_get_rate(l3ck);
 
         omap_mux_init_gpio(19, OMAP_PIN_INPUT_PULLUP);
-        if (gpio_request(OMAP3STALKER_ETHR_GPIO_IRQ, "SMC911x irq") < 0) {
-                printk(KERN_ERR
-                       "Failed to request GPIO%d for smc911x IRQ\n",
-                       OMAP3STALKER_ETHR_GPIO_IRQ);
-                return;
-        }
-
-        gpio_direction_input(OMAP3STALKER_ETHR_GPIO_IRQ);
-
-        platform_device_register(&omap3stalker_smsc911x_device);
+        gpmc_smsc911x_init(&smsc911x_cfg);
 }
 
 #else
@@ -365,12 +331,11 @@ omap3stalker_twl_gpio_setup(struct device *dev,
          */
 
         /* TWL4030_GPIO_MAX + 0 == ledA, LCD Backlight control */
-        gpio_request(gpio + TWL4030_GPIO_MAX, "EN_LCD_BKL");
-        gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0);
+        gpio_request_one(gpio + TWL4030_GPIO_MAX, GPIOF_OUT_INIT_LOW,
+                         "EN_LCD_BKL");
 
         /* gpio + 7 == DVI Enable */
-        gpio_request(gpio + 7, "EN_DVI");
-        gpio_direction_output(gpio + 7, 0);
+        gpio_request_one(gpio + 7, GPIOF_OUT_INIT_LOW, "EN_DVI");
 
         /* TWL4030_GPIO_MAX + 1 == ledB (out, mmc0) */
         gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
@@ -489,15 +454,8 @@ static struct twl4030_platform_data omap3stalker_twldata = {
         .codec          = &omap3stalker_codec_data,
         .vdac           = &omap3_stalker_vdac,
         .vpll2          = &omap3_stalker_vpll2,
-};
-
-static struct i2c_board_info __initdata omap3stalker_i2c_boardinfo[] = {
-        {
-         I2C_BOARD_INFO("twl4030", 0x48),
-         .flags         = I2C_CLIENT_WAKE,
-         .irq           = INT_34XX_SYS_NIRQ,
-         .platform_data = &omap3stalker_twldata,
-         },
+        .vmmc1          = &omap3stalker_vmmc1,
+        .vsim           = &omap3stalker_vsim,
 };
 
 static struct at24_platform_data fram_info = {
@@ -516,15 +474,7 @@ static struct i2c_board_info __initdata omap3stalker_i2c_boardinfo3[] = {
 
 static int __init omap3_stalker_i2c_init(void)
 {
-        /*
-         * REVISIT: These entries can be set in omap3evm_twl_data
-         * after a merge with MFD tree
-         */
-        omap3stalker_twldata.vmmc1 = &omap3stalker_vmmc1;
-        omap3stalker_twldata.vsim = &omap3stalker_vsim;
-
-        omap_register_i2c_bus(1, 2600, omap3stalker_i2c_boardinfo,
-                              ARRAY_SIZE(omap3stalker_i2c_boardinfo));
+        omap3_pmic_init("twl4030", &omap3stalker_twldata);
         omap_register_i2c_bus(2, 400, NULL, 0);
         omap_register_i2c_bus(3, 400, omap3stalker_i2c_boardinfo3,
                               ARRAY_SIZE(omap3stalker_i2c_boardinfo3));
@@ -532,49 +482,6 @@ static int __init omap3_stalker_i2c_init(void)
 }
 
 #define OMAP3_STALKER_TS_GPIO   175
-static void ads7846_dev_init(void)
-{
-        if (gpio_request(OMAP3_STALKER_TS_GPIO, "ADS7846 pendown") < 0)
-                printk(KERN_ERR "can't get ads7846 pen down GPIO\n");
-
-        gpio_direction_input(OMAP3_STALKER_TS_GPIO);
-        gpio_set_debounce(OMAP3_STALKER_TS_GPIO, 310);
-}
-
-static int ads7846_get_pendown_state(void)
-{
-        return !gpio_get_value(OMAP3_STALKER_TS_GPIO);
-}
-
-static struct ads7846_platform_data ads7846_config = {
-        .x_max                  = 0x0fff,
-        .y_max                  = 0x0fff,
-        .x_plate_ohms           = 180,
-        .pressure_max           = 255,
-        .debounce_max           = 10,
-        .debounce_tol           = 3,
-        .debounce_rep           = 1,
-        .get_pendown_state      = ads7846_get_pendown_state,
-        .keep_vref_on           = 1,
-        .settle_delay_usecs     = 150,
-};
-
-static struct omap2_mcspi_device_config ads7846_mcspi_config = {
-        .turbo_mode             = 0,
-        .single_channel         = 1,    /* 0: slave, 1: master */
-};
-
-static struct spi_board_info omap3stalker_spi_board_info[] = {
-        [0] = {
-               .modalias        = "ads7846",
-               .bus_num         = 1,
-               .chip_select     = 0,
-               .max_speed_hz    = 1500000,
-               .controller_data = &ads7846_mcspi_config,
-               .irq             = OMAP_GPIO_IRQ(OMAP3_STALKER_TS_GPIO),
-               .platform_data   = &ads7846_config,
-        },
-};
 
 static struct omap_board_config_kernel omap3_stalker_config[] __initdata = {
 };
@@ -618,12 +525,6 @@ static struct omap_board_mux board_mux[] __initdata = {
 };
 #endif
 
-static struct omap_musb_board_data musb_board_data = {
-        .interface_type = MUSB_INTERFACE_ULPI,
-        .mode           = MUSB_OTG,
-        .power          = 100,
-};
-
 static void __init omap3_stalker_init(void)
 {
         omap3_mux_init(board_mux, OMAP_PACKAGE_CUS);
@@ -636,13 +537,11 @@ static void __init omap3_stalker_init(void)
                              ARRAY_SIZE(omap3_stalker_devices));
 
         omap_display_init(&omap3_stalker_dss_data);
-        spi_register_board_info(omap3stalker_spi_board_info,
-                                ARRAY_SIZE(omap3stalker_spi_board_info));
 
         omap_serial_init();
-        usb_musb_init(&musb_board_data);
+        usb_musb_init(NULL);
         usbhs_init(&usbhs_bdata);
-        ads7846_dev_init();
+        omap_ads7846_init(1, OMAP3_STALKER_TS_GPIO, 310, NULL);
 
         omap_mux_init_gpio(21, OMAP_PIN_OUTPUT);
         omap_mux_init_gpio(18, OMAP_PIN_INPUT_PULLUP);
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c
index 127cb1752bdd..82872d7d313b 100644
--- a/arch/arm/mach-omap2/board-omap3touchbook.c
+++ b/arch/arm/mach-omap2/board-omap3touchbook.c
@@ -52,6 +52,7 @@
 #include "mux.h"
 #include "hsmmc.h"
 #include "timer-gp.h"
+#include "common-board-devices.h"
 
 #include <asm/setup.h>
 
@@ -95,15 +96,6 @@ static struct mtd_partition omap3touchbook_nand_partitions[] = {
         },
 };
 
-static struct omap_nand_platform_data omap3touchbook_nand_data = {
-        .options        = NAND_BUSWIDTH_16,
-        .parts          = omap3touchbook_nand_partitions,
-        .nr_parts       = ARRAY_SIZE(omap3touchbook_nand_partitions),
-        .dma_channel    = -1,           /* disable DMA in OMAP NAND driver */
-        .nand_setup     = NULL,
-        .dev_ready      = NULL,
-};
-
 #include "sdram-micron-mt46h32m32lf-6.h"
 
 static struct omap2_hsmmc_info mmc[] = {
@@ -154,13 +146,11 @@ static int touchbook_twl_gpio_setup(struct device *dev,
         /* REVISIT: need ehci-omap hooks for external VBUS
          * power switch and overcurrent detect
          */
-
-        gpio_request(gpio + 1, "EHCI_nOC");
-        gpio_direction_input(gpio + 1);
+        gpio_request_one(gpio + 1, GPIOF_IN, "EHCI_nOC");
 
         /* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */
-        gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR");
-        gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0);
+        gpio_request_one(gpio + TWL4030_GPIO_MAX, GPIOF_OUT_INIT_LOW,
+                         "nEN_USB_PWR");
 
         /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
         gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
@@ -273,15 +263,6 @@ static struct twl4030_platform_data touchbook_twldata = {
         .vpll2          = &touchbook_vpll2,
 };
 
-static struct i2c_board_info __initdata touchbook_i2c_boardinfo[] = {
-        {
-                I2C_BOARD_INFO("twl4030", 0x48),
-                .flags = I2C_CLIENT_WAKE,
-                .irq = INT_34XX_SYS_NIRQ,
-                .platform_data = &touchbook_twldata,
-        },
-};
-
 static struct i2c_board_info __initdata touchBook_i2c_boardinfo[] = {
         {
                 I2C_BOARD_INFO("bq27200", 0x55),
@@ -291,8 +272,7 @@ static struct i2c_board_info __initdata touchBook_i2c_boardinfo[] = {
 static int __init omap3_touchbook_i2c_init(void)
 {
         /* Standard TouchBook bus */
-        omap_register_i2c_bus(1, 2600, touchbook_i2c_boardinfo,
-                        ARRAY_SIZE(touchbook_i2c_boardinfo));
+        omap3_pmic_init("twl4030", &touchbook_twldata);
 
         /* Additional TouchBook bus */
         omap_register_i2c_bus(3, 100, touchBook_i2c_boardinfo,
@@ -301,19 +281,7 @@ static int __init omap3_touchbook_i2c_init(void)
         return 0;
 }
 
-static void __init omap3_ads7846_init(void)
-{
-        if (gpio_request(OMAP3_TS_GPIO, "ads7846_pen_down")) {
-                printk(KERN_ERR "Failed to request GPIO %d for "
-                                "ads7846 pen down IRQ\n", OMAP3_TS_GPIO);
-                return;
-        }
-
-        gpio_direction_input(OMAP3_TS_GPIO);
-        gpio_set_debounce(OMAP3_TS_GPIO, 310);
-}
-
-static struct ads7846_platform_data ads7846_config = {
+static struct ads7846_platform_data ads7846_pdata = {
         .x_min                  = 100,
         .y_min                  = 265,
         .x_max                  = 3950,
@@ -327,23 +295,6 @@ static struct ads7846_platform_data ads7846_config = {
         .keep_vref_on           = 1,
 };
 
-static struct omap2_mcspi_device_config ads7846_mcspi_config = {
-        .turbo_mode     = 0,
-        .single_channel = 1,    /* 0: slave, 1: master */
-};
-
-static struct spi_board_info omap3_ads7846_spi_board_info[] __initdata = {
-        {
-                .modalias               = "ads7846",
-                .bus_num                = 4,
-                .chip_select            = 0,
-                .max_speed_hz           = 1500000,
-                .controller_data        = &ads7846_mcspi_config,
-                .irq                    = OMAP_GPIO_IRQ(OMAP3_TS_GPIO),
-                .platform_data          = &ads7846_config,
-        }
-};
-
 static struct gpio_led gpio_leds[] = {
         {
                 .name                   = "touchbook::usr0",
@@ -434,39 +385,6 @@ static struct platform_device *omap3_touchbook_devices[] __initdata = {
         &keys_gpio,
 };
 
-static void __init omap3touchbook_flash_init(void)
-{
-        u8 cs = 0;
-        u8 nandcs = GPMC_CS_NUM + 1;
-
-        /* find out the chip-select on which NAND exists */
-        while (cs < GPMC_CS_NUM) {
-                u32 ret = 0;
-                ret = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1);
-
-                if ((ret & 0xC00) == 0x800) {
-                        printk(KERN_INFO "Found NAND on CS%d\n", cs);
-                        if (nandcs > GPMC_CS_NUM)
-                                nandcs = cs;
-                }
-                cs++;
-        }
-
-        if (nandcs > GPMC_CS_NUM) {
-                printk(KERN_INFO "NAND: Unable to find configuration "
-                                 "in GPMC\n ");
-                return;
-        }
-
-        if (nandcs < GPMC_CS_NUM) {
-                omap3touchbook_nand_data.cs = nandcs;
-
-                printk(KERN_INFO "Registering NAND on CS%d\n", nandcs);
-                if (gpmc_nand_init(&omap3touchbook_nand_data) < 0)
-                        printk(KERN_ERR "Unable to register NAND device\n");
-        }
-}
-
 static const struct usbhs_omap_board_data usbhs_bdata __initconst = {
 
         .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
@@ -481,15 +399,10 @@ static const struct usbhs_omap_board_data usbhs_bdata __initconst = {
 
 static void omap3_touchbook_poweroff(void)
 {
-        int r;
+        int pwr_off = TB_KILL_POWER_GPIO;
 
-        r = gpio_request(TB_KILL_POWER_GPIO, "DVI reset");
-        if (r < 0) {
+        if (gpio_request_one(pwr_off, GPIOF_OUT_INIT_LOW, "DVI reset") < 0)
                 printk(KERN_ERR "Unable to get kill power GPIO\n");
-                return;
-        }
-
-        gpio_direction_output(TB_KILL_POWER_GPIO, 0);
 }
 
 static int __init early_touchbook_revision(char *p)
@@ -501,12 +414,6 @@ static int __init early_touchbook_revision(char *p)
 }
 early_param("tbr", early_touchbook_revision);
 
-static struct omap_musb_board_data musb_board_data = {
-        .interface_type         = MUSB_INTERFACE_ULPI,
-        .mode                   = MUSB_OTG,
-        .power                  = 100,
-};
-
 static void __init omap3_touchbook_init(void)
 {
         omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
@@ -521,17 +428,15 @@ static void __init omap3_touchbook_init(void)
         omap_serial_init();
 
         omap_mux_init_gpio(170, OMAP_PIN_INPUT);
-        gpio_request(176, "DVI_nPD");
         /* REVISIT leave DVI powered down until it's needed ... */
-        gpio_direction_output(176, true);
+        gpio_request_one(176, GPIOF_OUT_INIT_HIGH, "DVI_nPD");
 
         /* Touchscreen and accelerometer */
-        spi_register_board_info(omap3_ads7846_spi_board_info,
-                                ARRAY_SIZE(omap3_ads7846_spi_board_info));
-        omap3_ads7846_init();
-        usb_musb_init(&musb_board_data);
+        omap_ads7846_init(4, OMAP3_TS_GPIO, 310, &ads7846_pdata);
+        usb_musb_init(NULL);
         usbhs_init(&usbhs_bdata);
-        omap3touchbook_flash_init();
+        omap_nand_flash_init(NAND_BUSWIDTH_16, omap3touchbook_nand_partitions,
+                             ARRAY_SIZE(omap3touchbook_nand_partitions));
 
         /* Ensure SDRC pins are mux'd for self-refresh */
         omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index e4973ac77cbc..90485fced973 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -46,6 +46,7 @@
 #include "hsmmc.h"
 #include "control.h"
 #include "mux.h"
+#include "common-board-devices.h"
 
 #define GPIO_HUB_POWER          1
 #define GPIO_HUB_NRESET         62
@@ -111,6 +112,11 @@ static const struct usbhs_omap_board_data usbhs_bdata __initconst = {
         .reset_gpio_port[2]  = -EINVAL
 };
 
+static struct gpio panda_ehci_gpios[] __initdata = {
+        { GPIO_HUB_POWER,       GPIOF_OUT_INIT_LOW,  "hub_power"  },
+        { GPIO_HUB_NRESET,      GPIOF_OUT_INIT_LOW,  "hub_nreset" },
+};
+
 static void __init omap4_ehci_init(void)
 {
         int ret;
@@ -120,44 +126,27 @@ static void __init omap4_ehci_init(void)
         phy_ref_clk = clk_get(NULL, "auxclk3_ck");
         if (IS_ERR(phy_ref_clk)) {
                 pr_err("Cannot request auxclk3\n");
-                goto error1;
+                return;
         }
         clk_set_rate(phy_ref_clk, 19200000);
         clk_enable(phy_ref_clk);
 
-        /* disable the power to the usb hub prior to init */
-        ret = gpio_request(GPIO_HUB_POWER, "hub_power");
+        /* disable the power to the usb hub prior to init and reset phy+hub */
+        ret = gpio_request_array(panda_ehci_gpios,
+                                 ARRAY_SIZE(panda_ehci_gpios));
         if (ret) {
-                pr_err("Cannot request GPIO %d\n", GPIO_HUB_POWER);
-                goto error1;
+                pr_err("Unable to initialize EHCI power/reset\n");
+                return;
         }
-        gpio_export(GPIO_HUB_POWER, 0);
-        gpio_direction_output(GPIO_HUB_POWER, 0);
-        gpio_set_value(GPIO_HUB_POWER, 0);
 
-        /* reset phy+hub */
-        ret = gpio_request(GPIO_HUB_NRESET, "hub_nreset");
-        if (ret) {
-                pr_err("Cannot request GPIO %d\n", GPIO_HUB_NRESET);
-                goto error2;
-        }
+        gpio_export(GPIO_HUB_POWER, 0);
         gpio_export(GPIO_HUB_NRESET, 0);
-        gpio_direction_output(GPIO_HUB_NRESET, 0);
-        gpio_set_value(GPIO_HUB_NRESET, 0);
         gpio_set_value(GPIO_HUB_NRESET, 1);
 
         usbhs_init(&usbhs_bdata);
 
         /* enable power to hub */
         gpio_set_value(GPIO_HUB_POWER, 1);
-        return;
-
-error2:
-        gpio_free(GPIO_HUB_POWER);
-error1:
-        pr_err("Unable to initialize EHCI power/reset\n");
-        return;
-
 }
 
 static struct omap_musb_board_data musb_board_data = {
@@ -408,15 +397,6 @@ static struct twl4030_platform_data omap4_panda_twldata = {
         .usb            = &omap4_usbphy_data,
 };
 
-static struct i2c_board_info __initdata omap4_panda_i2c_boardinfo[] = {
-        {
-                I2C_BOARD_INFO("twl6030", 0x48),
-                .flags = I2C_CLIENT_WAKE,
-                .irq = OMAP44XX_IRQ_SYS_1N,
-                .platform_data = &omap4_panda_twldata,
-        },
-};
-
 /*
  * Display monitor features are burnt in their EEPROM as EDID data. The EEPROM
  * is connected as I2C slave device, and can be accessed at address 0x50
@@ -429,12 +409,7 @@ static struct i2c_board_info __initdata panda_i2c_eeprom[] = {
 
 static int __init omap4_panda_i2c_init(void)
 {
-        /*
-         * Phoenix Audio IC needs I2C1 to
-         * start with 400 KHz or less
-         */
-        omap_register_i2c_bus(1, 400, omap4_panda_i2c_boardinfo,
-                        ARRAY_SIZE(omap4_panda_i2c_boardinfo));
+        omap4_pmic_init("twl6030", &omap4_panda_twldata);
         omap_register_i2c_bus(2, 400, NULL, 0);
         /*
          * Bus 3 is attached to the DVI port where devices like the pico DLP
@@ -651,27 +626,19 @@ static void omap4_panda_hdmi_mux_init(void)
                         OMAP_PIN_INPUT_PULLUP);
 }
 
+static struct gpio panda_hdmi_gpios[] = {
+        { HDMI_GPIO_HPD,        GPIOF_OUT_INIT_HIGH, "hdmi_gpio_hpd"   },
+        { HDMI_GPIO_LS_OE,      GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ls_oe" },
+};
+
 static int omap4_panda_panel_enable_hdmi(struct omap_dss_device *dssdev)
 {
         int status;
 
-        status = gpio_request_one(HDMI_GPIO_HPD, GPIOF_OUT_INIT_HIGH,
-                                                        "hdmi_gpio_hpd");
-        if (status) {
-                pr_err("Cannot request GPIO %d\n", HDMI_GPIO_HPD);
-                return status;
-        }
-        status = gpio_request_one(HDMI_GPIO_LS_OE, GPIOF_OUT_INIT_HIGH,
-                                                        "hdmi_gpio_ls_oe");
-        if (status) {
-                pr_err("Cannot request GPIO %d\n", HDMI_GPIO_LS_OE);
-                goto error1;
-        }
-
-        return 0;
-
-error1:
-        gpio_free(HDMI_GPIO_HPD);
+        status = gpio_request_array(panda_hdmi_gpios,
+                                    ARRAY_SIZE(panda_hdmi_gpios));
+        if (status)
+                pr_err("Cannot request HDMI GPIOs\n");
 
         return status;
 }
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
index 9d192ff3b9ac..1555918e3ffa 100644
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -56,6 +56,7 @@
 #include "mux.h"
 #include "sdram-micron-mt46h32m32lf-6.h"
 #include "hsmmc.h"
+#include "common-board-devices.h"
 
 #define OVERO_GPIO_BT_XGATE     15
 #define OVERO_GPIO_W2W_NRESET   16
@@ -74,30 +75,6 @@
 #if defined(CONFIG_TOUCHSCREEN_ADS7846) || \
         defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)
 
-#include <linux/spi/ads7846.h>
-
-static struct omap2_mcspi_device_config ads7846_mcspi_config = {
-        .turbo_mode     = 0,
-        .single_channel = 1,    /* 0: slave, 1: master */
-};
-
-static int ads7846_get_pendown_state(void)
-{
-        return !gpio_get_value(OVERO_GPIO_PENDOWN);
-}
-
-static struct ads7846_platform_data ads7846_config = {
-        .x_max                  = 0x0fff,
-        .y_max                  = 0x0fff,
-        .x_plate_ohms           = 180,
-        .pressure_max           = 255,
-        .debounce_max           = 10,
-        .debounce_tol           = 3,
-        .debounce_rep           = 1,
-        .get_pendown_state      = ads7846_get_pendown_state,
-        .keep_vref_on           = 1,
-};
-
 /* fixed regulator for ads7846 */
 static struct regulator_consumer_supply ads7846_supply =
         REGULATOR_SUPPLY("vcc", "spi1.0");
@@ -128,14 +105,7 @@ static struct platform_device vads7846_device = {
 
 static void __init overo_ads7846_init(void)
 {
-        if ((gpio_request(OVERO_GPIO_PENDOWN, "ADS7846_PENDOWN") == 0) &&
-            (gpio_direction_input(OVERO_GPIO_PENDOWN) == 0)) {
-                gpio_export(OVERO_GPIO_PENDOWN, 0);
-        } else {
-                printk(KERN_ERR "could not obtain gpio for ADS7846_PENDOWN\n");
-                return;
-        }
-
+        omap_ads7846_init(1, OVERO_GPIO_PENDOWN, 0, NULL);
         platform_device_register(&vads7846_device);
 }
 
@@ -146,106 +116,28 @@ static inline void __init overo_ads7846_init(void) { return; }
 #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
 
 #include <linux/smsc911x.h>
+#include <plat/gpmc-smsc911x.h>
 
-static struct resource overo_smsc911x_resources[] = {
-        {
-                .name   = "smsc911x-memory",
-                .flags  = IORESOURCE_MEM,
-        },
-        {
-                .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
-        },
-};
-
-static struct resource overo_smsc911x2_resources[] = {
-        {
-                .name   = "smsc911x2-memory",
-                .flags  = IORESOURCE_MEM,
-        },
-        {
-                .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
-        },
-};
-
-static struct smsc911x_platform_config overo_smsc911x_config = {
-        .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
-        .irq_type       = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
-        .flags          = SMSC911X_USE_32BIT ,
-        .phy_interface  = PHY_INTERFACE_MODE_MII,
-};
-
-static struct platform_device overo_smsc911x_device = {
-        .name           = "smsc911x",
+static struct omap_smsc911x_platform_data smsc911x_cfg = {
         .id             = 0,
-        .num_resources  = ARRAY_SIZE(overo_smsc911x_resources),
-        .resource       = overo_smsc911x_resources,
-        .dev            = {
-                .platform_data = &overo_smsc911x_config,
-        },
+        .cs             = OVERO_SMSC911X_CS,
+        .gpio_irq       = OVERO_SMSC911X_GPIO,
+        .gpio_reset     = -EINVAL,
+        .flags          = SMSC911X_USE_32BIT,
 };
 
-static struct platform_device overo_smsc911x2_device = {
-        .name           = "smsc911x",
+static struct omap_smsc911x_platform_data smsc911x2_cfg = {
         .id             = 1,
-        .num_resources  = ARRAY_SIZE(overo_smsc911x2_resources),
-        .resource       = overo_smsc911x2_resources,
-        .dev            = {
-                .platform_data = &overo_smsc911x_config,
-        },
+        .cs             = OVERO_SMSC911X2_CS,
+        .gpio_irq       = OVERO_SMSC911X2_GPIO,
+        .gpio_reset     = -EINVAL,
+        .flags          = SMSC911X_USE_32BIT,
 };
 
-static struct platform_device *smsc911x_devices[] = {
-        &overo_smsc911x_device,
-        &overo_smsc911x2_device,
-};
-
-static inline void __init overo_init_smsc911x(void)
+static void __init overo_init_smsc911x(void)
 {
-        unsigned long cs_mem_base, cs_mem_base2;
-
-        /* set up first smsc911x chip */
-
-        if (gpmc_cs_request(OVERO_SMSC911X_CS, SZ_16M, &cs_mem_base) < 0) {
-                printk(KERN_ERR "Failed request for GPMC mem for smsc911x\n");
-                return;
-        }
-
-        overo_smsc911x_resources[0].start = cs_mem_base + 0x0;
-        overo_smsc911x_resources[0].end   = cs_mem_base + 0xff;
-
-        if ((gpio_request(OVERO_SMSC911X_GPIO, "SMSC911X IRQ") == 0) &&
-            (gpio_direction_input(OVERO_SMSC911X_GPIO) == 0)) {
-                gpio_export(OVERO_SMSC911X_GPIO, 0);
-        } else {
-                printk(KERN_ERR "could not obtain gpio for SMSC911X IRQ\n");
-                return;
-        }
-
-        overo_smsc911x_resources[1].start = OMAP_GPIO_IRQ(OVERO_SMSC911X_GPIO);
-        overo_smsc911x_resources[1].end   = 0;
-
-        /* set up second smsc911x chip */
-
-        if (gpmc_cs_request(OVERO_SMSC911X2_CS, SZ_16M, &cs_mem_base2) < 0) {
-                printk(KERN_ERR "Failed request for GPMC mem for smsc911x2\n");
-                return;
-        }
-
-        overo_smsc911x2_resources[0].start = cs_mem_base2 + 0x0;
-        overo_smsc911x2_resources[0].end   = cs_mem_base2 + 0xff;
-
-        if ((gpio_request(OVERO_SMSC911X2_GPIO, "SMSC911X2 IRQ") == 0) &&
-            (gpio_direction_input(OVERO_SMSC911X2_GPIO) == 0)) {
-                gpio_export(OVERO_SMSC911X2_GPIO, 0);
-        } else {
-                printk(KERN_ERR "could not obtain gpio for SMSC911X2 IRQ\n");
-                return;
-        }
-
-        overo_smsc911x2_resources[1].start = OMAP_GPIO_IRQ(OVERO_SMSC911X2_GPIO);
-        overo_smsc911x2_resources[1].end   = 0;
-
-        platform_add_devices(smsc911x_devices, ARRAY_SIZE(smsc911x_devices));
+        gpmc_smsc911x_init(&smsc911x_cfg);
+        gpmc_smsc911x_init(&smsc911x2_cfg);
 }
 
 #else
@@ -259,21 +151,20 @@ static int dvi_enabled;
 #define OVERO_GPIO_LCD_EN 144
 #define OVERO_GPIO_LCD_BL 145
 
+static struct gpio overo_dss_gpios[] __initdata = {
+        { OVERO_GPIO_LCD_EN, GPIOF_OUT_INIT_HIGH, "OVERO_GPIO_LCD_EN" },
+        { OVERO_GPIO_LCD_BL, GPIOF_OUT_INIT_HIGH, "OVERO_GPIO_LCD_BL" },
+};
+
 static void __init overo_display_init(void)
 {
-        if ((gpio_request(OVERO_GPIO_LCD_EN, "OVERO_GPIO_LCD_EN") == 0) &&
-            (gpio_direction_output(OVERO_GPIO_LCD_EN, 1) == 0))
-                gpio_export(OVERO_GPIO_LCD_EN, 0);
-        else
-                printk(KERN_ERR "could not obtain gpio for "
-                                        "OVERO_GPIO_LCD_EN\n");
+        if (gpio_request_array(overo_dss_gpios, ARRAY_SIZE(overo_dss_gpios))) {
+                printk(KERN_ERR "could not obtain DSS control GPIOs\n");
+                return;
+        }
 
-        if ((gpio_request(OVERO_GPIO_LCD_BL, "OVERO_GPIO_LCD_BL") == 0) &&
-            (gpio_direction_output(OVERO_GPIO_LCD_BL, 1) == 0))
-                gpio_export(OVERO_GPIO_LCD_BL, 0);
-        else
-                printk(KERN_ERR "could not obtain gpio for "
-                                        "OVERO_GPIO_LCD_BL\n");
+        gpio_export(OVERO_GPIO_LCD_EN, 0);
+        gpio_export(OVERO_GPIO_LCD_BL, 0);
 }
 
 static int overo_panel_enable_dvi(struct omap_dss_device *dssdev)
@@ -412,45 +303,6 @@ static struct mtd_partition overo_nand_partitions[] = {
         },
 };
 
-static struct omap_nand_platform_data overo_nand_data = {
-        .parts = overo_nand_partitions,
-        .nr_parts = ARRAY_SIZE(overo_nand_partitions),
-        .dma_channel = -1,      /* disable DMA in OMAP NAND driver */
-};
-
-static void __init overo_flash_init(void)
-{
-        u8 cs = 0;
-        u8 nandcs = GPMC_CS_NUM + 1;
-
-        /* find out the chip-select on which NAND exists */
-        while (cs < GPMC_CS_NUM) {
-                u32 ret = 0;
-                ret = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1);
-
-                if ((ret & 0xC00) == 0x800) {
-                        printk(KERN_INFO "Found NAND on CS%d\n", cs);
-                        if (nandcs > GPMC_CS_NUM)
-                                nandcs = cs;
-                }
-                cs++;
-        }
-
-        if (nandcs > GPMC_CS_NUM) {
-                printk(KERN_INFO "NAND: Unable to find configuration "
-                                 "in GPMC\n ");
-                return;
-        }
-
-        if (nandcs < GPMC_CS_NUM) {
-                overo_nand_data.cs = nandcs;
-
-                printk(KERN_INFO "Registering NAND on CS%d\n", nandcs);
-                if (gpmc_nand_init(&overo_nand_data) < 0)
-                        printk(KERN_ERR "Unable to register NAND device\n");
-        }
-}
-
 static struct omap2_hsmmc_info mmc[] = {
         {
                 .mmc            = 1,
@@ -648,37 +500,15 @@ static struct twl4030_platform_data overo_twldata = {
         .vpll2          = &overo_vpll2,
 };
 
-static struct i2c_board_info __initdata overo_i2c_boardinfo[] = {
-        {
-                I2C_BOARD_INFO("tps65950", 0x48),
-                .flags = I2C_CLIENT_WAKE,
-                .irq = INT_34XX_SYS_NIRQ,
-                .platform_data = &overo_twldata,
-        },
-};
-
 static int __init overo_i2c_init(void)
 {
-        omap_register_i2c_bus(1, 2600, overo_i2c_boardinfo,
-                        ARRAY_SIZE(overo_i2c_boardinfo));
+        omap3_pmic_init("tps65950", &overo_twldata);
         /* i2c2 pins are used for gpio */
         omap_register_i2c_bus(3, 400, NULL, 0);
         return 0;
 }
 
 static struct spi_board_info overo_spi_board_info[] __initdata = {
-#if defined(CONFIG_TOUCHSCREEN_ADS7846) || \
-        defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)
-        {
-                .modalias               = "ads7846",
-                .bus_num                = 1,
-                .chip_select            = 0,
-                .max_speed_hz           = 1500000,
-                .controller_data        = &ads7846_mcspi_config,
-                .irq                    = OMAP_GPIO_IRQ(OVERO_GPIO_PENDOWN),
-                .platform_data          = &ads7846_config,
-        },
-#endif
 #if defined(CONFIG_PANEL_LGPHILIPS_LB035Q02) || \
         defined(CONFIG_PANEL_LGPHILIPS_LB035Q02_MODULE)
         {
@@ -722,20 +552,22 @@ static struct omap_board_mux board_mux[] __initdata = {
 };
 #endif
 
-static struct omap_musb_board_data musb_board_data = {
-        .interface_type         = MUSB_INTERFACE_ULPI,
-        .mode                   = MUSB_OTG,
-        .power                  = 100,
+static struct gpio overo_bt_gpios[] __initdata = {
+        { OVERO_GPIO_BT_XGATE,  GPIOF_OUT_INIT_LOW,     "lcd enable"    },
+        { OVERO_GPIO_BT_NRESET, GPIOF_OUT_INIT_HIGH,    "lcd bl enable" },
 };
 
 static void __init overo_init(void)
 {
+        int ret;
+
         omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
         overo_i2c_init();
         omap_display_init(&overo_dss_data);
         omap_serial_init();
-        overo_flash_init();
-        usb_musb_init(&musb_board_data);
+        omap_nand_flash_init(0, overo_nand_partitions,
+                             ARRAY_SIZE(overo_nand_partitions));
+        usb_musb_init(NULL);
         usbhs_init(&usbhs_bdata);
         overo_spi_init();
         overo_ads7846_init();
@@ -748,9 +580,9 @@ static void __init overo_init(void)
         omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
         omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT);
 
-        if ((gpio_request(OVERO_GPIO_W2W_NRESET,
-                          "OVERO_GPIO_W2W_NRESET") == 0) &&
-            (gpio_direction_output(OVERO_GPIO_W2W_NRESET, 1) == 0)) {
+        ret = gpio_request_one(OVERO_GPIO_W2W_NRESET, GPIOF_OUT_INIT_HIGH,
+                               "OVERO_GPIO_W2W_NRESET");
+        if (ret == 0) {
                 gpio_export(OVERO_GPIO_W2W_NRESET, 0);
                 gpio_set_value(OVERO_GPIO_W2W_NRESET, 0);
                 udelay(10);
@@ -760,25 +592,20 @@ static void __init overo_init(void)
                                         "OVERO_GPIO_W2W_NRESET\n");
         }
 
-        if ((gpio_request(OVERO_GPIO_BT_XGATE, "OVERO_GPIO_BT_XGATE") == 0) &&
-            (gpio_direction_output(OVERO_GPIO_BT_XGATE, 0) == 0))
+        ret = gpio_request_array(overo_bt_gpios, ARRAY_SIZE(overo_bt_gpios));
+        if (ret) {
+                pr_err("%s: could not obtain BT gpios\n", __func__);
+        } else {
                 gpio_export(OVERO_GPIO_BT_XGATE, 0);
-        else
-                printk(KERN_ERR "could not obtain gpio for OVERO_GPIO_BT_XGATE\n");
-
-        if ((gpio_request(OVERO_GPIO_BT_NRESET, "OVERO_GPIO_BT_NRESET") == 0) &&
-            (gpio_direction_output(OVERO_GPIO_BT_NRESET, 1) == 0)) {
                 gpio_export(OVERO_GPIO_BT_NRESET, 0);
                 gpio_set_value(OVERO_GPIO_BT_NRESET, 0);
                 mdelay(6);
                 gpio_set_value(OVERO_GPIO_BT_NRESET, 1);
-        } else {
-                printk(KERN_ERR "could not obtain gpio for "
-                                        "OVERO_GPIO_BT_NRESET\n");
         }
 
-        if ((gpio_request(OVERO_GPIO_USBH_CPEN, "OVERO_GPIO_USBH_CPEN") == 0) &&
-            (gpio_direction_output(OVERO_GPIO_USBH_CPEN, 1) == 0))
+        ret = gpio_request_one(OVERO_GPIO_USBH_CPEN, GPIOF_OUT_INIT_HIGH,
+                               "OVERO_GPIO_USBH_CPEN");
+        if (ret == 0)
                 gpio_export(OVERO_GPIO_USBH_CPEN, 0);
         else
                 printk(KERN_ERR "could not obtain gpio for "
diff --git a/arch/arm/mach-omap2/board-rm680.c b/arch/arm/mach-omap2/board-rm680.c
index 2af8b05e786d..42d10b12da3c 100644
--- a/arch/arm/mach-omap2/board-rm680.c
+++ b/arch/arm/mach-omap2/board-rm680.c
@@ -31,6 +31,7 @@
 #include "mux.h"
 #include "hsmmc.h"
 #include "sdram-nokia.h"
+#include "common-board-devices.h"
 
 static struct regulator_consumer_supply rm680_vemmc_consumers[] = {
         REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"),
@@ -90,19 +91,9 @@ static struct twl4030_platform_data rm680_twl_data = {
         /* add rest of the children here */
 };
 
-static struct i2c_board_info __initdata rm680_twl_i2c_board_info[] = {
-        {
-                I2C_BOARD_INFO("twl5031", 0x48),
-                .flags          = I2C_CLIENT_WAKE,
-                .irq            = INT_34XX_SYS_NIRQ,
-                .platform_data  = &rm680_twl_data,
-        },
-};
-
 static void __init rm680_i2c_init(void)
 {
-        omap_register_i2c_bus(1, 2900, rm680_twl_i2c_board_info,
-                                ARRAY_SIZE(rm680_twl_i2c_board_info));
+        omap_pmic_init(1, 2900, "twl5031", INT_34XX_SYS_NIRQ, &rm680_twl_data);
         omap_register_i2c_bus(2, 400, NULL, 0);
         omap_register_i2c_bus(3, 400, NULL, 0);
 }
@@ -153,17 +144,11 @@ static struct omap_board_mux board_mux[] __initdata = {
 };
 #endif
 
-static struct omap_musb_board_data rm680_musb_data = {
-        .interface_type = MUSB_INTERFACE_ULPI,
-        .mode           = MUSB_PERIPHERAL,
-        .power          = 100,
-};
-
 static void __init rm680_init(void)
 {
         omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
         omap_serial_init();
-        usb_musb_init(&rm680_musb_data);
+        usb_musb_init(NULL);
         rm680_peripherals_init();
 }
 
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index bbcb6775a6a3..f6247e71a194 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -23,6 +23,7 @@
 #include <linux/gpio.h>
 #include <linux/gpio_keys.h>
 #include <linux/mmc/host.h>
+#include <linux/power/isp1704_charger.h>
 
 #include <plat/mcspi.h>
 #include <plat/board.h>
@@ -43,6 +44,7 @@
 
 #include "mux.h"
 #include "hsmmc.h"
+#include "common-board-devices.h"
 
 #define SYSTEM_REV_B_USES_VAUX3 0x1699
 #define SYSTEM_REV_S_USES_VAUX3 0x8
@@ -52,6 +54,8 @@
 #define RX51_FMTX_RESET_GPIO            163
 #define RX51_FMTX_IRQ                   53
 
+#define RX51_USB_TRANSCEIVER_RST_GPIO   67
+
 /* list all spi devices here */
 enum {
         RX51_SPI_WL1251,
@@ -110,10 +114,30 @@ static struct spi_board_info rx51_peripherals_spi_board_info[] __initdata = {
         },
 };
 
+static void rx51_charger_set_power(bool on)
+{
+        gpio_set_value(RX51_USB_TRANSCEIVER_RST_GPIO, on);
+}
+
+static struct isp1704_charger_data rx51_charger_data = {
+        .set_power      = rx51_charger_set_power,
+};
+
 static struct platform_device rx51_charger_device = {
-        .name = "isp1704_charger",
+        .name   = "isp1704_charger",
+        .dev    = {
+                .platform_data = &rx51_charger_data,
+        },
 };
 
+static void __init rx51_charger_init(void)
+{
+        WARN_ON(gpio_request_one(RX51_USB_TRANSCEIVER_RST_GPIO,
+                GPIOF_OUT_INIT_LOW, "isp1704_reset"));
+
+        platform_device_register(&rx51_charger_device);
+}
+
 #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
 
 #define RX51_GPIO_CAMERA_LENS_COVER     110
@@ -557,10 +581,8 @@ static __init void rx51_init_si4713(void)
 static int rx51_twlgpio_setup(struct device *dev, unsigned gpio, unsigned n)
 {
         /* FIXME this gpio setup is just a placeholder for now */
-        gpio_request(gpio + 6, "backlight_pwm");
-        gpio_direction_output(gpio + 6, 0);
-        gpio_request(gpio + 7, "speaker_en");
-        gpio_direction_output(gpio + 7, 1);
+        gpio_request_one(gpio + 6, GPIOF_OUT_INIT_LOW, "backlight_pwm");
+        gpio_request_one(gpio + 7, GPIOF_OUT_INIT_HIGH, "speaker_en");
 
         return 0;
 }
@@ -730,7 +752,7 @@ static struct twl4030_resconfig twl4030_rconfig[] __initdata = {
         { .resource = RES_RESET, .devgroup = -1,
           .type = 1, .type2 = -1, .remap_off = -1, .remap_sleep = -1
         },
-        { .resource = RES_Main_Ref, .devgroup = -1,
+        { .resource = RES_MAIN_REF, .devgroup = -1,
           .type = 1, .type2 = -1, .remap_off = -1, .remap_sleep = -1
         },
         { 0, 0},
@@ -777,15 +799,6 @@ static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata_or_module =
         .power_gpio             = 98,
 };
 
-static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_1[] = {
-        {
-                I2C_BOARD_INFO("twl5030", 0x48),
-                .flags = I2C_CLIENT_WAKE,
-                .irq = INT_34XX_SYS_NIRQ,
-                .platform_data = &rx51_twldata,
-        },
-};
-
 /* Audio setup data */
 static struct aic3x_setup_data rx51_aic34_setup = {
         .gpio_func[0] = AIC3X_GPIO1_FUNC_DISABLED,
@@ -833,8 +846,7 @@ static int __init rx51_i2c_init(void)
                 rx51_twldata.vaux3 = &rx51_vaux3_cam;
         }
         rx51_twldata.vmmc2 = &rx51_vmmc2;
-        omap_register_i2c_bus(1, 2200, rx51_peripherals_i2c_board_info_1,
-                              ARRAY_SIZE(rx51_peripherals_i2c_board_info_1));
+        omap_pmic_init(1, 2200, "twl5030", INT_34XX_SYS_NIRQ, &rx51_twldata);
         omap_register_i2c_bus(2, 100, rx51_peripherals_i2c_board_info_2,
                               ARRAY_SIZE(rx51_peripherals_i2c_board_info_2));
         omap_register_i2c_bus(3, 400, NULL, 0);
@@ -921,26 +933,20 @@ static void rx51_wl1251_set_power(bool enable)
         gpio_set_value(RX51_WL1251_POWER_GPIO, enable);
 }
 
+static struct gpio rx51_wl1251_gpios[] __initdata = {
+        { RX51_WL1251_POWER_GPIO, GPIOF_OUT_INIT_LOW,   "wl1251 power"  },
+        { RX51_WL1251_IRQ_GPIO,   GPIOF_IN,             "wl1251 irq"    },
+};
+
 static void __init rx51_init_wl1251(void)
 {
         int irq, ret;
 
-        ret = gpio_request(RX51_WL1251_POWER_GPIO, "wl1251 power");
+        ret = gpio_request_array(rx51_wl1251_gpios,
+                                 ARRAY_SIZE(rx51_wl1251_gpios));
         if (ret < 0)
                 goto error;
 
-        ret = gpio_direction_output(RX51_WL1251_POWER_GPIO, 0);
-        if (ret < 0)
-                goto err_power;
-
-        ret = gpio_request(RX51_WL1251_IRQ_GPIO, "wl1251 irq");
-        if (ret < 0)
-                goto err_power;
-
-        ret = gpio_direction_input(RX51_WL1251_IRQ_GPIO);
-        if (ret < 0)
-                goto err_irq;
-
         irq = gpio_to_irq(RX51_WL1251_IRQ_GPIO);
         if (irq < 0)
                 goto err_irq;
@@ -952,10 +958,7 @@ static void __init rx51_init_wl1251(void)
 
 err_irq:
         gpio_free(RX51_WL1251_IRQ_GPIO);
-
-err_power:
         gpio_free(RX51_WL1251_POWER_GPIO);
-
 error:
         printk(KERN_ERR "wl1251 board initialisation failed\n");
         wl1251_pdata.set_power = NULL;
@@ -981,6 +984,6 @@ void __init rx51_peripherals_init(void)
         if (partition)
                 omap2_hsmmc_init(mmc);
 
-        platform_device_register(&rx51_charger_device);
+        rx51_charger_init();
 }
 
diff --git a/arch/arm/mach-omap2/board-rx51-video.c b/arch/arm/mach-omap2/board-rx51-video.c
index 2df10b6a5940..2c1289bd5e6a 100644
--- a/arch/arm/mach-omap2/board-rx51-video.c
+++ b/arch/arm/mach-omap2/board-rx51-video.c
@@ -76,13 +76,12 @@ static int __init rx51_video_init(void)
                 return 0;
         }
 
-        if (gpio_request(RX51_LCD_RESET_GPIO, "LCD ACX565AKM reset")) {
+        if (gpio_request_one(RX51_LCD_RESET_GPIO, GPIOF_OUT_INIT_HIGH,
+                             "LCD ACX565AKM reset")) {
                 pr_err("%s failed to get LCD Reset GPIO\n", __func__);
                 return 0;
         }
 
-        gpio_direction_output(RX51_LCD_RESET_GPIO, 1);
-
         omap_display_init(&rx51_dss_board_info);
         return 0;
 }
diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c
index f8ba20a14e62..fec4cac8fa0a 100644
--- a/arch/arm/mach-omap2/board-rx51.c
+++ b/arch/arm/mach-omap2/board-rx51.c
@@ -58,21 +58,25 @@ static struct platform_device leds_gpio = {
         },
 };
 
+/*
+ * cpuidle C-states definition override from the default values.
+ * The 'exit_latency' field is the sum of sleep and wake-up latencies.
+ */
 static struct cpuidle_params rx51_cpuidle_params[] = {
         /* C1 */
-        {1, 110, 162, 5},
+        {110 + 162, 5 , 1},
         /* C2 */
-        {1, 106, 180, 309},
+        {106 + 180, 309, 1},
         /* C3 */
-        {0, 107, 410, 46057},
+        {107 + 410, 46057, 0},
         /* C4 */
-        {0, 121, 3374, 46057},
+        {121 + 3374, 46057, 0},
         /* C5 */
-        {1, 855, 1146, 46057},
+        {855 + 1146, 46057, 1},
         /* C6 */
-        {0, 7580, 4134, 484329},
+        {7580 + 4134, 484329, 0},
         /* C7 */
-        {1, 7505, 15274, 484329},
+        {7505 + 15274, 484329, 1},
 };
 
 static struct omap_lcd_config rx51_lcd_config = {
diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom-debugboard.c
index 007ebdc6c993..6402e781c458 100644
--- a/arch/arm/mach-omap2/board-zoom-debugboard.c
+++ b/arch/arm/mach-omap2/board-zoom-debugboard.c
@@ -15,6 +15,7 @@
 #include <linux/interrupt.h>
 
 #include <plat/gpmc.h>
+#include <plat/gpmc-smsc911x.h>
 
 #include <mach/board-zoom.h>
 
@@ -26,60 +27,16 @@
 #define DEBUG_BASE              0x08000000
 #define ZOOM_ETHR_START DEBUG_BASE
 
-static struct resource zoom_smsc911x_resources[] = {
-        [0] = {
-                .start  = ZOOM_ETHR_START,
-                .end    = ZOOM_ETHR_START + SZ_4K,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
-        },
-};
-
-static struct smsc911x_platform_config zoom_smsc911x_config = {
-        .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
-        .irq_type       = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
+static struct omap_smsc911x_platform_data zoom_smsc911x_cfg = {
+        .cs             = ZOOM_SMSC911X_CS,
+        .gpio_irq       = ZOOM_SMSC911X_GPIO,
+        .gpio_reset     = -EINVAL,
         .flags          = SMSC911X_USE_32BIT,
-        .phy_interface  = PHY_INTERFACE_MODE_MII,
-};
-
-static struct platform_device zoom_smsc911x_device = {
-        .name           = "smsc911x",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(zoom_smsc911x_resources),
-        .resource       = zoom_smsc911x_resources,
-        .dev            = {
-                .platform_data = &zoom_smsc911x_config,
-        },
 };
 
 static inline void __init zoom_init_smsc911x(void)
 {
-        int eth_cs;
-        unsigned long cs_mem_base;
-        int eth_gpio = 0;
-
-        eth_cs = ZOOM_SMSC911X_CS;
-
-        if (gpmc_cs_request(eth_cs, SZ_16M, &cs_mem_base) < 0) {
-                printk(KERN_ERR "Failed to request GPMC mem for smsc911x\n");
-                return;
-        }
-
-        zoom_smsc911x_resources[0].start = cs_mem_base + 0x0;
-        zoom_smsc911x_resources[0].end   = cs_mem_base + 0xff;
-
-        eth_gpio = ZOOM_SMSC911X_GPIO;
-
-        zoom_smsc911x_resources[1].start = OMAP_GPIO_IRQ(eth_gpio);
-
-        if (gpio_request(eth_gpio, "smsc911x irq") < 0) {
-                printk(KERN_ERR "Failed to request GPIO%d for smsc911x IRQ\n",
-                                eth_gpio);
-                return;
-        }
-        gpio_direction_input(eth_gpio);
+        gpmc_smsc911x_init(&zoom_smsc911x_cfg);
 }
 
 static struct plat_serial8250_port serial_platform_data[] = {
@@ -120,12 +77,9 @@ static inline void __init zoom_init_quaduart(void)
 
         quart_gpio = ZOOM_QUADUART_GPIO;
 
-        if (gpio_request(quart_gpio, "TL16CP754C GPIO") < 0) {
+        if (gpio_request_one(quart_gpio, GPIOF_IN, "TL16CP754C GPIO") < 0)
                 printk(KERN_ERR "Failed to request GPIO%d for TL16CP754C\n",
                                                                 quart_gpio);
-                return;
-        }
-        gpio_direction_input(quart_gpio);
 }
 
 static inline int omap_zoom_debugboard_detect(void)
@@ -135,12 +89,12 @@ static inline int omap_zoom_debugboard_detect(void)
 
         debug_board_detect = ZOOM_SMSC911X_GPIO;
 
-        if (gpio_request(debug_board_detect, "Zoom debug board detect") < 0) {
+        if (gpio_request_one(debug_board_detect, GPIOF_IN,
+                             "Zoom debug board detect") < 0) {
                 printk(KERN_ERR "Failed to request GPIO%d for Zoom debug"
                 "board detect\n", debug_board_detect);
                 return 0;
         }
-        gpio_direction_input(debug_board_detect);
 
         if (!gpio_get_value(debug_board_detect)) {
                 ret = 0;
@@ -150,7 +104,6 @@ static inline int omap_zoom_debugboard_detect(void)
 }
 
 static struct platform_device *zoom_devices[] __initdata = {
-        &zoom_smsc911x_device,
         &zoom_debugboard_serial_device,
 };
 
diff --git a/arch/arm/mach-omap2/board-zoom-display.c b/arch/arm/mach-omap2/board-zoom-display.c
index 60e8645db59d..c7c6beb1ec24 100644
--- a/arch/arm/mach-omap2/board-zoom-display.c
+++ b/arch/arm/mach-omap2/board-zoom-display.c
@@ -21,34 +21,19 @@
 #define LCD_PANEL_RESET_GPIO_PILOT      55
 #define LCD_PANEL_QVGA_GPIO             56
 
+static struct gpio zoom_lcd_gpios[] __initdata = {
+        { -EINVAL,              GPIOF_OUT_INIT_HIGH, "lcd reset" },
+        { LCD_PANEL_QVGA_GPIO,  GPIOF_OUT_INIT_HIGH, "lcd qvga"  },
+};
+
 static void zoom_lcd_panel_init(void)
 {
-        int ret;
-        unsigned char lcd_panel_reset_gpio;
-
-        lcd_panel_reset_gpio = (omap_rev() > OMAP3430_REV_ES3_0) ?
+        zoom_lcd_gpios[0].gpio = (omap_rev() > OMAP3430_REV_ES3_0) ?
                         LCD_PANEL_RESET_GPIO_PROD :
                         LCD_PANEL_RESET_GPIO_PILOT;
 
-        ret = gpio_request(lcd_panel_reset_gpio, "lcd reset");
-        if (ret) {
-                pr_err("Failed to get LCD reset GPIO (gpio%d).\n",
-                        lcd_panel_reset_gpio);
-                return;
-        }
-        gpio_direction_output(lcd_panel_reset_gpio, 1);
-
-        ret = gpio_request(LCD_PANEL_QVGA_GPIO, "lcd qvga");
-        if (ret) {
-                pr_err("Failed to get LCD_PANEL_QVGA_GPIO (gpio%d).\n",
-                        LCD_PANEL_QVGA_GPIO);
-                goto err0;
-        }
-        gpio_direction_output(LCD_PANEL_QVGA_GPIO, 1);
-
-        return;
-err0:
-        gpio_free(lcd_panel_reset_gpio);
+        if (gpio_request_array(zoom_lcd_gpios, ARRAY_SIZE(zoom_lcd_gpios)))
+                pr_err("%s: Failed to get LCD GPIOs.\n", __func__);
 }
 
 static int zoom_panel_enable_lcd(struct omap_dss_device *dssdev)
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c
index 8dee7549fbdf..118c6f53c5eb 100644
--- a/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
@@ -31,6 +31,7 @@
 
 #include "mux.h"
 #include "hsmmc.h"
+#include "common-board-devices.h"
 
 #define OMAP_ZOOM_WLAN_PMENA_GPIO       (101)
 #define OMAP_ZOOM_WLAN_IRQ_GPIO         (162)
@@ -276,13 +277,11 @@ static int zoom_twl_gpio_setup(struct device *dev,
         zoom_vsim_supply.dev = mmc[0].dev;
         zoom_vmmc2_supply.dev = mmc[1].dev;
 
-        ret = gpio_request(LCD_PANEL_ENABLE_GPIO, "lcd enable");
-        if (ret) {
+        ret = gpio_request_one(LCD_PANEL_ENABLE_GPIO, GPIOF_OUT_INIT_LOW,
+                               "lcd enable");
+        if (ret)
                 pr_err("Failed to get LCD_PANEL_ENABLE_GPIO (gpio%d).\n",
                                 LCD_PANEL_ENABLE_GPIO);
-                return ret;
-        }
-        gpio_direction_output(LCD_PANEL_ENABLE_GPIO, 0);
 
         return ret;
 }
@@ -349,15 +348,6 @@ static struct twl4030_platform_data zoom_twldata = {
         .vdac           = &zoom_vdac,
 };
 
-static struct i2c_board_info __initdata zoom_i2c_boardinfo[] = {
-        {
-                I2C_BOARD_INFO("twl5030", 0x48),
-                .flags          = I2C_CLIENT_WAKE,
-                .irq            = INT_34XX_SYS_NIRQ,
-                .platform_data  = &zoom_twldata,
-        },
-};
-
 static int __init omap_i2c_init(void)
 {
         if (machine_is_omap_zoom2()) {
@@ -365,19 +355,12 @@ static int __init omap_i2c_init(void)
                 zoom_audio_data.hs_extmute = 1;
                 zoom_audio_data.set_hs_extmute = zoom2_set_hs_extmute;
         }
-        omap_register_i2c_bus(1, 2400, zoom_i2c_boardinfo,
-                        ARRAY_SIZE(zoom_i2c_boardinfo));
+        omap_pmic_init(1, 2400, "twl5030", INT_34XX_SYS_NIRQ, &zoom_twldata);
         omap_register_i2c_bus(2, 400, NULL, 0);
         omap_register_i2c_bus(3, 400, NULL, 0);
         return 0;
 }
 
-static struct omap_musb_board_data musb_board_data = {
-        .interface_type         = MUSB_INTERFACE_ULPI,
-        .mode                   = MUSB_OTG,
-        .power                  = 100,
-};
-
 static void enable_board_wakeup_source(void)
 {
         /* T2 interrupt line (keypad) */
@@ -392,7 +375,7 @@ void __init zoom_peripherals_init(void)
 
         omap_i2c_init();
         platform_device_register(&omap_vwlan_device);
-        usb_musb_init(&musb_board_data);
+        usb_musb_init(NULL);
         enable_board_wakeup_source();
         omap_serial_init();
 }
diff --git a/arch/arm/mach-omap2/common-board-devices.c b/arch/arm/mach-omap2/common-board-devices.c
new file mode 100644
index 000000000000..e94903b2c65b
--- /dev/null
+++ b/arch/arm/mach-omap2/common-board-devices.c
@@ -0,0 +1,163 @@
+/*
+ * common-board-devices.c
+ *
+ * Copyright (C) 2011 CompuLab, Ltd.
+ * Author: Mike Rapoport <mike@compulab.co.il>
+ *
+ * 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.
+ *
+ * This program 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., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include <linux/i2c.h>
+#include <linux/i2c/twl.h>
+
+#include <linux/gpio.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/ads7846.h>
+
+#include <plat/i2c.h>
+#include <plat/mcspi.h>
+#include <plat/nand.h>
+
+#include "common-board-devices.h"
+
+static struct i2c_board_info __initdata pmic_i2c_board_info = {
+        .addr           = 0x48,
+        .flags          = I2C_CLIENT_WAKE,
+};
+
+void __init omap_pmic_init(int bus, u32 clkrate,
+                           const char *pmic_type, int pmic_irq,
+                           struct twl4030_platform_data *pmic_data)
+{
+        strncpy(pmic_i2c_board_info.type, pmic_type,
+                sizeof(pmic_i2c_board_info.type));
+        pmic_i2c_board_info.irq = pmic_irq;
+        pmic_i2c_board_info.platform_data = pmic_data;
+
+        omap_register_i2c_bus(bus, clkrate, &pmic_i2c_board_info, 1);
+}
+
+#if defined(CONFIG_TOUCHSCREEN_ADS7846) || \
+        defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)
+static struct omap2_mcspi_device_config ads7846_mcspi_config = {
+        .turbo_mode     = 0,
+        .single_channel = 1,    /* 0: slave, 1: master */
+};
+
+static struct ads7846_platform_data ads7846_config = {
+        .x_max                  = 0x0fff,
+        .y_max                  = 0x0fff,
+        .x_plate_ohms           = 180,
+        .pressure_max           = 255,
+        .debounce_max           = 10,
+        .debounce_tol           = 3,
+        .debounce_rep           = 1,
+        .gpio_pendown           = -EINVAL,
+        .keep_vref_on           = 1,
+};
+
+static struct spi_board_info ads7846_spi_board_info __initdata = {
+        .modalias               = "ads7846",
+        .bus_num                = -EINVAL,
+        .chip_select            = 0,
+        .max_speed_hz           = 1500000,
+        .controller_data        = &ads7846_mcspi_config,
+        .irq                    = -EINVAL,
+        .platform_data          = &ads7846_config,
+};
+
+void __init omap_ads7846_init(int bus_num, int gpio_pendown, int gpio_debounce,
+                              struct ads7846_platform_data *board_pdata)
+{
+        struct spi_board_info *spi_bi = &ads7846_spi_board_info;
+        int err;
+
+        err = gpio_request(gpio_pendown, "TS PenDown");
+        if (err) {
+                pr_err("Could not obtain gpio for TS PenDown: %d\n", err);
+                return;
+        }
+
+        gpio_direction_input(gpio_pendown);
+        gpio_export(gpio_pendown, 0);
+
+        if (gpio_debounce)
+                gpio_set_debounce(gpio_pendown, gpio_debounce);
+
+        ads7846_config.gpio_pendown = gpio_pendown;
+
+        spi_bi->bus_num = bus_num;
+        spi_bi->irq     = OMAP_GPIO_IRQ(gpio_pendown);
+
+        if (board_pdata)
+                spi_bi->platform_data = board_pdata;
+
+        spi_register_board_info(&ads7846_spi_board_info, 1);
+}
+#else
+void __init omap_ads7846_init(int bus_num, int gpio_pendown, int gpio_debounce,
+                              struct ads7846_platform_data *board_pdata)
+{
+}
+#endif
+
+#if defined(CONFIG_MTD_NAND_OMAP2) || defined(CONFIG_MTD_NAND_OMAP2_MODULE)
+static struct omap_nand_platform_data nand_data = {
+        .dma_channel    = -1,           /* disable DMA in OMAP NAND driver */
+};
+
+void __init omap_nand_flash_init(int options, struct mtd_partition *parts,
+                                 int nr_parts)
+{
+        u8 cs = 0;
+        u8 nandcs = GPMC_CS_NUM + 1;
+
+        /* find out the chip-select on which NAND exists */
+        while (cs < GPMC_CS_NUM) {
+                u32 ret = 0;
+                ret = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1);
+
+                if ((ret & 0xC00) == 0x800) {
+                        printk(KERN_INFO "Found NAND on CS%d\n", cs);
+                        if (nandcs > GPMC_CS_NUM)
+                                nandcs = cs;
+                }
+                cs++;
+        }
+
+        if (nandcs > GPMC_CS_NUM) {
+                printk(KERN_INFO "NAND: Unable to find configuration "
+                                 "in GPMC\n ");
+                return;
+        }
+
+        if (nandcs < GPMC_CS_NUM) {
+                nand_data.cs = nandcs;
+                nand_data.parts = parts;
+                nand_data.nr_parts = nr_parts;
+                nand_data.options = options;
+
+                printk(KERN_INFO "Registering NAND on CS%d\n", nandcs);
+                if (gpmc_nand_init(&nand_data) < 0)
+                        printk(KERN_ERR "Unable to register NAND device\n");
+        }
+}
+#else
+void __init omap_nand_flash_init(int options, struct mtd_partition *parts,
+                                 int nr_parts)
+{
+}
+#endif
diff --git a/arch/arm/mach-omap2/common-board-devices.h b/arch/arm/mach-omap2/common-board-devices.h
new file mode 100644
index 000000000000..eb80b3b0ef47
--- /dev/null
+++ b/arch/arm/mach-omap2/common-board-devices.h
@@ -0,0 +1,35 @@
+#ifndef __OMAP_COMMON_BOARD_DEVICES__
+#define __OMAP_COMMON_BOARD_DEVICES__
+
+struct twl4030_platform_data;
+struct mtd_partition;
+
+void omap_pmic_init(int bus, u32 clkrate, const char *pmic_type, int pmic_irq,
+                    struct twl4030_platform_data *pmic_data);
+
+static inline void omap2_pmic_init(const char *pmic_type,
+                                   struct twl4030_platform_data *pmic_data)
+{
+        omap_pmic_init(2, 2600, pmic_type, INT_24XX_SYS_NIRQ, pmic_data);
+}
+
+static inline void omap3_pmic_init(const char *pmic_type,
+                                   struct twl4030_platform_data *pmic_data)
+{
+        omap_pmic_init(1, 2600, pmic_type, INT_34XX_SYS_NIRQ, pmic_data);
+}
+
+static inline void omap4_pmic_init(const char *pmic_type,
+                                   struct twl4030_platform_data *pmic_data)
+{
+        /* Phoenix Audio IC needs I2C1 to start with 400 KHz or less */
+        omap_pmic_init(1, 400, pmic_type, OMAP44XX_IRQ_SYS_1N, pmic_data);
+}
+
+struct ads7846_platform_data;
+
+void omap_ads7846_init(int bus_num, int gpio_pendown, int gpio_debounce,
+                       struct ads7846_platform_data *board_pdata);
+void omap_nand_flash_init(int opts, struct mtd_partition *parts, int n_parts);
+
+#endif /* __OMAP_COMMON_BOARD_DEVICES__ */
diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c
index 1c240eff3918..4bf6e6e8b100 100644
--- a/arch/arm/mach-omap2/cpuidle34xx.c
+++ b/arch/arm/mach-omap2/cpuidle34xx.c
@@ -36,36 +36,6 @@
 
 #ifdef CONFIG_CPU_IDLE
 
-#define OMAP3_MAX_STATES 7
-#define OMAP3_STATE_C1 0 /* C1 - MPU WFI + Core active */
-#define OMAP3_STATE_C2 1 /* C2 - MPU WFI + Core inactive */
-#define OMAP3_STATE_C3 2 /* C3 - MPU CSWR + Core inactive */
-#define OMAP3_STATE_C4 3 /* C4 - MPU OFF + Core iactive */
-#define OMAP3_STATE_C5 4 /* C5 - MPU RET + Core RET */
-#define OMAP3_STATE_C6 5 /* C6 - MPU OFF + Core RET */
-#define OMAP3_STATE_C7 6 /* C7 - MPU OFF + Core OFF */
-
-#define OMAP3_STATE_MAX OMAP3_STATE_C7
-
-#define CPUIDLE_FLAG_CHECK_BM   0x10000 /* use omap3_enter_idle_bm() */
-
-struct omap3_processor_cx {
-        u8 valid;
-        u8 type;
-        u32 sleep_latency;
-        u32 wakeup_latency;
-        u32 mpu_state;
-        u32 core_state;
-        u32 threshold;
-        u32 flags;
-        const char *desc;
-};
-
-struct omap3_processor_cx omap3_power_states[OMAP3_MAX_STATES];
-struct omap3_processor_cx current_cx_state;
-struct powerdomain *mpu_pd, *core_pd, *per_pd;
-struct powerdomain *cam_pd;
-
 /*
  * The latencies/thresholds for various C states have
  * to be configured from the respective board files.
@@ -75,27 +45,31 @@ struct powerdomain *cam_pd;
  */
 static struct cpuidle_params cpuidle_params_table[] = {
         /* C1 */
-        {1, 2, 2, 5},
+        {2 + 2, 5, 1},
         /* C2 */
-        {1, 10, 10, 30},
+        {10 + 10, 30, 1},
         /* C3 */
-        {1, 50, 50, 300},
+        {50 + 50, 300, 1},
         /* C4 */
-        {1, 1500, 1800, 4000},
+        {1500 + 1800, 4000, 1},
         /* C5 */
-        {1, 2500, 7500, 12000},
+        {2500 + 7500, 12000, 1},
         /* C6 */
-        {1, 3000, 8500, 15000},
+        {3000 + 8500, 15000, 1},
         /* C7 */
-        {1, 10000, 30000, 300000},
+        {10000 + 30000, 300000, 1},
 };
+#define OMAP3_NUM_STATES ARRAY_SIZE(cpuidle_params_table)
 
-static int omap3_idle_bm_check(void)
-{
-        if (!omap3_can_sleep())
-                return 1;
-        return 0;
-}
+/* Mach specific information to be recorded in the C-state driver_data */
+struct omap3_idle_statedata {
+        u32 mpu_state;
+        u32 core_state;
+        u8 valid;
+};
+struct omap3_idle_statedata omap3_idle_data[OMAP3_NUM_STATES];
+
+struct powerdomain *mpu_pd, *core_pd, *per_pd, *cam_pd;
 
 static int _cpuidle_allow_idle(struct powerdomain *pwrdm,
                                 struct clockdomain *clkdm)
@@ -122,12 +96,10 @@ static int _cpuidle_deny_idle(struct powerdomain *pwrdm,
 static int omap3_enter_idle(struct cpuidle_device *dev,
                         struct cpuidle_state *state)
 {
-        struct omap3_processor_cx *cx = cpuidle_get_statedata(state);
+        struct omap3_idle_statedata *cx = cpuidle_get_statedata(state);
         struct timespec ts_preidle, ts_postidle, ts_idle;
         u32 mpu_state = cx->mpu_state, core_state = cx->core_state;
 
-        current_cx_state = *cx;
-
         /* Used to keep track of the total time in idle */
         getnstimeofday(&ts_preidle);
 
@@ -140,7 +112,8 @@ static int omap3_enter_idle(struct cpuidle_device *dev,
         if (omap_irq_pending() || need_resched())
                 goto return_sleep_time;
 
-        if (cx->type == OMAP3_STATE_C1) {
+        /* Deny idle for C1 */
+        if (state == &dev->states[0]) {
                 pwrdm_for_each_clkdm(mpu_pd, _cpuidle_deny_idle);
                 pwrdm_for_each_clkdm(core_pd, _cpuidle_deny_idle);
         }
@@ -148,7 +121,8 @@ static int omap3_enter_idle(struct cpuidle_device *dev,
         /* Execute ARM wfi */
         omap_sram_idle();
 
-        if (cx->type == OMAP3_STATE_C1) {
+        /* Re-allow idle for C1 */
+        if (state == &dev->states[0]) {
                 pwrdm_for_each_clkdm(mpu_pd, _cpuidle_allow_idle);
                 pwrdm_for_each_clkdm(core_pd, _cpuidle_allow_idle);
         }
@@ -164,41 +138,53 @@ return_sleep_time:
 }
 
 /**
- * next_valid_state - Find next valid c-state
+ * next_valid_state - Find next valid C-state
  * @dev: cpuidle device
- * @state: Currently selected c-state
+ * @state: Currently selected C-state
  *
  * If the current state is valid, it is returned back to the caller.
  * Else, this function searches for a lower c-state which is still
- * valid (as defined in omap3_power_states[]).
+ * valid.
+ *
+ * A state is valid if the 'valid' field is enabled and
+ * if it satisfies the enable_off_mode condition.
  */
 static struct cpuidle_state *next_valid_state(struct cpuidle_device *dev,
-                                                struct cpuidle_state *curr)
+                                              struct cpuidle_state *curr)
 {
         struct cpuidle_state *next = NULL;
-        struct omap3_processor_cx *cx;
+        struct omap3_idle_statedata *cx = cpuidle_get_statedata(curr);
+        u32 mpu_deepest_state = PWRDM_POWER_RET;
+        u32 core_deepest_state = PWRDM_POWER_RET;
 
-        cx = (struct omap3_processor_cx *)cpuidle_get_statedata(curr);
+        if (enable_off_mode) {
+                mpu_deepest_state = PWRDM_POWER_OFF;
+                /*
+                 * Erratum i583: valable for ES rev < Es1.2 on 3630.
+                 * CORE OFF mode is not supported in a stable form, restrict
+                 * instead the CORE state to RET.
+                 */
+                if (!IS_PM34XX_ERRATUM(PM_SDRC_WAKEUP_ERRATUM_i583))
+                        core_deepest_state = PWRDM_POWER_OFF;
+        }
 
         /* Check if current state is valid */
-        if (cx->valid) {
+        if ((cx->valid) &&
+            (cx->mpu_state >= mpu_deepest_state) &&
+            (cx->core_state >= core_deepest_state)) {
                 return curr;
         } else {
-                u8 idx = OMAP3_STATE_MAX;
+                int idx = OMAP3_NUM_STATES - 1;
 
-                /*
-                 * Reach the current state starting at highest C-state
-                 */
-                for (; idx >= OMAP3_STATE_C1; idx--) {
+                /* Reach the current state starting at highest C-state */
+                for (; idx >= 0; idx--) {
                         if (&dev->states[idx] == curr) {
                                 next = &dev->states[idx];
                                 break;
                         }
                 }
 
-                /*
-                 * Should never hit this condition.
-                 */
+                /* Should never hit this condition */
                 WARN_ON(next == NULL);
 
                 /*
@@ -206,17 +192,17 @@ static struct cpuidle_state *next_valid_state(struct cpuidle_device *dev,
                  * Start search from the next (lower) state.
                  */
                 idx--;
-                for (; idx >= OMAP3_STATE_C1; idx--) {
-                        struct omap3_processor_cx *cx;
-
+                for (; idx >= 0; idx--) {
                         cx = cpuidle_get_statedata(&dev->states[idx]);
-                        if (cx->valid) {
+                        if ((cx->valid) &&
+                            (cx->mpu_state >= mpu_deepest_state) &&
+                            (cx->core_state >= core_deepest_state)) {
                                 next = &dev->states[idx];
                                 break;
                         }
                 }
                 /*
-                 * C1 and C2 are always valid.
+                 * C1 is always valid.
                  * So, no need to check for 'next==NULL' outside this loop.
                  */
         }
@@ -229,36 +215,22 @@ static struct cpuidle_state *next_valid_state(struct cpuidle_device *dev,
  * @dev: cpuidle device
  * @state: The target state to be programmed
  *
- * Used for C states with CPUIDLE_FLAG_CHECK_BM flag set. This
- * function checks for any pending activity and then programs the
- * device to the specified or a safer state.
+ * This function checks for any pending activity and then programs
+ * the device to the specified or a safer state.
  */
 static int omap3_enter_idle_bm(struct cpuidle_device *dev,
                                struct cpuidle_state *state)
 {
-        struct cpuidle_state *new_state = next_valid_state(dev, state);
-        u32 core_next_state, per_next_state = 0, per_saved_state = 0;
-        u32 cam_state;
-        struct omap3_processor_cx *cx;
+        struct cpuidle_state *new_state;
+        u32 core_next_state, per_next_state = 0, per_saved_state = 0, cam_state;
+        struct omap3_idle_statedata *cx;
         int ret;
 
-        if ((state->flags & CPUIDLE_FLAG_CHECK_BM) && omap3_idle_bm_check()) {
-                BUG_ON(!dev->safe_state);
+        if (!omap3_can_sleep()) {
                 new_state = dev->safe_state;
                 goto select_state;
         }
 
-        cx = cpuidle_get_statedata(state);
-        core_next_state = cx->core_state;
-
-        /*
-         * FIXME: we currently manage device-specific idle states
-         *        for PER and CORE in combination with CPU-specific
-         *        idle states.  This is wrong, and device-specific
-         *        idle management needs to be separated out into 
-         *        its own code.
-         */
-
         /*
          * Prevent idle completely if CAM is active.
          * CAM does not have wakeup capability in OMAP3.
@@ -270,9 +242,19 @@ static int omap3_enter_idle_bm(struct cpuidle_device *dev,
         }
 
         /*
+         * FIXME: we currently manage device-specific idle states
+         *        for PER and CORE in combination with CPU-specific
+         *        idle states.  This is wrong, and device-specific
+         *        idle management needs to be separated out into
+         *        its own code.
+         */
+
+        /*
          * Prevent PER off if CORE is not in retention or off as this
          * would disable PER wakeups completely.
          */
+        cx = cpuidle_get_statedata(state);
+        core_next_state = cx->core_state;
         per_next_state = per_saved_state = pwrdm_read_next_pwrst(per_pd);
         if ((per_next_state == PWRDM_POWER_OFF) &&
             (core_next_state > PWRDM_POWER_RET))
@@ -282,6 +264,8 @@ static int omap3_enter_idle_bm(struct cpuidle_device *dev,
         if (per_next_state != per_saved_state)
                 pwrdm_set_next_pwrst(per_pd, per_next_state);
 
+        new_state = next_valid_state(dev, state);
+
 select_state:
         dev->last_state = new_state;
         ret = omap3_enter_idle(dev, new_state);
@@ -295,31 +279,6 @@ select_state:
 
 DEFINE_PER_CPU(struct cpuidle_device, omap3_idle_dev);
 
-/**
- * omap3_cpuidle_update_states() - Update the cpuidle states
- * @mpu_deepest_state:  Enable states up to and including this for mpu domain
- * @core_deepest_state: Enable states up to and including this for core domain
- *
- * This goes through the list of states available and enables and disables the
- * validity of C states based on deepest state that can be achieved for the
- * variable domain
- */
-void omap3_cpuidle_update_states(u32 mpu_deepest_state, u32 core_deepest_state)
-{
-        int i;
-
-        for (i = OMAP3_STATE_C1; i < OMAP3_MAX_STATES; i++) {
-                struct omap3_processor_cx *cx = &omap3_power_states[i];
-
-                if ((cx->mpu_state >= mpu_deepest_state) &&
-                    (cx->core_state >= core_deepest_state)) {
-                        cx->valid = 1;
-                } else {
-                        cx->valid = 0;
-                }
-        }
-}
-
 void omap3_pm_init_cpuidle(struct cpuidle_params *cpuidle_board_params)
 {
         int i;
@@ -327,212 +286,109 @@ void omap3_pm_init_cpuidle(struct cpuidle_params *cpuidle_board_params)
         if (!cpuidle_board_params)
                 return;
 
-        for (i = OMAP3_STATE_C1; i < OMAP3_MAX_STATES; i++) {
-                cpuidle_params_table[i].valid =
-                        cpuidle_board_params[i].valid;
-                cpuidle_params_table[i].sleep_latency =
-                        cpuidle_board_params[i].sleep_latency;
-                cpuidle_params_table[i].wake_latency =
-                        cpuidle_board_params[i].wake_latency;
-                cpuidle_params_table[i].threshold =
-                        cpuidle_board_params[i].threshold;
+        for (i = 0; i < OMAP3_NUM_STATES; i++) {
+                cpuidle_params_table[i].valid = cpuidle_board_params[i].valid;
+                cpuidle_params_table[i].exit_latency =
+                        cpuidle_board_params[i].exit_latency;
+                cpuidle_params_table[i].target_residency =
+                        cpuidle_board_params[i].target_residency;
         }
         return;
 }
 
-/* omap3_init_power_states - Initialises the OMAP3 specific C states.
- *
- * Below is the desciption of each C state.
- *      C1 . MPU WFI + Core active
- *      C2 . MPU WFI + Core inactive
- *      C3 . MPU CSWR + Core inactive
- *      C4 . MPU OFF + Core inactive
- *      C5 . MPU CSWR + Core CSWR
- *      C6 . MPU OFF + Core CSWR
- *      C7 . MPU OFF + Core OFF
- */
-void omap_init_power_states(void)
-{
-        /* C1 . MPU WFI + Core active */
-        omap3_power_states[OMAP3_STATE_C1].valid =
-                        cpuidle_params_table[OMAP3_STATE_C1].valid;
-        omap3_power_states[OMAP3_STATE_C1].type = OMAP3_STATE_C1;
-        omap3_power_states[OMAP3_STATE_C1].sleep_latency =
-                        cpuidle_params_table[OMAP3_STATE_C1].sleep_latency;
-        omap3_power_states[OMAP3_STATE_C1].wakeup_latency =
-                        cpuidle_params_table[OMAP3_STATE_C1].wake_latency;
-        omap3_power_states[OMAP3_STATE_C1].threshold =
-                        cpuidle_params_table[OMAP3_STATE_C1].threshold;
-        omap3_power_states[OMAP3_STATE_C1].mpu_state = PWRDM_POWER_ON;
-        omap3_power_states[OMAP3_STATE_C1].core_state = PWRDM_POWER_ON;
-        omap3_power_states[OMAP3_STATE_C1].flags = CPUIDLE_FLAG_TIME_VALID;
-        omap3_power_states[OMAP3_STATE_C1].desc = "MPU ON + CORE ON";
-
-        /* C2 . MPU WFI + Core inactive */
-        omap3_power_states[OMAP3_STATE_C2].valid =
-                        cpuidle_params_table[OMAP3_STATE_C2].valid;
-        omap3_power_states[OMAP3_STATE_C2].type = OMAP3_STATE_C2;
-        omap3_power_states[OMAP3_STATE_C2].sleep_latency =
-                        cpuidle_params_table[OMAP3_STATE_C2].sleep_latency;
-        omap3_power_states[OMAP3_STATE_C2].wakeup_latency =
-                        cpuidle_params_table[OMAP3_STATE_C2].wake_latency;
-        omap3_power_states[OMAP3_STATE_C2].threshold =
-                        cpuidle_params_table[OMAP3_STATE_C2].threshold;
-        omap3_power_states[OMAP3_STATE_C2].mpu_state = PWRDM_POWER_ON;
-        omap3_power_states[OMAP3_STATE_C2].core_state = PWRDM_POWER_ON;
-        omap3_power_states[OMAP3_STATE_C2].flags = CPUIDLE_FLAG_TIME_VALID |
-                                CPUIDLE_FLAG_CHECK_BM;
-        omap3_power_states[OMAP3_STATE_C2].desc = "MPU ON + CORE ON";
-
-        /* C3 . MPU CSWR + Core inactive */
-        omap3_power_states[OMAP3_STATE_C3].valid =
-                        cpuidle_params_table[OMAP3_STATE_C3].valid;
-        omap3_power_states[OMAP3_STATE_C3].type = OMAP3_STATE_C3;
-        omap3_power_states[OMAP3_STATE_C3].sleep_latency =
-                        cpuidle_params_table[OMAP3_STATE_C3].sleep_latency;
-        omap3_power_states[OMAP3_STATE_C3].wakeup_latency =
-                        cpuidle_params_table[OMAP3_STATE_C3].wake_latency;
-        omap3_power_states[OMAP3_STATE_C3].threshold =
-                        cpuidle_params_table[OMAP3_STATE_C3].threshold;
-        omap3_power_states[OMAP3_STATE_C3].mpu_state = PWRDM_POWER_RET;
-        omap3_power_states[OMAP3_STATE_C3].core_state = PWRDM_POWER_ON;
-        omap3_power_states[OMAP3_STATE_C3].flags = CPUIDLE_FLAG_TIME_VALID |
-                                CPUIDLE_FLAG_CHECK_BM;
-        omap3_power_states[OMAP3_STATE_C3].desc = "MPU RET + CORE ON";
-
-        /* C4 . MPU OFF + Core inactive */
-        omap3_power_states[OMAP3_STATE_C4].valid =
-                        cpuidle_params_table[OMAP3_STATE_C4].valid;
-        omap3_power_states[OMAP3_STATE_C4].type = OMAP3_STATE_C4;
-        omap3_power_states[OMAP3_STATE_C4].sleep_latency =
-                        cpuidle_params_table[OMAP3_STATE_C4].sleep_latency;
-        omap3_power_states[OMAP3_STATE_C4].wakeup_latency =
-                        cpuidle_params_table[OMAP3_STATE_C4].wake_latency;
-        omap3_power_states[OMAP3_STATE_C4].threshold =
-                        cpuidle_params_table[OMAP3_STATE_C4].threshold;
-        omap3_power_states[OMAP3_STATE_C4].mpu_state = PWRDM_POWER_OFF;
-        omap3_power_states[OMAP3_STATE_C4].core_state = PWRDM_POWER_ON;
-        omap3_power_states[OMAP3_STATE_C4].flags = CPUIDLE_FLAG_TIME_VALID |
-                                CPUIDLE_FLAG_CHECK_BM;
-        omap3_power_states[OMAP3_STATE_C4].desc = "MPU OFF + CORE ON";
-
-        /* C5 . MPU CSWR + Core CSWR*/
-        omap3_power_states[OMAP3_STATE_C5].valid =
-                        cpuidle_params_table[OMAP3_STATE_C5].valid;
-        omap3_power_states[OMAP3_STATE_C5].type = OMAP3_STATE_C5;
-        omap3_power_states[OMAP3_STATE_C5].sleep_latency =
-                        cpuidle_params_table[OMAP3_STATE_C5].sleep_latency;
-        omap3_power_states[OMAP3_STATE_C5].wakeup_latency =
-                        cpuidle_params_table[OMAP3_STATE_C5].wake_latency;
-        omap3_power_states[OMAP3_STATE_C5].threshold =
-                        cpuidle_params_table[OMAP3_STATE_C5].threshold;
-        omap3_power_states[OMAP3_STATE_C5].mpu_state = PWRDM_POWER_RET;
-        omap3_power_states[OMAP3_STATE_C5].core_state = PWRDM_POWER_RET;
-        omap3_power_states[OMAP3_STATE_C5].flags = CPUIDLE_FLAG_TIME_VALID |
-                                CPUIDLE_FLAG_CHECK_BM;
-        omap3_power_states[OMAP3_STATE_C5].desc = "MPU RET + CORE RET";
-
-        /* C6 . MPU OFF + Core CSWR */
-        omap3_power_states[OMAP3_STATE_C6].valid =
-                        cpuidle_params_table[OMAP3_STATE_C6].valid;
-        omap3_power_states[OMAP3_STATE_C6].type = OMAP3_STATE_C6;
-        omap3_power_states[OMAP3_STATE_C6].sleep_latency =
-                        cpuidle_params_table[OMAP3_STATE_C6].sleep_latency;
-        omap3_power_states[OMAP3_STATE_C6].wakeup_latency =
-                        cpuidle_params_table[OMAP3_STATE_C6].wake_latency;
-        omap3_power_states[OMAP3_STATE_C6].threshold =
-                        cpuidle_params_table[OMAP3_STATE_C6].threshold;
-        omap3_power_states[OMAP3_STATE_C6].mpu_state = PWRDM_POWER_OFF;
-        omap3_power_states[OMAP3_STATE_C6].core_state = PWRDM_POWER_RET;
-        omap3_power_states[OMAP3_STATE_C6].flags = CPUIDLE_FLAG_TIME_VALID |
-                                CPUIDLE_FLAG_CHECK_BM;
-        omap3_power_states[OMAP3_STATE_C6].desc = "MPU OFF + CORE RET";
-
-        /* C7 . MPU OFF + Core OFF */
-        omap3_power_states[OMAP3_STATE_C7].valid =
-                        cpuidle_params_table[OMAP3_STATE_C7].valid;
-        omap3_power_states[OMAP3_STATE_C7].type = OMAP3_STATE_C7;
-        omap3_power_states[OMAP3_STATE_C7].sleep_latency =
-                        cpuidle_params_table[OMAP3_STATE_C7].sleep_latency;
-        omap3_power_states[OMAP3_STATE_C7].wakeup_latency =
-                        cpuidle_params_table[OMAP3_STATE_C7].wake_latency;
-        omap3_power_states[OMAP3_STATE_C7].threshold =
-                        cpuidle_params_table[OMAP3_STATE_C7].threshold;
-        omap3_power_states[OMAP3_STATE_C7].mpu_state = PWRDM_POWER_OFF;
-        omap3_power_states[OMAP3_STATE_C7].core_state = PWRDM_POWER_OFF;
-        omap3_power_states[OMAP3_STATE_C7].flags = CPUIDLE_FLAG_TIME_VALID |
-                                CPUIDLE_FLAG_CHECK_BM;
-        omap3_power_states[OMAP3_STATE_C7].desc = "MPU OFF + CORE OFF";
-
-        /*
-         * Erratum i583: implementation for ES rev < Es1.2 on 3630. We cannot
-         * enable OFF mode in a stable form for previous revisions.
-         * we disable C7 state as a result.
-         */
-        if (IS_PM34XX_ERRATUM(PM_SDRC_WAKEUP_ERRATUM_i583)) {
-                omap3_power_states[OMAP3_STATE_C7].valid = 0;
-                cpuidle_params_table[OMAP3_STATE_C7].valid = 0;
-                pr_warn("%s: core off state C7 disabled due to i583\n",
-                                __func__);
-        }
-}
-
 struct cpuidle_driver omap3_idle_driver = {
         .name =         "omap3_idle",
         .owner =        THIS_MODULE,
 };
 
+/* Helper to fill the C-state common data and register the driver_data */
+static inline struct omap3_idle_statedata *_fill_cstate(
+                                        struct cpuidle_device *dev,
+                                        int idx, const char *descr)
+{
+        struct omap3_idle_statedata *cx = &omap3_idle_data[idx];
+        struct cpuidle_state *state = &dev->states[idx];
+
+        state->exit_latency     = cpuidle_params_table[idx].exit_latency;
+        state->target_residency = cpuidle_params_table[idx].target_residency;
+        state->flags            = CPUIDLE_FLAG_TIME_VALID;
+        state->enter            = omap3_enter_idle_bm;
+        cx->valid               = cpuidle_params_table[idx].valid;
+        sprintf(state->name, "C%d", idx + 1);
+        strncpy(state->desc, descr, CPUIDLE_DESC_LEN);
+        cpuidle_set_statedata(state, cx);
+
+        return cx;
+}
+
 /**
  * omap3_idle_init - Init routine for OMAP3 idle
  *
- * Registers the OMAP3 specific cpuidle driver with the cpuidle
+ * Registers the OMAP3 specific cpuidle driver to the cpuidle
  * framework with the valid set of states.
  */
 int __init omap3_idle_init(void)
 {
-        int i, count = 0;
-        struct omap3_processor_cx *cx;
-        struct cpuidle_state *state;
         struct cpuidle_device *dev;
+        struct omap3_idle_statedata *cx;
 
         mpu_pd = pwrdm_lookup("mpu_pwrdm");
         core_pd = pwrdm_lookup("core_pwrdm");
         per_pd = pwrdm_lookup("per_pwrdm");
         cam_pd = pwrdm_lookup("cam_pwrdm");
 
-        omap_init_power_states();
         cpuidle_register_driver(&omap3_idle_driver);
-
         dev = &per_cpu(omap3_idle_dev, smp_processor_id());
 
-        for (i = OMAP3_STATE_C1; i < OMAP3_MAX_STATES; i++) {
-                cx = &omap3_power_states[i];
-                state = &dev->states[count];
-
-                if (!cx->valid)
-                        continue;
-                cpuidle_set_statedata(state, cx);
-                state->exit_latency = cx->sleep_latency + cx->wakeup_latency;
-                state->target_residency = cx->threshold;
-                state->flags = cx->flags;
-                state->enter = (state->flags & CPUIDLE_FLAG_CHECK_BM) ?
-                        omap3_enter_idle_bm : omap3_enter_idle;
-                if (cx->type == OMAP3_STATE_C1)
-                        dev->safe_state = state;
-                sprintf(state->name, "C%d", count+1);
-                strncpy(state->desc, cx->desc, CPUIDLE_DESC_LEN);
-                count++;
-        }
+        /* C1 . MPU WFI + Core active */
+        cx = _fill_cstate(dev, 0, "MPU ON + CORE ON");
+        (&dev->states[0])->enter = omap3_enter_idle;
+        dev->safe_state = &dev->states[0];
+        cx->valid = 1;  /* C1 is always valid */
+        cx->mpu_state = PWRDM_POWER_ON;
+        cx->core_state = PWRDM_POWER_ON;
 
-        if (!count)
-                return -EINVAL;
-        dev->state_count = count;
+        /* C2 . MPU WFI + Core inactive */
+        cx = _fill_cstate(dev, 1, "MPU ON + CORE ON");
+        cx->mpu_state = PWRDM_POWER_ON;
+        cx->core_state = PWRDM_POWER_ON;
+
+        /* C3 . MPU CSWR + Core inactive */
+        cx = _fill_cstate(dev, 2, "MPU RET + CORE ON");
+        cx->mpu_state = PWRDM_POWER_RET;
+        cx->core_state = PWRDM_POWER_ON;
 
-        if (enable_off_mode)
-                omap3_cpuidle_update_states(PWRDM_POWER_OFF, PWRDM_POWER_OFF);
-        else
-                omap3_cpuidle_update_states(PWRDM_POWER_RET, PWRDM_POWER_RET);
+        /* C4 . MPU OFF + Core inactive */
+        cx = _fill_cstate(dev, 3, "MPU OFF + CORE ON");
+        cx->mpu_state = PWRDM_POWER_OFF;
+        cx->core_state = PWRDM_POWER_ON;
+
+        /* C5 . MPU RET + Core RET */
+        cx = _fill_cstate(dev, 4, "MPU RET + CORE RET");
+        cx->mpu_state = PWRDM_POWER_RET;
+        cx->core_state = PWRDM_POWER_RET;
+
+        /* C6 . MPU OFF + Core RET */
+        cx = _fill_cstate(dev, 5, "MPU OFF + CORE RET");
+        cx->mpu_state = PWRDM_POWER_OFF;
+        cx->core_state = PWRDM_POWER_RET;
+
+        /* C7 . MPU OFF + Core OFF */
+        cx = _fill_cstate(dev, 6, "MPU OFF + CORE OFF");
+        /*
+         * Erratum i583: implementation for ES rev < Es1.2 on 3630. We cannot
+         * enable OFF mode in a stable form for previous revisions.
+         * We disable C7 state as a result.
+         */
+        if (IS_PM34XX_ERRATUM(PM_SDRC_WAKEUP_ERRATUM_i583)) {
+                cx->valid = 0;
+                pr_warn("%s: core off state C7 disabled due to i583\n",
+                        __func__);
+        }
+        cx->mpu_state = PWRDM_POWER_OFF;
+        cx->core_state = PWRDM_POWER_OFF;
 
+        dev->state_count = OMAP3_NUM_STATES;
         if (cpuidle_register_device(dev)) {
                 printk(KERN_ERR "%s: CPUidle register device failed\n",
                        __func__);
diff --git a/arch/arm/mach-omap2/gpmc-smc91x.c b/arch/arm/mach-omap2/gpmc-smc91x.c
index 877c6f5807b7..ba10c24f3d8d 100644
--- a/arch/arm/mach-omap2/gpmc-smc91x.c
+++ b/arch/arm/mach-omap2/gpmc-smc91x.c
@@ -147,25 +147,24 @@ void __init gpmc_smc91x_init(struct omap_smc91x_platform_data *board_data)
                         goto free1;
         }
 
-        if (gpio_request(gpmc_cfg->gpio_irq, "SMC91X irq") < 0)
+        if (gpio_request_one(gpmc_cfg->gpio_irq, GPIOF_IN, "SMC91X irq") < 0)
                 goto free1;
 
-        gpio_direction_input(gpmc_cfg->gpio_irq);
         gpmc_smc91x_resources[1].start = gpio_to_irq(gpmc_cfg->gpio_irq);
 
         if (gpmc_cfg->gpio_pwrdwn) {
-                ret = gpio_request(gpmc_cfg->gpio_pwrdwn, "SMC91X powerdown");
+                ret = gpio_request_one(gpmc_cfg->gpio_pwrdwn,
+                                       GPIOF_OUT_INIT_LOW, "SMC91X powerdown");
                 if (ret)
                         goto free2;
-                gpio_direction_output(gpmc_cfg->gpio_pwrdwn, 0);
         }
 
         if (gpmc_cfg->gpio_reset) {
-                ret = gpio_request(gpmc_cfg->gpio_reset, "SMC91X reset");
+                ret = gpio_request_one(gpmc_cfg->gpio_reset,
+                                       GPIOF_OUT_INIT_LOW, "SMC91X reset");
                 if (ret)
                         goto free3;
 
-                gpio_direction_output(gpmc_cfg->gpio_reset, 0);
                 gpio_set_value(gpmc_cfg->gpio_reset, 1);
                 msleep(100);
                 gpio_set_value(gpmc_cfg->gpio_reset, 0);
diff --git a/arch/arm/mach-omap2/gpmc-smsc911x.c b/arch/arm/mach-omap2/gpmc-smsc911x.c
index 703f150dd01d..997033129d26 100644
--- a/arch/arm/mach-omap2/gpmc-smsc911x.c
+++ b/arch/arm/mach-omap2/gpmc-smsc911x.c
@@ -10,6 +10,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+#define pr_fmt(fmt) "%s: " fmt, __func__
 
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
@@ -30,7 +31,7 @@ static struct resource gpmc_smsc911x_resources[] = {
                 .flags          = IORESOURCE_MEM,
         },
         [1] = {
-                .flags          = IORESOURCE_IRQ,
+                .flags          = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
         },
 };
 
@@ -41,16 +42,6 @@ static struct smsc911x_platform_config gpmc_smsc911x_config = {
         .flags          = SMSC911X_USE_16BIT,
 };
 
-static struct platform_device gpmc_smsc911x_device = {
-        .name           = "smsc911x",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(gpmc_smsc911x_resources),
-        .resource       = gpmc_smsc911x_resources,
-        .dev            = {
-                .platform_data = &gpmc_smsc911x_config,
-        },
-};
-
 /*
  * Initialize smsc911x device connected to the GPMC. Note that we
  * assume that pin multiplexing is done in the board-*.c file,
@@ -58,46 +49,49 @@ static struct platform_device gpmc_smsc911x_device = {
  */
 void __init gpmc_smsc911x_init(struct omap_smsc911x_platform_data *board_data)
 {
+        struct platform_device *pdev;
         unsigned long cs_mem_base;
         int ret;
 
         gpmc_cfg = board_data;
 
         if (gpmc_cs_request(gpmc_cfg->cs, SZ_16M, &cs_mem_base) < 0) {
-                printk(KERN_ERR "Failed to request GPMC mem for smsc911x\n");
+                pr_err("Failed to request GPMC mem region\n");
                 return;
         }
 
         gpmc_smsc911x_resources[0].start = cs_mem_base + 0x0;
         gpmc_smsc911x_resources[0].end = cs_mem_base + 0xff;
 
-        if (gpio_request(gpmc_cfg->gpio_irq, "smsc911x irq") < 0) {
-                printk(KERN_ERR "Failed to request GPIO%d for smsc911x IRQ\n",
-                                gpmc_cfg->gpio_irq);
+        if (gpio_request_one(gpmc_cfg->gpio_irq, GPIOF_IN, "smsc911x irq")) {
+                pr_err("Failed to request IRQ GPIO%d\n", gpmc_cfg->gpio_irq);
                 goto free1;
         }
 
-        gpio_direction_input(gpmc_cfg->gpio_irq);
         gpmc_smsc911x_resources[1].start = gpio_to_irq(gpmc_cfg->gpio_irq);
-        gpmc_smsc911x_resources[1].flags |=
-                                        (gpmc_cfg->flags & IRQF_TRIGGER_MASK);
 
         if (gpio_is_valid(gpmc_cfg->gpio_reset)) {
-                ret = gpio_request(gpmc_cfg->gpio_reset, "smsc911x reset");
+                ret = gpio_request_one(gpmc_cfg->gpio_reset,
+                                       GPIOF_OUT_INIT_HIGH, "smsc911x reset");
                 if (ret) {
-                        printk(KERN_ERR "Failed to request GPIO%d for smsc911x reset\n",
-                                        gpmc_cfg->gpio_reset);
+                        pr_err("Failed to request reset GPIO%d\n",
+                               gpmc_cfg->gpio_reset);
                         goto free2;
                 }
 
-                gpio_direction_output(gpmc_cfg->gpio_reset, 1);
                 gpio_set_value(gpmc_cfg->gpio_reset, 0);
                 msleep(100);
                 gpio_set_value(gpmc_cfg->gpio_reset, 1);
         }
 
-        if (platform_device_register(&gpmc_smsc911x_device) < 0) {
-                printk(KERN_ERR "Unable to register smsc911x device\n");
+        if (gpmc_cfg->flags)
+                gpmc_smsc911x_config.flags = gpmc_cfg->flags;
+
+        pdev = platform_device_register_resndata(NULL, "smsc911x", gpmc_cfg->id,
+                 gpmc_smsc911x_resources, ARRAY_SIZE(gpmc_smsc911x_resources),
+                 &gpmc_smsc911x_config, sizeof(gpmc_smsc911x_config));
+        if (!pdev) {
+                pr_err("Unable to register platform device\n");
                 gpio_free(gpmc_cfg->gpio_reset);
                 goto free2;
         }
@@ -109,5 +103,5 @@ free2:
 free1:
         gpmc_cs_free(gpmc_cfg->cs);
 
-        printk(KERN_ERR "Could not initialize smsc911x\n");
+        pr_err("Could not initialize smsc911x device\n");
 }
diff --git a/arch/arm/mach-omap2/omap_l3_noc.c b/arch/arm/mach-omap2/omap_l3_noc.c
index 82632c24076f..7b9f1909ddb2 100644
--- a/arch/arm/mach-omap2/omap_l3_noc.c
+++ b/arch/arm/mach-omap2/omap_l3_noc.c
@@ -63,10 +63,7 @@ static irqreturn_t l3_interrupt_handler(int irq, void *_l3)
         char *source_name;
 
         /* Get the Type of interrupt */
-        if (irq == l3->app_irq)
-                inttype = L3_APPLICATION_ERROR;
-        else
-                inttype = L3_DEBUG_ERROR;
+        inttype = irq == l3->app_irq ? L3_APPLICATION_ERROR : L3_DEBUG_ERROR;
 
         for (i = 0; i < L3_MODULES; i++) {
                 /*
@@ -84,10 +81,10 @@ static irqreturn_t l3_interrupt_handler(int irq, void *_l3)
 
                         err_src = j;
                         /* Read the stderrlog_main_source from clk domain */
-                        std_err_main_addr = base + (*(l3_targ[i] + err_src));
-                        std_err_main =  readl(std_err_main_addr);
+                        std_err_main_addr = base + *(l3_targ[i] + err_src);
+                        std_err_main = readl(std_err_main_addr);
 
-                        switch ((std_err_main & CUSTOM_ERROR)) {
+                        switch (std_err_main & CUSTOM_ERROR) {
                         case STANDARD_ERROR:
                                 source_name =
                                 l3_targ_stderrlog_main_name[i][err_src];
@@ -132,49 +129,49 @@ static int __init omap4_l3_probe(struct platform_device *pdev)
 
         l3 = kzalloc(sizeof(*l3), GFP_KERNEL);
         if (!l3)
-                ret = -ENOMEM;
+                return -ENOMEM;
 
         platform_set_drvdata(pdev, l3);
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!res) {
                 dev_err(&pdev->dev, "couldn't find resource 0\n");
                 ret = -ENODEV;
-                goto err1;
+                goto err0;
         }
 
         l3->l3_base[0] = ioremap(res->start, resource_size(res));
-        if (!(l3->l3_base[0])) {
+        if (!l3->l3_base[0]) {
                 dev_err(&pdev->dev, "ioremap failed\n");
                 ret = -ENOMEM;
-                goto err2;
+                goto err0;
         }
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
         if (!res) {
                 dev_err(&pdev->dev, "couldn't find resource 1\n");
                 ret = -ENODEV;
-                goto err3;
+                goto err1;
         }
 
         l3->l3_base[1] = ioremap(res->start, resource_size(res));
-        if (!(l3->l3_base[1])) {
+        if (!l3->l3_base[1]) {
                 dev_err(&pdev->dev, "ioremap failed\n");
                 ret = -ENOMEM;
-                goto err4;
+                goto err1;
         }
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
         if (!res) {
                 dev_err(&pdev->dev, "couldn't find resource 2\n");
                 ret = -ENODEV;
-                goto err5;
+                goto err2;
         }
 
         l3->l3_base[2] = ioremap(res->start, resource_size(res));
-        if (!(l3->l3_base[2])) {
+        if (!l3->l3_base[2]) {
                 dev_err(&pdev->dev, "ioremap failed\n");
                 ret = -ENOMEM;
-                goto err6;
+                goto err2;
         }
 
         /*
@@ -187,7 +184,7 @@ static int __init omap4_l3_probe(struct platform_device *pdev)
         if (ret) {
                 pr_crit("L3: request_irq failed to register for 0x%x\n",
                                          OMAP44XX_IRQ_L3_DBG);
-                goto err7;
+                goto err3;
         }
         l3->debug_irq = irq;
 
@@ -198,24 +195,22 @@ static int __init omap4_l3_probe(struct platform_device *pdev)
         if (ret) {
                 pr_crit("L3: request_irq failed to register for 0x%x\n",
                                          OMAP44XX_IRQ_L3_APP);
-                goto err8;
+                goto err4;
         }
         l3->app_irq = irq;
 
-        goto err0;
-err8:
-err7:
-        iounmap(l3->l3_base[2]);
-err6:
-err5:
-        iounmap(l3->l3_base[1]);
+        return 0;
+
 err4:
+        free_irq(l3->debug_irq, l3);
 err3:
-        iounmap(l3->l3_base[0]);
+        iounmap(l3->l3_base[2]);
 err2:
+        iounmap(l3->l3_base[1]);
 err1:
-        kfree(l3);
+        iounmap(l3->l3_base[0]);
 err0:
+        kfree(l3);
         return ret;
 }
 
diff --git a/arch/arm/mach-omap2/omap_l3_smx.c b/arch/arm/mach-omap2/omap_l3_smx.c
index 4321e7938929..873c0e33b512 100644
--- a/arch/arm/mach-omap2/omap_l3_smx.c
+++ b/arch/arm/mach-omap2/omap_l3_smx.c
@@ -155,7 +155,7 @@ static irqreturn_t omap3_l3_block_irq(struct omap3_l3 *l3,
         u8                      multi = error & L3_ERROR_LOG_MULTI;
         u32                     address = omap3_l3_decode_addr(error_addr);
 
-        WARN(true, "%s Error seen by %s %s at address %x\n",
+        WARN(true, "%s seen by %s %s at address %x\n",
                                  omap3_l3_code_string(code),
                           omap3_l3_initiator_string(initid),
                              multi ? "Multiple Errors" : "",
@@ -167,21 +167,15 @@ static irqreturn_t omap3_l3_block_irq(struct omap3_l3 *l3,
 static irqreturn_t omap3_l3_app_irq(int irq, void *_l3)
 {
         struct omap3_l3         *l3 = _l3;
-
         u64                     status, clear;
         u64                     error;
         u64                     error_addr;
         u64                     err_source = 0;
         void                    __iomem *base;
         int                     int_type;
-
         irqreturn_t             ret = IRQ_NONE;
 
-        if (irq == l3->app_irq)
-                int_type = L3_APPLICATION_ERROR;
-        else
-                int_type = L3_DEBUG_ERROR;
-
+        int_type = irq == l3->app_irq ? L3_APPLICATION_ERROR : L3_DEBUG_ERROR;
         if (!int_type) {
                 status = omap3_l3_readll(l3->rt, L3_SI_FLAG_STATUS_0);
                 /*
@@ -202,7 +196,6 @@ static irqreturn_t omap3_l3_app_irq(int irq, void *_l3)
 
         base = l3->rt + *(omap3_l3_bases[int_type] + err_source);
         error = omap3_l3_readll(base, L3_ERROR_LOG);
-
         if (error) {
                 error_addr = omap3_l3_readll(base, L3_ERROR_LOG_ADDR);
 
@@ -210,9 +203,8 @@ static irqreturn_t omap3_l3_app_irq(int irq, void *_l3)
         }
 
         /* Clear the status register */
-        clear = ((L3_AGENT_STATUS_CLEAR_IA << int_type) |
-                 (L3_AGENT_STATUS_CLEAR_TA));
-
+        clear = (L3_AGENT_STATUS_CLEAR_IA << int_type) |
+                L3_AGENT_STATUS_CLEAR_TA;
         omap3_l3_writell(base, L3_AGENT_STATUS, clear);
 
         /* clear the error log register */
@@ -228,10 +220,8 @@ static int __init omap3_l3_probe(struct platform_device *pdev)
         int                     ret;
 
         l3 = kzalloc(sizeof(*l3), GFP_KERNEL);
-        if (!l3) {
-                ret = -ENOMEM;
-                goto err0;
-        }
+        if (!l3)
+                return -ENOMEM;
 
         platform_set_drvdata(pdev, l3);
 
@@ -239,13 +229,13 @@ static int __init omap3_l3_probe(struct platform_device *pdev)
         if (!res) {
                 dev_err(&pdev->dev, "couldn't find resource\n");
                 ret = -ENODEV;
-                goto err1;
+                goto err0;
         }
         l3->rt = ioremap(res->start, resource_size(res));
-        if (!(l3->rt)) {
+        if (!l3->rt) {
                 dev_err(&pdev->dev, "ioremap failed\n");
                 ret = -ENOMEM;
-                goto err2;
+                goto err0;
         }
 
         l3->debug_irq = platform_get_irq(pdev, 0);
@@ -254,28 +244,26 @@ static int __init omap3_l3_probe(struct platform_device *pdev)
                 "l3-debug-irq", l3);
         if (ret) {
                 dev_err(&pdev->dev, "couldn't request debug irq\n");
-                goto err3;
+                goto err1;
         }
 
         l3->app_irq = platform_get_irq(pdev, 1);
         ret = request_irq(l3->app_irq, omap3_l3_app_irq,
                 IRQF_DISABLED | IRQF_TRIGGER_RISING,
                 "l3-app-irq", l3);
-
         if (ret) {
                 dev_err(&pdev->dev, "couldn't request app irq\n");
-                goto err4;
+                goto err2;
         }
 
-        goto err0;
+        return 0;
 
-err4:
-err3:
-        iounmap(l3->rt);
 err2:
+        free_irq(l3->debug_irq, l3);
 err1:
-        kfree(l3);
+        iounmap(l3->rt);
 err0:
+        kfree(l3);
         return ret;
 }
 
diff --git a/arch/arm/mach-omap2/omap_phy_internal.c b/arch/arm/mach-omap2/omap_phy_internal.c
index 05f6abc96b0d..f47813edd951 100644
--- a/arch/arm/mach-omap2/omap_phy_internal.c
+++ b/arch/arm/mach-omap2/omap_phy_internal.c
@@ -50,13 +50,16 @@ int omap4430_phy_init(struct device *dev)
 {
         ctrl_base = ioremap(OMAP443X_SCM_BASE, SZ_1K);
         if (!ctrl_base) {
-                dev_err(dev, "control module ioremap failed\n");
+                pr_err("control module ioremap failed\n");
                 return -ENOMEM;
         }
         /* Power down the phy */
         __raw_writel(PHY_PD, ctrl_base + CONTROL_DEV_CONF);
-        phyclk = clk_get(dev, "ocp2scp_usb_phy_ick");
 
+        if (!dev)
+                return 0;
+
+        phyclk = clk_get(dev, "ocp2scp_usb_phy_ick");
         if (IS_ERR(phyclk)) {
                 dev_err(dev, "cannot clk_get ocp2scp_usb_phy_ick\n");
                 iounmap(ctrl_base);
@@ -228,7 +231,7 @@ void am35x_musb_clear_irq(void)
         regval = omap_ctrl_readl(AM35XX_CONTROL_LVL_INTR_CLEAR);
 }
 
-void am35x_musb_set_mode(u8 musb_mode)
+void am35x_set_mode(u8 musb_mode)
 {
         u32 devconf2 = omap_ctrl_readl(AM35XX_CONTROL_DEVCONF2);
 
diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h
index 797bfd12b643..45bcfce77352 100644
--- a/arch/arm/mach-omap2/pm.h
+++ b/arch/arm/mach-omap2/pm.h
@@ -36,11 +36,16 @@ static inline int omap4_opp_init(void)
 }
 #endif
 
+/*
+ * cpuidle mach specific parameters
+ *
+ * The board code can override the default C-states definition using
+ * omap3_pm_init_cpuidle
+ */
 struct cpuidle_params {
-        u8  valid;
-        u32 sleep_latency;
-        u32 wake_latency;
-        u32 threshold;
+        u32 exit_latency;       /* exit_latency = sleep + wake-up latencies */
+        u32 target_residency;
+        u8 valid;               /* validates the C-state */
 };
 
 #if defined(CONFIG_PM) && defined(CONFIG_CPU_IDLE)
@@ -73,10 +78,6 @@ extern u32 sleep_while_idle;
 #define sleep_while_idle 0
 #endif
 
-#if defined(CONFIG_CPU_IDLE)
-extern void omap3_cpuidle_update_states(u32, u32);
-#endif
-
 #if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS)
 extern void pm_dbg_update_time(struct powerdomain *pwrdm, int prev);
 extern int pm_dbg_regset_save(int reg_set);
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index 0c5e3a46a3ad..c155c9d1c82c 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -779,18 +779,6 @@ void omap3_pm_off_mode_enable(int enable)
         else
                 state = PWRDM_POWER_RET;
 
-#ifdef CONFIG_CPU_IDLE
-        /*
-         * Erratum i583: implementation for ES rev < Es1.2 on 3630. We cannot
-         * enable OFF mode in a stable form for previous revisions, restrict
-         * instead to RET
-         */
-        if (IS_PM34XX_ERRATUM(PM_SDRC_WAKEUP_ERRATUM_i583))
-                omap3_cpuidle_update_states(state, PWRDM_POWER_RET);
-        else
-                omap3_cpuidle_update_states(state, state);
-#endif
-
         list_for_each_entry(pwrst, &pwrst_list, node) {
                 if (IS_PM34XX_ERRATUM(PM_SDRC_WAKEUP_ERRATUM_i583) &&
                                 pwrst->pwrdm == core_pwrdm &&
@@ -895,8 +883,6 @@ static int __init omap3_pm_init(void)
 
         pm_errata_configure();
 
-        printk(KERN_ERR "Power Management for TI OMAP3.\n");
-
         /* XXX prcm_setup_regs needs to be before enabling hw
          * supervised mode for powerdomains */
         prcm_setup_regs();
diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c
index 76cfff2db514..59a870be8390 100644
--- a/arch/arm/mach-omap2/pm44xx.c
+++ b/arch/arm/mach-omap2/pm44xx.c
@@ -105,13 +105,11 @@ static int __init omap4_pm_init(void)
 
         pr_err("Power Management for TI OMAP4.\n");
 
-#ifdef CONFIG_PM
         ret = pwrdm_for_each(pwrdms_setup, NULL);
         if (ret) {
                 pr_err("Failed to setup powerdomains\n");
                 goto err2;
         }
-#endif
 
 #ifdef CONFIG_SUSPEND
         suspend_set_ops(&omap_pm_ops);
diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
index 13e24f913dd4..fb7dc52394a8 100644
--- a/arch/arm/mach-omap2/smartreflex.c
+++ b/arch/arm/mach-omap2/smartreflex.c
@@ -847,6 +847,14 @@ static int __init omap_sr_probe(struct platform_device *pdev)
                 goto err_free_devinfo;
         }
 
+        mem = request_mem_region(mem->start, resource_size(mem),
+                                        dev_name(&pdev->dev));
+        if (!mem) {
+                dev_err(&pdev->dev, "%s: no mem region\n", __func__);
+                ret = -EBUSY;
+                goto err_free_devinfo;
+        }
+
         irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
 
         pm_runtime_enable(&pdev->dev);
@@ -883,7 +891,7 @@ static int __init omap_sr_probe(struct platform_device *pdev)
                 ret = sr_late_init(sr_info);
                 if (ret) {
                         pr_warning("%s: Error in SR late init\n", __func__);
-                        goto err_release_region;
+                        return ret;
                 }
         }
 
@@ -896,7 +904,7 @@ static int __init omap_sr_probe(struct platform_device *pdev)
         vdd_dbg_dir = omap_voltage_get_dbgdir(sr_info->voltdm);
         if (!vdd_dbg_dir) {
                 ret = -EINVAL;
-                goto err_release_region;
+                goto err_iounmap;
         }
 
         sr_info->dbg_dir = debugfs_create_dir("smartreflex", vdd_dbg_dir);
@@ -904,7 +912,7 @@ static int __init omap_sr_probe(struct platform_device *pdev)
                 dev_err(&pdev->dev, "%s: Unable to create debugfs directory\n",
                         __func__);
                 ret = PTR_ERR(sr_info->dbg_dir);
-                goto err_release_region;
+                goto err_iounmap;
         }
 
         (void) debugfs_create_file("autocomp", S_IRUGO | S_IWUSR,
@@ -921,7 +929,7 @@ static int __init omap_sr_probe(struct platform_device *pdev)
                 dev_err(&pdev->dev, "%s: Unable to create debugfs directory"
                         "for n-values\n", __func__);
                 ret = PTR_ERR(nvalue_dir);
-                goto err_release_region;
+                goto err_debugfs;
         }
 
         omap_voltage_get_volttable(sr_info->voltdm, &volt_data);
@@ -931,7 +939,7 @@ static int __init omap_sr_probe(struct platform_device *pdev)
                         "entries for n-values\n",
                         __func__, sr_info->voltdm->name);
                 ret = -ENODATA;
-                goto err_release_region;
+                goto err_debugfs;
         }
 
         for (i = 0; i < sr_info->nvalue_count; i++) {
@@ -945,6 +953,11 @@ static int __init omap_sr_probe(struct platform_device *pdev)
 
         return ret;
 
+err_debugfs:
+        debugfs_remove_recursive(sr_info->dbg_dir);
+err_iounmap:
+        list_del(&sr_info->node);
+        iounmap(sr_info->base);
 err_release_region:
         release_mem_region(mem->start, resource_size(mem));
 err_free_devinfo:
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index 35559f77e2de..c7ed540d868d 100644
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -108,7 +108,13 @@ static void usb_musb_mux_init(struct omap_musb_board_data *board_data)
         }
 }
 
-void __init usb_musb_init(struct omap_musb_board_data *board_data)
+static struct omap_musb_board_data musb_default_board_data = {
+        .interface_type         = MUSB_INTERFACE_ULPI,
+        .mode                   = MUSB_OTG,
+        .power                  = 100,
+};
+
+void __init usb_musb_init(struct omap_musb_board_data *musb_board_data)
 {
         struct omap_hwmod               *oh;
         struct omap_device              *od;
@@ -116,11 +122,12 @@ void __init usb_musb_init(struct omap_musb_board_data *board_data)
         struct device                   *dev;
         int                             bus_id = -1;
         const char                      *oh_name, *name;
+        struct omap_musb_board_data     *board_data;
 
-        if (cpu_is_omap3517() || cpu_is_omap3505()) {
-        } else if (cpu_is_omap44xx()) {
-                usb_musb_mux_init(board_data);
-        }
+        if (musb_board_data)
+                board_data = musb_board_data;
+        else
+                board_data = &musb_default_board_data;
 
         /*
          * REVISIT: This line can be removed once all the platforms using
@@ -164,10 +171,15 @@ void __init usb_musb_init(struct omap_musb_board_data *board_data)
         dev->dma_mask = &musb_dmamask;
         dev->coherent_dma_mask = musb_dmamask;
         put_device(dev);
+
+        if (cpu_is_omap44xx())
+                omap4430_phy_init(dev);
 }
 
 #else
 void __init usb_musb_init(struct omap_musb_board_data *board_data)
 {
+        if (cpu_is_omap44xx())
+                omap4430_phy_init(NULL);
 }
 #endif /* CONFIG_USB_MUSB_SOC */
diff --git a/arch/arm/mach-omap2/usb-tusb6010.c b/arch/arm/mach-omap2/usb-tusb6010.c
index 8a3c05f3c1d6..8dd26b765b7d 100644
--- a/arch/arm/mach-omap2/usb-tusb6010.c
+++ b/arch/arm/mach-omap2/usb-tusb6010.c
@@ -293,12 +293,11 @@ tusb6010_setup_interface(struct musb_hdrc_platform_data *data,
                         );
 
         /* IRQ */
-        status = gpio_request(irq, "TUSB6010 irq");
+        status = gpio_request_one(irq, GPIOF_IN, "TUSB6010 irq");
         if (status < 0) {
                 printk(error, 3, status);
                 return status;
         }
-        gpio_direction_input(irq);
         tusb_resources[2].start = irq + IH_GPIO_BASE;
 
         /* set up memory timings ... can speed them up later */
diff --git a/arch/arm/mach-omap2/voltage.c b/arch/arm/mach-omap2/voltage.c
index 0c1552d9d995..9ef3789ded4b 100644
--- a/arch/arm/mach-omap2/voltage.c
+++ b/arch/arm/mach-omap2/voltage.c
@@ -148,7 +148,6 @@ static int vp_volt_debug_get(void *data, u64 *val)
         }
 
         vsel = vdd->read_reg(prm_mod_offs, vdd->vp_data->voltage);
-        pr_notice("curr_vsel = %x\n", vsel);
 
         if (!vdd->pmic_info->vsel_to_uv) {
                 pr_warning("PMIC function to convert vsel to voltage"
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 2fc9f94cdd29..cd19309fd3b8 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -153,7 +153,6 @@ config MACH_XCEP
         bool "Iskratel Electronics XCEP"
         select PXA25x
         select MTD
-        select MTD_PARTITIONS
         select MTD_PHYSMAP
         select MTD_CFI_INTELEXT
         select MTD_CFI
diff --git a/arch/arm/mach-s3c2410/mach-amlm5900.c b/arch/arm/mach-s3c2410/mach-amlm5900.c
index 44440cbd7620..dabc141243f3 100644
--- a/arch/arm/mach-s3c2410/mach-amlm5900.c
+++ b/arch/arm/mach-s3c2410/mach-amlm5900.c
@@ -58,8 +58,6 @@
 #include <plat/cpu.h>
 #include <plat/gpio-cfg.h>
 
-#ifdef CONFIG_MTD_PARTITIONS
-
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/map.h>
@@ -113,7 +111,6 @@ static struct platform_device amlm5900_device_nor = {
         .num_resources  = 1,
         .resource       = &amlm5900_nor_resource,
 };
-#endif
 
 static struct map_desc amlm5900_iodesc[] __initdata = {
 };
@@ -158,9 +155,7 @@ static struct platform_device *amlm5900_devices[] __initdata = {
         &s3c_device_rtc,
         &s3c_device_usbgadget,
         &s3c_device_sdi,
-#ifdef CONFIG_MTD_PARTITIONS
         &amlm5900_device_nor,
-#endif
 };
 
 static void __init amlm5900_map_io(void)
diff --git a/arch/arm/mach-s3c2410/mach-tct_hammer.c b/arch/arm/mach-s3c2410/mach-tct_hammer.c
index a15d0621c22f..43c2b831b9e8 100644
--- a/arch/arm/mach-s3c2410/mach-tct_hammer.c
+++ b/arch/arm/mach-s3c2410/mach-tct_hammer.c
@@ -49,8 +49,6 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 
-#ifdef CONFIG_MTD_PARTITIONS
-
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/map.h>
@@ -91,8 +89,6 @@ static struct platform_device tct_hammer_device_nor = {
         .resource       = &tct_hammer_nor_resource,
 };
 
-#endif
-
 static struct map_desc tct_hammer_iodesc[] __initdata = {
 };
 
@@ -133,9 +129,7 @@ static struct platform_device *tct_hammer_devices[] __initdata = {
         &s3c_device_rtc,
         &s3c_device_usbgadget,
         &s3c_device_sdi,
-#ifdef CONFIG_MTD_PARTITIONS
         &tct_hammer_device_nor,
-#endif
 };
 
 static void __init tct_hammer_map_io(void)
diff --git a/arch/arm/mach-s3c64xx/dev-spi.c b/arch/arm/mach-s3c64xx/dev-spi.c
index 405e62128917..82db072cb836 100644
--- a/arch/arm/mach-s3c64xx/dev-spi.c
+++ b/arch/arm/mach-s3c64xx/dev-spi.c
@@ -16,7 +16,6 @@
 
 #include <mach/dma.h>
 #include <mach/map.h>
-#include <mach/gpio-bank-c.h>
 #include <mach/spi-clocks.h>
 #include <mach/irqs.h>
 
@@ -40,23 +39,15 @@ static char *spi_src_clks[] = {
  */
 static int s3c64xx_spi_cfg_gpio(struct platform_device *pdev)
 {
+        unsigned int base;
+
         switch (pdev->id) {
         case 0:
-                s3c_gpio_cfgpin(S3C64XX_GPC(0), S3C64XX_GPC0_SPI_MISO0);
-                s3c_gpio_cfgpin(S3C64XX_GPC(1), S3C64XX_GPC1_SPI_CLKO);
-                s3c_gpio_cfgpin(S3C64XX_GPC(2), S3C64XX_GPC2_SPI_MOSIO);
-                s3c_gpio_setpull(S3C64XX_GPC(0), S3C_GPIO_PULL_UP);
-                s3c_gpio_setpull(S3C64XX_GPC(1), S3C_GPIO_PULL_UP);
-                s3c_gpio_setpull(S3C64XX_GPC(2), S3C_GPIO_PULL_UP);
+                base = S3C64XX_GPC(0);
                 break;
 
         case 1:
-                s3c_gpio_cfgpin(S3C64XX_GPC(4), S3C64XX_GPC4_SPI_MISO1);
-                s3c_gpio_cfgpin(S3C64XX_GPC(5), S3C64XX_GPC5_SPI_CLK1);
-                s3c_gpio_cfgpin(S3C64XX_GPC(6), S3C64XX_GPC6_SPI_MOSI1);
-                s3c_gpio_setpull(S3C64XX_GPC(4), S3C_GPIO_PULL_UP);
-                s3c_gpio_setpull(S3C64XX_GPC(5), S3C_GPIO_PULL_UP);
-                s3c_gpio_setpull(S3C64XX_GPC(6), S3C_GPIO_PULL_UP);
+                base = S3C64XX_GPC(4);
                 break;
 
         default:
@@ -64,6 +55,9 @@ static int s3c64xx_spi_cfg_gpio(struct platform_device *pdev)
                 return -EINVAL;
         }
 
+        s3c_gpio_cfgall_range(base, 3,
+                              S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
+
         return 0;
 }
 
diff --git a/arch/arm/mach-s3c64xx/include/mach/gpio-bank-a.h b/arch/arm/mach-s3c64xx/include/mach/gpio-bank-a.h
deleted file mode 100644
index 34212e1a7e81..000000000000
--- a/arch/arm/mach-s3c64xx/include/mach/gpio-bank-a.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* linux/arch/arm/mach-s3c64xx/include/mach/gpio-bank-a.h
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * GPIO Bank A register and configuration definitions
- *
- * 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 S3C64XX_GPACON                  (S3C64XX_GPA_BASE + 0x00)
-#define S3C64XX_GPADAT                  (S3C64XX_GPA_BASE + 0x04)
-#define S3C64XX_GPAPUD                  (S3C64XX_GPA_BASE + 0x08)
-#define S3C64XX_GPACONSLP               (S3C64XX_GPA_BASE + 0x0c)
-#define S3C64XX_GPAPUDSLP               (S3C64XX_GPA_BASE + 0x10)
-
-#define S3C64XX_GPA_CONMASK(__gpio)     (0xf << ((__gpio) * 4))
-#define S3C64XX_GPA_INPUT(__gpio)       (0x0 << ((__gpio) * 4))
-#define S3C64XX_GPA_OUTPUT(__gpio)      (0x1 << ((__gpio) * 4))
-
-#define S3C64XX_GPA0_UART_RXD0          (0x02 << 0)
-#define S3C64XX_GPA0_EINT_G1_0          (0x07 << 0)
-
-#define S3C64XX_GPA1_UART_TXD0          (0x02 << 4)
-#define S3C64XX_GPA1_EINT_G1_1          (0x07 << 4)
-
-#define S3C64XX_GPA2_UART_nCTS0         (0x02 << 8)
-#define S3C64XX_GPA2_EINT_G1_2          (0x07 << 8)
-
-#define S3C64XX_GPA3_UART_nRTS0         (0x02 << 12)
-#define S3C64XX_GPA3_EINT_G1_3          (0x07 << 12)
-
-#define S3C64XX_GPA4_UART_RXD1          (0x02 << 16)
-#define S3C64XX_GPA4_EINT_G1_4          (0x07 << 16)
-
-#define S3C64XX_GPA5_UART_TXD1          (0x02 << 20)
-#define S3C64XX_GPA5_EINT_G1_5          (0x07 << 20)
-
-#define S3C64XX_GPA6_UART_nCTS1         (0x02 << 24)
-#define S3C64XX_GPA6_EINT_G1_6          (0x07 << 24)
-
-#define S3C64XX_GPA7_UART_nRTS1         (0x02 << 28)
-#define S3C64XX_GPA7_EINT_G1_7          (0x07 << 28)
-
diff --git a/arch/arm/mach-s3c64xx/include/mach/gpio-bank-b.h b/arch/arm/mach-s3c64xx/include/mach/gpio-bank-b.h
deleted file mode 100644
index 7232c037e642..000000000000
--- a/arch/arm/mach-s3c64xx/include/mach/gpio-bank-b.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* linux/arch/arm/mach-s3c64xx/include/mach/gpio-bank-b.h
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * GPIO Bank B register and configuration definitions
- *
- * 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 S3C64XX_GPBCON                  (S3C64XX_GPB_BASE + 0x00)
-#define S3C64XX_GPBDAT                  (S3C64XX_GPB_BASE + 0x04)
-#define S3C64XX_GPBPUD                  (S3C64XX_GPB_BASE + 0x08)
-#define S3C64XX_GPBCONSLP               (S3C64XX_GPB_BASE + 0x0c)
-#define S3C64XX_GPBPUDSLP               (S3C64XX_GPB_BASE + 0x10)
-
-#define S3C64XX_GPB_CONMASK(__gpio)     (0xf << ((__gpio) * 4))
-#define S3C64XX_GPB_INPUT(__gpio)       (0x0 << ((__gpio) * 4))
-#define S3C64XX_GPB_OUTPUT(__gpio)      (0x1 << ((__gpio) * 4))
-
-#define S3C64XX_GPB0_UART_RXD2          (0x02 << 0)
-#define S3C64XX_GPB0_EXTDMA_REQ         (0x03 << 0)
-#define S3C64XX_GPB0_IrDA_RXD           (0x04 << 0)
-#define S3C64XX_GPB0_ADDR_CF0           (0x05 << 0)
-#define S3C64XX_GPB0_EINT_G1_8          (0x07 << 0)
-
-#define S3C64XX_GPB1_UART_TXD2          (0x02 << 4)
-#define S3C64XX_GPB1_EXTDMA_ACK         (0x03 << 4)
-#define S3C64XX_GPB1_IrDA_TXD           (0x04 << 4)
-#define S3C64XX_GPB1_ADDR_CF1           (0x05 << 4)
-#define S3C64XX_GPB1_EINT_G1_9          (0x07 << 4)
-
-#define S3C64XX_GPB2_UART_RXD3          (0x02 << 8)
-#define S3C64XX_GPB2_IrDA_RXD           (0x03 << 8)
-#define S3C64XX_GPB2_EXTDMA_REQ         (0x04 << 8)
-#define S3C64XX_GPB2_ADDR_CF2           (0x05 << 8)
-#define S3C64XX_GPB2_I2C_SCL1           (0x06 << 8)
-#define S3C64XX_GPB2_EINT_G1_10         (0x07 << 8)
-
-#define S3C64XX_GPB3_UART_TXD3          (0x02 << 12)
-#define S3C64XX_GPB3_IrDA_TXD           (0x03 << 12)
-#define S3C64XX_GPB3_EXTDMA_ACK         (0x04 << 12)
-#define S3C64XX_GPB3_I2C_SDA1           (0x06 << 12)
-#define S3C64XX_GPB3_EINT_G1_11         (0x07 << 12)
-
-#define S3C64XX_GPB4_IrDA_SDBW          (0x02 << 16)
-#define S3C64XX_GPB4_CAM_FIELD          (0x03 << 16)
-#define S3C64XX_GPB4_CF_DATA_DIR        (0x04 << 16)
-#define S3C64XX_GPB4_EINT_G1_12         (0x07 << 16)
-
-#define S3C64XX_GPB5_I2C_SCL0           (0x02 << 20)
-#define S3C64XX_GPB5_EINT_G1_13         (0x07 << 20)
-
-#define S3C64XX_GPB6_I2C_SDA0           (0x02 << 24)
-#define S3C64XX_GPB6_EINT_G1_14         (0x07 << 24)
-
diff --git a/arch/arm/mach-s3c64xx/include/mach/gpio-bank-c.h b/arch/arm/mach-s3c64xx/include/mach/gpio-bank-c.h
deleted file mode 100644
index db189ab1639a..000000000000
--- a/arch/arm/mach-s3c64xx/include/mach/gpio-bank-c.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* linux/arch/arm/mach-s3c64xx/include/mach/gpio-bank-c.h
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * GPIO Bank C register and configuration definitions
- *
- * 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 S3C64XX_GPCCON                  (S3C64XX_GPC_BASE + 0x00)
-#define S3C64XX_GPCDAT                  (S3C64XX_GPC_BASE + 0x04)
-#define S3C64XX_GPCPUD                  (S3C64XX_GPC_BASE + 0x08)
-#define S3C64XX_GPCCONSLP               (S3C64XX_GPC_BASE + 0x0c)
-#define S3C64XX_GPCPUDSLP               (S3C64XX_GPC_BASE + 0x10)
-
-#define S3C64XX_GPC_CONMASK(__gpio)     (0xf << ((__gpio) * 4))
-#define S3C64XX_GPC_INPUT(__gpio)       (0x0 << ((__gpio) * 4))
-#define S3C64XX_GPC_OUTPUT(__gpio)      (0x1 << ((__gpio) * 4))
-
-#define S3C64XX_GPC0_SPI_MISO0          (0x02 << 0)
-#define S3C64XX_GPC0_EINT_G2_0          (0x07 << 0)
-
-#define S3C64XX_GPC1_SPI_CLKO           (0x02 << 4)
-#define S3C64XX_GPC1_EINT_G2_1          (0x07 << 4)
-
-#define S3C64XX_GPC2_SPI_MOSIO          (0x02 << 8)
-#define S3C64XX_GPC2_EINT_G2_2          (0x07 << 8)
-
-#define S3C64XX_GPC3_SPI_nCSO           (0x02 << 12)
-#define S3C64XX_GPC3_EINT_G2_3          (0x07 << 12)
-
-#define S3C64XX_GPC4_SPI_MISO1          (0x02 << 16)
-#define S3C64XX_GPC4_MMC2_CMD           (0x03 << 16)
-#define S3C64XX_GPC4_I2S_V40_DO0        (0x05 << 16)
-#define S3C64XX_GPC4_EINT_G2_4          (0x07 << 16)
-
-#define S3C64XX_GPC5_SPI_CLK1           (0x02 << 20)
-#define S3C64XX_GPC5_MMC2_CLK           (0x03 << 20)
-#define S3C64XX_GPC5_I2S_V40_DO1        (0x05 << 20)
-#define S3C64XX_GPC5_EINT_G2_5          (0x07 << 20)
-
-#define S3C64XX_GPC6_SPI_MOSI1          (0x02 << 24)
-#define S3C64XX_GPC6_EINT_G2_6          (0x07 << 24)
-
-#define S3C64XX_GPC7_SPI_nCS1           (0x02 << 28)
-#define S3C64XX_GPC7_I2S_V40_DO2        (0x05 << 28)
-#define S3C64XX_GPC7_EINT_G2_7          (0x07 << 28)
-
diff --git a/arch/arm/mach-s3c64xx/include/mach/gpio-bank-d.h b/arch/arm/mach-s3c64xx/include/mach/gpio-bank-d.h
deleted file mode 100644
index 1a01cee7aca3..000000000000
--- a/arch/arm/mach-s3c64xx/include/mach/gpio-bank-d.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* linux/arch/arm/mach-s3c64xx/include/mach/gpio-bank-d.h
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * GPIO Bank D register and configuration definitions
- *
- * 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 S3C64XX_GPDCON                  (S3C64XX_GPD_BASE + 0x00)
-#define S3C64XX_GPDDAT                  (S3C64XX_GPD_BASE + 0x04)
-#define S3C64XX_GPDPUD                  (S3C64XX_GPD_BASE + 0x08)
-#define S3C64XX_GPDCONSLP               (S3C64XX_GPD_BASE + 0x0c)
-#define S3C64XX_GPDPUDSLP               (S3C64XX_GPD_BASE + 0x10)
-
-#define S3C64XX_GPD_CONMASK(__gpio)     (0xf << ((__gpio) * 4))
-#define S3C64XX_GPD_INPUT(__gpio)       (0x0 << ((__gpio) * 4))
-#define S3C64XX_GPD_OUTPUT(__gpio)      (0x1 << ((__gpio) * 4))
-
-#define S3C64XX_GPD0_PCM0_SCLK          (0x02 << 0)
-#define S3C64XX_GPD0_I2S0_CLK           (0x03 << 0)
-#define S3C64XX_GPD0_AC97_BITCLK        (0x04 << 0)
-#define S3C64XX_GPD0_EINT_G3_0          (0x07 << 0)
-
-#define S3C64XX_GPD1_PCM0_EXTCLK        (0x02 << 4)
-#define S3C64XX_GPD1_I2S0_CDCLK         (0x03 << 4)
-#define S3C64XX_GPD1_AC97_nRESET        (0x04 << 4)
-#define S3C64XX_GPD1_EINT_G3_1          (0x07 << 4)
-
-#define S3C64XX_GPD2_PCM0_FSYNC         (0x02 << 8)
-#define S3C64XX_GPD2_I2S0_LRCLK         (0x03 << 8)
-#define S3C64XX_GPD2_AC97_SYNC          (0x04 << 8)
-#define S3C64XX_GPD2_EINT_G3_2          (0x07 << 8)
-
-#define S3C64XX_GPD3_PCM0_SIN           (0x02 << 12)
-#define S3C64XX_GPD3_I2S0_DI            (0x03 << 12)
-#define S3C64XX_GPD3_AC97_SDI           (0x04 << 12)
-#define S3C64XX_GPD3_EINT_G3_3          (0x07 << 12)
-
-#define S3C64XX_GPD4_PCM0_SOUT          (0x02 << 16)
-#define S3C64XX_GPD4_I2S0_D0            (0x03 << 16)
-#define S3C64XX_GPD4_AC97_SDO           (0x04 << 16)
-#define S3C64XX_GPD4_EINT_G3_4          (0x07 << 16)
-
diff --git a/arch/arm/mach-s3c64xx/include/mach/gpio-bank-e.h b/arch/arm/mach-s3c64xx/include/mach/gpio-bank-e.h
deleted file mode 100644
index f057adb627dd..000000000000
--- a/arch/arm/mach-s3c64xx/include/mach/gpio-bank-e.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* linux/arch/arm/mach-s3c64xx/include/mach/gpio-bank-e.h
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * GPIO Bank E register and configuration definitions
- *
- * 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 S3C64XX_GPECON                  (S3C64XX_GPE_BASE + 0x00)
-#define S3C64XX_GPEDAT                  (S3C64XX_GPE_BASE + 0x04)
-#define S3C64XX_GPEPUD                  (S3C64XX_GPE_BASE + 0x08)
-#define S3C64XX_GPECONSLP               (S3C64XX_GPE_BASE + 0x0c)
-#define S3C64XX_GPEPUDSLP               (S3C64XX_GPE_BASE + 0x10)
-
-#define S3C64XX_GPE_CONMASK(__gpio)     (0xf << ((__gpio) * 4))
-#define S3C64XX_GPE_INPUT(__gpio)       (0x0 << ((__gpio) * 4))
-#define S3C64XX_GPE_OUTPUT(__gpio)      (0x1 << ((__gpio) * 4))
-
-#define S3C64XX_GPE0_PCM1_SCLK          (0x02 << 0)
-#define S3C64XX_GPE0_I2S1_CLK           (0x03 << 0)
-#define S3C64XX_GPE0_AC97_BITCLK        (0x04 << 0)
-
-#define S3C64XX_GPE1_PCM1_EXTCLK        (0x02 << 4)
-#define S3C64XX_GPE1_I2S1_CDCLK         (0x03 << 4)
-#define S3C64XX_GPE1_AC97_nRESET        (0x04 << 4)
-
-#define S3C64XX_GPE2_PCM1_FSYNC         (0x02 << 8)
-#define S3C64XX_GPE2_I2S1_LRCLK         (0x03 << 8)
-#define S3C64XX_GPE2_AC97_SYNC          (0x04 << 8)
-
-#define S3C64XX_GPE3_PCM1_SIN           (0x02 << 12)
-#define S3C64XX_GPE3_I2S1_DI            (0x03 << 12)
-#define S3C64XX_GPE3_AC97_SDI           (0x04 << 12)
-
-#define S3C64XX_GPE4_PCM1_SOUT          (0x02 << 16)
-#define S3C64XX_GPE4_I2S1_D0            (0x03 << 16)
-#define S3C64XX_GPE4_AC97_SDO           (0x04 << 16)
-
diff --git a/arch/arm/mach-s3c64xx/include/mach/gpio-bank-f.h b/arch/arm/mach-s3c64xx/include/mach/gpio-bank-f.h
deleted file mode 100644
index 62ab8f5e7835..000000000000
--- a/arch/arm/mach-s3c64xx/include/mach/gpio-bank-f.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* linux/arch/arm/mach-s3c64xx/include/mach/gpio-bank-f.h
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * GPIO Bank F register and configuration definitions
- *
- * 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 S3C64XX_GPFCON                  (S3C64XX_GPF_BASE + 0x00)
-#define S3C64XX_GPFDAT                  (S3C64XX_GPF_BASE + 0x04)
-#define S3C64XX_GPFPUD                  (S3C64XX_GPF_BASE + 0x08)
-#define S3C64XX_GPFCONSLP               (S3C64XX_GPF_BASE + 0x0c)
-#define S3C64XX_GPFPUDSLP               (S3C64XX_GPF_BASE + 0x10)
-
-#define S3C64XX_GPF_CONMASK(__gpio)     (0x3 << ((__gpio) * 2))
-#define S3C64XX_GPF_INPUT(__gpio)       (0x0 << ((__gpio) * 2))
-#define S3C64XX_GPF_OUTPUT(__gpio)      (0x1 << ((__gpio) * 2))
-
-#define S3C64XX_GPF0_CAMIF_CLK          (0x02 << 0)
-#define S3C64XX_GPF0_EINT_G4_0          (0x03 << 0)
-
-#define S3C64XX_GPF1_CAMIF_HREF         (0x02 << 2)
-#define S3C64XX_GPF1_EINT_G4_1          (0x03 << 2)
-
-#define S3C64XX_GPF2_CAMIF_PCLK         (0x02 << 4)
-#define S3C64XX_GPF2_EINT_G4_2          (0x03 << 4)
-
-#define S3C64XX_GPF3_CAMIF_nRST         (0x02 << 6)
-#define S3C64XX_GPF3_EINT_G4_3          (0x03 << 6)
-
-#define S3C64XX_GPF4_CAMIF_VSYNC        (0x02 << 8)
-#define S3C64XX_GPF4_EINT_G4_4          (0x03 << 8)
-
-#define S3C64XX_GPF5_CAMIF_YDATA0       (0x02 << 10)
-#define S3C64XX_GPF5_EINT_G4_5          (0x03 << 10)
-
-#define S3C64XX_GPF6_CAMIF_YDATA1       (0x02 << 12)
-#define S3C64XX_GPF6_EINT_G4_6          (0x03 << 12)
-
-#define S3C64XX_GPF7_CAMIF_YDATA2       (0x02 << 14)
-#define S3C64XX_GPF7_EINT_G4_7          (0x03 << 14)
-
-#define S3C64XX_GPF8_CAMIF_YDATA3       (0x02 << 16)
-#define S3C64XX_GPF8_EINT_G4_8          (0x03 << 16)
-
-#define S3C64XX_GPF9_CAMIF_YDATA4       (0x02 << 18)
-#define S3C64XX_GPF9_EINT_G4_9          (0x03 << 18)
-
-#define S3C64XX_GPF10_CAMIF_YDATA5      (0x02 << 20)
-#define S3C64XX_GPF10_EINT_G4_10        (0x03 << 20)
-
-#define S3C64XX_GPF11_CAMIF_YDATA6      (0x02 << 22)
-#define S3C64XX_GPF11_EINT_G4_11        (0x03 << 22)
-
-#define S3C64XX_GPF12_CAMIF_YDATA7      (0x02 << 24)
-#define S3C64XX_GPF12_EINT_G4_12        (0x03 << 24)
-
-#define S3C64XX_GPF13_PWM_ECLK          (0x02 << 26)
-#define S3C64XX_GPF13_EINT_G4_13        (0x03 << 26)
-
-#define S3C64XX_GPF14_PWM_TOUT0         (0x02 << 28)
-#define S3C64XX_GPF14_CLKOUT0           (0x03 << 28)
-
-#define S3C64XX_GPF15_PWM_TOUT1         (0x02 << 30)
-
diff --git a/arch/arm/mach-s3c64xx/include/mach/gpio-bank-g.h b/arch/arm/mach-s3c64xx/include/mach/gpio-bank-g.h
deleted file mode 100644
index b94954af1598..000000000000
--- a/arch/arm/mach-s3c64xx/include/mach/gpio-bank-g.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* linux/arch/arm/mach-s3c64xx/include/mach/gpio-bank-g.h
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * GPIO Bank G register and configuration definitions
- *
- * 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 S3C64XX_GPGCON                  (S3C64XX_GPG_BASE + 0x00)
-#define S3C64XX_GPGDAT                  (S3C64XX_GPG_BASE + 0x04)
-#define S3C64XX_GPGPUD                  (S3C64XX_GPG_BASE + 0x08)
-#define S3C64XX_GPGCONSLP               (S3C64XX_GPG_BASE + 0x0c)
-#define S3C64XX_GPGPUDSLP               (S3C64XX_GPG_BASE + 0x10)
-
-#define S3C64XX_GPG_CONMASK(__gpio)     (0xf << ((__gpio) * 4))
-#define S3C64XX_GPG_INPUT(__gpio)       (0x0 << ((__gpio) * 4))
-#define S3C64XX_GPG_OUTPUT(__gpio)      (0x1 << ((__gpio) * 4))
-
-#define S3C64XX_GPG0_MMC0_CLK           (0x02 << 0)
-#define S3C64XX_GPG0_EINT_G5_0          (0x07 << 0)
-
-#define S3C64XX_GPG1_MMC0_CMD           (0x02 << 4)
-#define S3C64XX_GPG1_EINT_G5_1          (0x07 << 4)
-
-#define S3C64XX_GPG2_MMC0_DATA0         (0x02 << 8)
-#define S3C64XX_GPG2_EINT_G5_2          (0x07 << 8)
-
-#define S3C64XX_GPG3_MMC0_DATA1         (0x02 << 12)
-#define S3C64XX_GPG3_EINT_G5_3          (0x07 << 12)
-
-#define S3C64XX_GPG4_MMC0_DATA2         (0x02 << 16)
-#define S3C64XX_GPG4_EINT_G5_4          (0x07 << 16)
-
-#define S3C64XX_GPG5_MMC0_DATA3         (0x02 << 20)
-#define S3C64XX_GPG5_EINT_G5_5          (0x07 << 20)
-
diff --git a/arch/arm/mach-s3c64xx/include/mach/gpio-bank-h.h b/arch/arm/mach-s3c64xx/include/mach/gpio-bank-h.h
deleted file mode 100644
index 5d75aaad865e..000000000000
--- a/arch/arm/mach-s3c64xx/include/mach/gpio-bank-h.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* linux/arch/arm/mach-s3c64xx/include/mach/gpio-bank-h.h
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * GPIO Bank H register and configuration definitions
- *
- * 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 S3C64XX_GPHCON0                 (S3C64XX_GPH_BASE + 0x00)
-#define S3C64XX_GPHCON1                 (S3C64XX_GPH_BASE + 0x04)
-#define S3C64XX_GPHDAT                  (S3C64XX_GPH_BASE + 0x08)
-#define S3C64XX_GPHPUD                  (S3C64XX_GPH_BASE + 0x0c)
-#define S3C64XX_GPHCONSLP               (S3C64XX_GPH_BASE + 0x10)
-#define S3C64XX_GPHPUDSLP               (S3C64XX_GPH_BASE + 0x14)
-
-#define S3C64XX_GPH_CONMASK(__gpio)     (0xf << ((__gpio) * 4))
-#define S3C64XX_GPH_INPUT(__gpio)       (0x0 << ((__gpio) * 4))
-#define S3C64XX_GPH_OUTPUT(__gpio)      (0x1 << ((__gpio) * 4))
-
-#define S3C64XX_GPH0_MMC1_CLK           (0x02 << 0)
-#define S3C64XX_GPH0_KP_COL0            (0x04 << 0)
-#define S3C64XX_GPH0_EINT_G6_0          (0x07 << 0)
-
-#define S3C64XX_GPH1_MMC1_CMD           (0x02 << 4)
-#define S3C64XX_GPH1_KP_COL1            (0x04 << 4)
-#define S3C64XX_GPH1_EINT_G6_1          (0x07 << 4)
-
-#define S3C64XX_GPH2_MMC1_DATA0         (0x02 << 8)
-#define S3C64XX_GPH2_KP_COL2            (0x04 << 8)
-#define S3C64XX_GPH2_EINT_G6_2          (0x07 << 8)
-
-#define S3C64XX_GPH3_MMC1_DATA1         (0x02 << 12)
-#define S3C64XX_GPH3_KP_COL3            (0x04 << 12)
-#define S3C64XX_GPH3_EINT_G6_3          (0x07 << 12)
-
-#define S3C64XX_GPH4_MMC1_DATA2         (0x02 << 16)
-#define S3C64XX_GPH4_KP_COL4            (0x04 << 16)
-#define S3C64XX_GPH4_EINT_G6_4          (0x07 << 16)
-
-#define S3C64XX_GPH5_MMC1_DATA3         (0x02 << 20)
-#define S3C64XX_GPH5_KP_COL5            (0x04 << 20)
-#define S3C64XX_GPH5_EINT_G6_5          (0x07 << 20)
-
-#define S3C64XX_GPH6_MMC1_DATA4         (0x02 << 24)
-#define S3C64XX_GPH6_MMC2_DATA0         (0x03 << 24)
-#define S3C64XX_GPH6_KP_COL6            (0x04 << 24)
-#define S3C64XX_GPH6_I2S_V40_BCLK       (0x05 << 24)
-#define S3C64XX_GPH6_ADDR_CF0           (0x06 << 24)
-#define S3C64XX_GPH6_EINT_G6_6          (0x07 << 24)
-
-#define S3C64XX_GPH7_MMC1_DATA5         (0x02 << 28)
-#define S3C64XX_GPH7_MMC2_DATA1         (0x03 << 28)
-#define S3C64XX_GPH7_KP_COL7            (0x04 << 28)
-#define S3C64XX_GPH7_I2S_V40_CDCLK      (0x05 << 28)
-#define S3C64XX_GPH7_ADDR_CF1           (0x06 << 28)
-#define S3C64XX_GPH7_EINT_G6_7          (0x07 << 28)
-
-#define S3C64XX_GPH8_MMC1_DATA6         (0x02 <<  0)
-#define S3C64XX_GPH8_MMC2_DATA2         (0x03 <<  0)
-#define S3C64XX_GPH8_I2S_V40_LRCLK      (0x05 <<  0)
-#define S3C64XX_GPH8_ADDR_CF2           (0x06 <<  0)
-#define S3C64XX_GPH8_EINT_G6_8          (0x07 <<  0)
-
-#define S3C64XX_GPH9_OUTPUT             (0x01 <<  4)
-#define S3C64XX_GPH9_MMC1_DATA7         (0x02 <<  4)
-#define S3C64XX_GPH9_MMC2_DATA3         (0x03 <<  4)
-#define S3C64XX_GPH9_I2S_V40_DI         (0x05 <<  4)
-#define S3C64XX_GPH9_EINT_G6_9          (0x07 <<  4)
diff --git a/arch/arm/mach-s3c64xx/include/mach/gpio-bank-i.h b/arch/arm/mach-s3c64xx/include/mach/gpio-bank-i.h
deleted file mode 100644
index 4ceaa6098bc7..000000000000
--- a/arch/arm/mach-s3c64xx/include/mach/gpio-bank-i.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* linux/arch/arm/mach-s3c64xx/include/mach/gpio-bank-i.h
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * GPIO Bank I register and configuration definitions
- *
- * 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 S3C64XX_GPICON                  (S3C64XX_GPI_BASE + 0x00)
-#define S3C64XX_GPIDAT                  (S3C64XX_GPI_BASE + 0x04)
-#define S3C64XX_GPIPUD                  (S3C64XX_GPI_BASE + 0x08)
-#define S3C64XX_GPICONSLP               (S3C64XX_GPI_BASE + 0x0c)
-#define S3C64XX_GPIPUDSLP               (S3C64XX_GPI_BASE + 0x10)
-
-#define S3C64XX_GPI_CONMASK(__gpio)     (0x3 << ((__gpio) * 2))
-#define S3C64XX_GPI_INPUT(__gpio)       (0x0 << ((__gpio) * 2))
-#define S3C64XX_GPI_OUTPUT(__gpio)      (0x1 << ((__gpio) * 2))
-
-#define S3C64XX_GPI0_VD0                (0x02 << 0)
-#define S3C64XX_GPI1_VD1                (0x02 << 2)
-#define S3C64XX_GPI2_VD2                (0x02 << 4)
-#define S3C64XX_GPI3_VD3                (0x02 << 6)
-#define S3C64XX_GPI4_VD4                (0x02 << 8)
-#define S3C64XX_GPI5_VD5                (0x02 << 10)
-#define S3C64XX_GPI6_VD6                (0x02 << 12)
-#define S3C64XX_GPI7_VD7                (0x02 << 14)
-#define S3C64XX_GPI8_VD8                (0x02 << 16)
-#define S3C64XX_GPI9_VD9                (0x02 << 18)
-#define S3C64XX_GPI10_VD10              (0x02 << 20)
-#define S3C64XX_GPI11_VD11              (0x02 << 22)
-#define S3C64XX_GPI12_VD12              (0x02 << 24)
-#define S3C64XX_GPI13_VD13              (0x02 << 26)
-#define S3C64XX_GPI14_VD14              (0x02 << 28)
-#define S3C64XX_GPI15_VD15              (0x02 << 30)
diff --git a/arch/arm/mach-s3c64xx/include/mach/gpio-bank-j.h b/arch/arm/mach-s3c64xx/include/mach/gpio-bank-j.h
deleted file mode 100644
index 6f25cd079a40..000000000000
--- a/arch/arm/mach-s3c64xx/include/mach/gpio-bank-j.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* linux/arch/arm/mach-s3c64xx/include/mach/gpio-bank-j.h
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * GPIO Bank J register and configuration definitions
- *
- * 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 S3C64XX_GPJCON                  (S3C64XX_GPJ_BASE + 0x00)
-#define S3C64XX_GPJDAT                  (S3C64XX_GPJ_BASE + 0x04)
-#define S3C64XX_GPJPUD                  (S3C64XX_GPJ_BASE + 0x08)
-#define S3C64XX_GPJCONSLP               (S3C64XX_GPJ_BASE + 0x0c)
-#define S3C64XX_GPJPUDSLP               (S3C64XX_GPJ_BASE + 0x10)
-
-#define S3C64XX_GPJ_CONMASK(__gpio)     (0x3 << ((__gpio) * 2))
-#define S3C64XX_GPJ_INPUT(__gpio)       (0x0 << ((__gpio) * 2))
-#define S3C64XX_GPJ_OUTPUT(__gpio)      (0x1 << ((__gpio) * 2))
-
-#define S3C64XX_GPJ0_VD16               (0x02 << 0)
-#define S3C64XX_GPJ1_VD17               (0x02 << 2)
-#define S3C64XX_GPJ2_VD18               (0x02 << 4)
-#define S3C64XX_GPJ3_VD19               (0x02 << 6)
-#define S3C64XX_GPJ4_VD20               (0x02 << 8)
-#define S3C64XX_GPJ5_VD21               (0x02 << 10)
-#define S3C64XX_GPJ6_VD22               (0x02 << 12)
-#define S3C64XX_GPJ7_VD23               (0x02 << 14)
-#define S3C64XX_GPJ8_LCD_HSYNC          (0x02 << 16)
-#define S3C64XX_GPJ9_LCD_VSYNC          (0x02 << 18)
-#define S3C64XX_GPJ10_LCD_VDEN          (0x02 << 20)
-#define S3C64XX_GPJ11_LCD_VCLK          (0x02 << 22)
diff --git a/arch/arm/mach-s3c64xx/include/mach/gpio-bank-n.h b/arch/arm/mach-s3c64xx/include/mach/gpio-bank-n.h
deleted file mode 100644
index d0aeda1cd9de..000000000000
--- a/arch/arm/mach-s3c64xx/include/mach/gpio-bank-n.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* linux/arch/arm/mach-s3c64xx/include/mach/gpio-bank-n.h
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * GPIO Bank N register and configuration definitions
- *
- * 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 S3C64XX_GPNCON                  (S3C64XX_GPN_BASE + 0x00)
-#define S3C64XX_GPNDAT                  (S3C64XX_GPN_BASE + 0x04)
-#define S3C64XX_GPNPUD                  (S3C64XX_GPN_BASE + 0x08)
-
-#define S3C64XX_GPN_CONMASK(__gpio)     (0x3 << ((__gpio) * 2))
-#define S3C64XX_GPN_INPUT(__gpio)       (0x0 << ((__gpio) * 2))
-#define S3C64XX_GPN_OUTPUT(__gpio)      (0x1 << ((__gpio) * 2))
-
-#define S3C64XX_GPN0_EINT0              (0x02 << 0)
-#define S3C64XX_GPN0_KP_ROW0            (0x03 << 0)
-
-#define S3C64XX_GPN1_EINT1              (0x02 << 2)
-#define S3C64XX_GPN1_KP_ROW1            (0x03 << 2)
-
-#define S3C64XX_GPN2_EINT2              (0x02 << 4)
-#define S3C64XX_GPN2_KP_ROW2            (0x03 << 4)
-
-#define S3C64XX_GPN3_EINT3              (0x02 << 6)
-#define S3C64XX_GPN3_KP_ROW3            (0x03 << 6)
-
-#define S3C64XX_GPN4_EINT4              (0x02 << 8)
-#define S3C64XX_GPN4_KP_ROW4            (0x03 << 8)
-
-#define S3C64XX_GPN5_EINT5              (0x02 << 10)
-#define S3C64XX_GPN5_KP_ROW5            (0x03 << 10)
-
-#define S3C64XX_GPN6_EINT6              (0x02 << 12)
-#define S3C64XX_GPN6_KP_ROW6            (0x03 << 12)
-
-#define S3C64XX_GPN7_EINT7              (0x02 << 14)
-#define S3C64XX_GPN7_KP_ROW7            (0x03 << 14)
-
-#define S3C64XX_GPN8_EINT8              (0x02 << 16)
-#define S3C64XX_GPN9_EINT9              (0x02 << 18)
-#define S3C64XX_GPN10_EINT10            (0x02 << 20)
-#define S3C64XX_GPN11_EINT11            (0x02 << 22)
-#define S3C64XX_GPN12_EINT12            (0x02 << 24)
-#define S3C64XX_GPN13_EINT13            (0x02 << 26)
-#define S3C64XX_GPN14_EINT14            (0x02 << 28)
-#define S3C64XX_GPN15_EINT15            (0x02 << 30)
diff --git a/arch/arm/mach-s3c64xx/include/mach/gpio-bank-o.h b/arch/arm/mach-s3c64xx/include/mach/gpio-bank-o.h
deleted file mode 100644
index 21868fa102d0..000000000000
--- a/arch/arm/mach-s3c64xx/include/mach/gpio-bank-o.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* linux/arch/arm/mach-s3c64xx/include/mach/gpio-bank-o.h
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * GPIO Bank O register and configuration definitions
- *
- * 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 S3C64XX_GPOCON                  (S3C64XX_GPO_BASE + 0x00)
-#define S3C64XX_GPODAT                  (S3C64XX_GPO_BASE + 0x04)
-#define S3C64XX_GPOPUD                  (S3C64XX_GPO_BASE + 0x08)
-#define S3C64XX_GPOCONSLP               (S3C64XX_GPO_BASE + 0x0c)
-#define S3C64XX_GPOPUDSLP               (S3C64XX_GPO_BASE + 0x10)
-
-#define S3C64XX_GPO_CONMASK(__gpio)     (0x3 << ((__gpio) * 2))
-#define S3C64XX_GPO_INPUT(__gpio)       (0x0 << ((__gpio) * 2))
-#define S3C64XX_GPO_OUTPUT(__gpio)      (0x1 << ((__gpio) * 2))
-
-#define S3C64XX_GPO0_MEM0_nCS2          (0x02 << 0)
-#define S3C64XX_GPO0_EINT_G7_0          (0x03 << 0)
-
-#define S3C64XX_GPO1_MEM0_nCS3          (0x02 << 2)
-#define S3C64XX_GPO1_EINT_G7_1          (0x03 << 2)
-
-#define S3C64XX_GPO2_MEM0_nCS4          (0x02 << 4)
-#define S3C64XX_GPO2_EINT_G7_2          (0x03 << 4)
-
-#define S3C64XX_GPO3_MEM0_nCS5          (0x02 << 6)
-#define S3C64XX_GPO3_EINT_G7_3          (0x03 << 6)
-
-#define S3C64XX_GPO4_EINT_G7_4          (0x03 << 8)
-
-#define S3C64XX_GPO5_EINT_G7_5          (0x03 << 10)
-
-#define S3C64XX_GPO6_MEM0_ADDR6         (0x02 << 12)
-#define S3C64XX_GPO6_EINT_G7_6          (0x03 << 12)
-
-#define S3C64XX_GPO7_MEM0_ADDR7         (0x02 << 14)
-#define S3C64XX_GPO7_EINT_G7_7          (0x03 << 14)
-
-#define S3C64XX_GPO8_MEM0_ADDR8         (0x02 << 16)
-#define S3C64XX_GPO8_EINT_G7_8          (0x03 << 16)
-
-#define S3C64XX_GPO9_MEM0_ADDR9         (0x02 << 18)
-#define S3C64XX_GPO9_EINT_G7_9          (0x03 << 18)
-
-#define S3C64XX_GPO10_MEM0_ADDR10       (0x02 << 20)
-#define S3C64XX_GPO10_EINT_G7_10        (0x03 << 20)
-
-#define S3C64XX_GPO11_MEM0_ADDR11       (0x02 << 22)
-#define S3C64XX_GPO11_EINT_G7_11        (0x03 << 22)
-
-#define S3C64XX_GPO12_MEM0_ADDR12       (0x02 << 24)
-#define S3C64XX_GPO12_EINT_G7_12        (0x03 << 24)
-
-#define S3C64XX_GPO13_MEM0_ADDR13       (0x02 << 26)
-#define S3C64XX_GPO13_EINT_G7_13        (0x03 << 26)
-
-#define S3C64XX_GPO14_MEM0_ADDR14       (0x02 << 28)
-#define S3C64XX_GPO14_EINT_G7_14        (0x03 << 28)
-
-#define S3C64XX_GPO15_MEM0_ADDR15       (0x02 << 30)
-#define S3C64XX_GPO15_EINT_G7_15        (0x03 << 30)
-
diff --git a/arch/arm/mach-s3c64xx/include/mach/gpio-bank-p.h b/arch/arm/mach-s3c64xx/include/mach/gpio-bank-p.h
deleted file mode 100644
index 46bcfb63b8de..000000000000
--- a/arch/arm/mach-s3c64xx/include/mach/gpio-bank-p.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* linux/arch/arm/mach-s3c64xx/include/mach/gpio-bank-p.h
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * GPIO Bank P register and configuration definitions
- *
- * 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 S3C64XX_GPPCON                  (S3C64XX_GPP_BASE + 0x00)
-#define S3C64XX_GPPDAT                  (S3C64XX_GPP_BASE + 0x04)
-#define S3C64XX_GPPPUD                  (S3C64XX_GPP_BASE + 0x08)
-#define S3C64XX_GPPCONSLP               (S3C64XX_GPP_BASE + 0x0c)
-#define S3C64XX_GPPPUDSLP               (S3C64XX_GPP_BASE + 0x10)
-
-#define S3C64XX_GPP_CONMASK(__gpio)     (0x3 << ((__gpio) * 2))
-#define S3C64XX_GPP_INPUT(__gpio)       (0x0 << ((__gpio) * 2))
-#define S3C64XX_GPP_OUTPUT(__gpio)      (0x1 << ((__gpio) * 2))
-
-#define S3C64XX_GPP0_MEM0_ADDRV         (0x02 << 0)
-#define S3C64XX_GPP0_EINT_G8_0          (0x03 << 0)
-
-#define S3C64XX_GPP1_MEM0_SMCLK         (0x02 << 2)
-#define S3C64XX_GPP1_EINT_G8_1          (0x03 << 2)
-
-#define S3C64XX_GPP2_MEM0_nWAIT         (0x02 << 4)
-#define S3C64XX_GPP2_EINT_G8_2          (0x03 << 4)
-
-#define S3C64XX_GPP3_MEM0_RDY0_ALE      (0x02 << 6)
-#define S3C64XX_GPP3_EINT_G8_3          (0x03 << 6)
-
-#define S3C64XX_GPP4_MEM0_RDY1_CLE      (0x02 << 8)
-#define S3C64XX_GPP4_EINT_G8_4          (0x03 << 8)
-
-#define S3C64XX_GPP5_MEM0_INTsm0_FWE    (0x02 << 10)
-#define S3C64XX_GPP5_EINT_G8_5          (0x03 << 10)
-
-#define S3C64XX_GPP6_MEM0_(null)        (0x02 << 12)
-#define S3C64XX_GPP6_EINT_G8_6          (0x03 << 12)
-
-#define S3C64XX_GPP7_MEM0_INTsm1_FRE    (0x02 << 14)
-#define S3C64XX_GPP7_EINT_G8_7          (0x03 << 14)
-
-#define S3C64XX_GPP8_MEM0_RPn_RnB       (0x02 << 16)
-#define S3C64XX_GPP8_EINT_G8_8          (0x03 << 16)
-
-#define S3C64XX_GPP9_MEM0_ATA_RESET     (0x02 << 18)
-#define S3C64XX_GPP9_EINT_G8_9          (0x03 << 18)
-
-#define S3C64XX_GPP10_MEM0_ATA_INPACK   (0x02 << 20)
-#define S3C64XX_GPP10_EINT_G8_10        (0x03 << 20)
-
-#define S3C64XX_GPP11_MEM0_ATA_REG      (0x02 << 22)
-#define S3C64XX_GPP11_EINT_G8_11        (0x03 << 22)
-
-#define S3C64XX_GPP12_MEM0_ATA_WE       (0x02 << 24)
-#define S3C64XX_GPP12_EINT_G8_12        (0x03 << 24)
-
-#define S3C64XX_GPP13_MEM0_ATA_OE       (0x02 << 26)
-#define S3C64XX_GPP13_EINT_G8_13        (0x03 << 26)
-
-#define S3C64XX_GPP14_MEM0_ATA_CD       (0x02 << 28)
-#define S3C64XX_GPP14_EINT_G8_14        (0x03 << 28)
-
diff --git a/arch/arm/mach-s3c64xx/include/mach/gpio-bank-q.h b/arch/arm/mach-s3c64xx/include/mach/gpio-bank-q.h
deleted file mode 100644
index 1712223487b0..000000000000
--- a/arch/arm/mach-s3c64xx/include/mach/gpio-bank-q.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* linux/arch/arm/mach-s3c64xx/include/mach/gpio-bank-q.h
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * GPIO Bank Q register and configuration definitions
- *
- * 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 S3C64XX_GPQCON                  (S3C64XX_GPQ_BASE + 0x00)
-#define S3C64XX_GPQDAT                  (S3C64XX_GPQ_BASE + 0x04)
-#define S3C64XX_GPQPUD                  (S3C64XX_GPQ_BASE + 0x08)
-#define S3C64XX_GPQCONSLP               (S3C64XX_GPQ_BASE + 0x0c)
-#define S3C64XX_GPQPUDSLP               (S3C64XX_GPQ_BASE + 0x10)
-
-#define S3C64XX_GPQ_CONMASK(__gpio)     (0x3 << ((__gpio) * 2))
-#define S3C64XX_GPQ_INPUT(__gpio)       (0x0 << ((__gpio) * 2))
-#define S3C64XX_GPQ_OUTPUT(__gpio)      (0x1 << ((__gpio) * 2))
-
-#define S3C64XX_GPQ0_MEM0_ADDR18_RAS    (0x02 << 0)
-#define S3C64XX_GPQ0_EINT_G9_0          (0x03 << 0)
-
-#define S3C64XX_GPQ1_MEM0_ADDR19_CAS    (0x02 << 2)
-#define S3C64XX_GPQ1_EINT_G9_1          (0x03 << 2)
-
-#define S3C64XX_GPQ2_EINT_G9_2          (0x03 << 4)
-
-#define S3C64XX_GPQ3_EINT_G9_3          (0x03 << 6)
-
-#define S3C64XX_GPQ4_EINT_G9_4          (0x03 << 8)
-
-#define S3C64XX_GPQ5_EINT_G9_5          (0x03 << 10)
-
-#define S3C64XX_GPQ6_EINT_G9_6          (0x03 << 12)
-
-#define S3C64XX_GPQ7_MEM0_ADDR17_WENDMC (0x02 << 14)
-#define S3C64XX_GPQ7_EINT_G9_7          (0x03 << 14)
-
-#define S3C64XX_GPQ8_MEM0_ADDR16_APDMC  (0x02 << 16)
-#define S3C64XX_GPQ8_EINT_G9_8          (0x03 << 16)
-
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c
index 686a4f270b12..2c0353a80906 100644
--- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
@@ -50,7 +50,6 @@
 #include <mach/hardware.h>
 #include <mach/regs-fb.h>
 #include <mach/map.h>
-#include <mach/gpio-bank-f.h>
 
 #include <asm/irq.h>
 #include <asm/mach-types.h>
diff --git a/arch/arm/mach-s3c64xx/pm.c b/arch/arm/mach-s3c64xx/pm.c
index 79412f735a8d..bc1c470b7de6 100644
--- a/arch/arm/mach-s3c64xx/pm.c
+++ b/arch/arm/mach-s3c64xx/pm.c
@@ -30,26 +30,18 @@
 #include <mach/regs-gpio-memport.h>
 
 #ifdef CONFIG_S3C_PM_DEBUG_LED_SMDK
-#include <mach/gpio-bank-n.h>
-
 void s3c_pm_debug_smdkled(u32 set, u32 clear)
 {
         unsigned long flags;
-        u32 reg;
+        int i;
 
         local_irq_save(flags);
-        reg = __raw_readl(S3C64XX_GPNCON);
-        reg &= ~(S3C64XX_GPN_CONMASK(12) | S3C64XX_GPN_CONMASK(13) |
-                 S3C64XX_GPN_CONMASK(14) | S3C64XX_GPN_CONMASK(15));
-        reg |= S3C64XX_GPN_OUTPUT(12) | S3C64XX_GPN_OUTPUT(13) |
-               S3C64XX_GPN_OUTPUT(14) | S3C64XX_GPN_OUTPUT(15);
-        __raw_writel(reg, S3C64XX_GPNCON);
-
-        reg = __raw_readl(S3C64XX_GPNDAT);
-        reg &= ~(clear << 12);
-        reg |= set << 12;
-        __raw_writel(reg, S3C64XX_GPNDAT);
-
+        for (i = 0; i < 4; i++) {
+                if (clear & (1 << i))
+                        gpio_set_value(S3C64XX_GPN(12 + i), 0);
+                if (set & (1 << i))
+                        gpio_set_value(S3C64XX_GPN(12 + i), 1);
+        }
         local_irq_restore(flags);
 }
 #endif
@@ -187,6 +179,18 @@ static int s3c64xx_pm_init(void)
         pm_cpu_prep = s3c64xx_pm_prepare;
         pm_cpu_sleep = s3c64xx_cpu_suspend;
         pm_uart_udivslot = 1;
+
+#ifdef CONFIG_S3C_PM_DEBUG_LED_SMDK
+        gpio_request(S3C64XX_GPN(12), "DEBUG_LED0");
+        gpio_request(S3C64XX_GPN(13), "DEBUG_LED1");
+        gpio_request(S3C64XX_GPN(14), "DEBUG_LED2");
+        gpio_request(S3C64XX_GPN(15), "DEBUG_LED3");
+        gpio_direction_output(S3C64XX_GPN(12), 0);
+        gpio_direction_output(S3C64XX_GPN(13), 0);
+        gpio_direction_output(S3C64XX_GPN(14), 0);
+        gpio_direction_output(S3C64XX_GPN(15), 0);
+#endif
+
         return 0;
 }
 
diff --git a/arch/arm/mach-s3c64xx/setup-i2c0.c b/arch/arm/mach-s3c64xx/setup-i2c0.c
index 406192a43c6e..241af94a9e70 100644
--- a/arch/arm/mach-s3c64xx/setup-i2c0.c
+++ b/arch/arm/mach-s3c64xx/setup-i2c0.c
@@ -18,14 +18,11 @@
 
 struct platform_device; /* don't need the contents */
 
-#include <mach/gpio-bank-b.h>
 #include <plat/iic.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c0_cfg_gpio(struct platform_device *dev)
 {
-        s3c_gpio_cfgpin(S3C64XX_GPB(5), S3C64XX_GPB5_I2C_SCL0);
-        s3c_gpio_cfgpin(S3C64XX_GPB(6), S3C64XX_GPB6_I2C_SDA0);
-        s3c_gpio_setpull(S3C64XX_GPB(5), S3C_GPIO_PULL_UP);
-        s3c_gpio_setpull(S3C64XX_GPB(6), S3C_GPIO_PULL_UP);
+        s3c_gpio_cfgall_range(S3C64XX_GPB(5), 2,
+                              S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
 }
diff --git a/arch/arm/mach-s3c64xx/setup-i2c1.c b/arch/arm/mach-s3c64xx/setup-i2c1.c
index 1ee62c97cd7f..3d13a961986d 100644
--- a/arch/arm/mach-s3c64xx/setup-i2c1.c
+++ b/arch/arm/mach-s3c64xx/setup-i2c1.c
@@ -18,14 +18,11 @@
 
 struct platform_device; /* don't need the contents */
 
-#include <mach/gpio-bank-b.h>
 #include <plat/iic.h>
 #include <plat/gpio-cfg.h>
 
 void s3c_i2c1_cfg_gpio(struct platform_device *dev)
 {
-        s3c_gpio_cfgpin(S3C64XX_GPB(2), S3C64XX_GPB2_I2C_SCL1);
-        s3c_gpio_cfgpin(S3C64XX_GPB(3), S3C64XX_GPB3_I2C_SDA1);
-        s3c_gpio_setpull(S3C64XX_GPB(2), S3C_GPIO_PULL_UP);
-        s3c_gpio_setpull(S3C64XX_GPB(3), S3C_GPIO_PULL_UP);
+        s3c_gpio_cfgall_range(S3C64XX_GPB(2), 2,
+                              S3C_GPIO_SFN(6), S3C_GPIO_PULL_UP);
 }
diff --git a/arch/arm/mach-s3c64xx/sleep.S b/arch/arm/mach-s3c64xx/sleep.S
index afe5a762f46e..1f87732b2320 100644
--- a/arch/arm/mach-s3c64xx/sleep.S
+++ b/arch/arm/mach-s3c64xx/sleep.S
@@ -20,7 +20,6 @@
 #define S3C64XX_VA_GPIO (0x0)
 
 #include <mach/regs-gpio.h>
-#include <mach/gpio-bank-n.h>
 
 #define LL_UART (S3C_PA_UART + (0x400 * CONFIG_S3C_LOWLEVEL_UART_PORT))
 
@@ -68,6 +67,13 @@ ENTRY(s3c_cpu_resume)
         ldr     r2, =LL_UART            /* for debug */
 
 #ifdef CONFIG_S3C_PM_DEBUG_LED_SMDK
+
+#define S3C64XX_GPNCON                  (S3C64XX_GPN_BASE + 0x00)
+#define S3C64XX_GPNDAT                  (S3C64XX_GPN_BASE + 0x04)
+
+#define S3C64XX_GPN_CONMASK(__gpio)     (0x3 << ((__gpio) * 2))
+#define S3C64XX_GPN_OUTPUT(__gpio)      (0x1 << ((__gpio) * 2))
+
         /* Initialise the GPIO state if we are debugging via the SMDK LEDs,
          * as the uboot version supplied resets these to inputs during the
          * resume checks.
diff --git a/arch/arm/mach-s5p6442/Kconfig b/arch/arm/mach-s5p6442/Kconfig
deleted file mode 100644
index 33569e4007c4..000000000000
--- a/arch/arm/mach-s5p6442/Kconfig
+++ /dev/null
@@ -1,25 +0,0 @@
-# arch/arm/mach-s5p6442/Kconfig
-#
-# Copyright (c) 2010 Samsung Electronics Co., Ltd.
-#               http://www.samsung.com/
-#
-# Licensed under GPLv2
-
-# Configuration options for the S5P6442
-
-if ARCH_S5P6442
-
-config CPU_S5P6442
-        bool
-        select S3C_PL330_DMA
-        help
-          Enable S5P6442 CPU support
-
-config MACH_SMDK6442
-        bool "SMDK6442"
-        select CPU_S5P6442
-        select S3C_DEV_WDT
-        help
-          Machine support for Samsung SMDK6442
-
-endif
diff --git a/arch/arm/mach-s5p6442/Makefile b/arch/arm/mach-s5p6442/Makefile
deleted file mode 100644
index 90a3d8373416..000000000000
--- a/arch/arm/mach-s5p6442/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# arch/arm/mach-s5p6442/Makefile
-#
-# Copyright (c) 2010 Samsung Electronics Co., Ltd.
-#               http://www.samsung.com/
-#
-# Licensed under GPLv2
-
-obj-y                           :=
-obj-m                           :=
-obj-n                           :=
-obj-                            :=
-
-# Core support for S5P6442 system
-
-obj-$(CONFIG_CPU_S5P6442)       += cpu.o init.o clock.o dma.o
-obj-$(CONFIG_CPU_S5P6442)       += setup-i2c0.o
-
-# machine support
-
-obj-$(CONFIG_MACH_SMDK6442)     += mach-smdk6442.o
-
-# device support
-obj-y                           += dev-audio.o
-obj-$(CONFIG_S3C64XX_DEV_SPI)   += dev-spi.o
diff --git a/arch/arm/mach-s5p6442/Makefile.boot b/arch/arm/mach-s5p6442/Makefile.boot
deleted file mode 100644
index ff90aa13bd67..000000000000
--- a/arch/arm/mach-s5p6442/Makefile.boot
+++ /dev/null
@@ -1,2 +0,0 @@
-   zreladdr-y   := 0x20008000
-params_phys-y   := 0x20000100
diff --git a/arch/arm/mach-s5p6442/clock.c b/arch/arm/mach-s5p6442/clock.c
deleted file mode 100644
index fbbc7bede685..000000000000
--- a/arch/arm/mach-s5p6442/clock.c
+++ /dev/null
@@ -1,420 +0,0 @@
-/* linux/arch/arm/mach-s5p6442/clock.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * S5P6442 - Clock support
- *
- * 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/module.h>
-#include <linux/kernel.h>
-#include <linux/list.h>
-#include <linux/err.h>
-#include <linux/clk.h>
-#include <linux/io.h>
-
-#include <mach/map.h>
-
-#include <plat/cpu-freq.h>
-#include <mach/regs-clock.h>
-#include <plat/clock.h>
-#include <plat/cpu.h>
-#include <plat/pll.h>
-#include <plat/s5p-clock.h>
-#include <plat/clock-clksrc.h>
-#include <plat/s5p6442.h>
-
-static struct clksrc_clk clk_mout_apll = {
-        .clk    = {
-                .name           = "mout_apll",
-                .id             = -1,
-        },
-        .sources        = &clk_src_apll,
-        .reg_src        = { .reg = S5P_CLK_SRC0, .shift = 0, .size = 1 },
-};
-
-static struct clksrc_clk clk_mout_mpll = {
-        .clk = {
-                .name           = "mout_mpll",
-                .id             = -1,
-        },
-        .sources        = &clk_src_mpll,
-        .reg_src        = { .reg = S5P_CLK_SRC0, .shift = 4, .size = 1 },
-};
-
-static struct clksrc_clk clk_mout_epll = {
-        .clk    = {
-                .name           = "mout_epll",
-                .id             = -1,
-        },
-        .sources        = &clk_src_epll,
-        .reg_src        = { .reg = S5P_CLK_SRC0, .shift = 8, .size = 1 },
-};
-
-/* Possible clock sources for ARM Mux */
-static struct clk *clk_src_arm_list[] = {
-        [1] = &clk_mout_apll.clk,
-        [2] = &clk_mout_mpll.clk,
-};
-
-static struct clksrc_sources clk_src_arm = {
-        .sources        = clk_src_arm_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_arm_list),
-};
-
-static struct clksrc_clk clk_mout_arm = {
-        .clk    = {
-                .name           = "mout_arm",
-                .id             = -1,
-        },
-        .sources        = &clk_src_arm,
-        .reg_src        = { .reg = S5P_CLK_MUX_STAT0, .shift = 16, .size = 3 },
-};
-
-static struct clk clk_dout_a2m = {
-        .name           = "dout_a2m",
-        .id             = -1,
-        .parent         = &clk_mout_apll.clk,
-};
-
-/* Possible clock sources for D0 Mux */
-static struct clk *clk_src_d0_list[] = {
-        [1] = &clk_mout_mpll.clk,
-        [2] = &clk_dout_a2m,
-};
-
-static struct clksrc_sources clk_src_d0 = {
-        .sources        = clk_src_d0_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_d0_list),
-};
-
-static struct clksrc_clk clk_mout_d0 = {
-        .clk = {
-                .name           = "mout_d0",
-                .id             = -1,
-        },
-        .sources        = &clk_src_d0,
-        .reg_src        = { .reg = S5P_CLK_MUX_STAT0, .shift = 20, .size = 3 },
-};
-
-static struct clk clk_dout_apll = {
-        .name           = "dout_apll",
-        .id             = -1,
-        .parent         = &clk_mout_arm.clk,
-};
-
-/* Possible clock sources for D0SYNC Mux */
-static struct clk *clk_src_d0sync_list[] = {
-        [1] = &clk_mout_d0.clk,
-        [2] = &clk_dout_apll,
-};
-
-static struct clksrc_sources clk_src_d0sync = {
-        .sources        = clk_src_d0sync_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_d0sync_list),
-};
-
-static struct clksrc_clk clk_mout_d0sync = {
-        .clk    = {
-                .name           = "mout_d0sync",
-                .id             = -1,
-        },
-        .sources        = &clk_src_d0sync,
-        .reg_src        = { .reg = S5P_CLK_MUX_STAT1, .shift = 28, .size = 3 },
-};
-
-/* Possible clock sources for D1 Mux */
-static struct clk *clk_src_d1_list[] = {
-        [1] = &clk_mout_mpll.clk,
-        [2] = &clk_dout_a2m,
-};
-
-static struct clksrc_sources clk_src_d1 = {
-        .sources        = clk_src_d1_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_d1_list),
-};
-
-static struct clksrc_clk clk_mout_d1 = {
-        .clk    = {
-                .name           = "mout_d1",
-                .id             = -1,
-        },
-        .sources        = &clk_src_d1,
-        .reg_src        = { .reg = S5P_CLK_MUX_STAT0, .shift = 24, .size = 3 },
-};
-
-/* Possible clock sources for D1SYNC Mux */
-static struct clk *clk_src_d1sync_list[] = {
-        [1] = &clk_mout_d1.clk,
-        [2] = &clk_dout_apll,
-};
-
-static struct clksrc_sources clk_src_d1sync = {
-        .sources        = clk_src_d1sync_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_d1sync_list),
-};
-
-static struct clksrc_clk clk_mout_d1sync = {
-        .clk    = {
-                .name           = "mout_d1sync",
-                .id             = -1,
-        },
-        .sources        = &clk_src_d1sync,
-        .reg_src        = { .reg = S5P_CLK_MUX_STAT1, .shift = 24, .size = 3 },
-};
-
-static struct clk clk_hclkd0 = {
-        .name           = "hclkd0",
-        .id             = -1,
-        .parent         = &clk_mout_d0sync.clk,
-};
-
-static struct clk clk_hclkd1 = {
-        .name           = "hclkd1",
-        .id             = -1,
-        .parent         = &clk_mout_d1sync.clk,
-};
-
-static struct clk clk_pclkd0 = {
-        .name           = "pclkd0",
-        .id             = -1,
-        .parent         = &clk_hclkd0,
-};
-
-static struct clk clk_pclkd1 = {
-        .name           = "pclkd1",
-        .id             = -1,
-        .parent         = &clk_hclkd1,
-};
-
-int s5p6442_clk_ip0_ctrl(struct clk *clk, int enable)
-{
-        return s5p_gatectrl(S5P_CLKGATE_IP0, clk, enable);
-}
-
-int s5p6442_clk_ip3_ctrl(struct clk *clk, int enable)
-{
-        return s5p_gatectrl(S5P_CLKGATE_IP3, clk, enable);
-}
-
-static struct clksrc_clk clksrcs[] = {
-        {
-                .clk    = {
-                        .name           = "dout_a2m",
-                        .id             = -1,
-                        .parent         = &clk_mout_apll.clk,
-                },
-                .sources = &clk_src_apll,
-                .reg_src = { .reg = S5P_CLK_SRC0, .shift = 0, .size = 1 },
-                .reg_div = { .reg = S5P_CLK_DIV0, .shift = 4, .size = 3 },
-        }, {
-                .clk    = {
-                        .name           = "dout_apll",
-                        .id             = -1,
-                        .parent         = &clk_mout_arm.clk,
-                },
-                .sources = &clk_src_arm,
-                .reg_src = { .reg = S5P_CLK_MUX_STAT0, .shift = 16, .size = 3 },
-                .reg_div = { .reg = S5P_CLK_DIV0, .shift = 0, .size = 3 },
-        }, {
-                .clk    = {
-                        .name           = "hclkd1",
-                        .id             = -1,
-                        .parent         = &clk_mout_d1sync.clk,
-                },
-                .sources = &clk_src_d1sync,
-                .reg_src = { .reg = S5P_CLK_MUX_STAT1, .shift = 24, .size = 3 },
-                .reg_div = { .reg = S5P_CLK_DIV0, .shift = 24, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "hclkd0",
-                        .id             = -1,
-                        .parent         = &clk_mout_d0sync.clk,
-                },
-                .sources = &clk_src_d0sync,
-                .reg_src = { .reg = S5P_CLK_MUX_STAT1, .shift = 28, .size = 3 },
-                .reg_div = { .reg = S5P_CLK_DIV0, .shift = 16, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "pclkd0",
-                        .id             = -1,
-                        .parent         = &clk_hclkd0,
-                },
-                .sources = &clk_src_d0sync,
-                .reg_src = { .reg = S5P_CLK_MUX_STAT1, .shift = 28, .size = 3 },
-                .reg_div = { .reg = S5P_CLK_DIV0, .shift = 20, .size = 3 },
-        }, {
-                .clk    = {
-                        .name           = "pclkd1",
-                        .id             = -1,
-                        .parent         = &clk_hclkd1,
-                },
-                .sources = &clk_src_d1sync,
-                .reg_src = { .reg = S5P_CLK_MUX_STAT1, .shift = 24, .size = 3 },
-                .reg_div = { .reg = S5P_CLK_DIV0, .shift = 28, .size = 3 },
-        }
-};
-
-/* Clock initialisation code */
-static struct clksrc_clk *init_parents[] = {
-        &clk_mout_apll,
-        &clk_mout_mpll,
-        &clk_mout_epll,
-        &clk_mout_arm,
-        &clk_mout_d0,
-        &clk_mout_d0sync,
-        &clk_mout_d1,
-        &clk_mout_d1sync,
-};
-
-void __init_or_cpufreq s5p6442_setup_clocks(void)
-{
-        struct clk *pclkd0_clk;
-        struct clk *pclkd1_clk;
-
-        unsigned long xtal;
-        unsigned long arm;
-        unsigned long hclkd0 = 0;
-        unsigned long hclkd1 = 0;
-        unsigned long pclkd0 = 0;
-        unsigned long pclkd1 = 0;
-
-        unsigned long apll;
-        unsigned long mpll;
-        unsigned long epll;
-        unsigned int ptr;
-
-        printk(KERN_DEBUG "%s: registering clocks\n", __func__);
-
-        xtal = clk_get_rate(&clk_xtal);
-
-        printk(KERN_DEBUG "%s: xtal is %ld\n", __func__, xtal);
-
-        apll = s5p_get_pll45xx(xtal, __raw_readl(S5P_APLL_CON), pll_4508);
-        mpll = s5p_get_pll45xx(xtal, __raw_readl(S5P_MPLL_CON), pll_4502);
-        epll = s5p_get_pll45xx(xtal, __raw_readl(S5P_EPLL_CON), pll_4500);
-
-        printk(KERN_INFO "S5P6442: PLL settings, A=%ld, M=%ld, E=%ld",
-                        apll, mpll, epll);
-
-        clk_fout_apll.rate = apll;
-        clk_fout_mpll.rate = mpll;
-        clk_fout_epll.rate = epll;
-
-        for (ptr = 0; ptr < ARRAY_SIZE(init_parents); ptr++)
-                s3c_set_clksrc(init_parents[ptr], true);
-
-        for (ptr = 0; ptr < ARRAY_SIZE(clksrcs); ptr++)
-                s3c_set_clksrc(&clksrcs[ptr], true);
-
-        arm = clk_get_rate(&clk_dout_apll);
-        hclkd0 = clk_get_rate(&clk_hclkd0);
-        hclkd1 = clk_get_rate(&clk_hclkd1);
-
-        pclkd0_clk = clk_get(NULL, "pclkd0");
-        BUG_ON(IS_ERR(pclkd0_clk));
-
-        pclkd0 = clk_get_rate(pclkd0_clk);
-        clk_put(pclkd0_clk);
-
-        pclkd1_clk = clk_get(NULL, "pclkd1");
-        BUG_ON(IS_ERR(pclkd1_clk));
-
-        pclkd1 = clk_get_rate(pclkd1_clk);
-        clk_put(pclkd1_clk);
-
-        printk(KERN_INFO "S5P6442: HCLKD0=%ld, HCLKD1=%ld, PCLKD0=%ld, PCLKD1=%ld\n",
-                        hclkd0, hclkd1, pclkd0, pclkd1);
-
-        /* For backward compatibility */
-        clk_f.rate = arm;
-        clk_h.rate = hclkd1;
-        clk_p.rate = pclkd1;
-
-        clk_pclkd0.rate = pclkd0;
-        clk_pclkd1.rate = pclkd1;
-}
-
-static struct clk init_clocks_off[] = {
-        {
-                .name           = "pdma",
-                .id             = -1,
-                .parent         = &clk_pclkd1,
-                .enable         = s5p6442_clk_ip0_ctrl,
-                .ctrlbit        = (1 << 3),
-        },
-};
-
-static struct clk init_clocks[] = {
-        {
-                .name           = "systimer",
-                .id             = -1,
-                .parent         = &clk_pclkd1,
-                .enable         = s5p6442_clk_ip3_ctrl,
-                .ctrlbit        = (1<<16),
-        }, {
-                .name           = "uart",
-                .id             = 0,
-                .parent         = &clk_pclkd1,
-                .enable         = s5p6442_clk_ip3_ctrl,
-                .ctrlbit        = (1<<17),
-        }, {
-                .name           = "uart",
-                .id             = 1,
-                .parent         = &clk_pclkd1,
-                .enable         = s5p6442_clk_ip3_ctrl,
-                .ctrlbit        = (1<<18),
-        }, {
-                .name           = "uart",
-                .id             = 2,
-                .parent         = &clk_pclkd1,
-                .enable         = s5p6442_clk_ip3_ctrl,
-                .ctrlbit        = (1<<19),
-        }, {
-                .name           = "watchdog",
-                .id             = -1,
-                .parent         = &clk_pclkd1,
-                .enable         = s5p6442_clk_ip3_ctrl,
-                .ctrlbit        = (1 << 22),
-        }, {
-                .name           = "timers",
-                .id             = -1,
-                .parent         = &clk_pclkd1,
-                .enable         = s5p6442_clk_ip3_ctrl,
-                .ctrlbit        = (1<<23),
-        },
-};
-
-static struct clk *clks[] __initdata = {
-        &clk_ext,
-        &clk_epll,
-        &clk_mout_apll.clk,
-        &clk_mout_mpll.clk,
-        &clk_mout_epll.clk,
-        &clk_mout_d0.clk,
-        &clk_mout_d0sync.clk,
-        &clk_mout_d1.clk,
-        &clk_mout_d1sync.clk,
-        &clk_hclkd0,
-        &clk_pclkd0,
-        &clk_hclkd1,
-        &clk_pclkd1,
-};
-
-void __init s5p6442_register_clocks(void)
-{
-        s3c24xx_register_clocks(clks, ARRAY_SIZE(clks));
-
-        s3c_register_clksrc(clksrcs, ARRAY_SIZE(clksrcs));
-        s3c_register_clocks(init_clocks, ARRAY_SIZE(init_clocks));
-
-        s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
-        s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
-
-        s3c_pwmclk_init();
-}
diff --git a/arch/arm/mach-s5p6442/cpu.c b/arch/arm/mach-s5p6442/cpu.c
deleted file mode 100644
index 842af86bda6d..000000000000
--- a/arch/arm/mach-s5p6442/cpu.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/* linux/arch/arm/mach-s5p6442/cpu.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.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/kernel.h>
-#include <linux/types.h>
-#include <linux/interrupt.h>
-#include <linux/list.h>
-#include <linux/timer.h>
-#include <linux/init.h>
-#include <linux/clk.h>
-#include <linux/io.h>
-#include <linux/sysdev.h>
-#include <linux/serial_core.h>
-#include <linux/platform_device.h>
-#include <linux/sched.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/mach/irq.h>
-
-#include <asm/proc-fns.h>
-
-#include <mach/hardware.h>
-#include <mach/map.h>
-#include <asm/irq.h>
-
-#include <plat/regs-serial.h>
-#include <mach/regs-clock.h>
-
-#include <plat/cpu.h>
-#include <plat/devs.h>
-#include <plat/clock.h>
-#include <plat/s5p6442.h>
-
-/* Initial IO mappings */
-
-static struct map_desc s5p6442_iodesc[] __initdata = {
-        {
-                .virtual        = (unsigned long)S5P_VA_SYSTIMER,
-                .pfn            = __phys_to_pfn(S5P6442_PA_SYSTIMER),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S5P_VA_GPIO,
-                .pfn            = __phys_to_pfn(S5P6442_PA_GPIO),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)VA_VIC0,
-                .pfn            = __phys_to_pfn(S5P6442_PA_VIC0),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)VA_VIC1,
-                .pfn            = __phys_to_pfn(S5P6442_PA_VIC1),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)VA_VIC2,
-                .pfn            = __phys_to_pfn(S5P6442_PA_VIC2),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S3C_VA_UART,
-                .pfn            = __phys_to_pfn(S3C_PA_UART),
-                .length         = SZ_512K,
-                .type           = MT_DEVICE,
-        }
-};
-
-static void s5p6442_idle(void)
-{
-        if (!need_resched())
-                cpu_do_idle();
-
-        local_irq_enable();
-}
-
-/*
- * s5p6442_map_io
- *
- * register the standard cpu IO areas
- */
-
-void __init s5p6442_map_io(void)
-{
-        iotable_init(s5p6442_iodesc, ARRAY_SIZE(s5p6442_iodesc));
-}
-
-void __init s5p6442_init_clocks(int xtal)
-{
-        printk(KERN_DEBUG "%s: initializing clocks\n", __func__);
-
-        s3c24xx_register_baseclocks(xtal);
-        s5p_register_clocks(xtal);
-        s5p6442_register_clocks();
-        s5p6442_setup_clocks();
-}
-
-void __init s5p6442_init_irq(void)
-{
-        /* S5P6442 supports 3 VIC */
-        u32 vic[3];
-
-        /* VIC0, VIC1, and VIC2: some interrupt reserved */
-        vic[0] = 0x7fefffff;
-        vic[1] = 0X7f389c81;
-        vic[2] = 0X1bbbcfff;
-
-        s5p_init_irq(vic, ARRAY_SIZE(vic));
-}
-
-struct sysdev_class s5p6442_sysclass = {
-        .name   = "s5p6442-core",
-};
-
-static struct sys_device s5p6442_sysdev = {
-        .cls    = &s5p6442_sysclass,
-};
-
-static int __init s5p6442_core_init(void)
-{
-        return sysdev_class_register(&s5p6442_sysclass);
-}
-
-core_initcall(s5p6442_core_init);
-
-int __init s5p6442_init(void)
-{
-        printk(KERN_INFO "S5P6442: Initializing architecture\n");
-
-        /* set idle function */
-        pm_idle = s5p6442_idle;
-
-        return sysdev_register(&s5p6442_sysdev);
-}
diff --git a/arch/arm/mach-s5p6442/dev-audio.c b/arch/arm/mach-s5p6442/dev-audio.c
deleted file mode 100644
index 8719dc41fe32..000000000000
--- a/arch/arm/mach-s5p6442/dev-audio.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/* linux/arch/arm/mach-s5p6442/dev-audio.c
- *
- * Copyright (c) 2010 Samsung Electronics Co. Ltd
- *      Jaswinder Singh <jassi.brar@samsung.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/platform_device.h>
-#include <linux/dma-mapping.h>
-#include <linux/gpio.h>
-
-#include <plat/gpio-cfg.h>
-#include <plat/audio.h>
-
-#include <mach/map.h>
-#include <mach/dma.h>
-#include <mach/irqs.h>
-
-static int s5p6442_cfg_i2s(struct platform_device *pdev)
-{
-        unsigned int base;
-
-        /* configure GPIO for i2s port */
-        switch (pdev->id) {
-        case 1:
-                base = S5P6442_GPC1(0);
-                break;
-
-        case 0:
-                base = S5P6442_GPC0(0);
-                break;
-
-        default:
-                printk(KERN_ERR "Invalid Device %d\n", pdev->id);
-                return -EINVAL;
-        }
-
-        s3c_gpio_cfgpin_range(base, 5, S3C_GPIO_SFN(2));
-        return 0;
-}
-
-static const char *rclksrc_v35[] = {
-        [0] = "busclk",
-        [1] = "i2sclk",
-};
-
-static struct s3c_audio_pdata i2sv35_pdata = {
-        .cfg_gpio = s5p6442_cfg_i2s,
-        .type = {
-                .i2s = {
-                        .quirks = QUIRK_SEC_DAI | QUIRK_NEED_RSTCLR,
-                        .src_clk = rclksrc_v35,
-                },
-        },
-};
-
-static struct resource s5p6442_iis0_resource[] = {
-        [0] = {
-                .start = S5P6442_PA_I2S0,
-                .end   = S5P6442_PA_I2S0 + 0x100 - 1,
-                .flags = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start = DMACH_I2S0_TX,
-                .end   = DMACH_I2S0_TX,
-                .flags = IORESOURCE_DMA,
-        },
-        [2] = {
-                .start = DMACH_I2S0_RX,
-                .end   = DMACH_I2S0_RX,
-                .flags = IORESOURCE_DMA,
-        },
-        [3] = {
-                .start = DMACH_I2S0S_TX,
-                .end = DMACH_I2S0S_TX,
-                .flags = IORESOURCE_DMA,
-        },
-};
-
-struct platform_device s5p6442_device_iis0 = {
-        .name = "samsung-i2s",
-        .id = 0,
-        .num_resources    = ARRAY_SIZE(s5p6442_iis0_resource),
-        .resource         = s5p6442_iis0_resource,
-        .dev = {
-                .platform_data = &i2sv35_pdata,
-        },
-};
-
-static const char *rclksrc_v3[] = {
-        [0] = "iis",
-        [1] = "sclk_audio",
-};
-
-static struct s3c_audio_pdata i2sv3_pdata = {
-        .cfg_gpio = s5p6442_cfg_i2s,
-        .type = {
-                .i2s = {
-                        .src_clk = rclksrc_v3,
-                },
-        },
-};
-
-static struct resource s5p6442_iis1_resource[] = {
-        [0] = {
-                .start = S5P6442_PA_I2S1,
-                .end   = S5P6442_PA_I2S1 + 0x100 - 1,
-                .flags = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start = DMACH_I2S1_TX,
-                .end   = DMACH_I2S1_TX,
-                .flags = IORESOURCE_DMA,
-        },
-        [2] = {
-                .start = DMACH_I2S1_RX,
-                .end   = DMACH_I2S1_RX,
-                .flags = IORESOURCE_DMA,
-        },
-};
-
-struct platform_device s5p6442_device_iis1 = {
-        .name             = "samsung-i2s",
-        .id               = 1,
-        .num_resources    = ARRAY_SIZE(s5p6442_iis1_resource),
-        .resource         = s5p6442_iis1_resource,
-        .dev = {
-                .platform_data = &i2sv3_pdata,
-        },
-};
-
-/* PCM Controller platform_devices */
-
-static int s5p6442_pcm_cfg_gpio(struct platform_device *pdev)
-{
-        unsigned int base;
-
-        switch (pdev->id) {
-        case 0:
-                base = S5P6442_GPC0(0);
-                break;
-
-        case 1:
-                base = S5P6442_GPC1(0);
-                break;
-
-        default:
-                printk(KERN_DEBUG "Invalid PCM Controller number!");
-                return -EINVAL;
-        }
-
-        s3c_gpio_cfgpin_range(base, 5, S3C_GPIO_SFN(3));
-        return 0;
-}
-
-static struct s3c_audio_pdata s3c_pcm_pdata = {
-        .cfg_gpio = s5p6442_pcm_cfg_gpio,
-};
-
-static struct resource s5p6442_pcm0_resource[] = {
-        [0] = {
-                .start = S5P6442_PA_PCM0,
-                .end   = S5P6442_PA_PCM0 + 0x100 - 1,
-                .flags = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start = DMACH_PCM0_TX,
-                .end   = DMACH_PCM0_TX,
-                .flags = IORESOURCE_DMA,
-        },
-        [2] = {
-                .start = DMACH_PCM0_RX,
-                .end   = DMACH_PCM0_RX,
-                .flags = IORESOURCE_DMA,
-        },
-};
-
-struct platform_device s5p6442_device_pcm0 = {
-        .name             = "samsung-pcm",
-        .id               = 0,
-        .num_resources    = ARRAY_SIZE(s5p6442_pcm0_resource),
-        .resource         = s5p6442_pcm0_resource,
-        .dev = {
-                .platform_data = &s3c_pcm_pdata,
-        },
-};
-
-static struct resource s5p6442_pcm1_resource[] = {
-        [0] = {
-                .start = S5P6442_PA_PCM1,
-                .end   = S5P6442_PA_PCM1 + 0x100 - 1,
-                .flags = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start = DMACH_PCM1_TX,
-                .end   = DMACH_PCM1_TX,
-                .flags = IORESOURCE_DMA,
-        },
-        [2] = {
-                .start = DMACH_PCM1_RX,
-                .end   = DMACH_PCM1_RX,
-                .flags = IORESOURCE_DMA,
-        },
-};
-
-struct platform_device s5p6442_device_pcm1 = {
-        .name             = "samsung-pcm",
-        .id               = 1,
-        .num_resources    = ARRAY_SIZE(s5p6442_pcm1_resource),
-        .resource         = s5p6442_pcm1_resource,
-        .dev = {
-                .platform_data = &s3c_pcm_pdata,
-        },
-};
diff --git a/arch/arm/mach-s5p6442/dev-spi.c b/arch/arm/mach-s5p6442/dev-spi.c
deleted file mode 100644
index cce8c2470709..000000000000
--- a/arch/arm/mach-s5p6442/dev-spi.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* linux/arch/arm/mach-s5p6442/dev-spi.c
- *
- * Copyright (C) 2010 Samsung Electronics Co. Ltd.
- *      Jaswinder Singh <jassi.brar@samsung.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/platform_device.h>
-#include <linux/dma-mapping.h>
-#include <linux/gpio.h>
-
-#include <mach/dma.h>
-#include <mach/map.h>
-#include <mach/irqs.h>
-#include <mach/spi-clocks.h>
-
-#include <plat/s3c64xx-spi.h>
-#include <plat/gpio-cfg.h>
-
-static char *spi_src_clks[] = {
-        [S5P6442_SPI_SRCCLK_PCLK] = "pclk",
-        [S5P6442_SPI_SRCCLK_SCLK] = "spi_epll",
-};
-
-/* SPI Controller platform_devices */
-
-/* Since we emulate multi-cs capability, we do not touch the CS.
- * The emulated CS is toggled by board specific mechanism, as it can
- * be either some immediate GPIO or some signal out of some other
- * chip in between ... or some yet another way.
- * We simply do not assume anything about CS.
- */
-static int s5p6442_spi_cfg_gpio(struct platform_device *pdev)
-{
-        switch (pdev->id) {
-        case 0:
-                s3c_gpio_cfgpin(S5P6442_GPB(0), S3C_GPIO_SFN(2));
-                s3c_gpio_setpull(S5P6442_GPB(0), S3C_GPIO_PULL_UP);
-                s3c_gpio_cfgall_range(S5P6442_GPB(2), 2,
-                                      S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
-                break;
-
-        default:
-                dev_err(&pdev->dev, "Invalid SPI Controller number!");
-                return -EINVAL;
-        }
-
-        return 0;
-}
-
-static struct resource s5p6442_spi0_resource[] = {
-        [0] = {
-                .start = S5P6442_PA_SPI,
-                .end   = S5P6442_PA_SPI + 0x100 - 1,
-                .flags = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start = DMACH_SPI0_TX,
-                .end   = DMACH_SPI0_TX,
-                .flags = IORESOURCE_DMA,
-        },
-        [2] = {
-                .start = DMACH_SPI0_RX,
-                .end   = DMACH_SPI0_RX,
-                .flags = IORESOURCE_DMA,
-        },
-        [3] = {
-                .start = IRQ_SPI0,
-                .end   = IRQ_SPI0,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-static struct s3c64xx_spi_info s5p6442_spi0_pdata = {
-        .cfg_gpio = s5p6442_spi_cfg_gpio,
-        .fifo_lvl_mask = 0x1ff,
-        .rx_lvl_offset = 15,
-};
-
-static u64 spi_dmamask = DMA_BIT_MASK(32);
-
-struct platform_device s5p6442_device_spi = {
-        .name             = "s3c64xx-spi",
-        .id               = 0,
-        .num_resources    = ARRAY_SIZE(s5p6442_spi0_resource),
-        .resource         = s5p6442_spi0_resource,
-        .dev = {
-                .dma_mask               = &spi_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-                .platform_data = &s5p6442_spi0_pdata,
-        },
-};
-
-void __init s5p6442_spi_set_info(int cntrlr, int src_clk_nr, int num_cs)
-{
-        struct s3c64xx_spi_info *pd;
-
-        /* Reject invalid configuration */
-        if (!num_cs || src_clk_nr < 0
-                        || src_clk_nr > S5P6442_SPI_SRCCLK_SCLK) {
-                printk(KERN_ERR "%s: Invalid SPI configuration\n", __func__);
-                return;
-        }
-
-        switch (cntrlr) {
-        case 0:
-                pd = &s5p6442_spi0_pdata;
-                break;
-        default:
-                printk(KERN_ERR "%s: Invalid SPI controller(%d)\n",
-                                                        __func__, cntrlr);
-                return;
-        }
-
-        pd->num_cs = num_cs;
-        pd->src_clk_nr = src_clk_nr;
-        pd->src_clk_name = spi_src_clks[src_clk_nr];
-}
diff --git a/arch/arm/mach-s5p6442/dma.c b/arch/arm/mach-s5p6442/dma.c
deleted file mode 100644
index 7dfb13654f8a..000000000000
--- a/arch/arm/mach-s5p6442/dma.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2010 Samsung Electronics Co. Ltd.
- *      Jaswinder Singh <jassi.brar@samsung.com>
- *
- * 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 program 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/platform_device.h>
-#include <linux/dma-mapping.h>
-
-#include <plat/devs.h>
-#include <plat/irqs.h>
-
-#include <mach/map.h>
-#include <mach/irqs.h>
-
-#include <plat/s3c-pl330-pdata.h>
-
-static u64 dma_dmamask = DMA_BIT_MASK(32);
-
-static struct resource s5p6442_pdma_resource[] = {
-        [0] = {
-                .start  = S5P6442_PA_PDMA,
-                .end    = S5P6442_PA_PDMA + SZ_4K,
-                .flags = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = IRQ_PDMA,
-                .end    = IRQ_PDMA,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct s3c_pl330_platdata s5p6442_pdma_pdata = {
-        .peri = {
-                [0] = DMACH_UART0_RX,
-                [1] = DMACH_UART0_TX,
-                [2] = DMACH_UART1_RX,
-                [3] = DMACH_UART1_TX,
-                [4] = DMACH_UART2_RX,
-                [5] = DMACH_UART2_TX,
-                [6] = DMACH_MAX,
-                [7] = DMACH_MAX,
-                [8] = DMACH_MAX,
-                [9] = DMACH_I2S0_RX,
-                [10] = DMACH_I2S0_TX,
-                [11] = DMACH_I2S0S_TX,
-                [12] = DMACH_I2S1_RX,
-                [13] = DMACH_I2S1_TX,
-                [14] = DMACH_MAX,
-                [15] = DMACH_MAX,
-                [16] = DMACH_SPI0_RX,
-                [17] = DMACH_SPI0_TX,
-                [18] = DMACH_MAX,
-                [19] = DMACH_MAX,
-                [20] = DMACH_PCM0_RX,
-                [21] = DMACH_PCM0_TX,
-                [22] = DMACH_PCM1_RX,
-                [23] = DMACH_PCM1_TX,
-                [24] = DMACH_MAX,
-                [25] = DMACH_MAX,
-                [26] = DMACH_MAX,
-                [27] = DMACH_MSM_REQ0,
-                [28] = DMACH_MSM_REQ1,
-                [29] = DMACH_MSM_REQ2,
-                [30] = DMACH_MSM_REQ3,
-                [31] = DMACH_MAX,
-        },
-};
-
-static struct platform_device s5p6442_device_pdma = {
-        .name           = "s3c-pl330",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(s5p6442_pdma_resource),
-        .resource       = s5p6442_pdma_resource,
-        .dev            = {
-                .dma_mask = &dma_dmamask,
-                .coherent_dma_mask = DMA_BIT_MASK(32),
-                .platform_data = &s5p6442_pdma_pdata,
-        },
-};
-
-static struct platform_device *s5p6442_dmacs[] __initdata = {
-        &s5p6442_device_pdma,
-};
-
-static int __init s5p6442_dma_init(void)
-{
-        platform_add_devices(s5p6442_dmacs, ARRAY_SIZE(s5p6442_dmacs));
-
-        return 0;
-}
-arch_initcall(s5p6442_dma_init);
diff --git a/arch/arm/mach-s5p6442/include/mach/debug-macro.S b/arch/arm/mach-s5p6442/include/mach/debug-macro.S
deleted file mode 100644
index e2213205d780..000000000000
--- a/arch/arm/mach-s5p6442/include/mach/debug-macro.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/* linux/arch/arm/mach-s5p6442/include/mach/debug-macro.S
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * Based on arch/arm/mach-s3c6400/include/mach/debug-macro.S
- *
- * 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.
-*/
-
-/* pull in the relevant register and map files. */
-
-#include <mach/map.h>
-#include <plat/regs-serial.h>
-
-        .macro addruart, rp, rv
-                ldr     \rp, = S3C_PA_UART
-                ldr     \rv, = S3C_VA_UART
-#if CONFIG_DEBUG_S3C_UART != 0
-                add     \rp, \rp, #(0x400 * CONFIG_DEBUG_S3C_UART)
-                add     \rv, \rv, #(0x400 * CONFIG_DEBUG_S3C_UART)
-#endif
-        .endm
-
-#define fifo_full fifo_full_s5pv210
-#define fifo_level fifo_level_s5pv210
-
-/* include the reset of the code which will do the work, we're only
- * compiling for a single cpu processor type so the default of s3c2440
- * will be fine with us.
- */
-
-#include <plat/debug-macro.S>
diff --git a/arch/arm/mach-s5p6442/include/mach/dma.h b/arch/arm/mach-s5p6442/include/mach/dma.h
deleted file mode 100644
index 81209eb1409b..000000000000
--- a/arch/arm/mach-s5p6442/include/mach/dma.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2010 Samsung Electronics Co. Ltd.
- *      Jaswinder Singh <jassi.brar@samsung.com>
- *
- * 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 program 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef __MACH_DMA_H
-#define __MACH_DMA_H
-
-/* This platform uses the common S3C DMA API driver for PL330 */
-#include <plat/s3c-dma-pl330.h>
-
-#endif /* __MACH_DMA_H */
diff --git a/arch/arm/mach-s5p6442/include/mach/entry-macro.S b/arch/arm/mach-s5p6442/include/mach/entry-macro.S
deleted file mode 100644
index 6d574edbf1ae..000000000000
--- a/arch/arm/mach-s5p6442/include/mach/entry-macro.S
+++ /dev/null
@@ -1,48 +0,0 @@
-/* linux/arch/arm/mach-s5p6442/include/mach/entry-macro.S
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * Low-level IRQ helper macros for the Samsung S5P6442
- *
- * 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 <asm/hardware/vic.h>
-#include <mach/map.h>
-#include <plat/irqs.h>
-
-        .macro  disable_fiq
-        .endm
-
-        .macro  get_irqnr_preamble, base, tmp
-        ldr     \base, =VA_VIC0
-        .endm
-
-        .macro  arch_ret_to_user, tmp1, tmp2
-        .endm
-
-        .macro  get_irqnr_and_base, irqnr, irqstat, base, tmp
-
-        @ check the vic0
-        mov     \irqnr, # S5P_IRQ_OFFSET + 31
-        ldr     \irqstat, [ \base, # VIC_IRQ_STATUS ]
-        teq     \irqstat, #0
-
-        @ otherwise try vic1
-        addeq   \tmp, \base, #(VA_VIC1 - VA_VIC0)
-        addeq   \irqnr, \irqnr, #32
-        ldreq   \irqstat, [ \tmp, # VIC_IRQ_STATUS ]
-        teqeq   \irqstat, #0
-
-        @ otherwise try vic2
-        addeq   \tmp, \base, #(VA_VIC2 - VA_VIC0)
-        addeq   \irqnr, \irqnr, #32
-        ldreq   \irqstat, [ \tmp, # VIC_IRQ_STATUS ]
-        teqeq   \irqstat, #0
-
-        clzne   \irqstat, \irqstat
-        subne   \irqnr, \irqnr, \irqstat
-        .endm
diff --git a/arch/arm/mach-s5p6442/include/mach/gpio.h b/arch/arm/mach-s5p6442/include/mach/gpio.h
deleted file mode 100644
index b8715df2fdab..000000000000
--- a/arch/arm/mach-s5p6442/include/mach/gpio.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* linux/arch/arm/mach-s5p6442/include/mach/gpio.h
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * S5P6442 - GPIO lib support
- *
- * 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.
-*/
-
-#ifndef __ASM_ARCH_GPIO_H
-#define __ASM_ARCH_GPIO_H __FILE__
-
-#define gpio_get_value  __gpio_get_value
-#define gpio_set_value  __gpio_set_value
-#define gpio_cansleep   __gpio_cansleep
-#define gpio_to_irq     __gpio_to_irq
-
-/* GPIO bank sizes */
-#define S5P6442_GPIO_A0_NR      (8)
-#define S5P6442_GPIO_A1_NR      (2)
-#define S5P6442_GPIO_B_NR       (4)
-#define S5P6442_GPIO_C0_NR      (5)
-#define S5P6442_GPIO_C1_NR      (5)
-#define S5P6442_GPIO_D0_NR      (2)
-#define S5P6442_GPIO_D1_NR      (6)
-#define S5P6442_GPIO_E0_NR      (8)
-#define S5P6442_GPIO_E1_NR      (5)
-#define S5P6442_GPIO_F0_NR      (8)
-#define S5P6442_GPIO_F1_NR      (8)
-#define S5P6442_GPIO_F2_NR      (8)
-#define S5P6442_GPIO_F3_NR      (6)
-#define S5P6442_GPIO_G0_NR      (7)
-#define S5P6442_GPIO_G1_NR      (7)
-#define S5P6442_GPIO_G2_NR      (7)
-#define S5P6442_GPIO_H0_NR      (8)
-#define S5P6442_GPIO_H1_NR      (8)
-#define S5P6442_GPIO_H2_NR      (8)
-#define S5P6442_GPIO_H3_NR      (8)
-#define S5P6442_GPIO_J0_NR      (8)
-#define S5P6442_GPIO_J1_NR      (6)
-#define S5P6442_GPIO_J2_NR      (8)
-#define S5P6442_GPIO_J3_NR      (8)
-#define S5P6442_GPIO_J4_NR      (5)
-
-/* GPIO bank numbers */
-
-/* CONFIG_S3C_GPIO_SPACE allows the user to select extra
- * space for debugging purposes so that any accidental
- * change from one gpio bank to another can be caught.
-*/
-
-#define S5P6442_GPIO_NEXT(__gpio) \
-        ((__gpio##_START) + (__gpio##_NR) + CONFIG_S3C_GPIO_SPACE + 1)
-
-enum s5p_gpio_number {
-        S5P6442_GPIO_A0_START   = 0,
-        S5P6442_GPIO_A1_START   = S5P6442_GPIO_NEXT(S5P6442_GPIO_A0),
-        S5P6442_GPIO_B_START    = S5P6442_GPIO_NEXT(S5P6442_GPIO_A1),
-        S5P6442_GPIO_C0_START   = S5P6442_GPIO_NEXT(S5P6442_GPIO_B),
-        S5P6442_GPIO_C1_START   = S5P6442_GPIO_NEXT(S5P6442_GPIO_C0),
-        S5P6442_GPIO_D0_START   = S5P6442_GPIO_NEXT(S5P6442_GPIO_C1),
-        S5P6442_GPIO_D1_START   = S5P6442_GPIO_NEXT(S5P6442_GPIO_D0),
-        S5P6442_GPIO_E0_START   = S5P6442_GPIO_NEXT(S5P6442_GPIO_D1),
-        S5P6442_GPIO_E1_START   = S5P6442_GPIO_NEXT(S5P6442_GPIO_E0),
-        S5P6442_GPIO_F0_START   = S5P6442_GPIO_NEXT(S5P6442_GPIO_E1),
-        S5P6442_GPIO_F1_START   = S5P6442_GPIO_NEXT(S5P6442_GPIO_F0),
-        S5P6442_GPIO_F2_START   = S5P6442_GPIO_NEXT(S5P6442_GPIO_F1),
-        S5P6442_GPIO_F3_START   = S5P6442_GPIO_NEXT(S5P6442_GPIO_F2),
-        S5P6442_GPIO_G0_START   = S5P6442_GPIO_NEXT(S5P6442_GPIO_F3),
-        S5P6442_GPIO_G1_START   = S5P6442_GPIO_NEXT(S5P6442_GPIO_G0),
-        S5P6442_GPIO_G2_START   = S5P6442_GPIO_NEXT(S5P6442_GPIO_G1),
-        S5P6442_GPIO_H0_START   = S5P6442_GPIO_NEXT(S5P6442_GPIO_G2),
-        S5P6442_GPIO_H1_START   = S5P6442_GPIO_NEXT(S5P6442_GPIO_H0),
-        S5P6442_GPIO_H2_START   = S5P6442_GPIO_NEXT(S5P6442_GPIO_H1),
-        S5P6442_GPIO_H3_START   = S5P6442_GPIO_NEXT(S5P6442_GPIO_H2),
-        S5P6442_GPIO_J0_START   = S5P6442_GPIO_NEXT(S5P6442_GPIO_H3),
-        S5P6442_GPIO_J1_START   = S5P6442_GPIO_NEXT(S5P6442_GPIO_J0),
-        S5P6442_GPIO_J2_START   = S5P6442_GPIO_NEXT(S5P6442_GPIO_J1),
-        S5P6442_GPIO_J3_START   = S5P6442_GPIO_NEXT(S5P6442_GPIO_J2),
-        S5P6442_GPIO_J4_START   = S5P6442_GPIO_NEXT(S5P6442_GPIO_J3),
-};
-
-/* S5P6442 GPIO number definitions. */
-#define S5P6442_GPA0(_nr)       (S5P6442_GPIO_A0_START + (_nr))
-#define S5P6442_GPA1(_nr)       (S5P6442_GPIO_A1_START + (_nr))
-#define S5P6442_GPB(_nr)        (S5P6442_GPIO_B_START + (_nr))
-#define S5P6442_GPC0(_nr)       (S5P6442_GPIO_C0_START + (_nr))
-#define S5P6442_GPC1(_nr)       (S5P6442_GPIO_C1_START + (_nr))
-#define S5P6442_GPD0(_nr)       (S5P6442_GPIO_D0_START + (_nr))
-#define S5P6442_GPD1(_nr)       (S5P6442_GPIO_D1_START + (_nr))
-#define S5P6442_GPE0(_nr)       (S5P6442_GPIO_E0_START + (_nr))
-#define S5P6442_GPE1(_nr)       (S5P6442_GPIO_E1_START + (_nr))
-#define S5P6442_GPF0(_nr)       (S5P6442_GPIO_F0_START + (_nr))
-#define S5P6442_GPF1(_nr)       (S5P6442_GPIO_F1_START + (_nr))
-#define S5P6442_GPF2(_nr)       (S5P6442_GPIO_F2_START + (_nr))
-#define S5P6442_GPF3(_nr)       (S5P6442_GPIO_F3_START + (_nr))
-#define S5P6442_GPG0(_nr)       (S5P6442_GPIO_G0_START + (_nr))
-#define S5P6442_GPG1(_nr)       (S5P6442_GPIO_G1_START + (_nr))
-#define S5P6442_GPG2(_nr)       (S5P6442_GPIO_G2_START + (_nr))
-#define S5P6442_GPH0(_nr)       (S5P6442_GPIO_H0_START + (_nr))
-#define S5P6442_GPH1(_nr)       (S5P6442_GPIO_H1_START + (_nr))
-#define S5P6442_GPH2(_nr)       (S5P6442_GPIO_H2_START + (_nr))
-#define S5P6442_GPH3(_nr)       (S5P6442_GPIO_H3_START + (_nr))
-#define S5P6442_GPJ0(_nr)       (S5P6442_GPIO_J0_START + (_nr))
-#define S5P6442_GPJ1(_nr)       (S5P6442_GPIO_J1_START + (_nr))
-#define S5P6442_GPJ2(_nr)       (S5P6442_GPIO_J2_START + (_nr))
-#define S5P6442_GPJ3(_nr)       (S5P6442_GPIO_J3_START + (_nr))
-#define S5P6442_GPJ4(_nr)       (S5P6442_GPIO_J4_START + (_nr))
-
-/* the end of the S5P6442 specific gpios */
-#define S5P6442_GPIO_END        (S5P6442_GPJ4(S5P6442_GPIO_J4_NR) + 1)
-#define S3C_GPIO_END            S5P6442_GPIO_END
-
-/* define the number of gpios we need to the one after the GPJ4() range */
-#define ARCH_NR_GPIOS           (S5P6442_GPJ4(S5P6442_GPIO_J4_NR) +     \
-                                 CONFIG_SAMSUNG_GPIO_EXTRA + 1)
-
-#include <asm-generic/gpio.h>
-
-#endif /* __ASM_ARCH_GPIO_H */
diff --git a/arch/arm/mach-s5p6442/include/mach/hardware.h b/arch/arm/mach-s5p6442/include/mach/hardware.h
deleted file mode 100644
index 8cd7b67b49d4..000000000000
--- a/arch/arm/mach-s5p6442/include/mach/hardware.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* linux/arch/arm/mach-s5p6442/include/mach/hardware.h
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * S5P6442 - Hardware support
- *
- * 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.
-*/
-
-#ifndef __ASM_ARCH_HARDWARE_H
-#define __ASM_ARCH_HARDWARE_H __FILE__
-
-/* currently nothing here, placeholder */
-
-#endif /* __ASM_ARCH_HARDWARE_H */
diff --git a/arch/arm/mach-s5p6442/include/mach/io.h b/arch/arm/mach-s5p6442/include/mach/io.h
deleted file mode 100644
index 5d2195ad0b67..000000000000
--- a/arch/arm/mach-s5p6442/include/mach/io.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* arch/arm/mach-s5p6442/include/mach/io.h
- *
- * Copyright 2008-2010 Ben Dooks <ben-linux@fluff.org>
- *
- * Default IO routines for S5P6442
- */
-
-#ifndef __ASM_ARM_ARCH_IO_H
-#define __ASM_ARM_ARCH_IO_H
-
-/* No current ISA/PCI bus support. */
-#define __io(a)         __typesafe_io(a)
-#define __mem_pci(a)    (a)
-
-#define IO_SPACE_LIMIT (0xFFFFFFFF)
-
-#endif
diff --git a/arch/arm/mach-s5p6442/include/mach/irqs.h b/arch/arm/mach-s5p6442/include/mach/irqs.h
deleted file mode 100644
index 3fbc6c3ad2da..000000000000
--- a/arch/arm/mach-s5p6442/include/mach/irqs.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* linux/arch/arm/mach-s5p6442/include/mach/irqs.h
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * S5P6442 - IRQ definitions
- *
- * 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.
-*/
-
-#ifndef __ASM_ARCH_IRQS_H
-#define __ASM_ARCH_IRQS_H __FILE__
-
-#include <plat/irqs.h>
-
-/* VIC0 */
-#define IRQ_EINT16_31           S5P_IRQ_VIC0(16)
-#define IRQ_BATF                S5P_IRQ_VIC0(17)
-#define IRQ_MDMA                S5P_IRQ_VIC0(18)
-#define IRQ_PDMA                S5P_IRQ_VIC0(19)
-#define IRQ_TIMER0_VIC          S5P_IRQ_VIC0(21)
-#define IRQ_TIMER1_VIC          S5P_IRQ_VIC0(22)
-#define IRQ_TIMER2_VIC          S5P_IRQ_VIC0(23)
-#define IRQ_TIMER3_VIC          S5P_IRQ_VIC0(24)
-#define IRQ_TIMER4_VIC          S5P_IRQ_VIC0(25)
-#define IRQ_SYSTIMER            S5P_IRQ_VIC0(26)
-#define IRQ_WDT                 S5P_IRQ_VIC0(27)
-#define IRQ_RTC_ALARM           S5P_IRQ_VIC0(28)
-#define IRQ_RTC_TIC             S5P_IRQ_VIC0(29)
-#define IRQ_GPIOINT             S5P_IRQ_VIC0(30)
-
-/* VIC1 */
-#define IRQ_PMU                 S5P_IRQ_VIC1(0)
-#define IRQ_ONENAND             S5P_IRQ_VIC1(7)
-#define IRQ_UART0               S5P_IRQ_VIC1(10)
-#define IRQ_UART1               S5P_IRQ_VIC1(11)
-#define IRQ_UART2               S5P_IRQ_VIC1(12)
-#define IRQ_SPI0                S5P_IRQ_VIC1(15)
-#define IRQ_IIC                 S5P_IRQ_VIC1(19)
-#define IRQ_IIC1                S5P_IRQ_VIC1(20)
-#define IRQ_IIC2                S5P_IRQ_VIC1(21)
-#define IRQ_OTG                 S5P_IRQ_VIC1(24)
-#define IRQ_MSM                 S5P_IRQ_VIC1(25)
-#define IRQ_HSMMC0              S5P_IRQ_VIC1(26)
-#define IRQ_HSMMC1              S5P_IRQ_VIC1(27)
-#define IRQ_HSMMC2              S5P_IRQ_VIC1(28)
-#define IRQ_COMMRX              S5P_IRQ_VIC1(29)
-#define IRQ_COMMTX              S5P_IRQ_VIC1(30)
-
-/* VIC2 */
-#define IRQ_LCD0                S5P_IRQ_VIC2(0)
-#define IRQ_LCD1                S5P_IRQ_VIC2(1)
-#define IRQ_LCD2                S5P_IRQ_VIC2(2)
-#define IRQ_LCD3                S5P_IRQ_VIC2(3)
-#define IRQ_ROTATOR             S5P_IRQ_VIC2(4)
-#define IRQ_FIMC0               S5P_IRQ_VIC2(5)
-#define IRQ_FIMC1               S5P_IRQ_VIC2(6)
-#define IRQ_FIMC2               S5P_IRQ_VIC2(7)
-#define IRQ_JPEG                S5P_IRQ_VIC2(8)
-#define IRQ_3D                  S5P_IRQ_VIC2(10)
-#define IRQ_Mixer               S5P_IRQ_VIC2(11)
-#define IRQ_MFC                 S5P_IRQ_VIC2(14)
-#define IRQ_TVENC               S5P_IRQ_VIC2(15)
-#define IRQ_I2S0                S5P_IRQ_VIC2(16)
-#define IRQ_I2S1                S5P_IRQ_VIC2(17)
-#define IRQ_RP                  S5P_IRQ_VIC2(19)
-#define IRQ_PCM0                S5P_IRQ_VIC2(20)
-#define IRQ_PCM1                S5P_IRQ_VIC2(21)
-#define IRQ_ADC                 S5P_IRQ_VIC2(23)
-#define IRQ_PENDN               S5P_IRQ_VIC2(24)
-#define IRQ_KEYPAD              S5P_IRQ_VIC2(25)
-#define IRQ_SSS_INT             S5P_IRQ_VIC2(27)
-#define IRQ_SSS_HASH            S5P_IRQ_VIC2(28)
-#define IRQ_VIC_END             S5P_IRQ_VIC2(31)
-
-#define S5P_IRQ_EINT_BASE       (IRQ_VIC_END + 1)
-
-#define S5P_EINT_BASE1          (S5P_IRQ_VIC0(0))
-#define S5P_EINT_BASE2          (S5P_IRQ_EINT_BASE)
-
-/* Set the default NR_IRQS */
-
-#define NR_IRQS                 (IRQ_EINT(31) + 1)
-
-#endif /* __ASM_ARCH_IRQS_H */
diff --git a/arch/arm/mach-s5p6442/include/mach/map.h b/arch/arm/mach-s5p6442/include/mach/map.h
deleted file mode 100644
index 058dab4482a1..000000000000
--- a/arch/arm/mach-s5p6442/include/mach/map.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* linux/arch/arm/mach-s5p6442/include/mach/map.h
- *
- * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * S5P6442 - Memory map definitions
- *
- * 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.
-*/
-
-#ifndef __ASM_ARCH_MAP_H
-#define __ASM_ARCH_MAP_H __FILE__
-
-#include <plat/map-base.h>
-#include <plat/map-s5p.h>
-
-#define S5P6442_PA_SDRAM        0x20000000
-
-#define S5P6442_PA_I2S0         0xC0B00000
-#define S5P6442_PA_I2S1         0xF2200000
-
-#define S5P6442_PA_CHIPID       0xE0000000
-
-#define S5P6442_PA_SYSCON       0xE0100000
-
-#define S5P6442_PA_GPIO         0xE0200000
-
-#define S5P6442_PA_VIC0         0xE4000000
-#define S5P6442_PA_VIC1         0xE4100000
-#define S5P6442_PA_VIC2         0xE4200000
-
-#define S5P6442_PA_SROMC        0xE7000000
-
-#define S5P6442_PA_MDMA         0xE8000000
-#define S5P6442_PA_PDMA         0xE9000000
-
-#define S5P6442_PA_TIMER        0xEA000000
-
-#define S5P6442_PA_SYSTIMER     0xEA100000
-
-#define S5P6442_PA_WATCHDOG     0xEA200000
-
-#define S5P6442_PA_UART         0xEC000000
-
-#define S5P6442_PA_IIC0         0xEC100000
-
-#define S5P6442_PA_SPI          0xEC300000
-
-#define S5P6442_PA_PCM0         0xF2400000
-#define S5P6442_PA_PCM1         0xF2500000
-
-/* Compatibiltiy Defines */
-
-#define S3C_PA_IIC              S5P6442_PA_IIC0
-#define S3C_PA_WDT              S5P6442_PA_WATCHDOG
-
-#define S5P_PA_CHIPID           S5P6442_PA_CHIPID
-#define S5P_PA_SDRAM            S5P6442_PA_SDRAM
-#define S5P_PA_SROMC            S5P6442_PA_SROMC
-#define S5P_PA_SYSCON           S5P6442_PA_SYSCON
-#define S5P_PA_TIMER            S5P6442_PA_TIMER
-
-/* UART */
-
-#define S3C_PA_UART             S5P6442_PA_UART
-
-#define S5P_PA_UART(x)          (S3C_PA_UART + ((x) * S3C_UART_OFFSET))
-#define S5P_PA_UART0            S5P_PA_UART(0)
-#define S5P_PA_UART1            S5P_PA_UART(1)
-#define S5P_PA_UART2            S5P_PA_UART(2)
-
-#define S5P_SZ_UART             SZ_256
-
-#endif /* __ASM_ARCH_MAP_H */
diff --git a/arch/arm/mach-s5p6442/include/mach/memory.h b/arch/arm/mach-s5p6442/include/mach/memory.h
deleted file mode 100644
index cfe259dded33..000000000000
--- a/arch/arm/mach-s5p6442/include/mach/memory.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* linux/arch/arm/mach-s5p6442/include/mach/memory.h
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * S5P6442 - Memory definitions
- *
- * 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.
-*/
-
-#ifndef __ASM_ARCH_MEMORY_H
-#define __ASM_ARCH_MEMORY_H
-
-#define PLAT_PHYS_OFFSET                UL(0x20000000)
-#define CONSISTENT_DMA_SIZE     SZ_8M
-
-#endif /* __ASM_ARCH_MEMORY_H */
diff --git a/arch/arm/mach-s5p6442/include/mach/pwm-clock.h b/arch/arm/mach-s5p6442/include/mach/pwm-clock.h
deleted file mode 100644
index 2724b37def31..000000000000
--- a/arch/arm/mach-s5p6442/include/mach/pwm-clock.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* linux/arch/arm/mach-s5p6442/include/mach/pwm-clock.h
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * Based on arch/arm/mach-s3c64xx/include/mach/pwm-clock.h
- *
- * S5P6442 - pwm clock and timer support
- *
- * 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.
-*/
-
-#ifndef __ASM_ARCH_PWMCLK_H
-#define __ASM_ARCH_PWMCLK_H __FILE__
-
-/**
- * pwm_cfg_src_is_tclk() - return whether the given mux config is a tclk
- * @tcfg: The timer TCFG1 register bits shifted down to 0.
- *
- * Return true if the given configuration from TCFG1 is a TCLK instead
- * any of the TDIV clocks.
- */
-static inline int pwm_cfg_src_is_tclk(unsigned long tcfg)
-{
-        return tcfg == S3C64XX_TCFG1_MUX_TCLK;
-}
-
-/**
- * tcfg_to_divisor() - convert tcfg1 setting to a divisor
- * @tcfg1: The tcfg1 setting, shifted down.
- *
- * Get the divisor value for the given tcfg1 setting. We assume the
- * caller has already checked to see if this is not a TCLK source.
- */
-static inline unsigned long tcfg_to_divisor(unsigned long tcfg1)
-{
-        return 1 << tcfg1;
-}
-
-/**
- * pwm_tdiv_has_div1() - does the tdiv setting have a /1
- *
- * Return true if we have a /1 in the tdiv setting.
- */
-static inline unsigned int pwm_tdiv_has_div1(void)
-{
-        return 1;
-}
-
-/**
- * pwm_tdiv_div_bits() - calculate TCFG1 divisor value.
- * @div: The divisor to calculate the bit information for.
- *
- * Turn a divisor into the necessary bit field for TCFG1.
- */
-static inline unsigned long pwm_tdiv_div_bits(unsigned int div)
-{
-        return ilog2(div);
-}
-
-#define S3C_TCFG1_MUX_TCLK S3C64XX_TCFG1_MUX_TCLK
-
-#endif /* __ASM_ARCH_PWMCLK_H */
diff --git a/arch/arm/mach-s5p6442/include/mach/regs-clock.h b/arch/arm/mach-s5p6442/include/mach/regs-clock.h
deleted file mode 100644
index 00828a336991..000000000000
--- a/arch/arm/mach-s5p6442/include/mach/regs-clock.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* linux/arch/arm/mach-s5p6442/include/mach/regs-clock.h
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * S5P6442 - Clock register definitions
- *
- * 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.
-*/
-
-#ifndef __ASM_ARCH_REGS_CLOCK_H
-#define __ASM_ARCH_REGS_CLOCK_H __FILE__
-
-#include <mach/map.h>
-
-#define S5P_CLKREG(x)           (S3C_VA_SYS + (x))
-
-#define S5P_APLL_LOCK           S5P_CLKREG(0x00)
-#define S5P_MPLL_LOCK           S5P_CLKREG(0x08)
-#define S5P_EPLL_LOCK           S5P_CLKREG(0x10)
-#define S5P_VPLL_LOCK           S5P_CLKREG(0x20)
-
-#define S5P_APLL_CON            S5P_CLKREG(0x100)
-#define S5P_MPLL_CON            S5P_CLKREG(0x108)
-#define S5P_EPLL_CON            S5P_CLKREG(0x110)
-#define S5P_VPLL_CON            S5P_CLKREG(0x120)
-
-#define S5P_CLK_SRC0            S5P_CLKREG(0x200)
-#define S5P_CLK_SRC1            S5P_CLKREG(0x204)
-#define S5P_CLK_SRC2            S5P_CLKREG(0x208)
-#define S5P_CLK_SRC3            S5P_CLKREG(0x20C)
-#define S5P_CLK_SRC4            S5P_CLKREG(0x210)
-#define S5P_CLK_SRC5            S5P_CLKREG(0x214)
-#define S5P_CLK_SRC6            S5P_CLKREG(0x218)
-
-#define S5P_CLK_SRC_MASK0       S5P_CLKREG(0x280)
-#define S5P_CLK_SRC_MASK1       S5P_CLKREG(0x284)
-
-#define S5P_CLK_DIV0            S5P_CLKREG(0x300)
-#define S5P_CLK_DIV1            S5P_CLKREG(0x304)
-#define S5P_CLK_DIV2            S5P_CLKREG(0x308)
-#define S5P_CLK_DIV3            S5P_CLKREG(0x30C)
-#define S5P_CLK_DIV4            S5P_CLKREG(0x310)
-#define S5P_CLK_DIV5            S5P_CLKREG(0x314)
-#define S5P_CLK_DIV6            S5P_CLKREG(0x318)
-
-#define S5P_CLKGATE_IP0         S5P_CLKREG(0x460)
-#define S5P_CLKGATE_IP3         S5P_CLKREG(0x46C)
-
-/* CLK_OUT */
-#define S5P_CLK_OUT_SHIFT       (12)
-#define S5P_CLK_OUT_MASK        (0x1F << S5P_CLK_OUT_SHIFT)
-#define S5P_CLK_OUT             S5P_CLKREG(0x500)
-
-#define S5P_CLK_DIV_STAT0       S5P_CLKREG(0x1000)
-#define S5P_CLK_DIV_STAT1       S5P_CLKREG(0x1004)
-
-#define S5P_CLK_MUX_STAT0       S5P_CLKREG(0x1100)
-#define S5P_CLK_MUX_STAT1       S5P_CLKREG(0x1104)
-
-#define S5P_MDNIE_SEL           S5P_CLKREG(0x7008)
-
-/* Register Bit definition */
-#define S5P_EPLL_EN                     (1<<31)
-#define S5P_EPLL_MASK                   0xffffffff
-#define S5P_EPLLVAL(_m, _p, _s)         ((_m) << 16 | ((_p) << 8) | ((_s)))
-
-/* CLKDIV0 */
-#define S5P_CLKDIV0_APLL_SHIFT          (0)
-#define S5P_CLKDIV0_APLL_MASK           (0x7 << S5P_CLKDIV0_APLL_SHIFT)
-#define S5P_CLKDIV0_A2M_SHIFT           (4)
-#define S5P_CLKDIV0_A2M_MASK            (0x7 << S5P_CLKDIV0_A2M_SHIFT)
-#define S5P_CLKDIV0_D0CLK_SHIFT         (16)
-#define S5P_CLKDIV0_D0CLK_MASK          (0xF << S5P_CLKDIV0_D0CLK_SHIFT)
-#define S5P_CLKDIV0_P0CLK_SHIFT         (20)
-#define S5P_CLKDIV0_P0CLK_MASK          (0x7 << S5P_CLKDIV0_P0CLK_SHIFT)
-#define S5P_CLKDIV0_D1CLK_SHIFT         (24)
-#define S5P_CLKDIV0_D1CLK_MASK          (0xF << S5P_CLKDIV0_D1CLK_SHIFT)
-#define S5P_CLKDIV0_P1CLK_SHIFT         (28)
-#define S5P_CLKDIV0_P1CLK_MASK          (0x7 << S5P_CLKDIV0_P1CLK_SHIFT)
-
-/* Clock MUX status Registers */
-#define S5P_CLK_MUX_STAT0_APLL_SHIFT    (0)
-#define S5P_CLK_MUX_STAT0_APLL_MASK     (0x7 << S5P_CLK_MUX_STAT0_APLL_SHIFT)
-#define S5P_CLK_MUX_STAT0_MPLL_SHIFT    (4)
-#define S5P_CLK_MUX_STAT0_MPLL_MASK     (0x7 << S5P_CLK_MUX_STAT0_MPLL_SHIFT)
-#define S5P_CLK_MUX_STAT0_EPLL_SHIFT    (8)
-#define S5P_CLK_MUX_STAT0_EPLL_MASK     (0x7 << S5P_CLK_MUX_STAT0_EPLL_SHIFT)
-#define S5P_CLK_MUX_STAT0_VPLL_SHIFT    (12)
-#define S5P_CLK_MUX_STAT0_VPLL_MASK     (0x7 << S5P_CLK_MUX_STAT0_VPLL_SHIFT)
-#define S5P_CLK_MUX_STAT0_MUXARM_SHIFT  (16)
-#define S5P_CLK_MUX_STAT0_MUXARM_MASK   (0x7 << S5P_CLK_MUX_STAT0_MUXARM_SHIFT)
-#define S5P_CLK_MUX_STAT0_MUXD0_SHIFT   (20)
-#define S5P_CLK_MUX_STAT0_MUXD0_MASK    (0x7 << S5P_CLK_MUX_STAT0_MUXD0_SHIFT)
-#define S5P_CLK_MUX_STAT0_MUXD1_SHIFT   (24)
-#define S5P_CLK_MUX_STAT0_MUXD1_MASK    (0x7 << S5P_CLK_MUX_STAT0_MUXD1_SHIFT)
-#define S5P_CLK_MUX_STAT1_D1SYNC_SHIFT  (24)
-#define S5P_CLK_MUX_STAT1_D1SYNC_MASK   (0x7 << S5P_CLK_MUX_STAT1_D1SYNC_SHIFT)
-#define S5P_CLK_MUX_STAT1_D0SYNC_SHIFT  (28)
-#define S5P_CLK_MUX_STAT1_D0SYNC_MASK   (0x7 << S5P_CLK_MUX_STAT1_D0SYNC_SHIFT)
-
-#endif /* __ASM_ARCH_REGS_CLOCK_H */
diff --git a/arch/arm/mach-s5p6442/include/mach/regs-irq.h b/arch/arm/mach-s5p6442/include/mach/regs-irq.h
deleted file mode 100644
index 73782b52a83b..000000000000
--- a/arch/arm/mach-s5p6442/include/mach/regs-irq.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* linux/arch/arm/mach-s5p6442/include/mach/regs-irq.h
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * S5P6442 - IRQ register definitions
- *
- * 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.
-*/
-
-#ifndef __ASM_ARCH_REGS_IRQ_H
-#define __ASM_ARCH_REGS_IRQ_H __FILE__
-
-#include <asm/hardware/vic.h>
-#include <mach/map.h>
-
-#endif /* __ASM_ARCH_REGS_IRQ_H */
diff --git a/arch/arm/mach-s5p6442/include/mach/spi-clocks.h b/arch/arm/mach-s5p6442/include/mach/spi-clocks.h
deleted file mode 100644
index 7fd88205a97c..000000000000
--- a/arch/arm/mach-s5p6442/include/mach/spi-clocks.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* linux/arch/arm/mach-s5p6442/include/mach/spi-clocks.h
- *
- * Copyright (C) 2010 Samsung Electronics Co. Ltd.
- *      Jaswinder Singh <jassi.brar@samsung.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.
- */
-
-#ifndef __S5P6442_PLAT_SPI_CLKS_H
-#define __S5P6442_PLAT_SPI_CLKS_H __FILE__
-
-#define S5P6442_SPI_SRCCLK_PCLK         0
-#define S5P6442_SPI_SRCCLK_SCLK         1
-
-#endif /* __S5P6442_PLAT_SPI_CLKS_H */
diff --git a/arch/arm/mach-s5p6442/include/mach/system.h b/arch/arm/mach-s5p6442/include/mach/system.h
deleted file mode 100644
index c30c1cc1b97e..000000000000
--- a/arch/arm/mach-s5p6442/include/mach/system.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* linux/arch/arm/mach-s5p6442/include/mach/system.h
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * S5P6442 - system support header
- *
- * 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.
-*/
-
-#ifndef __ASM_ARCH_SYSTEM_H
-#define __ASM_ARCH_SYSTEM_H __FILE__
-
-#include <plat/system-reset.h>
-
-static void arch_idle(void)
-{
-        /* nothing here yet */
-}
-
-#endif /* __ASM_ARCH_SYSTEM_H */
diff --git a/arch/arm/mach-s5p6442/include/mach/tick.h b/arch/arm/mach-s5p6442/include/mach/tick.h
deleted file mode 100644
index e1d4cabf8297..000000000000
--- a/arch/arm/mach-s5p6442/include/mach/tick.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* linux/arch/arm/mach-s5p6442/include/mach/tick.h
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * Based on arch/arm/mach-s3c6400/include/mach/tick.h
- *
- * S5P6442 - Timer tick support definitions
- *
- * 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.
-*/
-
-#ifndef __ASM_ARCH_TICK_H
-#define __ASM_ARCH_TICK_H __FILE__
-
-static inline u32 s3c24xx_ostimer_pending(void)
-{
-        u32 pend = __raw_readl(VA_VIC0 + VIC_RAW_STATUS);
-        return pend & (1 << (IRQ_TIMER4_VIC - S5P_IRQ_VIC0(0)));
-}
-
-#define TICK_MAX        (0xffffffff)
-
-#endif /* __ASM_ARCH_TICK_H */
diff --git a/arch/arm/mach-s5p6442/include/mach/timex.h b/arch/arm/mach-s5p6442/include/mach/timex.h
deleted file mode 100644
index ff8f2fcadeb7..000000000000
--- a/arch/arm/mach-s5p6442/include/mach/timex.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* arch/arm/mach-s5p6442/include/mach/timex.h
- *
- * Copyright (c) 2003-2010 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *
- * S5P6442 - time parameters
- *
- * 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.
-*/
-
-#ifndef __ASM_ARCH_TIMEX_H
-#define __ASM_ARCH_TIMEX_H
-
-/* CLOCK_TICK_RATE needs to be evaluatable by the cpp, so making it
- * a variable is useless. It seems as long as we make our timers an
- * exact multiple of HZ, any value that makes a 1->1 correspondence
- * for the time conversion functions to/from jiffies is acceptable.
-*/
-
-#define CLOCK_TICK_RATE 12000000
-
-#endif /* __ASM_ARCH_TIMEX_H */
diff --git a/arch/arm/mach-s5p6442/include/mach/uncompress.h b/arch/arm/mach-s5p6442/include/mach/uncompress.h
deleted file mode 100644
index 5ac7cbeeb987..000000000000
--- a/arch/arm/mach-s5p6442/include/mach/uncompress.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* linux/arch/arm/mach-s5p6442/include/mach/uncompress.h
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * S5P6442 - uncompress 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.
-*/
-
-#ifndef __ASM_ARCH_UNCOMPRESS_H
-#define __ASM_ARCH_UNCOMPRESS_H
-
-#include <mach/map.h>
-#include <plat/uncompress.h>
-
-static void arch_detect_cpu(void)
-{
-        /* we do not need to do any cpu detection here at the moment. */
-}
-
-#endif /* __ASM_ARCH_UNCOMPRESS_H */
diff --git a/arch/arm/mach-s5p6442/include/mach/vmalloc.h b/arch/arm/mach-s5p6442/include/mach/vmalloc.h
deleted file mode 100644
index 4aa55e55ac47..000000000000
--- a/arch/arm/mach-s5p6442/include/mach/vmalloc.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* arch/arm/mach-s5p6442/include/mach/vmalloc.h
- *
- * Copyright 2010 Ben Dooks <ben-linux@fluff.org>
- *
- * 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.
- *
- * S5P6442 vmalloc definition
-*/
-
-#ifndef __ASM_ARCH_VMALLOC_H
-#define __ASM_ARCH_VMALLOC_H
-
-#define VMALLOC_END     0xF6000000UL
-
-#endif /* __ASM_ARCH_VMALLOC_H */
diff --git a/arch/arm/mach-s5p6442/init.c b/arch/arm/mach-s5p6442/init.c
deleted file mode 100644
index 1874bdb71e1d..000000000000
--- a/arch/arm/mach-s5p6442/init.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* linux/arch/arm/mach-s5p6442/s5p6442-init.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.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/kernel.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/serial_core.h>
-
-#include <plat/cpu.h>
-#include <plat/devs.h>
-#include <plat/s5p6442.h>
-#include <plat/regs-serial.h>
-
-static struct s3c24xx_uart_clksrc s5p6442_serial_clocks[] = {
-        [0] = {
-                .name           = "pclk",
-                .divisor        = 1,
-                .min_baud       = 0,
-                .max_baud       = 0,
-        },
-};
-
-/* uart registration process */
-void __init s5p6442_common_init_uarts(struct s3c2410_uartcfg *cfg, int no)
-{
-        struct s3c2410_uartcfg *tcfg = cfg;
-        u32 ucnt;
-
-        for (ucnt = 0; ucnt < no; ucnt++, tcfg++) {
-                if (!tcfg->clocks) {
-                        tcfg->clocks = s5p6442_serial_clocks;
-                        tcfg->clocks_size = ARRAY_SIZE(s5p6442_serial_clocks);
-                }
-        }
-
-        s3c24xx_init_uartdevs("s5pv210-uart", s5p_uart_resources, cfg, no);
-}
diff --git a/arch/arm/mach-s5p6442/mach-smdk6442.c b/arch/arm/mach-s5p6442/mach-smdk6442.c
deleted file mode 100644
index eaf6b9c489ff..000000000000
--- a/arch/arm/mach-s5p6442/mach-smdk6442.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* linux/arch/arm/mach-s5p6442/mach-smdk6442.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.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/kernel.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/serial_core.h>
-#include <linux/i2c.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-
-#include <mach/map.h>
-#include <mach/regs-clock.h>
-
-#include <plat/regs-serial.h>
-#include <plat/s5p6442.h>
-#include <plat/devs.h>
-#include <plat/cpu.h>
-#include <plat/iic.h>
-
-/* Following are default values for UCON, ULCON and UFCON UART registers */
-#define SMDK6442_UCON_DEFAULT   (S3C2410_UCON_TXILEVEL |        \
-                                 S3C2410_UCON_RXILEVEL |        \
-                                 S3C2410_UCON_TXIRQMODE |       \
-                                 S3C2410_UCON_RXIRQMODE |       \
-                                 S3C2410_UCON_RXFIFO_TOI |      \
-                                 S3C2443_UCON_RXERR_IRQEN)
-
-#define SMDK6442_ULCON_DEFAULT  S3C2410_LCON_CS8
-
-#define SMDK6442_UFCON_DEFAULT  (S3C2410_UFCON_FIFOMODE |       \
-                                 S5PV210_UFCON_TXTRIG4 |        \
-                                 S5PV210_UFCON_RXTRIG4)
-
-static struct s3c2410_uartcfg smdk6442_uartcfgs[] __initdata = {
-        [0] = {
-                .hwport         = 0,
-                .flags          = 0,
-                .ucon           = SMDK6442_UCON_DEFAULT,
-                .ulcon          = SMDK6442_ULCON_DEFAULT,
-                .ufcon          = SMDK6442_UFCON_DEFAULT,
-        },
-        [1] = {
-                .hwport         = 1,
-                .flags          = 0,
-                .ucon           = SMDK6442_UCON_DEFAULT,
-                .ulcon          = SMDK6442_ULCON_DEFAULT,
-                .ufcon          = SMDK6442_UFCON_DEFAULT,
-        },
-        [2] = {
-                .hwport         = 2,
-                .flags          = 0,
-                .ucon           = SMDK6442_UCON_DEFAULT,
-                .ulcon          = SMDK6442_ULCON_DEFAULT,
-                .ufcon          = SMDK6442_UFCON_DEFAULT,
-        },
-};
-
-static struct platform_device *smdk6442_devices[] __initdata = {
-        &s3c_device_i2c0,
-        &samsung_asoc_dma,
-        &s5p6442_device_iis0,
-        &s3c_device_wdt,
-};
-
-static struct i2c_board_info smdk6442_i2c_devs0[] __initdata = {
-        { I2C_BOARD_INFO("wm8580", 0x1b), },
-};
-
-static void __init smdk6442_map_io(void)
-{
-        s5p_init_io(NULL, 0, S5P_VA_CHIPID);
-        s3c24xx_init_clocks(12000000);
-        s3c24xx_init_uarts(smdk6442_uartcfgs, ARRAY_SIZE(smdk6442_uartcfgs));
-}
-
-static void __init smdk6442_machine_init(void)
-{
-        s3c_i2c0_set_platdata(NULL);
-        i2c_register_board_info(0, smdk6442_i2c_devs0,
-                        ARRAY_SIZE(smdk6442_i2c_devs0));
-        platform_add_devices(smdk6442_devices, ARRAY_SIZE(smdk6442_devices));
-}
-
-MACHINE_START(SMDK6442, "SMDK6442")
-        /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */
-        .boot_params    = S5P_PA_SDRAM + 0x100,
-        .init_irq       = s5p6442_init_irq,
-        .map_io         = smdk6442_map_io,
-        .init_machine   = smdk6442_machine_init,
-        .timer          = &s3c24xx_timer,
-MACHINE_END
diff --git a/arch/arm/mach-s5p6442/setup-i2c0.c b/arch/arm/mach-s5p6442/setup-i2c0.c
deleted file mode 100644
index aad85656b0cc..000000000000
--- a/arch/arm/mach-s5p6442/setup-i2c0.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* linux/arch/arm/mach-s5p6442/setup-i2c0.c
- *
- * Copyright (c) 2009 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * I2C0 GPIO configuration.
- *
- * Based on plat-s3c64xx/setup-i2c0.c
- *
- * 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/gpio.h>
-
-struct platform_device; /* don't need the contents */
-
-#include <plat/gpio-cfg.h>
-#include <plat/iic.h>
-
-void s3c_i2c0_cfg_gpio(struct platform_device *dev)
-{
-        s3c_gpio_cfgall_range(S5P6442_GPD1(0), 2,
-                              S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
-}
diff --git a/arch/arm/mach-s5pc100/Makefile b/arch/arm/mach-s5pc100/Makefile
index eecab57d2e5d..a5e6e608b498 100644
--- a/arch/arm/mach-s5pc100/Makefile
+++ b/arch/arm/mach-s5pc100/Makefile
@@ -11,7 +11,7 @@ obj-				:=
 
 # Core support for S5PC100 system
 
-obj-$(CONFIG_CPU_S5PC100)       += cpu.o init.o clock.o gpiolib.o
+obj-$(CONFIG_CPU_S5PC100)       += cpu.o init.o clock.o
 obj-$(CONFIG_CPU_S5PC100)       += setup-i2c0.o
 obj-$(CONFIG_CPU_S5PC100)       += dma.o
 
diff --git a/arch/arm/mach-s5pc100/gpiolib.c b/arch/arm/mach-s5pc100/gpiolib.c
deleted file mode 100644
index 2842394b28b5..000000000000
--- a/arch/arm/mach-s5pc100/gpiolib.c
+++ /dev/null
@@ -1,355 +0,0 @@
-/* linux/arch/arm/mach-s5pc100/gpiolib.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- *  Copyright 2009 Samsung Electronics Co
- *  Kyungmin Park <kyungmin.park@samsung.com>
- *
- * S5PC100 - GPIOlib support
- *
- * 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/irq.h>
-#include <linux/io.h>
-#include <linux/gpio.h>
-
-#include <mach/map.h>
-#include <mach/regs-gpio.h>
-
-#include <plat/gpio-core.h>
-#include <plat/gpio-cfg.h>
-#include <plat/gpio-cfg-helpers.h>
-
-/* S5PC100 GPIO bank summary:
- *
- * Bank GPIOs   Style   INT Type
- * A0   8       4Bit    GPIO_INT0
- * A1   5       4Bit    GPIO_INT1
- * B    8       4Bit    GPIO_INT2
- * C    5       4Bit    GPIO_INT3
- * D    7       4Bit    GPIO_INT4
- * E0   8       4Bit    GPIO_INT5
- * E1   6       4Bit    GPIO_INT6
- * F0   8       4Bit    GPIO_INT7
- * F1   8       4Bit    GPIO_INT8
- * F2   8       4Bit    GPIO_INT9
- * F3   4       4Bit    GPIO_INT10
- * G0   8       4Bit    GPIO_INT11
- * G1   3       4Bit    GPIO_INT12
- * G2   7       4Bit    GPIO_INT13
- * G3   7       4Bit    GPIO_INT14
- * H0   8       4Bit    WKUP_INT
- * H1   8       4Bit    WKUP_INT
- * H2   8       4Bit    WKUP_INT
- * H3   8       4Bit    WKUP_INT
- * I    8       4Bit    GPIO_INT15
- * J0   8       4Bit    GPIO_INT16
- * J1   5       4Bit    GPIO_INT17
- * J2   8       4Bit    GPIO_INT18
- * J3   8       4Bit    GPIO_INT19
- * J4   4       4Bit    GPIO_INT20
- * K0   8       4Bit    None
- * K1   6       4Bit    None
- * K2   8       4Bit    None
- * K3   8       4Bit    None
- * L0   8       4Bit    None
- * L1   8       4Bit    None
- * L2   8       4Bit    None
- * L3   8       4Bit    None
- */
-
-static struct s3c_gpio_cfg gpio_cfg = {
-        .set_config     = s3c_gpio_setcfg_s3c64xx_4bit,
-        .set_pull       = s3c_gpio_setpull_updown,
-        .get_pull       = s3c_gpio_getpull_updown,
-};
-
-static struct s3c_gpio_cfg gpio_cfg_eint = {
-        .cfg_eint       = 0xf,
-        .set_config     = s3c_gpio_setcfg_s3c64xx_4bit,
-        .set_pull       = s3c_gpio_setpull_updown,
-        .get_pull       = s3c_gpio_getpull_updown,
-};
-
-static struct s3c_gpio_cfg gpio_cfg_noint = {
-        .set_config     = s3c_gpio_setcfg_s3c64xx_4bit,
-        .set_pull       = s3c_gpio_setpull_updown,
-        .get_pull       = s3c_gpio_getpull_updown,
-};
-
-/*
- * GPIO bank's base address given the index of the bank in the
- * list of all gpio banks.
- */
-#define S5PC100_BANK_BASE(bank_nr)      (S5P_VA_GPIO + ((bank_nr) * 0x20))
-
-/*
- * Following are the gpio banks in S5PC100.
- *
- * The 'config' member when left to NULL, is initialized to the default
- * structure gpio_cfg in the init function below.
- *
- * The 'base' member is also initialized in the init function below.
- * Note: The initialization of 'base' member of s3c_gpio_chip structure
- * uses the above macro and depends on the banks being listed in order here.
- */
-static struct s3c_gpio_chip s5pc100_gpio_chips[] = {
-        {
-                .chip   = {
-                        .base   = S5PC100_GPA0(0),
-                        .ngpio  = S5PC100_GPIO_A0_NR,
-                        .label  = "GPA0",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPA1(0),
-                        .ngpio  = S5PC100_GPIO_A1_NR,
-                        .label  = "GPA1",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPB(0),
-                        .ngpio  = S5PC100_GPIO_B_NR,
-                        .label  = "GPB",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPC(0),
-                        .ngpio  = S5PC100_GPIO_C_NR,
-                        .label  = "GPC",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPD(0),
-                        .ngpio  = S5PC100_GPIO_D_NR,
-                        .label  = "GPD",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPE0(0),
-                        .ngpio  = S5PC100_GPIO_E0_NR,
-                        .label  = "GPE0",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPE1(0),
-                        .ngpio  = S5PC100_GPIO_E1_NR,
-                        .label  = "GPE1",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPF0(0),
-                        .ngpio  = S5PC100_GPIO_F0_NR,
-                        .label  = "GPF0",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPF1(0),
-                        .ngpio  = S5PC100_GPIO_F1_NR,
-                        .label  = "GPF1",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPF2(0),
-                        .ngpio  = S5PC100_GPIO_F2_NR,
-                        .label  = "GPF2",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPF3(0),
-                        .ngpio  = S5PC100_GPIO_F3_NR,
-                        .label  = "GPF3",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPG0(0),
-                        .ngpio  = S5PC100_GPIO_G0_NR,
-                        .label  = "GPG0",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPG1(0),
-                        .ngpio  = S5PC100_GPIO_G1_NR,
-                        .label  = "GPG1",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPG2(0),
-                        .ngpio  = S5PC100_GPIO_G2_NR,
-                        .label  = "GPG2",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPG3(0),
-                        .ngpio  = S5PC100_GPIO_G3_NR,
-                        .label  = "GPG3",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPI(0),
-                        .ngpio  = S5PC100_GPIO_I_NR,
-                        .label  = "GPI",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPJ0(0),
-                        .ngpio  = S5PC100_GPIO_J0_NR,
-                        .label  = "GPJ0",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPJ1(0),
-                        .ngpio  = S5PC100_GPIO_J1_NR,
-                        .label  = "GPJ1",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPJ2(0),
-                        .ngpio  = S5PC100_GPIO_J2_NR,
-                        .label  = "GPJ2",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPJ3(0),
-                        .ngpio  = S5PC100_GPIO_J3_NR,
-                        .label  = "GPJ3",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PC100_GPJ4(0),
-                        .ngpio  = S5PC100_GPIO_J4_NR,
-                        .label  = "GPJ4",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PC100_GPK0(0),
-                        .ngpio  = S5PC100_GPIO_K0_NR,
-                        .label  = "GPK0",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PC100_GPK1(0),
-                        .ngpio  = S5PC100_GPIO_K1_NR,
-                        .label  = "GPK1",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PC100_GPK2(0),
-                        .ngpio  = S5PC100_GPIO_K2_NR,
-                        .label  = "GPK2",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PC100_GPK3(0),
-                        .ngpio  = S5PC100_GPIO_K3_NR,
-                        .label  = "GPK3",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PC100_GPL0(0),
-                        .ngpio  = S5PC100_GPIO_L0_NR,
-                        .label  = "GPL0",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PC100_GPL1(0),
-                        .ngpio  = S5PC100_GPIO_L1_NR,
-                        .label  = "GPL1",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PC100_GPL2(0),
-                        .ngpio  = S5PC100_GPIO_L2_NR,
-                        .label  = "GPL2",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PC100_GPL3(0),
-                        .ngpio  = S5PC100_GPIO_L3_NR,
-                        .label  = "GPL3",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PC100_GPL4(0),
-                        .ngpio  = S5PC100_GPIO_L4_NR,
-                        .label  = "GPL4",
-                },
-        }, {
-                .base   = (S5P_VA_GPIO + 0xC00),
-                .config = &gpio_cfg_eint,
-                .irq_base = IRQ_EINT(0),
-                .chip   = {
-                        .base   = S5PC100_GPH0(0),
-                        .ngpio  = S5PC100_GPIO_H0_NR,
-                        .label  = "GPH0",
-                        .to_irq = samsung_gpiolib_to_irq,
-                },
-        }, {
-                .base   = (S5P_VA_GPIO + 0xC20),
-                .config = &gpio_cfg_eint,
-                .irq_base = IRQ_EINT(8),
-                .chip   = {
-                        .base   = S5PC100_GPH1(0),
-                        .ngpio  = S5PC100_GPIO_H1_NR,
-                        .label  = "GPH1",
-                        .to_irq = samsung_gpiolib_to_irq,
-                },
-        }, {
-                .base   = (S5P_VA_GPIO + 0xC40),
-                .config = &gpio_cfg_eint,
-                .irq_base = IRQ_EINT(16),
-                .chip   = {
-                        .base   = S5PC100_GPH2(0),
-                        .ngpio  = S5PC100_GPIO_H2_NR,
-                        .label  = "GPH2",
-                        .to_irq = samsung_gpiolib_to_irq,
-                },
-        }, {
-                .base   = (S5P_VA_GPIO + 0xC60),
-                .config = &gpio_cfg_eint,
-                .irq_base = IRQ_EINT(24),
-                .chip   = {
-                        .base   = S5PC100_GPH3(0),
-                        .ngpio  = S5PC100_GPIO_H3_NR,
-                        .label  = "GPH3",
-                        .to_irq = samsung_gpiolib_to_irq,
-                },
-        },
-};
-
-static __init int s5pc100_gpiolib_init(void)
-{
-        struct s3c_gpio_chip *chip = s5pc100_gpio_chips;
-        int nr_chips = ARRAY_SIZE(s5pc100_gpio_chips);
-        int gpioint_group = 0;
-        int i;
-
-        for (i = 0; i < nr_chips; i++, chip++) {
-                if (chip->config == NULL) {
-                        chip->config = &gpio_cfg;
-                        chip->group = gpioint_group++;
-                }
-                if (chip->base == NULL)
-                        chip->base = S5PC100_BANK_BASE(i);
-        }
-
-        samsung_gpiolib_add_4bit_chips(s5pc100_gpio_chips, nr_chips);
-        s5p_register_gpioint_bank(IRQ_GPIOINT, 0, S5P_GPIOINT_GROUP_MAXNR);
-
-        return 0;
-}
-core_initcall(s5pc100_gpiolib_init);
diff --git a/arch/arm/mach-s5pv210/Makefile b/arch/arm/mach-s5pv210/Makefile
index 11f17907b4e8..50907aca006c 100644
--- a/arch/arm/mach-s5pv210/Makefile
+++ b/arch/arm/mach-s5pv210/Makefile
@@ -12,7 +12,7 @@ obj-				:=
 
 # Core support for S5PV210 system
 
-obj-$(CONFIG_CPU_S5PV210)       += cpu.o init.o clock.o dma.o gpiolib.o
+obj-$(CONFIG_CPU_S5PV210)       += cpu.o init.o clock.o dma.o
 obj-$(CONFIG_CPU_S5PV210)       += setup-i2c0.o
 obj-$(CONFIG_S5PV210_PM)        += pm.o sleep.o
 obj-$(CONFIG_CPU_FREQ)          += cpufreq.o
diff --git a/arch/arm/mach-s5pv210/gpiolib.c b/arch/arm/mach-s5pv210/gpiolib.c
deleted file mode 100644
index 1ba20a703e05..000000000000
--- a/arch/arm/mach-s5pv210/gpiolib.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/gpiolib.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * S5PV210 - GPIOlib support
- *
- * 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/irq.h>
-#include <linux/io.h>
-#include <linux/gpio.h>
-#include <plat/gpio-core.h>
-#include <plat/gpio-cfg.h>
-#include <plat/gpio-cfg-helpers.h>
-#include <mach/map.h>
-
-static struct s3c_gpio_cfg gpio_cfg = {
-        .set_config     = s3c_gpio_setcfg_s3c64xx_4bit,
-        .set_pull       = s3c_gpio_setpull_updown,
-        .get_pull       = s3c_gpio_getpull_updown,
-};
-
-static struct s3c_gpio_cfg gpio_cfg_noint = {
-        .set_config     = s3c_gpio_setcfg_s3c64xx_4bit,
-        .set_pull       = s3c_gpio_setpull_updown,
-        .get_pull       = s3c_gpio_getpull_updown,
-};
-
-/* GPIO bank's base address given the index of the bank in the
- * list of all gpio banks.
- */
-#define S5PV210_BANK_BASE(bank_nr)      (S5P_VA_GPIO + ((bank_nr) * 0x20))
-
-/*
- * Following are the gpio banks in v210.
- *
- * The 'config' member when left to NULL, is initialized to the default
- * structure gpio_cfg in the init function below.
- *
- * The 'base' member is also initialized in the init function below.
- * Note: The initialization of 'base' member of s3c_gpio_chip structure
- * uses the above macro and depends on the banks being listed in order here.
- */
-static struct s3c_gpio_chip s5pv210_gpio_4bit[] = {
-        {
-                .chip   = {
-                        .base   = S5PV210_GPA0(0),
-                        .ngpio  = S5PV210_GPIO_A0_NR,
-                        .label  = "GPA0",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPA1(0),
-                        .ngpio  = S5PV210_GPIO_A1_NR,
-                        .label  = "GPA1",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPB(0),
-                        .ngpio  = S5PV210_GPIO_B_NR,
-                        .label  = "GPB",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPC0(0),
-                        .ngpio  = S5PV210_GPIO_C0_NR,
-                        .label  = "GPC0",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPC1(0),
-                        .ngpio  = S5PV210_GPIO_C1_NR,
-                        .label  = "GPC1",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPD0(0),
-                        .ngpio  = S5PV210_GPIO_D0_NR,
-                        .label  = "GPD0",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPD1(0),
-                        .ngpio  = S5PV210_GPIO_D1_NR,
-                        .label  = "GPD1",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPE0(0),
-                        .ngpio  = S5PV210_GPIO_E0_NR,
-                        .label  = "GPE0",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPE1(0),
-                        .ngpio  = S5PV210_GPIO_E1_NR,
-                        .label  = "GPE1",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPF0(0),
-                        .ngpio  = S5PV210_GPIO_F0_NR,
-                        .label  = "GPF0",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPF1(0),
-                        .ngpio  = S5PV210_GPIO_F1_NR,
-                        .label  = "GPF1",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPF2(0),
-                        .ngpio  = S5PV210_GPIO_F2_NR,
-                        .label  = "GPF2",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPF3(0),
-                        .ngpio  = S5PV210_GPIO_F3_NR,
-                        .label  = "GPF3",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPG0(0),
-                        .ngpio  = S5PV210_GPIO_G0_NR,
-                        .label  = "GPG0",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPG1(0),
-                        .ngpio  = S5PV210_GPIO_G1_NR,
-                        .label  = "GPG1",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPG2(0),
-                        .ngpio  = S5PV210_GPIO_G2_NR,
-                        .label  = "GPG2",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPG3(0),
-                        .ngpio  = S5PV210_GPIO_G3_NR,
-                        .label  = "GPG3",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PV210_GPI(0),
-                        .ngpio  = S5PV210_GPIO_I_NR,
-                        .label  = "GPI",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPJ0(0),
-                        .ngpio  = S5PV210_GPIO_J0_NR,
-                        .label  = "GPJ0",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPJ1(0),
-                        .ngpio  = S5PV210_GPIO_J1_NR,
-                        .label  = "GPJ1",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPJ2(0),
-                        .ngpio  = S5PV210_GPIO_J2_NR,
-                        .label  = "GPJ2",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPJ3(0),
-                        .ngpio  = S5PV210_GPIO_J3_NR,
-                        .label  = "GPJ3",
-                },
-        }, {
-                .chip   = {
-                        .base   = S5PV210_GPJ4(0),
-                        .ngpio  = S5PV210_GPIO_J4_NR,
-                        .label  = "GPJ4",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PV210_MP01(0),
-                        .ngpio  = S5PV210_GPIO_MP01_NR,
-                        .label  = "MP01",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PV210_MP02(0),
-                        .ngpio  = S5PV210_GPIO_MP02_NR,
-                        .label  = "MP02",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PV210_MP03(0),
-                        .ngpio  = S5PV210_GPIO_MP03_NR,
-                        .label  = "MP03",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PV210_MP04(0),
-                        .ngpio  = S5PV210_GPIO_MP04_NR,
-                        .label  = "MP04",
-                },
-        }, {
-                .config = &gpio_cfg_noint,
-                .chip   = {
-                        .base   = S5PV210_MP05(0),
-                        .ngpio  = S5PV210_GPIO_MP05_NR,
-                        .label  = "MP05",
-                },
-        }, {
-                .base   = (S5P_VA_GPIO + 0xC00),
-                .config = &gpio_cfg_noint,
-                .irq_base = IRQ_EINT(0),
-                .chip   = {
-                        .base   = S5PV210_GPH0(0),
-                        .ngpio  = S5PV210_GPIO_H0_NR,
-                        .label  = "GPH0",
-                        .to_irq = samsung_gpiolib_to_irq,
-                },
-        }, {
-                .base   = (S5P_VA_GPIO + 0xC20),
-                .config = &gpio_cfg_noint,
-                .irq_base = IRQ_EINT(8),
-                .chip   = {
-                        .base   = S5PV210_GPH1(0),
-                        .ngpio  = S5PV210_GPIO_H1_NR,
-                        .label  = "GPH1",
-                        .to_irq = samsung_gpiolib_to_irq,
-                },
-        }, {
-                .base   = (S5P_VA_GPIO + 0xC40),
-                .config = &gpio_cfg_noint,
-                .irq_base = IRQ_EINT(16),
-                .chip   = {
-                        .base   = S5PV210_GPH2(0),
-                        .ngpio  = S5PV210_GPIO_H2_NR,
-                        .label  = "GPH2",
-                        .to_irq = samsung_gpiolib_to_irq,
-                },
-        }, {
-                .base   = (S5P_VA_GPIO + 0xC60),
-                .config = &gpio_cfg_noint,
-                .irq_base = IRQ_EINT(24),
-                .chip   = {
-                        .base   = S5PV210_GPH3(0),
-                        .ngpio  = S5PV210_GPIO_H3_NR,
-                        .label  = "GPH3",
-                        .to_irq = samsung_gpiolib_to_irq,
-                },
-        },
-};
-
-static __init int s5pv210_gpiolib_init(void)
-{
-        struct s3c_gpio_chip *chip = s5pv210_gpio_4bit;
-        int nr_chips = ARRAY_SIZE(s5pv210_gpio_4bit);
-        int gpioint_group = 0;
-        int i = 0;
-
-        for (i = 0; i < nr_chips; i++, chip++) {
-                if (chip->config == NULL) {
-                        chip->config = &gpio_cfg;
-                        chip->group = gpioint_group++;
-                }
-                if (chip->base == NULL)
-                        chip->base = S5PV210_BANK_BASE(i);
-        }
-
-        samsung_gpiolib_add_4bit_chips(s5pv210_gpio_4bit, nr_chips);
-        s5p_register_gpioint_bank(IRQ_GPIOINT, 0, S5P_GPIOINT_GROUP_MAXNR);
-
-        return 0;
-}
-core_initcall(s5pv210_gpiolib_init);
diff --git a/arch/arm/mach-u300/Makefile b/arch/arm/mach-u300/Makefile
index fab46fe9a71f..8fd354aaf0a7 100644
--- a/arch/arm/mach-u300/Makefile
+++ b/arch/arm/mach-u300/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the linux kernel, U300 machine.
 #
 
-obj-y           := core.o clock.o timer.o gpio.o padmux.o
+obj-y           := core.o clock.o timer.o padmux.o
 obj-m           :=
 obj-n           :=
 obj-            :=
diff --git a/arch/arm/mach-u300/gpio.c b/arch/arm/mach-u300/gpio.c
deleted file mode 100644
index d92790140fe5..000000000000
--- a/arch/arm/mach-u300/gpio.c
+++ /dev/null
@@ -1,700 +0,0 @@
-/*
- *
- * arch/arm/mach-u300/gpio.c
- *
- *
- * Copyright (C) 2007-2009 ST-Ericsson AB
- * License terms: GNU General Public License (GPL) version 2
- * U300 GPIO module.
- * This can driver either of the two basic GPIO cores
- * available in the U300 platforms:
- * COH 901 335   - Used in DB3150 (U300 1.0) and DB3200 (U330 1.0)
- * COH 901 571/3 - Used in DB3210 (U365 2.0) and DB3350 (U335 1.0)
- * Notice that you also have inline macros in <asm-arch/gpio.h>
- * Author: Linus Walleij <linus.walleij@stericsson.com>
- * Author: Jonas Aaberg <jonas.aberg@stericsson.com>
- *
- */
-#include <linux/module.h>
-#include <linux/interrupt.h>
-#include <linux/delay.h>
-#include <linux/errno.h>
-#include <linux/io.h>
-#include <linux/clk.h>
-#include <linux/err.h>
-#include <linux/platform_device.h>
-#include <linux/gpio.h>
-
-/* Reference to GPIO block clock */
-static struct clk *clk;
-
-/* Memory resource */
-static struct resource *memres;
-static void __iomem *virtbase;
-static struct device *gpiodev;
-
-struct u300_gpio_port {
-        const char *name;
-        int irq;
-        int number;
-};
-
-
-static struct u300_gpio_port gpio_ports[] = {
-        {
-                .name = "gpio0",
-                .number = 0,
-        },
-        {
-                .name = "gpio1",
-                .number = 1,
-        },
-        {
-                .name = "gpio2",
-                .number = 2,
-        },
-#ifdef U300_COH901571_3
-        {
-                .name = "gpio3",
-                .number = 3,
-        },
-        {
-                .name = "gpio4",
-                .number = 4,
-        },
-#ifdef CONFIG_MACH_U300_BS335
-        {
-                .name = "gpio5",
-                .number = 5,
-        },
-        {
-                .name = "gpio6",
-                .number = 6,
-        },
-#endif
-#endif
-
-};
-
-
-#ifdef U300_COH901571_3
-
-/* Default input value */
-#define DEFAULT_OUTPUT_LOW   0
-#define DEFAULT_OUTPUT_HIGH  1
-
-/* GPIO Pull-Up status */
-#define DISABLE_PULL_UP  0
-#define ENABLE_PULL_UP  1
-
-#define GPIO_NOT_USED 0
-#define GPIO_IN       1
-#define GPIO_OUT      2
-
-struct u300_gpio_configuration_data {
-        unsigned char pin_usage;
-        unsigned char default_output_value;
-        unsigned char pull_up;
-};
-
-/* Initial configuration */
-const struct u300_gpio_configuration_data
-u300_gpio_config[U300_GPIO_NUM_PORTS][U300_GPIO_PINS_PER_PORT] = {
-#ifdef CONFIG_MACH_U300_BS335
-        /* Port 0, pins 0-7 */
-        {
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_OUT, DEFAULT_OUTPUT_HIGH,  DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_OUT, DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_OUT, DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_OUT, DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_OUT, DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_OUT, DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP}
-        },
-        /* Port 1, pins 0-7 */
-        {
-                {GPIO_OUT, DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_OUT, DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_OUT, DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,    ENABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_OUT, DEFAULT_OUTPUT_HIGH,  DISABLE_PULL_UP},
-                {GPIO_OUT, DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_OUT, DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP}
-        },
-        /* Port 2, pins 0-7 */
-        {
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_OUT, DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,    ENABLE_PULL_UP},
-                {GPIO_OUT, DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,    ENABLE_PULL_UP}
-        },
-        /* Port 3, pins 0-7 */
-        {
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,    ENABLE_PULL_UP},
-                {GPIO_OUT, DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP}
-        },
-        /* Port 4, pins 0-7 */
-        {
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP}
-        },
-        /* Port 5, pins 0-7 */
-        {
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP}
-        },
-        /* Port 6, pind 0-7 */
-        {
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP}
-        }
-#endif
-
-#ifdef CONFIG_MACH_U300_BS365
-        /* Port 0, pins 0-7 */
-        {
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_OUT, DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_OUT, DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_OUT, DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_OUT, DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,    ENABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP}
-        },
-        /* Port 1, pins 0-7 */
-        {
-                {GPIO_OUT, DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_OUT, DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_OUT, DEFAULT_OUTPUT_HIGH,  DISABLE_PULL_UP},
-                {GPIO_OUT, DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_OUT, DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP}
-        },
-        /* Port 2, pins 0-7 */
-        {
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,    ENABLE_PULL_UP},
-                {GPIO_OUT, DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_OUT, DEFAULT_OUTPUT_LOW,   DISABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,    ENABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,    ENABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,    ENABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,    ENABLE_PULL_UP}
-        },
-        /* Port 3, pins 0-7 */
-        {
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,    ENABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,    ENABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,    ENABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,    ENABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,    ENABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,    ENABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,    ENABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,    ENABLE_PULL_UP}
-        },
-        /* Port 4, pins 0-7 */
-        {
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,    ENABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,    ENABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,    ENABLE_PULL_UP},
-                {GPIO_IN,  DEFAULT_OUTPUT_LOW,    ENABLE_PULL_UP},
-                /* These 4 pins doesn't exist on DB3210 */
-                {GPIO_OUT, DEFAULT_OUTPUT_LOW,    ENABLE_PULL_UP},
-                {GPIO_OUT, DEFAULT_OUTPUT_LOW,    ENABLE_PULL_UP},
-                {GPIO_OUT, DEFAULT_OUTPUT_LOW,    ENABLE_PULL_UP},
-                {GPIO_OUT, DEFAULT_OUTPUT_LOW,    ENABLE_PULL_UP}
-        }
-#endif
-};
-#endif
-
-
-/* No users == we can power down GPIO */
-static int gpio_users;
-
-struct gpio_struct {
-        int (*callback)(void *);
-        void *data;
-        int users;
-};
-
-static struct gpio_struct gpio_pin[U300_GPIO_MAX];
-
-/*
- * Let drivers register callback in order to get notified when there is
- * an interrupt on the gpio pin
- */
-int gpio_register_callback(unsigned gpio, int (*func)(void *arg), void *data)
-{
-        if (gpio_pin[gpio].callback)
-                dev_warn(gpiodev, "%s: WARNING: callback already "
-                         "registered for gpio pin#%d\n", __func__, gpio);
-        gpio_pin[gpio].callback = func;
-        gpio_pin[gpio].data = data;
-
-        return 0;
-}
-EXPORT_SYMBOL(gpio_register_callback);
-
-int gpio_unregister_callback(unsigned gpio)
-{
-        if (!gpio_pin[gpio].callback)
-                dev_warn(gpiodev, "%s: WARNING: callback already "
-                         "unregistered for gpio pin#%d\n", __func__, gpio);
-        gpio_pin[gpio].callback = NULL;
-        gpio_pin[gpio].data = NULL;
-
-        return 0;
-}
-EXPORT_SYMBOL(gpio_unregister_callback);
-
-/* Non-zero means valid */
-int gpio_is_valid(int number)
-{
-        if (number >= 0 &&
-            number < (U300_GPIO_NUM_PORTS * U300_GPIO_PINS_PER_PORT))
-                return 1;
-        return 0;
-}
-EXPORT_SYMBOL(gpio_is_valid);
-
-int gpio_request(unsigned gpio, const char *label)
-{
-        if (gpio_pin[gpio].users)
-                return -EINVAL;
-        else
-                gpio_pin[gpio].users++;
-
-        gpio_users++;
-
-        return 0;
-}
-EXPORT_SYMBOL(gpio_request);
-
-void gpio_free(unsigned gpio)
-{
-        gpio_users--;
-        gpio_pin[gpio].users--;
-        if (unlikely(gpio_pin[gpio].users < 0)) {
-                dev_warn(gpiodev, "warning: gpio#%d release mismatch\n",
-                         gpio);
-                gpio_pin[gpio].users = 0;
-        }
-
-        return;
-}
-EXPORT_SYMBOL(gpio_free);
-
-/* This returns zero or nonzero */
-int gpio_get_value(unsigned gpio)
-{
-        return readl(virtbase + U300_GPIO_PXPDIR +
-          PIN_TO_PORT(gpio) * U300_GPIO_PORTX_SPACING) & (1 << (gpio & 0x07));
-}
-EXPORT_SYMBOL(gpio_get_value);
-
-/*
- * We hope that the compiler will optimize away the unused branch
- * in case "value" is a constant
- */
-void gpio_set_value(unsigned gpio, int value)
-{
-        u32 val;
-        unsigned long flags;
-
-        local_irq_save(flags);
-        if (value) {
-                /* set */
-                val = readl(virtbase + U300_GPIO_PXPDOR +
-                  PIN_TO_PORT(gpio) * U300_GPIO_PORTX_SPACING)
-                  & (1 << (gpio & 0x07));
-                writel(val | (1 << (gpio & 0x07)), virtbase +
-                  U300_GPIO_PXPDOR +
-                  PIN_TO_PORT(gpio) * U300_GPIO_PORTX_SPACING);
-        } else {
-                /* clear */
-                val = readl(virtbase + U300_GPIO_PXPDOR +
-                  PIN_TO_PORT(gpio) * U300_GPIO_PORTX_SPACING)
-                  & (1 << (gpio & 0x07));
-                writel(val & ~(1 << (gpio & 0x07)), virtbase +
-                  U300_GPIO_PXPDOR +
-                  PIN_TO_PORT(gpio) * U300_GPIO_PORTX_SPACING);
-        }
-        local_irq_restore(flags);
-}
-EXPORT_SYMBOL(gpio_set_value);
-
-int gpio_direction_input(unsigned gpio)
-{
-        unsigned long flags;
-        u32 val;
-
-        if (gpio > U300_GPIO_MAX)
-                return -EINVAL;
-
-        local_irq_save(flags);
-        val = readl(virtbase + U300_GPIO_PXPCR + PIN_TO_PORT(gpio) *
-                                U300_GPIO_PORTX_SPACING);
-        /* Mask out this pin*/
-        val &= ~(U300_GPIO_PXPCR_PIN_MODE_MASK << ((gpio & 0x07) << 1));
-        /* This is not needed since it sets the bits to zero.*/
-        /* val |= (U300_GPIO_PXPCR_PIN_MODE_INPUT << (gpio*2)); */
-        writel(val, virtbase + U300_GPIO_PXPCR + PIN_TO_PORT(gpio) *
-                                U300_GPIO_PORTX_SPACING);
-        local_irq_restore(flags);
-        return 0;
-}
-EXPORT_SYMBOL(gpio_direction_input);
-
-int gpio_direction_output(unsigned gpio, int value)
-{
-        unsigned long flags;
-        u32 val;
-
-        if (gpio > U300_GPIO_MAX)
-                return -EINVAL;
-
-        local_irq_save(flags);
-        val = readl(virtbase + U300_GPIO_PXPCR + PIN_TO_PORT(gpio) *
-                                U300_GPIO_PORTX_SPACING);
-        /* Mask out this pin */
-        val &= ~(U300_GPIO_PXPCR_PIN_MODE_MASK << ((gpio & 0x07) << 1));
-        /*
-         * FIXME: configure for push/pull, open drain or open source per pin
-         * in setup. The current driver will only support push/pull.
-         */
-        val |= (U300_GPIO_PXPCR_PIN_MODE_OUTPUT_PUSH_PULL
-                        << ((gpio & 0x07) << 1));
-        writel(val, virtbase + U300_GPIO_PXPCR + PIN_TO_PORT(gpio) *
-                                U300_GPIO_PORTX_SPACING);
-        gpio_set_value(gpio, value);
-        local_irq_restore(flags);
-        return 0;
-}
-EXPORT_SYMBOL(gpio_direction_output);
-
-/*
- * Enable an IRQ, edge is rising edge (!= 0) or falling edge (==0).
- */
-void enable_irq_on_gpio_pin(unsigned gpio, int edge)
-{
-        u32 val;
-        unsigned long flags;
-        local_irq_save(flags);
-
-        val = readl(virtbase + U300_GPIO_PXIEN + PIN_TO_PORT(gpio) *
-                                U300_GPIO_PORTX_SPACING);
-        val |= (1 << (gpio & 0x07));
-        writel(val, virtbase + U300_GPIO_PXIEN + PIN_TO_PORT(gpio) *
-                                U300_GPIO_PORTX_SPACING);
-        val = readl(virtbase + U300_GPIO_PXICR + PIN_TO_PORT(gpio) *
-                                U300_GPIO_PORTX_SPACING);
-        if (edge)
-                val |= (1 << (gpio & 0x07));
-        else
-                val &= ~(1 << (gpio & 0x07));
-        writel(val, virtbase + U300_GPIO_PXICR + PIN_TO_PORT(gpio) *
-                                U300_GPIO_PORTX_SPACING);
-        local_irq_restore(flags);
-}
-EXPORT_SYMBOL(enable_irq_on_gpio_pin);
-
-void disable_irq_on_gpio_pin(unsigned gpio)
-{
-        u32 val;
-        unsigned long flags;
-
-        local_irq_save(flags);
-        val = readl(virtbase + U300_GPIO_PXIEN + PIN_TO_PORT(gpio) *
-                                U300_GPIO_PORTX_SPACING);
-        val &= ~(1 << (gpio & 0x07));
-        writel(val, virtbase + U300_GPIO_PXIEN + PIN_TO_PORT(gpio) *
-                                U300_GPIO_PORTX_SPACING);
-        local_irq_restore(flags);
-}
-EXPORT_SYMBOL(disable_irq_on_gpio_pin);
-
-/* Enable (value == 0) or disable (value == 1) internal pullup */
-void gpio_pullup(unsigned gpio, int value)
-{
-        u32 val;
-        unsigned long flags;
-
-        local_irq_save(flags);
-        if (value) {
-                val = readl(virtbase + U300_GPIO_PXPER + PIN_TO_PORT(gpio) *
-                                        U300_GPIO_PORTX_SPACING);
-                writel(val | (1 << (gpio & 0x07)), virtbase + U300_GPIO_PXPER +
-                                PIN_TO_PORT(gpio) * U300_GPIO_PORTX_SPACING);
-        } else {
-                val = readl(virtbase + U300_GPIO_PXPER + PIN_TO_PORT(gpio) *
-                                        U300_GPIO_PORTX_SPACING);
-                writel(val & ~(1 << (gpio & 0x07)), virtbase + U300_GPIO_PXPER +
-                                PIN_TO_PORT(gpio) * U300_GPIO_PORTX_SPACING);
-        }
-        local_irq_restore(flags);
-}
-EXPORT_SYMBOL(gpio_pullup);
-
-static irqreturn_t gpio_irq_handler(int irq, void *dev_id)
-{
-        struct u300_gpio_port *port = dev_id;
-        u32 val;
-        int pin;
-
-        /* Read event register */
-        val = readl(virtbase + U300_GPIO_PXIEV + port->number *
-                                U300_GPIO_PORTX_SPACING);
-        /* Mask with enable register */
-        val &= readl(virtbase + U300_GPIO_PXIEV + port->number *
-                                U300_GPIO_PORTX_SPACING);
-        /* Mask relevant bits */
-        val &= U300_GPIO_PXIEV_ALL_IRQ_EVENT_MASK;
-        /* ACK IRQ (clear event) */
-        writel(val, virtbase + U300_GPIO_PXIEV + port->number *
-                                U300_GPIO_PORTX_SPACING);
-        /* Print message */
-        while (val != 0) {
-                unsigned gpio;
-
-                pin = __ffs(val);
-                /* mask off this pin */
-                val &= ~(1 << pin);
-                gpio = (port->number << 3) + pin;
-
-                if (gpio_pin[gpio].callback)
-                        (void)gpio_pin[gpio].callback(gpio_pin[gpio].data);
-                else
-                        dev_dbg(gpiodev, "stray GPIO IRQ on line %d\n",
-                               gpio);
-        }
-        return IRQ_HANDLED;
-}
-
-static void gpio_set_initial_values(void)
-{
-#ifdef U300_COH901571_3
-        int i, j;
-        unsigned long flags;
-        u32 val;
-
-        /* Write default values to all pins */
-        for (i = 0; i < U300_GPIO_NUM_PORTS; i++) {
-                val = 0;
-                for (j = 0; j < 8; j++)
-                        val |= (u32) (u300_gpio_config[i][j].default_output_value != DEFAULT_OUTPUT_LOW) << j;
-                local_irq_save(flags);
-                writel(val, virtbase + U300_GPIO_PXPDOR + i * U300_GPIO_PORTX_SPACING);
-                local_irq_restore(flags);
-        }
-
-        /*
-         * Put all pins that are set to either 'GPIO_OUT' or 'GPIO_NOT_USED'
-         * to output and 'GPIO_IN' to input for each port. And initialize
-         * default value on outputs.
-         */
-        for (i = 0; i < U300_GPIO_NUM_PORTS; i++) {
-                for (j = 0; j < U300_GPIO_PINS_PER_PORT; j++) {
-                        local_irq_save(flags);
-                        val = readl(virtbase + U300_GPIO_PXPCR +
-                                         i * U300_GPIO_PORTX_SPACING);
-                        /* Mask out this pin */
-                        val &= ~(U300_GPIO_PXPCR_PIN_MODE_MASK << (j << 1));
-
-                        if (u300_gpio_config[i][j].pin_usage != GPIO_IN)
-                                val |= (U300_GPIO_PXPCR_PIN_MODE_OUTPUT_PUSH_PULL << (j << 1));
-                        writel(val, virtbase + U300_GPIO_PXPCR +
-                                         i * U300_GPIO_PORTX_SPACING);
-                        local_irq_restore(flags);
-                }
-        }
-
-        /* Enable or disable the internal pull-ups in the GPIO ASIC block */
-        for (i = 0; i < U300_GPIO_MAX; i++) {
-                val = 0;
-                for (j = 0; j < 8; j++)
-                        val |= (u32)((u300_gpio_config[i][j].pull_up == DISABLE_PULL_UP) << j);
-                local_irq_save(flags);
-                writel(val, virtbase + U300_GPIO_PXPER + i * U300_GPIO_PORTX_SPACING);
-                local_irq_restore(flags);
-        }
-#endif
-}
-
-static int __init gpio_probe(struct platform_device *pdev)
-{
-        u32 val;
-        int err = 0;
-        int i;
-        int num_irqs;
-
-        gpiodev = &pdev->dev;
-        memset(gpio_pin, 0, sizeof(gpio_pin));
-
-        /* Get GPIO clock */
-        clk = clk_get(&pdev->dev, NULL);
-        if (IS_ERR(clk)) {
-                err = PTR_ERR(clk);
-                dev_err(gpiodev, "could not get GPIO clock\n");
-                goto err_no_clk;
-        }
-        err = clk_enable(clk);
-        if (err) {
-                dev_err(gpiodev, "could not enable GPIO clock\n");
-                goto err_no_clk_enable;
-        }
-
-        memres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!memres)
-                goto err_no_resource;
-
-        if (request_mem_region(memres->start, memres->end - memres->start, "GPIO Controller")
-            == NULL) {
-                err = -ENODEV;
-                goto err_no_ioregion;
-        }
-
-        virtbase = ioremap(memres->start, resource_size(memres));
-        if (!virtbase) {
-                err = -ENOMEM;
-                goto err_no_ioremap;
-        }
-        dev_info(gpiodev, "remapped 0x%08x to %p\n",
-                 memres->start, virtbase);
-
-#ifdef U300_COH901335
-        dev_info(gpiodev, "initializing GPIO Controller COH 901 335\n");
-        /* Turn on the GPIO block */
-        writel(U300_GPIO_CR_BLOCK_CLOCK_ENABLE, virtbase + U300_GPIO_CR);
-#endif
-
-#ifdef U300_COH901571_3
-        dev_info(gpiodev, "initializing GPIO Controller COH 901 571/3\n");
-        val = readl(virtbase + U300_GPIO_CR);
-        dev_info(gpiodev, "COH901571/3 block version: %d, " \
-               "number of cores: %d\n",
-               ((val & 0x0000FE00) >> 9),
-               ((val & 0x000001FC) >> 2));
-        writel(U300_GPIO_CR_BLOCK_CLKRQ_ENABLE, virtbase + U300_GPIO_CR);
-#endif
-
-        gpio_set_initial_values();
-
-        for (num_irqs = 0 ; num_irqs < U300_GPIO_NUM_PORTS; num_irqs++) {
-
-                gpio_ports[num_irqs].irq =
-                        platform_get_irq_byname(pdev,
-                                                gpio_ports[num_irqs].name);
-
-                err = request_irq(gpio_ports[num_irqs].irq,
-                                  gpio_irq_handler, IRQF_DISABLED,
-                                  gpio_ports[num_irqs].name,
-                                  &gpio_ports[num_irqs]);
-                if (err) {
-                        dev_err(gpiodev, "cannot allocate IRQ for %s!\n",
-                                gpio_ports[num_irqs].name);
-                        goto err_no_irq;
-                }
-                /* Turns off PortX_irq_force */
-                writel(0x0, virtbase + U300_GPIO_PXIFR +
-                                 num_irqs * U300_GPIO_PORTX_SPACING);
-        }
-
-        return 0;
-
- err_no_irq:
-        for (i = 0; i < num_irqs; i++)
-                free_irq(gpio_ports[i].irq, &gpio_ports[i]);
-        iounmap(virtbase);
- err_no_ioremap:
-        release_mem_region(memres->start, memres->end - memres->start);
- err_no_ioregion:
- err_no_resource:
-        clk_disable(clk);
- err_no_clk_enable:
-        clk_put(clk);
- err_no_clk:
-        dev_info(gpiodev, "module ERROR:%d\n", err);
-        return err;
-}
-
-static int __exit gpio_remove(struct platform_device *pdev)
-{
-        int i;
-
-        /* Turn off the GPIO block */
-        writel(0x00000000U, virtbase + U300_GPIO_CR);
-        for (i = 0 ; i < U300_GPIO_NUM_PORTS; i++)
-                free_irq(gpio_ports[i].irq, &gpio_ports[i]);
-        iounmap(virtbase);
-        release_mem_region(memres->start, memres->end - memres->start);
-        clk_disable(clk);
-        clk_put(clk);
-        return 0;
-}
-
-static struct platform_driver gpio_driver = {
-        .driver         = {
-                .name   = "u300-gpio",
-        },
-        .remove         = __exit_p(gpio_remove),
-};
-
-
-static int __init u300_gpio_init(void)
-{
-        return platform_driver_probe(&gpio_driver, gpio_probe);
-}
-
-static void __exit u300_gpio_exit(void)
-{
-        platform_driver_unregister(&gpio_driver);
-}
-
-arch_initcall(u300_gpio_init);
-module_exit(u300_gpio_exit);
-
-MODULE_AUTHOR("Linus Walleij <linus.walleij@stericsson.com>");
-
-#ifdef U300_COH901571_3
-MODULE_DESCRIPTION("ST-Ericsson AB COH 901 571/3 GPIO driver");
-#endif
-
-#ifdef U300_COH901335
-MODULE_DESCRIPTION("ST-Ericsson AB COH 901 335 GPIO driver");
-#endif
-
-MODULE_LICENSE("GPL");
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
index 54429d015954..f8b9392ee347 100644
--- a/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@ -5,7 +5,6 @@ config UX500_SOC_COMMON
         default y
         select ARM_GIC
         select HAS_MTU
-        select NOMADIK_GPIO
         select ARM_ERRATA_753970
 
 menu "Ux500 SoC"
diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c
index bf0b02414e5b..7c6cb4fa47a9 100644
--- a/arch/arm/mach-ux500/board-mop500-sdi.c
+++ b/arch/arm/mach-ux500/board-mop500-sdi.c
@@ -99,8 +99,11 @@ static void sdi0_configure(void)
         gpio_direction_output(sdi0_vsel, 0);
         gpio_direction_output(sdi0_en, 1);
 
-        /* Add the device */
-        db8500_add_sdi0(&mop500_sdi0_data);
+        /* Add the device, force v2 to subrevision 1 */
+        if (cpu_is_u8500v2())
+                db8500_add_sdi0(&mop500_sdi0_data, 0x10480180);
+        else
+                db8500_add_sdi0(&mop500_sdi0_data, 0);
 }
 
 void mop500_sdi_tc35892_init(void)
@@ -188,13 +191,18 @@ static struct mmci_platform_data mop500_sdi4_data = {
 
 void __init mop500_sdi_init(void)
 {
+        u32 periphid = 0;
+
+        /* v2 has a new version of this block that need to be forced */
+        if (cpu_is_u8500v2())
+                periphid = 0x10480180;
         /* PoP:ed eMMC on top of DB8500 v1.0 has problems with high speed */
         if (!cpu_is_u8500v10())
                 mop500_sdi2_data.capabilities |= MMC_CAP_MMC_HIGHSPEED;
-        db8500_add_sdi2(&mop500_sdi2_data);
+        db8500_add_sdi2(&mop500_sdi2_data, periphid);
 
         /* On-board eMMC */
-        db8500_add_sdi4(&mop500_sdi4_data);
+        db8500_add_sdi4(&mop500_sdi4_data, periphid);
 
         if (machine_is_hrefv60()) {
                 mop500_sdi0_data.gpio_cd = HREFV60_SDMMC_CD_GPIO;
diff --git a/arch/arm/mach-ux500/devices-common.h b/arch/arm/mach-ux500/devices-common.h
index c719b5a1d913..7825705033bf 100644
--- a/arch/arm/mach-ux500/devices-common.h
+++ b/arch/arm/mach-ux500/devices-common.h
@@ -28,18 +28,20 @@ dbx500_add_msp_spi(const char *name, resource_size_t base, int irq,
 
 static inline struct amba_device *
 dbx500_add_spi(const char *name, resource_size_t base, int irq,
-                                   struct spi_master_cntlr *pdata)
+               struct spi_master_cntlr *pdata,
+               u32 periphid)
 {
-        return dbx500_add_amba_device(name, base, irq, pdata, 0);
+        return dbx500_add_amba_device(name, base, irq, pdata, periphid);
 }
 
 struct mmci_platform_data;
 
 static inline struct amba_device *
 dbx500_add_sdi(const char *name, resource_size_t base, int irq,
-               struct mmci_platform_data *pdata)
+               struct mmci_platform_data *pdata,
+               u32 periphid)
 {
-        return dbx500_add_amba_device(name, base, irq, pdata, 0);
+        return dbx500_add_amba_device(name, base, irq, pdata, periphid);
 }
 
 struct amba_pl011_data;
diff --git a/arch/arm/mach-ux500/devices-db5500.h b/arch/arm/mach-ux500/devices-db5500.h
index 94627f7783b0..0c4bccd02b90 100644
--- a/arch/arm/mach-ux500/devices-db5500.h
+++ b/arch/arm/mach-ux500/devices-db5500.h
@@ -38,24 +38,34 @@
         ux500_add_usb(U5500_USBOTG_BASE, IRQ_DB5500_USBOTG, rx_cfg, tx_cfg)
 
 #define db5500_add_sdi0(pdata) \
-        dbx500_add_sdi("sdi0", U5500_SDI0_BASE, IRQ_DB5500_SDMMC0, pdata)
+        dbx500_add_sdi("sdi0", U5500_SDI0_BASE, IRQ_DB5500_SDMMC0, pdata, \
+                       0x10480180)
 #define db5500_add_sdi1(pdata) \
-        dbx500_add_sdi("sdi1", U5500_SDI1_BASE, IRQ_DB5500_SDMMC1, pdata)
+        dbx500_add_sdi("sdi1", U5500_SDI1_BASE, IRQ_DB5500_SDMMC1, pdata, \
+                       0x10480180)
 #define db5500_add_sdi2(pdata) \
-        dbx500_add_sdi("sdi2", U5500_SDI2_BASE, IRQ_DB5500_SDMMC2, pdata)
+        dbx500_add_sdi("sdi2", U5500_SDI2_BASE, IRQ_DB5500_SDMMC2, pdata \
+                       0x10480180)
 #define db5500_add_sdi3(pdata) \
-        dbx500_add_sdi("sdi3", U5500_SDI3_BASE, IRQ_DB5500_SDMMC3, pdata)
+        dbx500_add_sdi("sdi3", U5500_SDI3_BASE, IRQ_DB5500_SDMMC3, pdata \
+                       0x10480180)
 #define db5500_add_sdi4(pdata) \
-        dbx500_add_sdi("sdi4", U5500_SDI4_BASE, IRQ_DB5500_SDMMC4, pdata)
+        dbx500_add_sdi("sdi4", U5500_SDI4_BASE, IRQ_DB5500_SDMMC4, pdata \
+                       0x10480180)
 
+/* This one has a bad peripheral ID in the U5500 silicon */
 #define db5500_add_spi0(pdata) \
-        dbx500_add_spi("spi0", U5500_SPI0_BASE, IRQ_DB5500_SPI0, pdata)
+        dbx500_add_spi("spi0", U5500_SPI0_BASE, IRQ_DB5500_SPI0, pdata, \
+                       0x10080023)
 #define db5500_add_spi1(pdata) \
-        dbx500_add_spi("spi1", U5500_SPI1_BASE, IRQ_DB5500_SPI1, pdata)
+        dbx500_add_spi("spi1", U5500_SPI1_BASE, IRQ_DB5500_SPI1, pdata, \
+                       0x10080023)
 #define db5500_add_spi2(pdata) \
-        dbx500_add_spi("spi2", U5500_SPI2_BASE, IRQ_DB5500_SPI2, pdata)
+        dbx500_add_spi("spi2", U5500_SPI2_BASE, IRQ_DB5500_SPI2, pdata \
+                       0x10080023)
 #define db5500_add_spi3(pdata) \
-        dbx500_add_spi("spi3", U5500_SPI3_BASE, IRQ_DB5500_SPI3, pdata)
+        dbx500_add_spi("spi3", U5500_SPI3_BASE, IRQ_DB5500_SPI3, pdata \
+                       0x10080023)
 
 #define db5500_add_uart0(plat) \
         dbx500_add_uart("uart0", U5500_UART0_BASE, IRQ_DB5500_UART0, plat)
diff --git a/arch/arm/mach-ux500/devices-db8500.h b/arch/arm/mach-ux500/devices-db8500.h
index 9cc6f8f5d3e6..cbd4a9ae8109 100644
--- a/arch/arm/mach-ux500/devices-db8500.h
+++ b/arch/arm/mach-ux500/devices-db8500.h
@@ -25,7 +25,7 @@ static inline struct amba_device *
 db8500_add_ssp(const char *name, resource_size_t base, int irq,
                struct pl022_ssp_controller *pdata)
 {
-        return dbx500_add_amba_device(name, base, irq, pdata, SSP_PER_ID);
+        return dbx500_add_amba_device(name, base, irq, pdata, 0);
 }
 
 
@@ -64,18 +64,18 @@ db8500_add_ssp(const char *name, resource_size_t base, int irq,
 #define db8500_add_usb(rx_cfg, tx_cfg) \
         ux500_add_usb(U8500_USBOTG_BASE, IRQ_DB8500_USBOTG, rx_cfg, tx_cfg)
 
-#define db8500_add_sdi0(pdata) \
-        dbx500_add_sdi("sdi0", U8500_SDI0_BASE, IRQ_DB8500_SDMMC0, pdata)
-#define db8500_add_sdi1(pdata) \
-        dbx500_add_sdi("sdi1", U8500_SDI1_BASE, IRQ_DB8500_SDMMC1, pdata)
-#define db8500_add_sdi2(pdata) \
-        dbx500_add_sdi("sdi2", U8500_SDI2_BASE, IRQ_DB8500_SDMMC2, pdata)
-#define db8500_add_sdi3(pdata) \
-        dbx500_add_sdi("sdi3", U8500_SDI3_BASE, IRQ_DB8500_SDMMC3, pdata)
-#define db8500_add_sdi4(pdata) \
-        dbx500_add_sdi("sdi4", U8500_SDI4_BASE, IRQ_DB8500_SDMMC4, pdata)
-#define db8500_add_sdi5(pdata) \
-        dbx500_add_sdi("sdi5", U8500_SDI5_BASE, IRQ_DB8500_SDMMC5, pdata)
+#define db8500_add_sdi0(pdata, pid) \
+        dbx500_add_sdi("sdi0", U8500_SDI0_BASE, IRQ_DB8500_SDMMC0, pdata, pid)
+#define db8500_add_sdi1(pdata, pid) \
+        dbx500_add_sdi("sdi1", U8500_SDI1_BASE, IRQ_DB8500_SDMMC1, pdata, pid)
+#define db8500_add_sdi2(pdata, pid) \
+        dbx500_add_sdi("sdi2", U8500_SDI2_BASE, IRQ_DB8500_SDMMC2, pdata, pid)
+#define db8500_add_sdi3(pdata, pid) \
+        dbx500_add_sdi("sdi3", U8500_SDI3_BASE, IRQ_DB8500_SDMMC3, pdata, pid)
+#define db8500_add_sdi4(pdata, pid) \
+        dbx500_add_sdi("sdi4", U8500_SDI4_BASE, IRQ_DB8500_SDMMC4, pdata, pid)
+#define db8500_add_sdi5(pdata, pid) \
+        dbx500_add_sdi("sdi5", U8500_SDI5_BASE, IRQ_DB8500_SDMMC5, pdata, pid)
 
 #define db8500_add_ssp0(pdata) \
         db8500_add_ssp("ssp0", U8500_SSP0_BASE, IRQ_DB8500_SSP0, pdata)
@@ -83,13 +83,13 @@ db8500_add_ssp(const char *name, resource_size_t base, int irq,
         db8500_add_ssp("ssp1", U8500_SSP1_BASE, IRQ_DB8500_SSP1, pdata)
 
 #define db8500_add_spi0(pdata) \
-        dbx500_add_spi("spi0", U8500_SPI0_BASE, IRQ_DB8500_SPI0, pdata)
+        dbx500_add_spi("spi0", U8500_SPI0_BASE, IRQ_DB8500_SPI0, pdata, 0)
 #define db8500_add_spi1(pdata) \
-        dbx500_add_spi("spi1", U8500_SPI1_BASE, IRQ_DB8500_SPI1, pdata)
+        dbx500_add_spi("spi1", U8500_SPI1_BASE, IRQ_DB8500_SPI1, pdata, 0)
 #define db8500_add_spi2(pdata) \
-        dbx500_add_spi("spi2", U8500_SPI2_BASE, IRQ_DB8500_SPI2, pdata)
+        dbx500_add_spi("spi2", U8500_SPI2_BASE, IRQ_DB8500_SPI2, pdata, 0)
 #define db8500_add_spi3(pdata) \
-        dbx500_add_spi("spi3", U8500_SPI3_BASE, IRQ_DB8500_SPI3, pdata)
+        dbx500_add_spi("spi3", U8500_SPI3_BASE, IRQ_DB8500_SPI3, pdata, 0)
 
 #define db8500_add_uart0(pdata) \
         dbx500_add_uart("uart0", U8500_UART0_BASE, IRQ_DB8500_UART0, pdata)
diff --git a/arch/arm/mach-ux500/include/mach/hardware.h b/arch/arm/mach-ux500/include/mach/hardware.h
index 2c6f71049f2e..470ac52663d6 100644
--- a/arch/arm/mach-ux500/include/mach/hardware.h
+++ b/arch/arm/mach-ux500/include/mach/hardware.h
@@ -29,9 +29,6 @@
 #include <mach/db8500-regs.h>
 #include <mach/db5500-regs.h>
 
-/* ST-Ericsson modified pl022 id */
-#define SSP_PER_ID              0x01080022
-
 #ifndef __ASSEMBLY__
 
 #include <mach/id.h>
diff --git a/arch/arm/mm/cache-v6.S b/arch/arm/mm/cache-v6.S
index c96fa1b3f49f..73b4a8b66a57 100644
--- a/arch/arm/mm/cache-v6.S
+++ b/arch/arm/mm/cache-v6.S
@@ -176,6 +176,7 @@ ENDPROC(v6_coherent_kern_range)
  */
 ENTRY(v6_flush_kern_dcache_area)
         add     r1, r0, r1
+        bic     r0, r0, #D_CACHE_LINE_SIZE - 1
 1:
 #ifdef HARVARD_CACHE
         mcr     p15, 0, r0, c7, c14, 1          @ clean & invalidate D line
diff --git a/arch/arm/mm/cache-v7.S b/arch/arm/mm/cache-v7.S
index dc18d81ef8ce..d32f02b61866 100644
--- a/arch/arm/mm/cache-v7.S
+++ b/arch/arm/mm/cache-v7.S
@@ -221,6 +221,8 @@ ENDPROC(v7_coherent_user_range)
 ENTRY(v7_flush_kern_dcache_area)
         dcache_line_size r2, r3
         add     r1, r0, r1
+        sub     r3, r2, #1
+        bic     r0, r0, r3
 1:
         mcr     p15, 0, r0, c7, c14, 1          @ clean & invalidate D line / unified line
         add     r0, r0, r2
diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
index b0ee9ba3cfab..8bfae964b133 100644
--- a/arch/arm/mm/context.c
+++ b/arch/arm/mm/context.c
@@ -24,9 +24,7 @@ DEFINE_PER_CPU(struct mm_struct *, current_mm);
 
 /*
  * We fork()ed a process, and we need a new context for the child
- * to run in.  We reserve version 0 for initial tasks so we will
- * always allocate an ASID. The ASID 0 is reserved for the TTBR
- * register changing sequence.
+ * to run in.
  */
 void __init_new_context(struct task_struct *tsk, struct mm_struct *mm)
 {
@@ -36,8 +34,11 @@ void __init_new_context(struct task_struct *tsk, struct mm_struct *mm)
 
 static void flush_context(void)
 {
-        /* set the reserved ASID before flushing the TLB */
-        asm("mcr        p15, 0, %0, c13, c0, 1\n" : : "r" (0));
+        u32 ttb;
+        /* Copy TTBR1 into TTBR0 */
+        asm volatile("mrc       p15, 0, %0, c2, c0, 1\n"
+                     "mcr       p15, 0, %0, c2, c0, 0"
+                     : "=r" (ttb));
         isb();
         local_flush_tlb_all();
         if (icache_is_vivt_asid_tagged()) {
@@ -93,7 +94,7 @@ static void reset_context(void *info)
                 return;
 
         smp_rmb();
-        asid = cpu_last_asid + cpu + 1;
+        asid = cpu_last_asid + cpu;
 
         flush_context();
         set_mm_context(mm, asid);
@@ -143,13 +144,13 @@ void __new_context(struct mm_struct *mm)
          * to start a new version and flush the TLB.
          */
         if (unlikely((asid & ~ASID_MASK) == 0)) {
-                asid = cpu_last_asid + smp_processor_id() + 1;
+                asid = cpu_last_asid + smp_processor_id();
                 flush_context();
 #ifdef CONFIG_SMP
                 smp_wmb();
                 smp_call_function(reset_context, NULL, 1);
 #endif
-                cpu_last_asid += NR_CPUS;
+                cpu_last_asid += NR_CPUS - 1;
         }
 
         set_mm_context(mm, asid);
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 3f17ea146f0e..2c2cce9cd8c8 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -15,12 +15,14 @@
 #include <linux/mman.h>
 #include <linux/nodemask.h>
 #include <linux/initrd.h>
+#include <linux/of_fdt.h>
 #include <linux/highmem.h>
 #include <linux/gfp.h>
 #include <linux/memblock.h>
 #include <linux/sort.h>
 
 #include <asm/mach-types.h>
+#include <asm/prom.h>
 #include <asm/sections.h>
 #include <asm/setup.h>
 #include <asm/sizes.h>
@@ -71,6 +73,14 @@ static int __init parse_tag_initrd2(const struct tag *tag)
 
 __tagtable(ATAG_INITRD2, parse_tag_initrd2);
 
+#ifdef CONFIG_OF_FLATTREE
+void __init early_init_dt_setup_initrd_arch(unsigned long start, unsigned long end)
+{
+        phys_initrd_start = start;
+        phys_initrd_size = end - start;
+}
+#endif /* CONFIG_OF_FLATTREE */
+
 /*
  * This keeps memory configuration data used by a couple memory
  * initialization functions, as well as show_mem() for the skipping
@@ -273,13 +283,15 @@ static void __init arm_bootmem_free(unsigned long min, unsigned long max_low,
         free_area_init_node(0, zone_size, min, zhole_size);
 }
 
-#ifndef CONFIG_SPARSEMEM
+#ifdef CONFIG_HAVE_ARCH_PFN_VALID
 int pfn_valid(unsigned long pfn)
 {
         return memblock_is_memory(pfn << PAGE_SHIFT);
 }
 EXPORT_SYMBOL(pfn_valid);
+#endif
 
+#ifndef CONFIG_SPARSEMEM
 static void arm_memory_present(void)
 {
 }
@@ -334,6 +346,7 @@ void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc)
 #endif
 
         arm_mm_memblock_reserve();
+        arm_dt_memblock_reserve();
 
         /* reserve any platform specific memblock areas */
         if (mdesc->reserve)
diff --git a/arch/arm/mm/mm.h b/arch/arm/mm/mm.h
index d2384106af9c..5b3d7d543659 100644
--- a/arch/arm/mm/mm.h
+++ b/arch/arm/mm/mm.h
@@ -5,14 +5,9 @@ extern pmd_t *top_pmd;
 
 #define TOP_PTE(x)      pte_offset_kernel(top_pmd, x)
 
-static inline pmd_t *pmd_off(pgd_t *pgd, unsigned long virt)
-{
-        return pmd_offset(pud_offset(pgd, virt), virt);
-}
-
 static inline pmd_t *pmd_off_k(unsigned long virt)
 {
-        return pmd_off(pgd_offset_k(virt), virt);
+        return pmd_offset(pud_offset(pgd_offset_k(virt), virt), virt);
 }
 
 struct mem_type {
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 08a92368d9d3..9d9e736c2b4f 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -763,15 +763,12 @@ static void __init sanity_check_meminfo(void)
 {
         int i, j, highmem = 0;
 
-        lowmem_limit = __pa(vmalloc_min - 1) + 1;
-        memblock_set_current_limit(lowmem_limit);
-
         for (i = 0, j = 0; i < meminfo.nr_banks; i++) {
                 struct membank *bank = &meminfo.bank[j];
                 *bank = meminfo.bank[i];
 
 #ifdef CONFIG_HIGHMEM
-                if (__va(bank->start) > vmalloc_min ||
+                if (__va(bank->start) >= vmalloc_min ||
                     __va(bank->start) < (void *)PAGE_OFFSET)
                         highmem = 1;
 
@@ -829,6 +826,9 @@ static void __init sanity_check_meminfo(void)
                         bank->size = newsize;
                 }
 #endif
+                if (!bank->highmem && bank->start + bank->size > lowmem_limit)
+                        lowmem_limit = bank->start + bank->size;
+
                 j++;
         }
 #ifdef CONFIG_HIGHMEM
@@ -852,6 +852,7 @@ static void __init sanity_check_meminfo(void)
         }
 #endif
         meminfo.nr_banks = j;
+        memblock_set_current_limit(lowmem_limit);
 }
 
 static inline void prepare_page_table(void)
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
index ab17cc0d3fa7..1d2b8451bf25 100644
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
@@ -213,7 +213,9 @@ __v6_setup:
         mcr     p15, 0, r0, c2, c0, 2           @ TTB control register
         ALT_SMP(orr     r4, r4, #TTB_FLAGS_SMP)
         ALT_UP(orr      r4, r4, #TTB_FLAGS_UP)
-        mcr     p15, 0, r4, c2, c0, 1           @ load TTB1
+        ALT_SMP(orr     r8, r8, #TTB_FLAGS_SMP)
+        ALT_UP(orr      r8, r8, #TTB_FLAGS_UP)
+        mcr     p15, 0, r8, c2, c0, 1           @ load TTB1
 #endif /* CONFIG_MMU */
         adr     r5, v6_crval
         ldmia   r5, {r5, r6}
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index babfba09c89f..b3b566ec83d3 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -108,18 +108,16 @@ ENTRY(cpu_v7_switch_mm)
 #ifdef CONFIG_ARM_ERRATA_430973
         mcr     p15, 0, r2, c7, c5, 6           @ flush BTAC/BTB
 #endif
-#ifdef CONFIG_ARM_ERRATA_754322
-        dsb
-#endif
-        mcr     p15, 0, r2, c13, c0, 1          @ set reserved context ID
-        isb
-1:      mcr     p15, 0, r0, c2, c0, 0           @ set TTB 0
+        mrc     p15, 0, r2, c2, c0, 1           @ load TTB 1
+        mcr     p15, 0, r2, c2, c0, 0           @ into TTB 0
         isb
 #ifdef CONFIG_ARM_ERRATA_754322
         dsb
 #endif
         mcr     p15, 0, r1, c13, c0, 1          @ set context ID
         isb
+        mcr     p15, 0, r0, c2, c0, 0           @ set TTB 0
+        isb
 #endif
         mov     pc, lr
 ENDPROC(cpu_v7_switch_mm)
@@ -368,7 +366,9 @@ __v7_setup:
         mcr     p15, 0, r10, c2, c0, 2          @ TTB control register
         ALT_SMP(orr     r4, r4, #TTB_FLAGS_SMP)
         ALT_UP(orr      r4, r4, #TTB_FLAGS_UP)
-        mcr     p15, 0, r4, c2, c0, 1           @ load TTB1
+        ALT_SMP(orr     r8, r8, #TTB_FLAGS_SMP)
+        ALT_UP(orr      r8, r8, #TTB_FLAGS_UP)
+        mcr     p15, 0, r8, c2, c0, 1           @ load TTB1
         ldr     r5, =PRRR                       @ PRRR
         ldr     r6, =NMRR                       @ NMRR
         mcr     p15, 0, r5, c10, c2, 0          @ write PRRR
diff --git a/arch/arm/plat-nomadik/Kconfig b/arch/arm/plat-nomadik/Kconfig
index 18296ee68802..ce659015535e 100644
--- a/arch/arm/plat-nomadik/Kconfig
+++ b/arch/arm/plat-nomadik/Kconfig
@@ -21,9 +21,4 @@ config HAS_MTU
           to multiple interrupt generating programmable
           32-bit free running decrementing counters.
 
-config NOMADIK_GPIO
-        bool
-        help
-          Support for the Nomadik GPIO controller.
-
 endif
diff --git a/arch/arm/plat-nomadik/Makefile b/arch/arm/plat-nomadik/Makefile
index c33547361bd7..37c7cdd0f8f0 100644
--- a/arch/arm/plat-nomadik/Makefile
+++ b/arch/arm/plat-nomadik/Makefile
@@ -3,4 +3,3 @@
 # Licensed under GPLv2
 
 obj-$(CONFIG_HAS_MTU)   += timer.o
-obj-$(CONFIG_NOMADIK_GPIO)      += gpio.o
diff --git a/arch/arm/plat-nomadik/gpio.c b/arch/arm/plat-nomadik/gpio.c
deleted file mode 100644
index 307b8131aa8c..000000000000
--- a/arch/arm/plat-nomadik/gpio.c
+++ /dev/null
@@ -1,1020 +0,0 @@
-/*
- * Generic GPIO driver for logic cells found in the Nomadik SoC
- *
- * Copyright (C) 2008,2009 STMicroelectronics
- * Copyright (C) 2009 Alessandro Rubini <rubini@unipv.it>
- *   Rewritten based on work by Prafulla WADASKAR <prafulla.wadaskar@st.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/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/device.h>
-#include <linux/platform_device.h>
-#include <linux/io.h>
-#include <linux/clk.h>
-#include <linux/err.h>
-#include <linux/gpio.h>
-#include <linux/spinlock.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/slab.h>
-
-#include <asm/mach/irq.h>
-
-#include <plat/pincfg.h>
-#include <mach/hardware.h>
-#include <mach/gpio.h>
-
-/*
- * The GPIO module in the Nomadik family of Systems-on-Chip is an
- * AMBA device, managing 32 pins and alternate functions.  The logic block
- * is currently used in the Nomadik and ux500.
- *
- * Symbols in this file are called "nmk_gpio" for "nomadik gpio"
- */
-
-#define NMK_GPIO_PER_CHIP       32
-
-struct nmk_gpio_chip {
-        struct gpio_chip chip;
-        void __iomem *addr;
-        struct clk *clk;
-        unsigned int bank;
-        unsigned int parent_irq;
-        int secondary_parent_irq;
-        u32 (*get_secondary_status)(unsigned int bank);
-        void (*set_ioforce)(bool enable);
-        spinlock_t lock;
-        /* Keep track of configured edges */
-        u32 edge_rising;
-        u32 edge_falling;
-        u32 real_wake;
-        u32 rwimsc;
-        u32 fwimsc;
-        u32 slpm;
-        u32 enabled;
-};
-
-static struct nmk_gpio_chip *
-nmk_gpio_chips[DIV_ROUND_UP(ARCH_NR_GPIOS, NMK_GPIO_PER_CHIP)];
-
-static DEFINE_SPINLOCK(nmk_gpio_slpm_lock);
-
-#define NUM_BANKS ARRAY_SIZE(nmk_gpio_chips)
-
-static void __nmk_gpio_set_mode(struct nmk_gpio_chip *nmk_chip,
-                                unsigned offset, int gpio_mode)
-{
-        u32 bit = 1 << offset;
-        u32 afunc, bfunc;
-
-        afunc = readl(nmk_chip->addr + NMK_GPIO_AFSLA) & ~bit;
-        bfunc = readl(nmk_chip->addr + NMK_GPIO_AFSLB) & ~bit;
-        if (gpio_mode & NMK_GPIO_ALT_A)
-                afunc |= bit;
-        if (gpio_mode & NMK_GPIO_ALT_B)
-                bfunc |= bit;
-        writel(afunc, nmk_chip->addr + NMK_GPIO_AFSLA);
-        writel(bfunc, nmk_chip->addr + NMK_GPIO_AFSLB);
-}
-
-static void __nmk_gpio_set_slpm(struct nmk_gpio_chip *nmk_chip,
-                                unsigned offset, enum nmk_gpio_slpm mode)
-{
-        u32 bit = 1 << offset;
-        u32 slpm;
-
-        slpm = readl(nmk_chip->addr + NMK_GPIO_SLPC);
-        if (mode == NMK_GPIO_SLPM_NOCHANGE)
-                slpm |= bit;
-        else
-                slpm &= ~bit;
-        writel(slpm, nmk_chip->addr + NMK_GPIO_SLPC);
-}
-
-static void __nmk_gpio_set_pull(struct nmk_gpio_chip *nmk_chip,
-                                unsigned offset, enum nmk_gpio_pull pull)
-{
-        u32 bit = 1 << offset;
-        u32 pdis;
-
-        pdis = readl(nmk_chip->addr + NMK_GPIO_PDIS);
-        if (pull == NMK_GPIO_PULL_NONE)
-                pdis |= bit;
-        else
-                pdis &= ~bit;
-        writel(pdis, nmk_chip->addr + NMK_GPIO_PDIS);
-
-        if (pull == NMK_GPIO_PULL_UP)
-                writel(bit, nmk_chip->addr + NMK_GPIO_DATS);
-        else if (pull == NMK_GPIO_PULL_DOWN)
-                writel(bit, nmk_chip->addr + NMK_GPIO_DATC);
-}
-
-static void __nmk_gpio_make_input(struct nmk_gpio_chip *nmk_chip,
-                                  unsigned offset)
-{
-        writel(1 << offset, nmk_chip->addr + NMK_GPIO_DIRC);
-}
-
-static void __nmk_gpio_set_output(struct nmk_gpio_chip *nmk_chip,
-                                  unsigned offset, int val)
-{
-        if (val)
-                writel(1 << offset, nmk_chip->addr + NMK_GPIO_DATS);
-        else
-                writel(1 << offset, nmk_chip->addr + NMK_GPIO_DATC);
-}
-
-static void __nmk_gpio_make_output(struct nmk_gpio_chip *nmk_chip,
-                                  unsigned offset, int val)
-{
-        writel(1 << offset, nmk_chip->addr + NMK_GPIO_DIRS);
-        __nmk_gpio_set_output(nmk_chip, offset, val);
-}
-
-static void __nmk_gpio_set_mode_safe(struct nmk_gpio_chip *nmk_chip,
-                                     unsigned offset, int gpio_mode,
-                                     bool glitch)
-{
-        u32 rwimsc = readl(nmk_chip->addr + NMK_GPIO_RWIMSC);
-        u32 fwimsc = readl(nmk_chip->addr + NMK_GPIO_FWIMSC);
-
-        if (glitch && nmk_chip->set_ioforce) {
-                u32 bit = BIT(offset);
-
-                /* Prevent spurious wakeups */
-                writel(rwimsc & ~bit, nmk_chip->addr + NMK_GPIO_RWIMSC);
-                writel(fwimsc & ~bit, nmk_chip->addr + NMK_GPIO_FWIMSC);
-
-                nmk_chip->set_ioforce(true);
-        }
-
-        __nmk_gpio_set_mode(nmk_chip, offset, gpio_mode);
-
-        if (glitch && nmk_chip->set_ioforce) {
-                nmk_chip->set_ioforce(false);
-
-                writel(rwimsc, nmk_chip->addr + NMK_GPIO_RWIMSC);
-                writel(fwimsc, nmk_chip->addr + NMK_GPIO_FWIMSC);
-        }
-}
-
-static void __nmk_config_pin(struct nmk_gpio_chip *nmk_chip, unsigned offset,
-                             pin_cfg_t cfg, bool sleep, unsigned int *slpmregs)
-{
-        static const char *afnames[] = {
-                [NMK_GPIO_ALT_GPIO]     = "GPIO",
-                [NMK_GPIO_ALT_A]        = "A",
-                [NMK_GPIO_ALT_B]        = "B",
-                [NMK_GPIO_ALT_C]        = "C"
-        };
-        static const char *pullnames[] = {
-                [NMK_GPIO_PULL_NONE]    = "none",
-                [NMK_GPIO_PULL_UP]      = "up",
-                [NMK_GPIO_PULL_DOWN]    = "down",
-                [3] /* illegal */       = "??"
-        };
-        static const char *slpmnames[] = {
-                [NMK_GPIO_SLPM_INPUT]           = "input/wakeup",
-                [NMK_GPIO_SLPM_NOCHANGE]        = "no-change/no-wakeup",
-        };
-
-        int pin = PIN_NUM(cfg);
-        int pull = PIN_PULL(cfg);
-        int af = PIN_ALT(cfg);
-        int slpm = PIN_SLPM(cfg);
-        int output = PIN_DIR(cfg);
-        int val = PIN_VAL(cfg);
-        bool glitch = af == NMK_GPIO_ALT_C;
-
-        dev_dbg(nmk_chip->chip.dev, "pin %d [%#lx]: af %s, pull %s, slpm %s (%s%s)\n",
-                pin, cfg, afnames[af], pullnames[pull], slpmnames[slpm],
-                output ? "output " : "input",
-                output ? (val ? "high" : "low") : "");
-
-        if (sleep) {
-                int slpm_pull = PIN_SLPM_PULL(cfg);
-                int slpm_output = PIN_SLPM_DIR(cfg);
-                int slpm_val = PIN_SLPM_VAL(cfg);
-
-                af = NMK_GPIO_ALT_GPIO;
-
-                /*
-                 * The SLPM_* values are normal values + 1 to allow zero to
-                 * mean "same as normal".
-                 */
-                if (slpm_pull)
-                        pull = slpm_pull - 1;
-                if (slpm_output)
-                        output = slpm_output - 1;
-                if (slpm_val)
-                        val = slpm_val - 1;
-
-                dev_dbg(nmk_chip->chip.dev, "pin %d: sleep pull %s, dir %s, val %s\n",
-                        pin,
-                        slpm_pull ? pullnames[pull] : "same",
-                        slpm_output ? (output ? "output" : "input") : "same",
-                        slpm_val ? (val ? "high" : "low") : "same");
-        }
-
-        if (output)
-                __nmk_gpio_make_output(nmk_chip, offset, val);
-        else {
-                __nmk_gpio_make_input(nmk_chip, offset);
-                __nmk_gpio_set_pull(nmk_chip, offset, pull);
-        }
-
-        /*
-         * If we've backed up the SLPM registers (glitch workaround), modify
-         * the backups since they will be restored.
-         */
-        if (slpmregs) {
-                if (slpm == NMK_GPIO_SLPM_NOCHANGE)
-                        slpmregs[nmk_chip->bank] |= BIT(offset);
-                else
-                        slpmregs[nmk_chip->bank] &= ~BIT(offset);
-        } else
-                __nmk_gpio_set_slpm(nmk_chip, offset, slpm);
-
-        __nmk_gpio_set_mode_safe(nmk_chip, offset, af, glitch);
-}
-
-/*
- * Safe sequence used to switch IOs between GPIO and Alternate-C mode:
- *  - Save SLPM registers
- *  - Set SLPM=0 for the IOs you want to switch and others to 1
- *  - Configure the GPIO registers for the IOs that are being switched
- *  - Set IOFORCE=1
- *  - Modify the AFLSA/B registers for the IOs that are being switched
- *  - Set IOFORCE=0
- *  - Restore SLPM registers
- *  - Any spurious wake up event during switch sequence to be ignored and
- *    cleared
- */
-static void nmk_gpio_glitch_slpm_init(unsigned int *slpm)
-{
-        int i;
-
-        for (i = 0; i < NUM_BANKS; i++) {
-                struct nmk_gpio_chip *chip = nmk_gpio_chips[i];
-                unsigned int temp = slpm[i];
-
-                if (!chip)
-                        break;
-
-                slpm[i] = readl(chip->addr + NMK_GPIO_SLPC);
-                writel(temp, chip->addr + NMK_GPIO_SLPC);
-        }
-}
-
-static void nmk_gpio_glitch_slpm_restore(unsigned int *slpm)
-{
-        int i;
-
-        for (i = 0; i < NUM_BANKS; i++) {
-                struct nmk_gpio_chip *chip = nmk_gpio_chips[i];
-
-                if (!chip)
-                        break;
-
-                writel(slpm[i], chip->addr + NMK_GPIO_SLPC);
-        }
-}
-
-static int __nmk_config_pins(pin_cfg_t *cfgs, int num, bool sleep)
-{
-        static unsigned int slpm[NUM_BANKS];
-        unsigned long flags;
-        bool glitch = false;
-        int ret = 0;
-        int i;
-
-        for (i = 0; i < num; i++) {
-                if (PIN_ALT(cfgs[i]) == NMK_GPIO_ALT_C) {
-                        glitch = true;
-                        break;
-                }
-        }
-
-        spin_lock_irqsave(&nmk_gpio_slpm_lock, flags);
-
-        if (glitch) {
-                memset(slpm, 0xff, sizeof(slpm));
-
-                for (i = 0; i < num; i++) {
-                        int pin = PIN_NUM(cfgs[i]);
-                        int offset = pin % NMK_GPIO_PER_CHIP;
-
-                        if (PIN_ALT(cfgs[i]) == NMK_GPIO_ALT_C)
-                                slpm[pin / NMK_GPIO_PER_CHIP] &= ~BIT(offset);
-                }
-
-                nmk_gpio_glitch_slpm_init(slpm);
-        }
-
-        for (i = 0; i < num; i++) {
-                struct nmk_gpio_chip *nmk_chip;
-                int pin = PIN_NUM(cfgs[i]);
-
-                nmk_chip = irq_get_chip_data(NOMADIK_GPIO_TO_IRQ(pin));
-                if (!nmk_chip) {
-                        ret = -EINVAL;
-                        break;
-                }
-
-                spin_lock(&nmk_chip->lock);
-                __nmk_config_pin(nmk_chip, pin - nmk_chip->chip.base,
-                                 cfgs[i], sleep, glitch ? slpm : NULL);
-                spin_unlock(&nmk_chip->lock);
-        }
-
-        if (glitch)
-                nmk_gpio_glitch_slpm_restore(slpm);
-
-        spin_unlock_irqrestore(&nmk_gpio_slpm_lock, flags);
-
-        return ret;
-}
-
-/**
- * nmk_config_pin - configure a pin's mux attributes
- * @cfg: pin confguration
- *
- * Configures a pin's mode (alternate function or GPIO), its pull up status,
- * and its sleep mode based on the specified configuration.  The @cfg is
- * usually one of the SoC specific macros defined in mach/<soc>-pins.h.  These
- * are constructed using, and can be further enhanced with, the macros in
- * plat/pincfg.h.
- *
- * If a pin's mode is set to GPIO, it is configured as an input to avoid
- * side-effects.  The gpio can be manipulated later using standard GPIO API
- * calls.
- */
-int nmk_config_pin(pin_cfg_t cfg, bool sleep)
-{
-        return __nmk_config_pins(&cfg, 1, sleep);
-}
-EXPORT_SYMBOL(nmk_config_pin);
-
-/**
- * nmk_config_pins - configure several pins at once
- * @cfgs: array of pin configurations
- * @num: number of elments in the array
- *
- * Configures several pins using nmk_config_pin().  Refer to that function for
- * further information.
- */
-int nmk_config_pins(pin_cfg_t *cfgs, int num)
-{
-        return __nmk_config_pins(cfgs, num, false);
-}
-EXPORT_SYMBOL(nmk_config_pins);
-
-int nmk_config_pins_sleep(pin_cfg_t *cfgs, int num)
-{
-        return __nmk_config_pins(cfgs, num, true);
-}
-EXPORT_SYMBOL(nmk_config_pins_sleep);
-
-/**
- * nmk_gpio_set_slpm() - configure the sleep mode of a pin
- * @gpio: pin number
- * @mode: NMK_GPIO_SLPM_INPUT or NMK_GPIO_SLPM_NOCHANGE,
- *
- * Sets the sleep mode of a pin.  If @mode is NMK_GPIO_SLPM_INPUT, the pin is
- * changed to an input (with pullup/down enabled) in sleep and deep sleep.  If
- * @mode is NMK_GPIO_SLPM_NOCHANGE, the pin remains in the state it was
- * configured even when in sleep and deep sleep.
- *
- * On DB8500v2 onwards, this setting loses the previous meaning and instead
- * indicates if wakeup detection is enabled on the pin.  Note that
- * enable_irq_wake() will automatically enable wakeup detection.
- */
-int nmk_gpio_set_slpm(int gpio, enum nmk_gpio_slpm mode)
-{
-        struct nmk_gpio_chip *nmk_chip;
-        unsigned long flags;
-
-        nmk_chip = irq_get_chip_data(NOMADIK_GPIO_TO_IRQ(gpio));
-        if (!nmk_chip)
-                return -EINVAL;
-
-        spin_lock_irqsave(&nmk_gpio_slpm_lock, flags);
-        spin_lock(&nmk_chip->lock);
-
-        __nmk_gpio_set_slpm(nmk_chip, gpio - nmk_chip->chip.base, mode);
-
-        spin_unlock(&nmk_chip->lock);
-        spin_unlock_irqrestore(&nmk_gpio_slpm_lock, flags);
-
-        return 0;
-}
-
-/**
- * nmk_gpio_set_pull() - enable/disable pull up/down on a gpio
- * @gpio: pin number
- * @pull: one of NMK_GPIO_PULL_DOWN, NMK_GPIO_PULL_UP, and NMK_GPIO_PULL_NONE
- *
- * Enables/disables pull up/down on a specified pin.  This only takes effect if
- * the pin is configured as an input (either explicitly or by the alternate
- * function).
- *
- * NOTE: If enabling the pull up/down, the caller must ensure that the GPIO is
- * configured as an input.  Otherwise, due to the way the controller registers
- * work, this function will change the value output on the pin.
- */
-int nmk_gpio_set_pull(int gpio, enum nmk_gpio_pull pull)
-{
-        struct nmk_gpio_chip *nmk_chip;
-        unsigned long flags;
-
-        nmk_chip = irq_get_chip_data(NOMADIK_GPIO_TO_IRQ(gpio));
-        if (!nmk_chip)
-                return -EINVAL;
-
-        spin_lock_irqsave(&nmk_chip->lock, flags);
-        __nmk_gpio_set_pull(nmk_chip, gpio - nmk_chip->chip.base, pull);
-        spin_unlock_irqrestore(&nmk_chip->lock, flags);
-
-        return 0;
-}
-
-/* Mode functions */
-/**
- * nmk_gpio_set_mode() - set the mux mode of a gpio pin
- * @gpio: pin number
- * @gpio_mode: one of NMK_GPIO_ALT_GPIO, NMK_GPIO_ALT_A,
- *             NMK_GPIO_ALT_B, and NMK_GPIO_ALT_C
- *
- * Sets the mode of the specified pin to one of the alternate functions or
- * plain GPIO.
- */
-int nmk_gpio_set_mode(int gpio, int gpio_mode)
-{
-        struct nmk_gpio_chip *nmk_chip;
-        unsigned long flags;
-
-        nmk_chip = irq_get_chip_data(NOMADIK_GPIO_TO_IRQ(gpio));
-        if (!nmk_chip)
-                return -EINVAL;
-
-        spin_lock_irqsave(&nmk_chip->lock, flags);
-        __nmk_gpio_set_mode(nmk_chip, gpio - nmk_chip->chip.base, gpio_mode);
-        spin_unlock_irqrestore(&nmk_chip->lock, flags);
-
-        return 0;
-}
-EXPORT_SYMBOL(nmk_gpio_set_mode);
-
-int nmk_gpio_get_mode(int gpio)
-{
-        struct nmk_gpio_chip *nmk_chip;
-        u32 afunc, bfunc, bit;
-
-        nmk_chip = irq_get_chip_data(NOMADIK_GPIO_TO_IRQ(gpio));
-        if (!nmk_chip)
-                return -EINVAL;
-
-        bit = 1 << (gpio - nmk_chip->chip.base);
-
-        afunc = readl(nmk_chip->addr + NMK_GPIO_AFSLA) & bit;
-        bfunc = readl(nmk_chip->addr + NMK_GPIO_AFSLB) & bit;
-
-        return (afunc ? NMK_GPIO_ALT_A : 0) | (bfunc ? NMK_GPIO_ALT_B : 0);
-}
-EXPORT_SYMBOL(nmk_gpio_get_mode);
-
-
-/* IRQ functions */
-static inline int nmk_gpio_get_bitmask(int gpio)
-{
-        return 1 << (gpio % 32);
-}
-
-static void nmk_gpio_irq_ack(struct irq_data *d)
-{
-        int gpio;
-        struct nmk_gpio_chip *nmk_chip;
-
-        gpio = NOMADIK_IRQ_TO_GPIO(d->irq);
-        nmk_chip = irq_data_get_irq_chip_data(d);
-        if (!nmk_chip)
-                return;
-        writel(nmk_gpio_get_bitmask(gpio), nmk_chip->addr + NMK_GPIO_IC);
-}
-
-enum nmk_gpio_irq_type {
-        NORMAL,
-        WAKE,
-};
-
-static void __nmk_gpio_irq_modify(struct nmk_gpio_chip *nmk_chip,
-                                  int gpio, enum nmk_gpio_irq_type which,
-                                  bool enable)
-{
-        u32 rimsc = which == WAKE ? NMK_GPIO_RWIMSC : NMK_GPIO_RIMSC;
-        u32 fimsc = which == WAKE ? NMK_GPIO_FWIMSC : NMK_GPIO_FIMSC;
-        u32 bitmask = nmk_gpio_get_bitmask(gpio);
-        u32 reg;
-
-        /* we must individually set/clear the two edges */
-        if (nmk_chip->edge_rising & bitmask) {
-                reg = readl(nmk_chip->addr + rimsc);
-                if (enable)
-                        reg |= bitmask;
-                else
-                        reg &= ~bitmask;
-                writel(reg, nmk_chip->addr + rimsc);
-        }
-        if (nmk_chip->edge_falling & bitmask) {
-                reg = readl(nmk_chip->addr + fimsc);
-                if (enable)
-                        reg |= bitmask;
-                else
-                        reg &= ~bitmask;
-                writel(reg, nmk_chip->addr + fimsc);
-        }
-}
-
-static void __nmk_gpio_set_wake(struct nmk_gpio_chip *nmk_chip,
-                                int gpio, bool on)
-{
-        __nmk_gpio_irq_modify(nmk_chip, gpio, WAKE, on);
-}
-
-static int nmk_gpio_irq_maskunmask(struct irq_data *d, bool enable)
-{
-        int gpio;
-        struct nmk_gpio_chip *nmk_chip;
-        unsigned long flags;
-        u32 bitmask;
-
-        gpio = NOMADIK_IRQ_TO_GPIO(d->irq);
-        nmk_chip = irq_data_get_irq_chip_data(d);
-        bitmask = nmk_gpio_get_bitmask(gpio);
-        if (!nmk_chip)
-                return -EINVAL;
-
-        if (enable)
-                nmk_chip->enabled |= bitmask;
-        else
-                nmk_chip->enabled &= ~bitmask;
-
-        spin_lock_irqsave(&nmk_gpio_slpm_lock, flags);
-        spin_lock(&nmk_chip->lock);
-
-        __nmk_gpio_irq_modify(nmk_chip, gpio, NORMAL, enable);
-
-        if (!(nmk_chip->real_wake & bitmask))
-                __nmk_gpio_set_wake(nmk_chip, gpio, enable);
-
-        spin_unlock(&nmk_chip->lock);
-        spin_unlock_irqrestore(&nmk_gpio_slpm_lock, flags);
-
-        return 0;
-}
-
-static void nmk_gpio_irq_mask(struct irq_data *d)
-{
-        nmk_gpio_irq_maskunmask(d, false);
-}
-
-static void nmk_gpio_irq_unmask(struct irq_data *d)
-{
-        nmk_gpio_irq_maskunmask(d, true);
-}
-
-static int nmk_gpio_irq_set_wake(struct irq_data *d, unsigned int on)
-{
-        struct nmk_gpio_chip *nmk_chip;
-        unsigned long flags;
-        u32 bitmask;
-        int gpio;
-
-        gpio = NOMADIK_IRQ_TO_GPIO(d->irq);
-        nmk_chip = irq_data_get_irq_chip_data(d);
-        if (!nmk_chip)
-                return -EINVAL;
-        bitmask = nmk_gpio_get_bitmask(gpio);
-
-        spin_lock_irqsave(&nmk_gpio_slpm_lock, flags);
-        spin_lock(&nmk_chip->lock);
-
-        if (!(nmk_chip->enabled & bitmask))
-                __nmk_gpio_set_wake(nmk_chip, gpio, on);
-
-        if (on)
-                nmk_chip->real_wake |= bitmask;
-        else
-                nmk_chip->real_wake &= ~bitmask;
-
-        spin_unlock(&nmk_chip->lock);
-        spin_unlock_irqrestore(&nmk_gpio_slpm_lock, flags);
-
-        return 0;
-}
-
-static int nmk_gpio_irq_set_type(struct irq_data *d, unsigned int type)
-{
-        bool enabled, wake = irqd_is_wakeup_set(d);
-        int gpio;
-        struct nmk_gpio_chip *nmk_chip;
-        unsigned long flags;
-        u32 bitmask;
-
-        gpio = NOMADIK_IRQ_TO_GPIO(d->irq);
-        nmk_chip = irq_data_get_irq_chip_data(d);
-        bitmask = nmk_gpio_get_bitmask(gpio);
-        if (!nmk_chip)
-                return -EINVAL;
-
-        if (type & IRQ_TYPE_LEVEL_HIGH)
-                return -EINVAL;
-        if (type & IRQ_TYPE_LEVEL_LOW)
-                return -EINVAL;
-
-        enabled = nmk_chip->enabled & bitmask;
-
-        spin_lock_irqsave(&nmk_chip->lock, flags);
-
-        if (enabled)
-                __nmk_gpio_irq_modify(nmk_chip, gpio, NORMAL, false);
-
-        if (enabled || wake)
-                __nmk_gpio_irq_modify(nmk_chip, gpio, WAKE, false);
-
-        nmk_chip->edge_rising &= ~bitmask;
-        if (type & IRQ_TYPE_EDGE_RISING)
-                nmk_chip->edge_rising |= bitmask;
-
-        nmk_chip->edge_falling &= ~bitmask;
-        if (type & IRQ_TYPE_EDGE_FALLING)
-                nmk_chip->edge_falling |= bitmask;
-
-        if (enabled)
-                __nmk_gpio_irq_modify(nmk_chip, gpio, NORMAL, true);
-
-        if (enabled || wake)
-                __nmk_gpio_irq_modify(nmk_chip, gpio, WAKE, true);
-
-        spin_unlock_irqrestore(&nmk_chip->lock, flags);
-
-        return 0;
-}
-
-static struct irq_chip nmk_gpio_irq_chip = {
-        .name           = "Nomadik-GPIO",
-        .irq_ack        = nmk_gpio_irq_ack,
-        .irq_mask       = nmk_gpio_irq_mask,
-        .irq_unmask     = nmk_gpio_irq_unmask,
-        .irq_set_type   = nmk_gpio_irq_set_type,
-        .irq_set_wake   = nmk_gpio_irq_set_wake,
-};
-
-static void __nmk_gpio_irq_handler(unsigned int irq, struct irq_desc *desc,
-                                   u32 status)
-{
-        struct nmk_gpio_chip *nmk_chip;
-        struct irq_chip *host_chip = irq_get_chip(irq);
-        unsigned int first_irq;
-
-        chained_irq_enter(host_chip, desc);
-
-        nmk_chip = irq_get_handler_data(irq);
-        first_irq = NOMADIK_GPIO_TO_IRQ(nmk_chip->chip.base);
-        while (status) {
-                int bit = __ffs(status);
-
-                generic_handle_irq(first_irq + bit);
-                status &= ~BIT(bit);
-        }
-
-        chained_irq_exit(host_chip, desc);
-}
-
-static void nmk_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
-{
-        struct nmk_gpio_chip *nmk_chip = irq_get_handler_data(irq);
-        u32 status = readl(nmk_chip->addr + NMK_GPIO_IS);
-
-        __nmk_gpio_irq_handler(irq, desc, status);
-}
-
-static void nmk_gpio_secondary_irq_handler(unsigned int irq,
-                                           struct irq_desc *desc)
-{
-        struct nmk_gpio_chip *nmk_chip = irq_get_handler_data(irq);
-        u32 status = nmk_chip->get_secondary_status(nmk_chip->bank);
-
-        __nmk_gpio_irq_handler(irq, desc, status);
-}
-
-static int nmk_gpio_init_irq(struct nmk_gpio_chip *nmk_chip)
-{
-        unsigned int first_irq;
-        int i;
-
-        first_irq = NOMADIK_GPIO_TO_IRQ(nmk_chip->chip.base);
-        for (i = first_irq; i < first_irq + nmk_chip->chip.ngpio; i++) {
-                irq_set_chip_and_handler(i, &nmk_gpio_irq_chip,
-                                         handle_edge_irq);
-                set_irq_flags(i, IRQF_VALID);
-                irq_set_chip_data(i, nmk_chip);
-                irq_set_irq_type(i, IRQ_TYPE_EDGE_FALLING);
-        }
-
-        irq_set_chained_handler(nmk_chip->parent_irq, nmk_gpio_irq_handler);
-        irq_set_handler_data(nmk_chip->parent_irq, nmk_chip);
-
-        if (nmk_chip->secondary_parent_irq >= 0) {
-                irq_set_chained_handler(nmk_chip->secondary_parent_irq,
-                                        nmk_gpio_secondary_irq_handler);
-                irq_set_handler_data(nmk_chip->secondary_parent_irq, nmk_chip);
-        }
-
-        return 0;
-}
-
-/* I/O Functions */
-static int nmk_gpio_make_input(struct gpio_chip *chip, unsigned offset)
-{
-        struct nmk_gpio_chip *nmk_chip =
-                container_of(chip, struct nmk_gpio_chip, chip);
-
-        writel(1 << offset, nmk_chip->addr + NMK_GPIO_DIRC);
-        return 0;
-}
-
-static int nmk_gpio_get_input(struct gpio_chip *chip, unsigned offset)
-{
-        struct nmk_gpio_chip *nmk_chip =
-                container_of(chip, struct nmk_gpio_chip, chip);
-        u32 bit = 1 << offset;
-
-        return (readl(nmk_chip->addr + NMK_GPIO_DAT) & bit) != 0;
-}
-
-static void nmk_gpio_set_output(struct gpio_chip *chip, unsigned offset,
-                                int val)
-{
-        struct nmk_gpio_chip *nmk_chip =
-                container_of(chip, struct nmk_gpio_chip, chip);
-
-        __nmk_gpio_set_output(nmk_chip, offset, val);
-}
-
-static int nmk_gpio_make_output(struct gpio_chip *chip, unsigned offset,
-                                int val)
-{
-        struct nmk_gpio_chip *nmk_chip =
-                container_of(chip, struct nmk_gpio_chip, chip);
-
-        __nmk_gpio_make_output(nmk_chip, offset, val);
-
-        return 0;
-}
-
-static int nmk_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
-{
-        struct nmk_gpio_chip *nmk_chip =
-                container_of(chip, struct nmk_gpio_chip, chip);
-
-        return NOMADIK_GPIO_TO_IRQ(nmk_chip->chip.base) + offset;
-}
-
-#ifdef CONFIG_DEBUG_FS
-
-#include <linux/seq_file.h>
-
-static void nmk_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
-{
-        int mode;
-        unsigned                i;
-        unsigned                gpio = chip->base;
-        int                     is_out;
-        struct nmk_gpio_chip *nmk_chip =
-                container_of(chip, struct nmk_gpio_chip, chip);
-        const char *modes[] = {
-                [NMK_GPIO_ALT_GPIO]     = "gpio",
-                [NMK_GPIO_ALT_A]        = "altA",
-                [NMK_GPIO_ALT_B]        = "altB",
-                [NMK_GPIO_ALT_C]        = "altC",
-        };
-
-        for (i = 0; i < chip->ngpio; i++, gpio++) {
-                const char *label = gpiochip_is_requested(chip, i);
-                bool pull;
-                u32 bit = 1 << i;
-
-                if (!label)
-                        continue;
-
-                is_out = readl(nmk_chip->addr + NMK_GPIO_DIR) & bit;
-                pull = !(readl(nmk_chip->addr + NMK_GPIO_PDIS) & bit);
-                mode = nmk_gpio_get_mode(gpio);
-                seq_printf(s, " gpio-%-3d (%-20.20s) %s %s %s %s",
-                        gpio, label,
-                        is_out ? "out" : "in ",
-                        chip->get
-                                ? (chip->get(chip, i) ? "hi" : "lo")
-                                : "?  ",
-                        (mode < 0) ? "unknown" : modes[mode],
-                        pull ? "pull" : "none");
-                seq_printf(s, "\n");
-        }
-}
-
-#else
-#define nmk_gpio_dbg_show       NULL
-#endif
-
-/* This structure is replicated for each GPIO block allocated at probe time */
-static struct gpio_chip nmk_gpio_template = {
-        .direction_input        = nmk_gpio_make_input,
-        .get                    = nmk_gpio_get_input,
-        .direction_output       = nmk_gpio_make_output,
-        .set                    = nmk_gpio_set_output,
-        .to_irq                 = nmk_gpio_to_irq,
-        .dbg_show               = nmk_gpio_dbg_show,
-        .can_sleep              = 0,
-};
-
-/*
- * Called from the suspend/resume path to only keep the real wakeup interrupts
- * (those that have had set_irq_wake() called on them) as wakeup interrupts,
- * and not the rest of the interrupts which we needed to have as wakeups for
- * cpuidle.
- *
- * PM ops are not used since this needs to be done at the end, after all the
- * other drivers are done with their suspend callbacks.
- */
-void nmk_gpio_wakeups_suspend(void)
-{
-        int i;
-
-        for (i = 0; i < NUM_BANKS; i++) {
-                struct nmk_gpio_chip *chip = nmk_gpio_chips[i];
-
-                if (!chip)
-                        break;
-
-                chip->rwimsc = readl(chip->addr + NMK_GPIO_RWIMSC);
-                chip->fwimsc = readl(chip->addr + NMK_GPIO_FWIMSC);
-
-                writel(chip->rwimsc & chip->real_wake,
-                       chip->addr + NMK_GPIO_RWIMSC);
-                writel(chip->fwimsc & chip->real_wake,
-                       chip->addr + NMK_GPIO_FWIMSC);
-
-                if (cpu_is_u8500v2()) {
-                        chip->slpm = readl(chip->addr + NMK_GPIO_SLPC);
-
-                        /* 0 -> wakeup enable */
-                        writel(~chip->real_wake, chip->addr + NMK_GPIO_SLPC);
-                }
-        }
-}
-
-void nmk_gpio_wakeups_resume(void)
-{
-        int i;
-
-        for (i = 0; i < NUM_BANKS; i++) {
-                struct nmk_gpio_chip *chip = nmk_gpio_chips[i];
-
-                if (!chip)
-                        break;
-
-                writel(chip->rwimsc, chip->addr + NMK_GPIO_RWIMSC);
-                writel(chip->fwimsc, chip->addr + NMK_GPIO_FWIMSC);
-
-                if (cpu_is_u8500v2())
-                        writel(chip->slpm, chip->addr + NMK_GPIO_SLPC);
-        }
-}
-
-static int __devinit nmk_gpio_probe(struct platform_device *dev)
-{
-        struct nmk_gpio_platform_data *pdata = dev->dev.platform_data;
-        struct nmk_gpio_chip *nmk_chip;
-        struct gpio_chip *chip;
-        struct resource *res;
-        struct clk *clk;
-        int secondary_irq;
-        int irq;
-        int ret;
-
-        if (!pdata)
-                return -ENODEV;
-
-        res = platform_get_resource(dev, IORESOURCE_MEM, 0);
-        if (!res) {
-                ret = -ENOENT;
-                goto out;
-        }
-
-        irq = platform_get_irq(dev, 0);
-        if (irq < 0) {
-                ret = irq;
-                goto out;
-        }
-
-        secondary_irq = platform_get_irq(dev, 1);
-        if (secondary_irq >= 0 && !pdata->get_secondary_status) {
-                ret = -EINVAL;
-                goto out;
-        }
-
-        if (request_mem_region(res->start, resource_size(res),
-                               dev_name(&dev->dev)) == NULL) {
-                ret = -EBUSY;
-                goto out;
-        }
-
-        clk = clk_get(&dev->dev, NULL);
-        if (IS_ERR(clk)) {
-                ret = PTR_ERR(clk);
-                goto out_release;
-        }
-
-        clk_enable(clk);
-
-        nmk_chip = kzalloc(sizeof(*nmk_chip), GFP_KERNEL);
-        if (!nmk_chip) {
-                ret = -ENOMEM;
-                goto out_clk;
-        }
-        /*
-         * The virt address in nmk_chip->addr is in the nomadik register space,
-         * so we can simply convert the resource address, without remapping
-         */
-        nmk_chip->bank = dev->id;
-        nmk_chip->clk = clk;
-        nmk_chip->addr = io_p2v(res->start);
-        nmk_chip->chip = nmk_gpio_template;
-        nmk_chip->parent_irq = irq;
-        nmk_chip->secondary_parent_irq = secondary_irq;
-        nmk_chip->get_secondary_status = pdata->get_secondary_status;
-        nmk_chip->set_ioforce = pdata->set_ioforce;
-        spin_lock_init(&nmk_chip->lock);
-
-        chip = &nmk_chip->chip;
-        chip->base = pdata->first_gpio;
-        chip->ngpio = pdata->num_gpio;
-        chip->label = pdata->name ?: dev_name(&dev->dev);
-        chip->dev = &dev->dev;
-        chip->owner = THIS_MODULE;
-
-        ret = gpiochip_add(&nmk_chip->chip);
-        if (ret)
-                goto out_free;
-
-        BUG_ON(nmk_chip->bank >= ARRAY_SIZE(nmk_gpio_chips));
-
-        nmk_gpio_chips[nmk_chip->bank] = nmk_chip;
-        platform_set_drvdata(dev, nmk_chip);
-
-        nmk_gpio_init_irq(nmk_chip);
-
-        dev_info(&dev->dev, "Bits %i-%i at address %p\n",
-                 nmk_chip->chip.base, nmk_chip->chip.base+31, nmk_chip->addr);
-        return 0;
-
-out_free:
-        kfree(nmk_chip);
-out_clk:
-        clk_disable(clk);
-        clk_put(clk);
-out_release:
-        release_mem_region(res->start, resource_size(res));
-out:
-        dev_err(&dev->dev, "Failure %i for GPIO %i-%i\n", ret,
-                  pdata->first_gpio, pdata->first_gpio+31);
-        return ret;
-}
-
-static struct platform_driver nmk_gpio_driver = {
-        .driver = {
-                .owner = THIS_MODULE,
-                .name = "gpio",
-        },
-        .probe = nmk_gpio_probe,
-};
-
-static int __init nmk_gpio_init(void)
-{
-        return platform_driver_register(&nmk_gpio_driver);
-}
-
-core_initcall(nmk_gpio_init);
-
-MODULE_AUTHOR("Prafulla WADASKAR and Alessandro Rubini");
-MODULE_DESCRIPTION("Nomadik GPIO Driver");
-MODULE_LICENSE("GPL");
-
-
diff --git a/arch/arm/plat-nomadik/include/plat/gpio.h b/arch/arm/plat-nomadik/include/plat/gpio.h
index 1b9f6f0843d1..ea19a5b2f227 100644
--- a/arch/arm/plat-nomadik/include/plat/gpio.h
+++ b/arch/arm/plat-nomadik/include/plat/gpio.h
@@ -78,6 +78,8 @@ extern int nmk_gpio_get_mode(int gpio);
 extern void nmk_gpio_wakeups_suspend(void);
 extern void nmk_gpio_wakeups_resume(void);
 
+extern void nmk_gpio_read_pull(int gpio_bank, u32 *pull_up);
+
 /*
  * Platform data to register a block: only the initial gpio/irq number.
  */
diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
index a4a12859fdd5..f0233e6abcdf 100644
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@ -3,7 +3,7 @@
 #
 
 # Common support
-obj-y := common.o sram.o clock.o devices.o dma.o mux.o gpio.o \
+obj-y := common.o sram.o clock.o devices.o dma.o mux.o \
          usb.o fb.o io.o counter_32k.o
 obj-m :=
 obj-n :=
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
deleted file mode 100644
index efb869390199..000000000000
--- a/arch/arm/plat-omap/gpio.c
+++ /dev/null
@@ -1,2112 +0,0 @@
-/*
- *  linux/arch/arm/plat-omap/gpio.c
- *
- * Support functions for OMAP GPIO
- *
- * Copyright (C) 2003-2005 Nokia Corporation
- * Written by Juha Yrjölä <juha.yrjola@nokia.com>
- *
- * Copyright (C) 2009 Texas Instruments
- * Added OMAP4 support - Santosh Shilimkar <santosh.shilimkar@ti.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/init.h>
-#include <linux/module.h>
-#include <linux/interrupt.h>
-#include <linux/syscore_ops.h>
-#include <linux/err.h>
-#include <linux/clk.h>
-#include <linux/io.h>
-#include <linux/slab.h>
-#include <linux/pm_runtime.h>
-
-#include <mach/hardware.h>
-#include <asm/irq.h>
-#include <mach/irqs.h>
-#include <mach/gpio.h>
-#include <asm/mach/irq.h>
-
-/*
- * OMAP1510 GPIO registers
- */
-#define OMAP1510_GPIO_DATA_INPUT        0x00
-#define OMAP1510_GPIO_DATA_OUTPUT       0x04
-#define OMAP1510_GPIO_DIR_CONTROL       0x08
-#define OMAP1510_GPIO_INT_CONTROL       0x0c
-#define OMAP1510_GPIO_INT_MASK          0x10
-#define OMAP1510_GPIO_INT_STATUS        0x14
-#define OMAP1510_GPIO_PIN_CONTROL       0x18
-
-#define OMAP1510_IH_GPIO_BASE           64
-
-/*
- * OMAP1610 specific GPIO registers
- */
-#define OMAP1610_GPIO_REVISION          0x0000
-#define OMAP1610_GPIO_SYSCONFIG         0x0010
-#define OMAP1610_GPIO_SYSSTATUS         0x0014
-#define OMAP1610_GPIO_IRQSTATUS1        0x0018
-#define OMAP1610_GPIO_IRQENABLE1        0x001c
-#define OMAP1610_GPIO_WAKEUPENABLE      0x0028
-#define OMAP1610_GPIO_DATAIN            0x002c
-#define OMAP1610_GPIO_DATAOUT           0x0030
-#define OMAP1610_GPIO_DIRECTION         0x0034
-#define OMAP1610_GPIO_EDGE_CTRL1        0x0038
-#define OMAP1610_GPIO_EDGE_CTRL2        0x003c
-#define OMAP1610_GPIO_CLEAR_IRQENABLE1  0x009c
-#define OMAP1610_GPIO_CLEAR_WAKEUPENA   0x00a8
-#define OMAP1610_GPIO_CLEAR_DATAOUT     0x00b0
-#define OMAP1610_GPIO_SET_IRQENABLE1    0x00dc
-#define OMAP1610_GPIO_SET_WAKEUPENA     0x00e8
-#define OMAP1610_GPIO_SET_DATAOUT       0x00f0
-
-/*
- * OMAP7XX specific GPIO registers
- */
-#define OMAP7XX_GPIO_DATA_INPUT         0x00
-#define OMAP7XX_GPIO_DATA_OUTPUT        0x04
-#define OMAP7XX_GPIO_DIR_CONTROL        0x08
-#define OMAP7XX_GPIO_INT_CONTROL        0x0c
-#define OMAP7XX_GPIO_INT_MASK           0x10
-#define OMAP7XX_GPIO_INT_STATUS         0x14
-
-/*
- * omap2+ specific GPIO registers
- */
-#define OMAP24XX_GPIO_REVISION          0x0000
-#define OMAP24XX_GPIO_IRQSTATUS1        0x0018
-#define OMAP24XX_GPIO_IRQSTATUS2        0x0028
-#define OMAP24XX_GPIO_IRQENABLE2        0x002c
-#define OMAP24XX_GPIO_IRQENABLE1        0x001c
-#define OMAP24XX_GPIO_WAKE_EN           0x0020
-#define OMAP24XX_GPIO_CTRL              0x0030
-#define OMAP24XX_GPIO_OE                0x0034
-#define OMAP24XX_GPIO_DATAIN            0x0038
-#define OMAP24XX_GPIO_DATAOUT           0x003c
-#define OMAP24XX_GPIO_LEVELDETECT0      0x0040
-#define OMAP24XX_GPIO_LEVELDETECT1      0x0044
-#define OMAP24XX_GPIO_RISINGDETECT      0x0048
-#define OMAP24XX_GPIO_FALLINGDETECT     0x004c
-#define OMAP24XX_GPIO_DEBOUNCE_EN       0x0050
-#define OMAP24XX_GPIO_DEBOUNCE_VAL      0x0054
-#define OMAP24XX_GPIO_CLEARIRQENABLE1   0x0060
-#define OMAP24XX_GPIO_SETIRQENABLE1     0x0064
-#define OMAP24XX_GPIO_CLEARWKUENA       0x0080
-#define OMAP24XX_GPIO_SETWKUENA         0x0084
-#define OMAP24XX_GPIO_CLEARDATAOUT      0x0090
-#define OMAP24XX_GPIO_SETDATAOUT        0x0094
-
-#define OMAP4_GPIO_REVISION             0x0000
-#define OMAP4_GPIO_EOI                  0x0020
-#define OMAP4_GPIO_IRQSTATUSRAW0        0x0024
-#define OMAP4_GPIO_IRQSTATUSRAW1        0x0028
-#define OMAP4_GPIO_IRQSTATUS0           0x002c
-#define OMAP4_GPIO_IRQSTATUS1           0x0030
-#define OMAP4_GPIO_IRQSTATUSSET0        0x0034
-#define OMAP4_GPIO_IRQSTATUSSET1        0x0038
-#define OMAP4_GPIO_IRQSTATUSCLR0        0x003c
-#define OMAP4_GPIO_IRQSTATUSCLR1        0x0040
-#define OMAP4_GPIO_IRQWAKEN0            0x0044
-#define OMAP4_GPIO_IRQWAKEN1            0x0048
-#define OMAP4_GPIO_IRQENABLE1           0x011c
-#define OMAP4_GPIO_WAKE_EN              0x0120
-#define OMAP4_GPIO_IRQSTATUS2           0x0128
-#define OMAP4_GPIO_IRQENABLE2           0x012c
-#define OMAP4_GPIO_CTRL                 0x0130
-#define OMAP4_GPIO_OE                   0x0134
-#define OMAP4_GPIO_DATAIN               0x0138
-#define OMAP4_GPIO_DATAOUT              0x013c
-#define OMAP4_GPIO_LEVELDETECT0         0x0140
-#define OMAP4_GPIO_LEVELDETECT1         0x0144
-#define OMAP4_GPIO_RISINGDETECT         0x0148
-#define OMAP4_GPIO_FALLINGDETECT        0x014c
-#define OMAP4_GPIO_DEBOUNCENABLE        0x0150
-#define OMAP4_GPIO_DEBOUNCINGTIME       0x0154
-#define OMAP4_GPIO_CLEARIRQENABLE1      0x0160
-#define OMAP4_GPIO_SETIRQENABLE1        0x0164
-#define OMAP4_GPIO_CLEARWKUENA          0x0180
-#define OMAP4_GPIO_SETWKUENA            0x0184
-#define OMAP4_GPIO_CLEARDATAOUT         0x0190
-#define OMAP4_GPIO_SETDATAOUT           0x0194
-
-struct gpio_bank {
-        unsigned long pbase;
-        void __iomem *base;
-        u16 irq;
-        u16 virtual_irq_start;
-        int method;
-#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2PLUS)
-        u32 suspend_wakeup;
-        u32 saved_wakeup;
-#endif
-        u32 non_wakeup_gpios;
-        u32 enabled_non_wakeup_gpios;
-
-        u32 saved_datain;
-        u32 saved_fallingdetect;
-        u32 saved_risingdetect;
-        u32 level_mask;
-        u32 toggle_mask;
-        spinlock_t lock;
-        struct gpio_chip chip;
-        struct clk *dbck;
-        u32 mod_usage;
-        u32 dbck_enable_mask;
-        struct device *dev;
-        bool dbck_flag;
-        int stride;
-};
-
-#ifdef CONFIG_ARCH_OMAP3
-struct omap3_gpio_regs {
-        u32 irqenable1;
-        u32 irqenable2;
-        u32 wake_en;
-        u32 ctrl;
-        u32 oe;
-        u32 leveldetect0;
-        u32 leveldetect1;
-        u32 risingdetect;
-        u32 fallingdetect;
-        u32 dataout;
-};
-
-static struct omap3_gpio_regs gpio_context[OMAP34XX_NR_GPIOS];
-#endif
-
-/*
- * TODO: Cleanup gpio_bank usage as it is having information
- * related to all instances of the device
- */
-static struct gpio_bank *gpio_bank;
-
-static int bank_width;
-
-/* TODO: Analyze removing gpio_bank_count usage from driver code */
-int gpio_bank_count;
-
-static inline struct gpio_bank *get_gpio_bank(int gpio)
-{
-        if (cpu_is_omap15xx()) {
-                if (OMAP_GPIO_IS_MPUIO(gpio))
-                        return &gpio_bank[0];
-                return &gpio_bank[1];
-        }
-        if (cpu_is_omap16xx()) {
-                if (OMAP_GPIO_IS_MPUIO(gpio))
-                        return &gpio_bank[0];
-                return &gpio_bank[1 + (gpio >> 4)];
-        }
-        if (cpu_is_omap7xx()) {
-                if (OMAP_GPIO_IS_MPUIO(gpio))
-                        return &gpio_bank[0];
-                return &gpio_bank[1 + (gpio >> 5)];
-        }
-        if (cpu_is_omap24xx())
-                return &gpio_bank[gpio >> 5];
-        if (cpu_is_omap34xx() || cpu_is_omap44xx())
-                return &gpio_bank[gpio >> 5];
-        BUG();
-        return NULL;
-}
-
-static inline int get_gpio_index(int gpio)
-{
-        if (cpu_is_omap7xx())
-                return gpio & 0x1f;
-        if (cpu_is_omap24xx())
-                return gpio & 0x1f;
-        if (cpu_is_omap34xx() || cpu_is_omap44xx())
-                return gpio & 0x1f;
-        return gpio & 0x0f;
-}
-
-static inline int gpio_valid(int gpio)
-{
-        if (gpio < 0)
-                return -1;
-        if (cpu_class_is_omap1() && OMAP_GPIO_IS_MPUIO(gpio)) {
-                if (gpio >= OMAP_MAX_GPIO_LINES + 16)
-                        return -1;
-                return 0;
-        }
-        if (cpu_is_omap15xx() && gpio < 16)
-                return 0;
-        if ((cpu_is_omap16xx()) && gpio < 64)
-                return 0;
-        if (cpu_is_omap7xx() && gpio < 192)
-                return 0;
-        if (cpu_is_omap2420() && gpio < 128)
-                return 0;
-        if (cpu_is_omap2430() && gpio < 160)
-                return 0;
-        if ((cpu_is_omap34xx() || cpu_is_omap44xx()) && gpio < 192)
-                return 0;
-        return -1;
-}
-
-static int check_gpio(int gpio)
-{
-        if (unlikely(gpio_valid(gpio) < 0)) {
-                printk(KERN_ERR "omap-gpio: invalid GPIO %d\n", gpio);
-                dump_stack();
-                return -1;
-        }
-        return 0;
-}
-
-static void _set_gpio_direction(struct gpio_bank *bank, int gpio, int is_input)
-{
-        void __iomem *reg = bank->base;
-        u32 l;
-
-        switch (bank->method) {
-#ifdef CONFIG_ARCH_OMAP1
-        case METHOD_MPUIO:
-                reg += OMAP_MPUIO_IO_CNTL / bank->stride;
-                break;
-#endif
-#ifdef CONFIG_ARCH_OMAP15XX
-        case METHOD_GPIO_1510:
-                reg += OMAP1510_GPIO_DIR_CONTROL;
-                break;
-#endif
-#ifdef CONFIG_ARCH_OMAP16XX
-        case METHOD_GPIO_1610:
-                reg += OMAP1610_GPIO_DIRECTION;
-                break;
-#endif
-#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
-        case METHOD_GPIO_7XX:
-                reg += OMAP7XX_GPIO_DIR_CONTROL;
-                break;
-#endif
-#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
-        case METHOD_GPIO_24XX:
-                reg += OMAP24XX_GPIO_OE;
-                break;
-#endif
-#if defined(CONFIG_ARCH_OMAP4)
-        case METHOD_GPIO_44XX:
-                reg += OMAP4_GPIO_OE;
-                break;
-#endif
-        default:
-                WARN_ON(1);
-                return;
-        }
-        l = __raw_readl(reg);
-        if (is_input)
-                l |= 1 << gpio;
-        else
-                l &= ~(1 << gpio);
-        __raw_writel(l, reg);
-}
-
-static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable)
-{
-        void __iomem *reg = bank->base;
-        u32 l = 0;
-
-        switch (bank->method) {
-#ifdef CONFIG_ARCH_OMAP1
-        case METHOD_MPUIO:
-                reg += OMAP_MPUIO_OUTPUT / bank->stride;
-                l = __raw_readl(reg);
-                if (enable)
-                        l |= 1 << gpio;
-                else
-                        l &= ~(1 << gpio);
-                break;
-#endif
-#ifdef CONFIG_ARCH_OMAP15XX
-        case METHOD_GPIO_1510:
-                reg += OMAP1510_GPIO_DATA_OUTPUT;
-                l = __raw_readl(reg);
-                if (enable)
-                        l |= 1 << gpio;
-                else
-                        l &= ~(1 << gpio);
-                break;
-#endif
-#ifdef CONFIG_ARCH_OMAP16XX
-        case METHOD_GPIO_1610:
-                if (enable)
-                        reg += OMAP1610_GPIO_SET_DATAOUT;
-                else
-                        reg += OMAP1610_GPIO_CLEAR_DATAOUT;
-                l = 1 << gpio;
-                break;
-#endif
-#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
-        case METHOD_GPIO_7XX:
-                reg += OMAP7XX_GPIO_DATA_OUTPUT;
-                l = __raw_readl(reg);
-                if (enable)
-                        l |= 1 << gpio;
-                else
-                        l &= ~(1 << gpio);
-                break;
-#endif
-#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
-        case METHOD_GPIO_24XX:
-                if (enable)
-                        reg += OMAP24XX_GPIO_SETDATAOUT;
-                else
-                        reg += OMAP24XX_GPIO_CLEARDATAOUT;
-                l = 1 << gpio;
-                break;
-#endif
-#ifdef CONFIG_ARCH_OMAP4
-        case METHOD_GPIO_44XX:
-                if (enable)
-                        reg += OMAP4_GPIO_SETDATAOUT;
-                else
-                        reg += OMAP4_GPIO_CLEARDATAOUT;
-                l = 1 << gpio;
-                break;
-#endif
-        default:
-                WARN_ON(1);
-                return;
-        }
-        __raw_writel(l, reg);
-}
-
-static int _get_gpio_datain(struct gpio_bank *bank, int gpio)
-{
-        void __iomem *reg;
-
-        if (check_gpio(gpio) < 0)
-                return -EINVAL;
-        reg = bank->base;
-        switch (bank->method) {
-#ifdef CONFIG_ARCH_OMAP1
-        case METHOD_MPUIO:
-                reg += OMAP_MPUIO_INPUT_LATCH / bank->stride;
-                break;
-#endif
-#ifdef CONFIG_ARCH_OMAP15XX
-        case METHOD_GPIO_1510:
-                reg += OMAP1510_GPIO_DATA_INPUT;
-                break;
-#endif
-#ifdef CONFIG_ARCH_OMAP16XX
-        case METHOD_GPIO_1610:
-                reg += OMAP1610_GPIO_DATAIN;
-                break;
-#endif
-#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
-        case METHOD_GPIO_7XX:
-                reg += OMAP7XX_GPIO_DATA_INPUT;
-                break;
-#endif
-#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
-        case METHOD_GPIO_24XX:
-                reg += OMAP24XX_GPIO_DATAIN;
-                break;
-#endif
-#ifdef CONFIG_ARCH_OMAP4
-        case METHOD_GPIO_44XX:
-                reg += OMAP4_GPIO_DATAIN;
-                break;
-#endif
-        default:
-                return -EINVAL;
-        }
-        return (__raw_readl(reg)
-                        & (1 << get_gpio_index(gpio))) != 0;
-}
-
-static int _get_gpio_dataout(struct gpio_bank *bank, int gpio)
-{
-        void __iomem *reg;
-
-        if (check_gpio(gpio) < 0)
-                return -EINVAL;
-        reg = bank->base;
-
-        switch (bank->method) {
-#ifdef CONFIG_ARCH_OMAP1
-        case METHOD_MPUIO:
-                reg += OMAP_MPUIO_OUTPUT / bank->stride;
-                break;
-#endif
-#ifdef CONFIG_ARCH_OMAP15XX
-        case METHOD_GPIO_1510:
-                reg += OMAP1510_GPIO_DATA_OUTPUT;
-                break;
-#endif
-#ifdef CONFIG_ARCH_OMAP16XX
-        case METHOD_GPIO_1610:
-                reg += OMAP1610_GPIO_DATAOUT;
-                break;
-#endif
-#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
-        case METHOD_GPIO_7XX:
-                reg += OMAP7XX_GPIO_DATA_OUTPUT;
-                break;
-#endif
-#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
-        case METHOD_GPIO_24XX:
-                reg += OMAP24XX_GPIO_DATAOUT;
-                break;
-#endif
-#ifdef CONFIG_ARCH_OMAP4
-        case METHOD_GPIO_44XX:
-                reg += OMAP4_GPIO_DATAOUT;
-                break;
-#endif
-        default:
-                return -EINVAL;
-        }
-
-        return (__raw_readl(reg) & (1 << get_gpio_index(gpio))) != 0;
-}
-
-#define MOD_REG_BIT(reg, bit_mask, set) \
-do {    \
-        int l = __raw_readl(base + reg); \
-        if (set) l |= bit_mask; \
-        else l &= ~bit_mask; \
-        __raw_writel(l, base + reg); \
-} while(0)
-
-/**
- * _set_gpio_debounce - low level gpio debounce time
- * @bank: the gpio bank we're acting upon
- * @gpio: the gpio number on this @gpio
- * @debounce: debounce time to use
- *
- * OMAP's debounce time is in 31us steps so we need
- * to convert and round up to the closest unit.
- */
-static void _set_gpio_debounce(struct gpio_bank *bank, unsigned gpio,
-                unsigned debounce)
-{
-        void __iomem            *reg = bank->base;
-        u32                     val;
-        u32                     l;
-
-        if (!bank->dbck_flag)
-                return;
-
-        if (debounce < 32)
-                debounce = 0x01;
-        else if (debounce > 7936)
-                debounce = 0xff;
-        else
-                debounce = (debounce / 0x1f) - 1;
-
-        l = 1 << get_gpio_index(gpio);
-
-        if (bank->method == METHOD_GPIO_44XX)
-                reg += OMAP4_GPIO_DEBOUNCINGTIME;
-        else
-                reg += OMAP24XX_GPIO_DEBOUNCE_VAL;
-
-        __raw_writel(debounce, reg);
-
-        reg = bank->base;
-        if (bank->method == METHOD_GPIO_44XX)
-                reg += OMAP4_GPIO_DEBOUNCENABLE;
-        else
-                reg += OMAP24XX_GPIO_DEBOUNCE_EN;
-
-        val = __raw_readl(reg);
-
-        if (debounce) {
-                val |= l;
-                clk_enable(bank->dbck);
-        } else {
-                val &= ~l;
-                clk_disable(bank->dbck);
-        }
-        bank->dbck_enable_mask = val;
-
-        __raw_writel(val, reg);
-}
-
-#ifdef CONFIG_ARCH_OMAP2PLUS
-static inline void set_24xx_gpio_triggering(struct gpio_bank *bank, int gpio,
-                                                int trigger)
-{
-        void __iomem *base = bank->base;
-        u32 gpio_bit = 1 << gpio;
-        u32 val;
-
-        if (cpu_is_omap44xx()) {
-                MOD_REG_BIT(OMAP4_GPIO_LEVELDETECT0, gpio_bit,
-                        trigger & IRQ_TYPE_LEVEL_LOW);
-                MOD_REG_BIT(OMAP4_GPIO_LEVELDETECT1, gpio_bit,
-                        trigger & IRQ_TYPE_LEVEL_HIGH);
-                MOD_REG_BIT(OMAP4_GPIO_RISINGDETECT, gpio_bit,
-                        trigger & IRQ_TYPE_EDGE_RISING);
-                MOD_REG_BIT(OMAP4_GPIO_FALLINGDETECT, gpio_bit,
-                        trigger & IRQ_TYPE_EDGE_FALLING);
-        } else {
-                MOD_REG_BIT(OMAP24XX_GPIO_LEVELDETECT0, gpio_bit,
-                        trigger & IRQ_TYPE_LEVEL_LOW);
-                MOD_REG_BIT(OMAP24XX_GPIO_LEVELDETECT1, gpio_bit,
-                        trigger & IRQ_TYPE_LEVEL_HIGH);
-                MOD_REG_BIT(OMAP24XX_GPIO_RISINGDETECT, gpio_bit,
-                        trigger & IRQ_TYPE_EDGE_RISING);
-                MOD_REG_BIT(OMAP24XX_GPIO_FALLINGDETECT, gpio_bit,
-                        trigger & IRQ_TYPE_EDGE_FALLING);
-        }
-        if (likely(!(bank->non_wakeup_gpios & gpio_bit))) {
-                if (cpu_is_omap44xx()) {
-                        if (trigger != 0)
-                                __raw_writel(1 << gpio, bank->base+
-                                                OMAP4_GPIO_IRQWAKEN0);
-                        else {
-                                val = __raw_readl(bank->base +
-                                                        OMAP4_GPIO_IRQWAKEN0);
-                                __raw_writel(val & (~(1 << gpio)), bank->base +
-                                                         OMAP4_GPIO_IRQWAKEN0);
-                        }
-                } else {
-                        /*
-                         * GPIO wakeup request can only be generated on edge
-                         * transitions
-                         */
-                        if (trigger & IRQ_TYPE_EDGE_BOTH)
-                                __raw_writel(1 << gpio, bank->base
-                                        + OMAP24XX_GPIO_SETWKUENA);
-                        else
-                                __raw_writel(1 << gpio, bank->base
-                                        + OMAP24XX_GPIO_CLEARWKUENA);
-                }
-        }
-        /* This part needs to be executed always for OMAP34xx */
-        if (cpu_is_omap34xx() || (bank->non_wakeup_gpios & gpio_bit)) {
-                /*
-                 * Log the edge gpio and manually trigger the IRQ
-                 * after resume if the input level changes
-                 * to avoid irq lost during PER RET/OFF mode
-                 * Applies for omap2 non-wakeup gpio and all omap3 gpios
-                 */
-                if (trigger & IRQ_TYPE_EDGE_BOTH)
-                        bank->enabled_non_wakeup_gpios |= gpio_bit;
-                else
-                        bank->enabled_non_wakeup_gpios &= ~gpio_bit;
-        }
-
-        if (cpu_is_omap44xx()) {
-                bank->level_mask =
-                        __raw_readl(bank->base + OMAP4_GPIO_LEVELDETECT0) |
-                        __raw_readl(bank->base + OMAP4_GPIO_LEVELDETECT1);
-        } else {
-                bank->level_mask =
-                        __raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT0) |
-                        __raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT1);
-        }
-}
-#endif
-
-#ifdef CONFIG_ARCH_OMAP1
-/*
- * This only applies to chips that can't do both rising and falling edge
- * detection at once.  For all other chips, this function is a noop.
- */
-static void _toggle_gpio_edge_triggering(struct gpio_bank *bank, int gpio)
-{
-        void __iomem *reg = bank->base;
-        u32 l = 0;
-
-        switch (bank->method) {
-        case METHOD_MPUIO:
-                reg += OMAP_MPUIO_GPIO_INT_EDGE / bank->stride;
-                break;
-#ifdef CONFIG_ARCH_OMAP15XX
-        case METHOD_GPIO_1510:
-                reg += OMAP1510_GPIO_INT_CONTROL;
-                break;
-#endif
-#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
-        case METHOD_GPIO_7XX:
-                reg += OMAP7XX_GPIO_INT_CONTROL;
-                break;
-#endif
-        default:
-                return;
-        }
-
-        l = __raw_readl(reg);
-        if ((l >> gpio) & 1)
-                l &= ~(1 << gpio);
-        else
-                l |= 1 << gpio;
-
-        __raw_writel(l, reg);
-}
-#endif
-
-static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)
-{
-        void __iomem *reg = bank->base;
-        u32 l = 0;
-
-        switch (bank->method) {
-#ifdef CONFIG_ARCH_OMAP1
-        case METHOD_MPUIO:
-                reg += OMAP_MPUIO_GPIO_INT_EDGE / bank->stride;
-                l = __raw_readl(reg);
-                if ((trigger & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_EDGE_BOTH)
-                        bank->toggle_mask |= 1 << gpio;
-                if (trigger & IRQ_TYPE_EDGE_RISING)
-                        l |= 1 << gpio;
-                else if (trigger & IRQ_TYPE_EDGE_FALLING)
-                        l &= ~(1 << gpio);
-                else
-                        goto bad;
-                break;
-#endif
-#ifdef CONFIG_ARCH_OMAP15XX
-        case METHOD_GPIO_1510:
-                reg += OMAP1510_GPIO_INT_CONTROL;
-                l = __raw_readl(reg);
-                if ((trigger & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_EDGE_BOTH)
-                        bank->toggle_mask |= 1 << gpio;
-                if (trigger & IRQ_TYPE_EDGE_RISING)
-                        l |= 1 << gpio;
-                else if (trigger & IRQ_TYPE_EDGE_FALLING)
-                        l &= ~(1 << gpio);
-                else
-                        goto bad;
-                break;
-#endif
-#ifdef CONFIG_ARCH_OMAP16XX
-        case METHOD_GPIO_1610:
-                if (gpio & 0x08)
-                        reg += OMAP1610_GPIO_EDGE_CTRL2;
-                else
-                        reg += OMAP1610_GPIO_EDGE_CTRL1;
-                gpio &= 0x07;
-                l = __raw_readl(reg);
-                l &= ~(3 << (gpio << 1));
-                if (trigger & IRQ_TYPE_EDGE_RISING)
-                        l |= 2 << (gpio << 1);
-                if (trigger & IRQ_TYPE_EDGE_FALLING)
-                        l |= 1 << (gpio << 1);
-                if (trigger)
-                        /* Enable wake-up during idle for dynamic tick */
-                        __raw_writel(1 << gpio, bank->base + OMAP1610_GPIO_SET_WAKEUPENA);
-                else
-                        __raw_writel(1 << gpio, bank->base + OMAP1610_GPIO_CLEAR_WAKEUPENA);
-                break;
-#endif
-#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
-        case METHOD_GPIO_7XX:
-                reg += OMAP7XX_GPIO_INT_CONTROL;
-                l = __raw_readl(reg);
-                if ((trigger & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_EDGE_BOTH)
-                        bank->toggle_mask |= 1 << gpio;
-                if (trigger & IRQ_TYPE_EDGE_RISING)
-                        l |= 1 << gpio;
-                else if (trigger & IRQ_TYPE_EDGE_FALLING)
-                        l &= ~(1 << gpio);
-                else
-                        goto bad;
-                break;
-#endif
-#ifdef CONFIG_ARCH_OMAP2PLUS
-        case METHOD_GPIO_24XX:
-        case METHOD_GPIO_44XX:
-                set_24xx_gpio_triggering(bank, gpio, trigger);
-                return 0;
-#endif
-        default:
-                goto bad;
-        }
-        __raw_writel(l, reg);
-        return 0;
-bad:
-        return -EINVAL;
-}
-
-static int gpio_irq_type(struct irq_data *d, unsigned type)
-{
-        struct gpio_bank *bank;
-        unsigned gpio;
-        int retval;
-        unsigned long flags;
-
-        if (!cpu_class_is_omap2() && d->irq > IH_MPUIO_BASE)
-                gpio = OMAP_MPUIO(d->irq - IH_MPUIO_BASE);
-        else
-                gpio = d->irq - IH_GPIO_BASE;
-
-        if (check_gpio(gpio) < 0)
-                return -EINVAL;
-
-        if (type & ~IRQ_TYPE_SENSE_MASK)
-                return -EINVAL;
-
-        /* OMAP1 allows only only edge triggering */
-        if (!cpu_class_is_omap2()
-                        && (type & (IRQ_TYPE_LEVEL_LOW|IRQ_TYPE_LEVEL_HIGH)))
-                return -EINVAL;
-
-        bank = irq_data_get_irq_chip_data(d);
-        spin_lock_irqsave(&bank->lock, flags);
-        retval = _set_gpio_triggering(bank, get_gpio_index(gpio), type);
-        spin_unlock_irqrestore(&bank->lock, flags);
-
-        if (type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH))
-                __irq_set_handler_locked(d->irq, handle_level_irq);
-        else if (type & (IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_EDGE_RISING))
-                __irq_set_handler_locked(d->irq, handle_edge_irq);
-
-        return retval;
-}
-
-static void _clear_gpio_irqbank(struct gpio_bank *bank, int gpio_mask)
-{
-        void __iomem *reg = bank->base;
-
-        switch (bank->method) {
-#ifdef CONFIG_ARCH_OMAP1
-        case METHOD_MPUIO:
-                /* MPUIO irqstatus is reset by reading the status register,
-                 * so do nothing here */
-                return;
-#endif
-#ifdef CONFIG_ARCH_OMAP15XX
-        case METHOD_GPIO_1510:
-                reg += OMAP1510_GPIO_INT_STATUS;
-                break;
-#endif
-#ifdef CONFIG_ARCH_OMAP16XX
-        case METHOD_GPIO_1610:
-                reg += OMAP1610_GPIO_IRQSTATUS1;
-                break;
-#endif
-#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
-        case METHOD_GPIO_7XX:
-                reg += OMAP7XX_GPIO_INT_STATUS;
-                break;
-#endif
-#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
-        case METHOD_GPIO_24XX:
-                reg += OMAP24XX_GPIO_IRQSTATUS1;
-                break;
-#endif
-#if defined(CONFIG_ARCH_OMAP4)
-        case METHOD_GPIO_44XX:
-                reg += OMAP4_GPIO_IRQSTATUS0;
-                break;
-#endif
-        default:
-                WARN_ON(1);
-                return;
-        }
-        __raw_writel(gpio_mask, reg);
-
-        /* Workaround for clearing DSP GPIO interrupts to allow retention */
-        if (cpu_is_omap24xx() || cpu_is_omap34xx())
-                reg = bank->base + OMAP24XX_GPIO_IRQSTATUS2;
-        else if (cpu_is_omap44xx())
-                reg = bank->base + OMAP4_GPIO_IRQSTATUS1;
-
-        if (cpu_is_omap24xx() || cpu_is_omap34xx() || cpu_is_omap44xx()) {
-                __raw_writel(gpio_mask, reg);
-
-        /* Flush posted write for the irq status to avoid spurious interrupts */
-        __raw_readl(reg);
-        }
-}
-
-static inline void _clear_gpio_irqstatus(struct gpio_bank *bank, int gpio)
-{
-        _clear_gpio_irqbank(bank, 1 << get_gpio_index(gpio));
-}
-
-static u32 _get_gpio_irqbank_mask(struct gpio_bank *bank)
-{
-        void __iomem *reg = bank->base;
-        int inv = 0;
-        u32 l;
-        u32 mask;
-
-        switch (bank->method) {
-#ifdef CONFIG_ARCH_OMAP1
-        case METHOD_MPUIO:
-                reg += OMAP_MPUIO_GPIO_MASKIT / bank->stride;
-                mask = 0xffff;
-                inv = 1;
-                break;
-#endif
-#ifdef CONFIG_ARCH_OMAP15XX
-        case METHOD_GPIO_1510:
-                reg += OMAP1510_GPIO_INT_MASK;
-                mask = 0xffff;
-                inv = 1;
-                break;
-#endif
-#ifdef CONFIG_ARCH_OMAP16XX
-        case METHOD_GPIO_1610:
-                reg += OMAP1610_GPIO_IRQENABLE1;
-                mask = 0xffff;
-                break;
-#endif
-#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
-        case METHOD_GPIO_7XX:
-                reg += OMAP7XX_GPIO_INT_MASK;
-                mask = 0xffffffff;
-                inv = 1;
-                break;
-#endif
-#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
-        case METHOD_GPIO_24XX:
-                reg += OMAP24XX_GPIO_IRQENABLE1;
-                mask = 0xffffffff;
-                break;
-#endif
-#if defined(CONFIG_ARCH_OMAP4)
-        case METHOD_GPIO_44XX:
-                reg += OMAP4_GPIO_IRQSTATUSSET0;
-                mask = 0xffffffff;
-                break;
-#endif
-        default:
-                WARN_ON(1);
-                return 0;
-        }
-
-        l = __raw_readl(reg);
-        if (inv)
-                l = ~l;
-        l &= mask;
-        return l;
-}
-
-static void _enable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask, int enable)
-{
-        void __iomem *reg = bank->base;
-        u32 l;
-
-        switch (bank->method) {
-#ifdef CONFIG_ARCH_OMAP1
-        case METHOD_MPUIO:
-                reg += OMAP_MPUIO_GPIO_MASKIT / bank->stride;
-                l = __raw_readl(reg);
-                if (enable)
-                        l &= ~(gpio_mask);
-                else
-                        l |= gpio_mask;
-                break;
-#endif
-#ifdef CONFIG_ARCH_OMAP15XX
-        case METHOD_GPIO_1510:
-                reg += OMAP1510_GPIO_INT_MASK;
-                l = __raw_readl(reg);
-                if (enable)
-                        l &= ~(gpio_mask);
-                else
-                        l |= gpio_mask;
-                break;
-#endif
-#ifdef CONFIG_ARCH_OMAP16XX
-        case METHOD_GPIO_1610:
-                if (enable)
-                        reg += OMAP1610_GPIO_SET_IRQENABLE1;
-                else
-                        reg += OMAP1610_GPIO_CLEAR_IRQENABLE1;
-                l = gpio_mask;
-                break;
-#endif
-#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
-        case METHOD_GPIO_7XX:
-                reg += OMAP7XX_GPIO_INT_MASK;
-                l = __raw_readl(reg);
-                if (enable)
-                        l &= ~(gpio_mask);
-                else
-                        l |= gpio_mask;
-                break;
-#endif
-#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
-        case METHOD_GPIO_24XX:
-                if (enable)
-                        reg += OMAP24XX_GPIO_SETIRQENABLE1;
-                else
-                        reg += OMAP24XX_GPIO_CLEARIRQENABLE1;
-                l = gpio_mask;
-                break;
-#endif
-#ifdef CONFIG_ARCH_OMAP4
-        case METHOD_GPIO_44XX:
-                if (enable)
-                        reg += OMAP4_GPIO_IRQSTATUSSET0;
-                else
-                        reg += OMAP4_GPIO_IRQSTATUSCLR0;
-                l = gpio_mask;
-                break;
-#endif
-        default:
-                WARN_ON(1);
-                return;
-        }
-        __raw_writel(l, reg);
-}
-
-static inline void _set_gpio_irqenable(struct gpio_bank *bank, int gpio, int enable)
-{
-        _enable_gpio_irqbank(bank, 1 << get_gpio_index(gpio), enable);
-}
-
-/*
- * Note that ENAWAKEUP needs to be enabled in GPIO_SYSCONFIG register.
- * 1510 does not seem to have a wake-up register. If JTAG is connected
- * to the target, system will wake up always on GPIO events. While
- * system is running all registered GPIO interrupts need to have wake-up
- * enabled. When system is suspended, only selected GPIO interrupts need
- * to have wake-up enabled.
- */
-static int _set_gpio_wakeup(struct gpio_bank *bank, int gpio, int enable)
-{
-        unsigned long uninitialized_var(flags);
-
-        switch (bank->method) {
-#ifdef CONFIG_ARCH_OMAP16XX
-        case METHOD_MPUIO:
-        case METHOD_GPIO_1610:
-                spin_lock_irqsave(&bank->lock, flags);
-                if (enable)
-                        bank->suspend_wakeup |= (1 << gpio);
-                else
-                        bank->suspend_wakeup &= ~(1 << gpio);
-                spin_unlock_irqrestore(&bank->lock, flags);
-                return 0;
-#endif
-#ifdef CONFIG_ARCH_OMAP2PLUS
-        case METHOD_GPIO_24XX:
-        case METHOD_GPIO_44XX:
-                if (bank->non_wakeup_gpios & (1 << gpio)) {
-                        printk(KERN_ERR "Unable to modify wakeup on "
-                                        "non-wakeup GPIO%d\n",
-                                        (bank - gpio_bank) * 32 + gpio);
-                        return -EINVAL;
-                }
-                spin_lock_irqsave(&bank->lock, flags);
-                if (enable)
-                        bank->suspend_wakeup |= (1 << gpio);
-                else
-                        bank->suspend_wakeup &= ~(1 << gpio);
-                spin_unlock_irqrestore(&bank->lock, flags);
-                return 0;
-#endif
-        default:
-                printk(KERN_ERR "Can't enable GPIO wakeup for method %i\n",
-                       bank->method);
-                return -EINVAL;
-        }
-}
-
-static void _reset_gpio(struct gpio_bank *bank, int gpio)
-{
-        _set_gpio_direction(bank, get_gpio_index(gpio), 1);
-        _set_gpio_irqenable(bank, gpio, 0);
-        _clear_gpio_irqstatus(bank, gpio);
-        _set_gpio_triggering(bank, get_gpio_index(gpio), IRQ_TYPE_NONE);
-}
-
-/* Use disable_irq_wake() and enable_irq_wake() functions from drivers */
-static int gpio_wake_enable(struct irq_data *d, unsigned int enable)
-{
-        unsigned int gpio = d->irq - IH_GPIO_BASE;
-        struct gpio_bank *bank;
-        int retval;
-
-        if (check_gpio(gpio) < 0)
-                return -ENODEV;
-        bank = irq_data_get_irq_chip_data(d);
-        retval = _set_gpio_wakeup(bank, get_gpio_index(gpio), enable);
-
-        return retval;
-}
-
-static int omap_gpio_request(struct gpio_chip *chip, unsigned offset)
-{
-        struct gpio_bank *bank = container_of(chip, struct gpio_bank, chip);
-        unsigned long flags;
-
-        spin_lock_irqsave(&bank->lock, flags);
-
-        /* Set trigger to none. You need to enable the desired trigger with
-         * request_irq() or set_irq_type().
-         */
-        _set_gpio_triggering(bank, offset, IRQ_TYPE_NONE);
-
-#ifdef CONFIG_ARCH_OMAP15XX
-        if (bank->method == METHOD_GPIO_1510) {
-                void __iomem *reg;
-
-                /* Claim the pin for MPU */
-                reg = bank->base + OMAP1510_GPIO_PIN_CONTROL;
-                __raw_writel(__raw_readl(reg) | (1 << offset), reg);
-        }
-#endif
-        if (!cpu_class_is_omap1()) {
-                if (!bank->mod_usage) {
-                        void __iomem *reg = bank->base;
-                        u32 ctrl;
-
-                        if (cpu_is_omap24xx() || cpu_is_omap34xx())
-                                reg += OMAP24XX_GPIO_CTRL;
-                        else if (cpu_is_omap44xx())
-                                reg += OMAP4_GPIO_CTRL;
-                        ctrl = __raw_readl(reg);
-                        /* Module is enabled, clocks are not gated */
-                        ctrl &= 0xFFFFFFFE;
-                        __raw_writel(ctrl, reg);
-                }
-                bank->mod_usage |= 1 << offset;
-        }
-        spin_unlock_irqrestore(&bank->lock, flags);
-
-        return 0;
-}
-
-static void omap_gpio_free(struct gpio_chip *chip, unsigned offset)
-{
-        struct gpio_bank *bank = container_of(chip, struct gpio_bank, chip);
-        unsigned long flags;
-
-        spin_lock_irqsave(&bank->lock, flags);
-#ifdef CONFIG_ARCH_OMAP16XX
-        if (bank->method == METHOD_GPIO_1610) {
-                /* Disable wake-up during idle for dynamic tick */
-                void __iomem *reg = bank->base + OMAP1610_GPIO_CLEAR_WAKEUPENA;
-                __raw_writel(1 << offset, reg);
-        }
-#endif
-#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
-        if (bank->method == METHOD_GPIO_24XX) {
-                /* Disable wake-up during idle for dynamic tick */
-                void __iomem *reg = bank->base + OMAP24XX_GPIO_CLEARWKUENA;
-                __raw_writel(1 << offset, reg);
-        }
-#endif
-#ifdef CONFIG_ARCH_OMAP4
-        if (bank->method == METHOD_GPIO_44XX) {
-                /* Disable wake-up during idle for dynamic tick */
-                void __iomem *reg = bank->base + OMAP4_GPIO_IRQWAKEN0;
-                __raw_writel(1 << offset, reg);
-        }
-#endif
-        if (!cpu_class_is_omap1()) {
-                bank->mod_usage &= ~(1 << offset);
-                if (!bank->mod_usage) {
-                        void __iomem *reg = bank->base;
-                        u32 ctrl;
-
-                        if (cpu_is_omap24xx() || cpu_is_omap34xx())
-                                reg += OMAP24XX_GPIO_CTRL;
-                        else if (cpu_is_omap44xx())
-                                reg += OMAP4_GPIO_CTRL;
-                        ctrl = __raw_readl(reg);
-                        /* Module is disabled, clocks are gated */
-                        ctrl |= 1;
-                        __raw_writel(ctrl, reg);
-                }
-        }
-        _reset_gpio(bank, bank->chip.base + offset);
-        spin_unlock_irqrestore(&bank->lock, flags);
-}
-
-/*
- * We need to unmask the GPIO bank interrupt as soon as possible to
- * avoid missing GPIO interrupts for other lines in the bank.
- * Then we need to mask-read-clear-unmask the triggered GPIO lines
- * in the bank to avoid missing nested interrupts for a GPIO line.
- * If we wait to unmask individual GPIO lines in the bank after the
- * line's interrupt handler has been run, we may miss some nested
- * interrupts.
- */
-static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
-{
-        void __iomem *isr_reg = NULL;
-        u32 isr;
-        unsigned int gpio_irq, gpio_index;
-        struct gpio_bank *bank;
-        u32 retrigger = 0;
-        int unmasked = 0;
-        struct irq_chip *chip = irq_desc_get_chip(desc);
-
-        chained_irq_enter(chip, desc);
-
-        bank = irq_get_handler_data(irq);
-#ifdef CONFIG_ARCH_OMAP1
-        if (bank->method == METHOD_MPUIO)
-                isr_reg = bank->base +
-                                OMAP_MPUIO_GPIO_INT / bank->stride;
-#endif
-#ifdef CONFIG_ARCH_OMAP15XX
-        if (bank->method == METHOD_GPIO_1510)
-                isr_reg = bank->base + OMAP1510_GPIO_INT_STATUS;
-#endif
-#if defined(CONFIG_ARCH_OMAP16XX)
-        if (bank->method == METHOD_GPIO_1610)
-                isr_reg = bank->base + OMAP1610_GPIO_IRQSTATUS1;
-#endif
-#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
-        if (bank->method == METHOD_GPIO_7XX)
-                isr_reg = bank->base + OMAP7XX_GPIO_INT_STATUS;
-#endif
-#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
-        if (bank->method == METHOD_GPIO_24XX)
-                isr_reg = bank->base + OMAP24XX_GPIO_IRQSTATUS1;
-#endif
-#if defined(CONFIG_ARCH_OMAP4)
-        if (bank->method == METHOD_GPIO_44XX)
-                isr_reg = bank->base + OMAP4_GPIO_IRQSTATUS0;
-#endif
-
-        if (WARN_ON(!isr_reg))
-                goto exit;
-
-        while(1) {
-                u32 isr_saved, level_mask = 0;
-                u32 enabled;
-
-                enabled = _get_gpio_irqbank_mask(bank);
-                isr_saved = isr = __raw_readl(isr_reg) & enabled;
-
-                if (cpu_is_omap15xx() && (bank->method == METHOD_MPUIO))
-                        isr &= 0x0000ffff;
-
-                if (cpu_class_is_omap2()) {
-                        level_mask = bank->level_mask & enabled;
-                }
-
-                /* clear edge sensitive interrupts before handler(s) are
-                called so that we don't miss any interrupt occurred while
-                executing them */
-                _enable_gpio_irqbank(bank, isr_saved & ~level_mask, 0);
-                _clear_gpio_irqbank(bank, isr_saved & ~level_mask);
-                _enable_gpio_irqbank(bank, isr_saved & ~level_mask, 1);
-
-                /* if there is only edge sensitive GPIO pin interrupts
-                configured, we could unmask GPIO bank interrupt immediately */
-                if (!level_mask && !unmasked) {
-                        unmasked = 1;
-                        chained_irq_exit(chip, desc);
-                }
-
-                isr |= retrigger;
-                retrigger = 0;
-                if (!isr)
-                        break;
-
-                gpio_irq = bank->virtual_irq_start;
-                for (; isr != 0; isr >>= 1, gpio_irq++) {
-                        gpio_index = get_gpio_index(irq_to_gpio(gpio_irq));
-
-                        if (!(isr & 1))
-                                continue;
-
-#ifdef CONFIG_ARCH_OMAP1
-                        /*
-                         * Some chips can't respond to both rising and falling
-                         * at the same time.  If this irq was requested with
-                         * both flags, we need to flip the ICR data for the IRQ
-                         * to respond to the IRQ for the opposite direction.
-                         * This will be indicated in the bank toggle_mask.
-                         */
-                        if (bank->toggle_mask & (1 << gpio_index))
-                                _toggle_gpio_edge_triggering(bank, gpio_index);
-#endif
-
-                        generic_handle_irq(gpio_irq);
-                }
-        }
-        /* if bank has any level sensitive GPIO pin interrupt
-        configured, we must unmask the bank interrupt only after
-        handler(s) are executed in order to avoid spurious bank
-        interrupt */
-exit:
-        if (!unmasked)
-                chained_irq_exit(chip, desc);
-}
-
-static void gpio_irq_shutdown(struct irq_data *d)
-{
-        unsigned int gpio = d->irq - IH_GPIO_BASE;
-        struct gpio_bank *bank = irq_data_get_irq_chip_data(d);
-
-        _reset_gpio(bank, gpio);
-}
-
-static void gpio_ack_irq(struct irq_data *d)
-{
-        unsigned int gpio = d->irq - IH_GPIO_BASE;
-        struct gpio_bank *bank = irq_data_get_irq_chip_data(d);
-
-        _clear_gpio_irqstatus(bank, gpio);
-}
-
-static void gpio_mask_irq(struct irq_data *d)
-{
-        unsigned int gpio = d->irq - IH_GPIO_BASE;
-        struct gpio_bank *bank = irq_data_get_irq_chip_data(d);
-
-        _set_gpio_irqenable(bank, gpio, 0);
-        _set_gpio_triggering(bank, get_gpio_index(gpio), IRQ_TYPE_NONE);
-}
-
-static void gpio_unmask_irq(struct irq_data *d)
-{
-        unsigned int gpio = d->irq - IH_GPIO_BASE;
-        struct gpio_bank *bank = irq_data_get_irq_chip_data(d);
-        unsigned int irq_mask = 1 << get_gpio_index(gpio);
-        u32 trigger = irqd_get_trigger_type(d);
-
-        if (trigger)
-                _set_gpio_triggering(bank, get_gpio_index(gpio), trigger);
-
-        /* For level-triggered GPIOs, the clearing must be done after
-         * the HW source is cleared, thus after the handler has run */
-        if (bank->level_mask & irq_mask) {
-                _set_gpio_irqenable(bank, gpio, 0);
-                _clear_gpio_irqstatus(bank, gpio);
-        }
-
-        _set_gpio_irqenable(bank, gpio, 1);
-}
-
-static struct irq_chip gpio_irq_chip = {
-        .name           = "GPIO",
-        .irq_shutdown   = gpio_irq_shutdown,
-        .irq_ack        = gpio_ack_irq,
-        .irq_mask       = gpio_mask_irq,
-        .irq_unmask     = gpio_unmask_irq,
-        .irq_set_type   = gpio_irq_type,
-        .irq_set_wake   = gpio_wake_enable,
-};
-
-/*---------------------------------------------------------------------*/
-
-#ifdef CONFIG_ARCH_OMAP1
-
-/* MPUIO uses the always-on 32k clock */
-
-static void mpuio_ack_irq(struct irq_data *d)
-{
-        /* The ISR is reset automatically, so do nothing here. */
-}
-
-static void mpuio_mask_irq(struct irq_data *d)
-{
-        unsigned int gpio = OMAP_MPUIO(d->irq - IH_MPUIO_BASE);
-        struct gpio_bank *bank = irq_data_get_irq_chip_data(d);
-
-        _set_gpio_irqenable(bank, gpio, 0);
-}
-
-static void mpuio_unmask_irq(struct irq_data *d)
-{
-        unsigned int gpio = OMAP_MPUIO(d->irq - IH_MPUIO_BASE);
-        struct gpio_bank *bank = irq_data_get_irq_chip_data(d);
-
-        _set_gpio_irqenable(bank, gpio, 1);
-}
-
-static struct irq_chip mpuio_irq_chip = {
-        .name           = "MPUIO",
-        .irq_ack        = mpuio_ack_irq,
-        .irq_mask       = mpuio_mask_irq,
-        .irq_unmask     = mpuio_unmask_irq,
-        .irq_set_type   = gpio_irq_type,
-#ifdef CONFIG_ARCH_OMAP16XX
-        /* REVISIT: assuming only 16xx supports MPUIO wake events */
-        .irq_set_wake   = gpio_wake_enable,
-#endif
-};
-
-
-#define bank_is_mpuio(bank)     ((bank)->method == METHOD_MPUIO)
-
-
-#ifdef CONFIG_ARCH_OMAP16XX
-
-#include <linux/platform_device.h>
-
-static int omap_mpuio_suspend_noirq(struct device *dev)
-{
-        struct platform_device *pdev = to_platform_device(dev);
-        struct gpio_bank        *bank = platform_get_drvdata(pdev);
-        void __iomem            *mask_reg = bank->base +
-                                        OMAP_MPUIO_GPIO_MASKIT / bank->stride;
-        unsigned long           flags;
-
-        spin_lock_irqsave(&bank->lock, flags);
-        bank->saved_wakeup = __raw_readl(mask_reg);
-        __raw_writel(0xffff & ~bank->suspend_wakeup, mask_reg);
-        spin_unlock_irqrestore(&bank->lock, flags);
-
-        return 0;
-}
-
-static int omap_mpuio_resume_noirq(struct device *dev)
-{
-        struct platform_device *pdev = to_platform_device(dev);
-        struct gpio_bank        *bank = platform_get_drvdata(pdev);
-        void __iomem            *mask_reg = bank->base +
-                                        OMAP_MPUIO_GPIO_MASKIT / bank->stride;
-        unsigned long           flags;
-
-        spin_lock_irqsave(&bank->lock, flags);
-        __raw_writel(bank->saved_wakeup, mask_reg);
-        spin_unlock_irqrestore(&bank->lock, flags);
-
-        return 0;
-}
-
-static const struct dev_pm_ops omap_mpuio_dev_pm_ops = {
-        .suspend_noirq = omap_mpuio_suspend_noirq,
-        .resume_noirq = omap_mpuio_resume_noirq,
-};
-
-/* use platform_driver for this. */
-static struct platform_driver omap_mpuio_driver = {
-        .driver         = {
-                .name   = "mpuio",
-                .pm     = &omap_mpuio_dev_pm_ops,
-        },
-};
-
-static struct platform_device omap_mpuio_device = {
-        .name           = "mpuio",
-        .id             = -1,
-        .dev = {
-                .driver = &omap_mpuio_driver.driver,
-        }
-        /* could list the /proc/iomem resources */
-};
-
-static inline void mpuio_init(void)
-{
-        struct gpio_bank *bank = get_gpio_bank(OMAP_MPUIO(0));
-        platform_set_drvdata(&omap_mpuio_device, bank);
-
-        if (platform_driver_register(&omap_mpuio_driver) == 0)
-                (void) platform_device_register(&omap_mpuio_device);
-}
-
-#else
-static inline void mpuio_init(void) {}
-#endif  /* 16xx */
-
-#else
-
-extern struct irq_chip mpuio_irq_chip;
-
-#define bank_is_mpuio(bank)     0
-static inline void mpuio_init(void) {}
-
-#endif
-
-/*---------------------------------------------------------------------*/
-
-/* REVISIT these are stupid implementations!  replace by ones that
- * don't switch on METHOD_* and which mostly avoid spinlocks
- */
-
-static int gpio_input(struct gpio_chip *chip, unsigned offset)
-{
-        struct gpio_bank *bank;
-        unsigned long flags;
-
-        bank = container_of(chip, struct gpio_bank, chip);
-        spin_lock_irqsave(&bank->lock, flags);
-        _set_gpio_direction(bank, offset, 1);
-        spin_unlock_irqrestore(&bank->lock, flags);
-        return 0;
-}
-
-static int gpio_is_input(struct gpio_bank *bank, int mask)
-{
-        void __iomem *reg = bank->base;
-
-        switch (bank->method) {
-        case METHOD_MPUIO:
-                reg += OMAP_MPUIO_IO_CNTL / bank->stride;
-                break;
-        case METHOD_GPIO_1510:
-                reg += OMAP1510_GPIO_DIR_CONTROL;
-                break;
-        case METHOD_GPIO_1610:
-                reg += OMAP1610_GPIO_DIRECTION;
-                break;
-        case METHOD_GPIO_7XX:
-                reg += OMAP7XX_GPIO_DIR_CONTROL;
-                break;
-        case METHOD_GPIO_24XX:
-                reg += OMAP24XX_GPIO_OE;
-                break;
-        case METHOD_GPIO_44XX:
-                reg += OMAP4_GPIO_OE;
-                break;
-        default:
-                WARN_ONCE(1, "gpio_is_input: incorrect OMAP GPIO method");
-                return -EINVAL;
-        }
-        return __raw_readl(reg) & mask;
-}
-
-static int gpio_get(struct gpio_chip *chip, unsigned offset)
-{
-        struct gpio_bank *bank;
-        void __iomem *reg;
-        int gpio;
-        u32 mask;
-
-        gpio = chip->base + offset;
-        bank = get_gpio_bank(gpio);
-        reg = bank->base;
-        mask = 1 << get_gpio_index(gpio);
-
-        if (gpio_is_input(bank, mask))
-                return _get_gpio_datain(bank, gpio);
-        else
-                return _get_gpio_dataout(bank, gpio);
-}
-
-static int gpio_output(struct gpio_chip *chip, unsigned offset, int value)
-{
-        struct gpio_bank *bank;
-        unsigned long flags;
-
-        bank = container_of(chip, struct gpio_bank, chip);
-        spin_lock_irqsave(&bank->lock, flags);
-        _set_gpio_dataout(bank, offset, value);
-        _set_gpio_direction(bank, offset, 0);
-        spin_unlock_irqrestore(&bank->lock, flags);
-        return 0;
-}
-
-static int gpio_debounce(struct gpio_chip *chip, unsigned offset,
-                unsigned debounce)
-{
-        struct gpio_bank *bank;
-        unsigned long flags;
-
-        bank = container_of(chip, struct gpio_bank, chip);
-
-        if (!bank->dbck) {
-                bank->dbck = clk_get(bank->dev, "dbclk");
-                if (IS_ERR(bank->dbck))
-                        dev_err(bank->dev, "Could not get gpio dbck\n");
-        }
-
-        spin_lock_irqsave(&bank->lock, flags);
-        _set_gpio_debounce(bank, offset, debounce);
-        spin_unlock_irqrestore(&bank->lock, flags);
-
-        return 0;
-}
-
-static void gpio_set(struct gpio_chip *chip, unsigned offset, int value)
-{
-        struct gpio_bank *bank;
-        unsigned long flags;
-
-        bank = container_of(chip, struct gpio_bank, chip);
-        spin_lock_irqsave(&bank->lock, flags);
-        _set_gpio_dataout(bank, offset, value);
-        spin_unlock_irqrestore(&bank->lock, flags);
-}
-
-static int gpio_2irq(struct gpio_chip *chip, unsigned offset)
-{
-        struct gpio_bank *bank;
-
-        bank = container_of(chip, struct gpio_bank, chip);
-        return bank->virtual_irq_start + offset;
-}
-
-/*---------------------------------------------------------------------*/
-
-static void __init omap_gpio_show_rev(struct gpio_bank *bank)
-{
-        u32 rev;
-
-        if (cpu_is_omap16xx() && !(bank->method != METHOD_MPUIO))
-                rev = __raw_readw(bank->base + OMAP1610_GPIO_REVISION);
-        else if (cpu_is_omap24xx() || cpu_is_omap34xx())
-                rev = __raw_readl(bank->base + OMAP24XX_GPIO_REVISION);
-        else if (cpu_is_omap44xx())
-                rev = __raw_readl(bank->base + OMAP4_GPIO_REVISION);
-        else
-                return;
-
-        printk(KERN_INFO "OMAP GPIO hardware version %d.%d\n",
-                (rev >> 4) & 0x0f, rev & 0x0f);
-}
-
-/* This lock class tells lockdep that GPIO irqs are in a different
- * category than their parents, so it won't report false recursion.
- */
-static struct lock_class_key gpio_lock_class;
-
-static inline int init_gpio_info(struct platform_device *pdev)
-{
-        /* TODO: Analyze removing gpio_bank_count usage from driver code */
-        gpio_bank = kzalloc(gpio_bank_count * sizeof(struct gpio_bank),
-                                GFP_KERNEL);
-        if (!gpio_bank) {
-                dev_err(&pdev->dev, "Memory alloc failed for gpio_bank\n");
-                return -ENOMEM;
-        }
-        return 0;
-}
-
-/* TODO: Cleanup cpu_is_* checks */
-static void omap_gpio_mod_init(struct gpio_bank *bank, int id)
-{
-        if (cpu_class_is_omap2()) {
-                if (cpu_is_omap44xx()) {
-                        __raw_writel(0xffffffff, bank->base +
-                                        OMAP4_GPIO_IRQSTATUSCLR0);
-                        __raw_writel(0x00000000, bank->base +
-                                         OMAP4_GPIO_DEBOUNCENABLE);
-                        /* Initialize interface clk ungated, module enabled */
-                        __raw_writel(0, bank->base + OMAP4_GPIO_CTRL);
-                } else if (cpu_is_omap34xx()) {
-                        __raw_writel(0x00000000, bank->base +
-                                        OMAP24XX_GPIO_IRQENABLE1);
-                        __raw_writel(0xffffffff, bank->base +
-                                        OMAP24XX_GPIO_IRQSTATUS1);
-                        __raw_writel(0x00000000, bank->base +
-                                        OMAP24XX_GPIO_DEBOUNCE_EN);
-
-                        /* Initialize interface clk ungated, module enabled */
-                        __raw_writel(0, bank->base + OMAP24XX_GPIO_CTRL);
-                } else if (cpu_is_omap24xx()) {
-                        static const u32 non_wakeup_gpios[] = {
-                                0xe203ffc0, 0x08700040
-                        };
-                        if (id < ARRAY_SIZE(non_wakeup_gpios))
-                                bank->non_wakeup_gpios = non_wakeup_gpios[id];
-                }
-        } else if (cpu_class_is_omap1()) {
-                if (bank_is_mpuio(bank))
-                        __raw_writew(0xffff, bank->base +
-                                OMAP_MPUIO_GPIO_MASKIT / bank->stride);
-                if (cpu_is_omap15xx() && bank->method == METHOD_GPIO_1510) {
-                        __raw_writew(0xffff, bank->base
-                                                + OMAP1510_GPIO_INT_MASK);
-                        __raw_writew(0x0000, bank->base
-                                                + OMAP1510_GPIO_INT_STATUS);
-                }
-                if (cpu_is_omap16xx() && bank->method == METHOD_GPIO_1610) {
-                        __raw_writew(0x0000, bank->base
-                                                + OMAP1610_GPIO_IRQENABLE1);
-                        __raw_writew(0xffff, bank->base
-                                                + OMAP1610_GPIO_IRQSTATUS1);
-                        __raw_writew(0x0014, bank->base
-                                                + OMAP1610_GPIO_SYSCONFIG);
-
-                        /*
-                         * Enable system clock for GPIO module.
-                         * The CAM_CLK_CTRL *is* really the right place.
-                         */
-                        omap_writel(omap_readl(ULPD_CAM_CLK_CTRL) | 0x04,
-                                                ULPD_CAM_CLK_CTRL);
-                }
-                if (cpu_is_omap7xx() && bank->method == METHOD_GPIO_7XX) {
-                        __raw_writel(0xffffffff, bank->base
-                                                + OMAP7XX_GPIO_INT_MASK);
-                        __raw_writel(0x00000000, bank->base
-                                                + OMAP7XX_GPIO_INT_STATUS);
-                }
-        }
-}
-
-static void __init omap_gpio_chip_init(struct gpio_bank *bank)
-{
-        int j;
-        static int gpio;
-
-        bank->mod_usage = 0;
-        /*
-         * REVISIT eventually switch from OMAP-specific gpio structs
-         * over to the generic ones
-         */
-        bank->chip.request = omap_gpio_request;
-        bank->chip.free = omap_gpio_free;
-        bank->chip.direction_input = gpio_input;
-        bank->chip.get = gpio_get;
-        bank->chip.direction_output = gpio_output;
-        bank->chip.set_debounce = gpio_debounce;
-        bank->chip.set = gpio_set;
-        bank->chip.to_irq = gpio_2irq;
-        if (bank_is_mpuio(bank)) {
-                bank->chip.label = "mpuio";
-#ifdef CONFIG_ARCH_OMAP16XX
-                bank->chip.dev = &omap_mpuio_device.dev;
-#endif
-                bank->chip.base = OMAP_MPUIO(0);
-        } else {
-                bank->chip.label = "gpio";
-                bank->chip.base = gpio;
-                gpio += bank_width;
-        }
-        bank->chip.ngpio = bank_width;
-
-        gpiochip_add(&bank->chip);
-
-        for (j = bank->virtual_irq_start;
-                     j < bank->virtual_irq_start + bank_width; j++) {
-                irq_set_lockdep_class(j, &gpio_lock_class);
-                irq_set_chip_data(j, bank);
-                if (bank_is_mpuio(bank))
-                        irq_set_chip(j, &mpuio_irq_chip);
-                else
-                        irq_set_chip(j, &gpio_irq_chip);
-                irq_set_handler(j, handle_simple_irq);
-                set_irq_flags(j, IRQF_VALID);
-        }
-        irq_set_chained_handler(bank->irq, gpio_irq_handler);
-        irq_set_handler_data(bank->irq, bank);
-}
-
-static int __devinit omap_gpio_probe(struct platform_device *pdev)
-{
-        static int gpio_init_done;
-        struct omap_gpio_platform_data *pdata;
-        struct resource *res;
-        int id;
-        struct gpio_bank *bank;
-
-        if (!pdev->dev.platform_data)
-                return -EINVAL;
-
-        pdata = pdev->dev.platform_data;
-
-        if (!gpio_init_done) {
-                int ret;
-
-                ret = init_gpio_info(pdev);
-                if (ret)
-                        return ret;
-        }
-
-        id = pdev->id;
-        bank = &gpio_bank[id];
-
-        res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-        if (unlikely(!res)) {
-                dev_err(&pdev->dev, "GPIO Bank %i Invalid IRQ resource\n", id);
-                return -ENODEV;
-        }
-
-        bank->irq = res->start;
-        bank->virtual_irq_start = pdata->virtual_irq_start;
-        bank->method = pdata->bank_type;
-        bank->dev = &pdev->dev;
-        bank->dbck_flag = pdata->dbck_flag;
-        bank->stride = pdata->bank_stride;
-        bank_width = pdata->bank_width;
-
-        spin_lock_init(&bank->lock);
-
-        /* Static mapping, never released */
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (unlikely(!res)) {
-                dev_err(&pdev->dev, "GPIO Bank %i Invalid mem resource\n", id);
-                return -ENODEV;
-        }
-
-        bank->base = ioremap(res->start, resource_size(res));
-        if (!bank->base) {
-                dev_err(&pdev->dev, "Could not ioremap gpio bank%i\n", id);
-                return -ENOMEM;
-        }
-
-        pm_runtime_enable(bank->dev);
-        pm_runtime_get_sync(bank->dev);
-
-        omap_gpio_mod_init(bank, id);
-        omap_gpio_chip_init(bank);
-        omap_gpio_show_rev(bank);
-
-        if (!gpio_init_done)
-                gpio_init_done = 1;
-
-        return 0;
-}
-
-#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2PLUS)
-static int omap_gpio_suspend(void)
-{
-        int i;
-
-        if (!cpu_class_is_omap2() && !cpu_is_omap16xx())
-                return 0;
-
-        for (i = 0; i < gpio_bank_count; i++) {
-                struct gpio_bank *bank = &gpio_bank[i];
-                void __iomem *wake_status;
-                void __iomem *wake_clear;
-                void __iomem *wake_set;
-                unsigned long flags;
-
-                switch (bank->method) {
-#ifdef CONFIG_ARCH_OMAP16XX
-                case METHOD_GPIO_1610:
-                        wake_status = bank->base + OMAP1610_GPIO_WAKEUPENABLE;
-                        wake_clear = bank->base + OMAP1610_GPIO_CLEAR_WAKEUPENA;
-                        wake_set = bank->base + OMAP1610_GPIO_SET_WAKEUPENA;
-                        break;
-#endif
-#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
-                case METHOD_GPIO_24XX:
-                        wake_status = bank->base + OMAP24XX_GPIO_WAKE_EN;
-                        wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA;
-                        wake_set = bank->base + OMAP24XX_GPIO_SETWKUENA;
-                        break;
-#endif
-#ifdef CONFIG_ARCH_OMAP4
-                case METHOD_GPIO_44XX:
-                        wake_status = bank->base + OMAP4_GPIO_IRQWAKEN0;
-                        wake_clear = bank->base + OMAP4_GPIO_IRQWAKEN0;
-                        wake_set = bank->base + OMAP4_GPIO_IRQWAKEN0;
-                        break;
-#endif
-                default:
-                        continue;
-                }
-
-                spin_lock_irqsave(&bank->lock, flags);
-                bank->saved_wakeup = __raw_readl(wake_status);
-                __raw_writel(0xffffffff, wake_clear);
-                __raw_writel(bank->suspend_wakeup, wake_set);
-                spin_unlock_irqrestore(&bank->lock, flags);
-        }
-
-        return 0;
-}
-
-static void omap_gpio_resume(void)
-{
-        int i;
-
-        if (!cpu_class_is_omap2() && !cpu_is_omap16xx())
-                return;
-
-        for (i = 0; i < gpio_bank_count; i++) {
-                struct gpio_bank *bank = &gpio_bank[i];
-                void __iomem *wake_clear;
-                void __iomem *wake_set;
-                unsigned long flags;
-
-                switch (bank->method) {
-#ifdef CONFIG_ARCH_OMAP16XX
-                case METHOD_GPIO_1610:
-                        wake_clear = bank->base + OMAP1610_GPIO_CLEAR_WAKEUPENA;
-                        wake_set = bank->base + OMAP1610_GPIO_SET_WAKEUPENA;
-                        break;
-#endif
-#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
-                case METHOD_GPIO_24XX:
-                        wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA;
-                        wake_set = bank->base + OMAP24XX_GPIO_SETWKUENA;
-                        break;
-#endif
-#ifdef CONFIG_ARCH_OMAP4
-                case METHOD_GPIO_44XX:
-                        wake_clear = bank->base + OMAP4_GPIO_IRQWAKEN0;
-                        wake_set = bank->base + OMAP4_GPIO_IRQWAKEN0;
-                        break;
-#endif
-                default:
-                        continue;
-                }
-
-                spin_lock_irqsave(&bank->lock, flags);
-                __raw_writel(0xffffffff, wake_clear);
-                __raw_writel(bank->saved_wakeup, wake_set);
-                spin_unlock_irqrestore(&bank->lock, flags);
-        }
-}
-
-static struct syscore_ops omap_gpio_syscore_ops = {
-        .suspend        = omap_gpio_suspend,
-        .resume         = omap_gpio_resume,
-};
-
-#endif
-
-#ifdef CONFIG_ARCH_OMAP2PLUS
-
-static int workaround_enabled;
-
-void omap2_gpio_prepare_for_idle(int off_mode)
-{
-        int i, c = 0;
-        int min = 0;
-
-        if (cpu_is_omap34xx())
-                min = 1;
-
-        for (i = min; i < gpio_bank_count; i++) {
-                struct gpio_bank *bank = &gpio_bank[i];
-                u32 l1 = 0, l2 = 0;
-                int j;
-
-                for (j = 0; j < hweight_long(bank->dbck_enable_mask); j++)
-                        clk_disable(bank->dbck);
-
-                if (!off_mode)
-                        continue;
-
-                /* If going to OFF, remove triggering for all
-                 * non-wakeup GPIOs.  Otherwise spurious IRQs will be
-                 * generated.  See OMAP2420 Errata item 1.101. */
-                if (!(bank->enabled_non_wakeup_gpios))
-                        continue;
-
-                if (cpu_is_omap24xx() || cpu_is_omap34xx()) {
-                        bank->saved_datain = __raw_readl(bank->base +
-                                        OMAP24XX_GPIO_DATAIN);
-                        l1 = __raw_readl(bank->base +
-                                        OMAP24XX_GPIO_FALLINGDETECT);
-                        l2 = __raw_readl(bank->base +
-                                        OMAP24XX_GPIO_RISINGDETECT);
-                }
-
-                if (cpu_is_omap44xx()) {
-                        bank->saved_datain = __raw_readl(bank->base +
-                                                OMAP4_GPIO_DATAIN);
-                        l1 = __raw_readl(bank->base +
-                                                OMAP4_GPIO_FALLINGDETECT);
-                        l2 = __raw_readl(bank->base +
-                                                OMAP4_GPIO_RISINGDETECT);
-                }
-
-                bank->saved_fallingdetect = l1;
-                bank->saved_risingdetect = l2;
-                l1 &= ~bank->enabled_non_wakeup_gpios;
-                l2 &= ~bank->enabled_non_wakeup_gpios;
-
-                if (cpu_is_omap24xx() || cpu_is_omap34xx()) {
-                        __raw_writel(l1, bank->base +
-                                        OMAP24XX_GPIO_FALLINGDETECT);
-                        __raw_writel(l2, bank->base +
-                                        OMAP24XX_GPIO_RISINGDETECT);
-                }
-
-                if (cpu_is_omap44xx()) {
-                        __raw_writel(l1, bank->base + OMAP4_GPIO_FALLINGDETECT);
-                        __raw_writel(l2, bank->base + OMAP4_GPIO_RISINGDETECT);
-                }
-
-                c++;
-        }
-        if (!c) {
-                workaround_enabled = 0;
-                return;
-        }
-        workaround_enabled = 1;
-}
-
-void omap2_gpio_resume_after_idle(void)
-{
-        int i;
-        int min = 0;
-
-        if (cpu_is_omap34xx())
-                min = 1;
-        for (i = min; i < gpio_bank_count; i++) {
-                struct gpio_bank *bank = &gpio_bank[i];
-                u32 l = 0, gen, gen0, gen1;
-                int j;
-
-                for (j = 0; j < hweight_long(bank->dbck_enable_mask); j++)
-                        clk_enable(bank->dbck);
-
-                if (!workaround_enabled)
-                        continue;
-
-                if (!(bank->enabled_non_wakeup_gpios))
-                        continue;
-
-                if (cpu_is_omap24xx() || cpu_is_omap34xx()) {
-                        __raw_writel(bank->saved_fallingdetect,
-                                 bank->base + OMAP24XX_GPIO_FALLINGDETECT);
-                        __raw_writel(bank->saved_risingdetect,
-                                 bank->base + OMAP24XX_GPIO_RISINGDETECT);
-                        l = __raw_readl(bank->base + OMAP24XX_GPIO_DATAIN);
-                }
-
-                if (cpu_is_omap44xx()) {
-                        __raw_writel(bank->saved_fallingdetect,
-                                 bank->base + OMAP4_GPIO_FALLINGDETECT);
-                        __raw_writel(bank->saved_risingdetect,
-                                 bank->base + OMAP4_GPIO_RISINGDETECT);
-                        l = __raw_readl(bank->base + OMAP4_GPIO_DATAIN);
-                }
-
-                /* Check if any of the non-wakeup interrupt GPIOs have changed
-                 * state.  If so, generate an IRQ by software.  This is
-                 * horribly racy, but it's the best we can do to work around
-                 * this silicon bug. */
-                l ^= bank->saved_datain;
-                l &= bank->enabled_non_wakeup_gpios;
-
-                /*
-                 * No need to generate IRQs for the rising edge for gpio IRQs
-                 * configured with falling edge only; and vice versa.
-                 */
-                gen0 = l & bank->saved_fallingdetect;
-                gen0 &= bank->saved_datain;
-
-                gen1 = l & bank->saved_risingdetect;
-                gen1 &= ~(bank->saved_datain);
-
-                /* FIXME: Consider GPIO IRQs with level detections properly! */
-                gen = l & (~(bank->saved_fallingdetect) &
-                                ~(bank->saved_risingdetect));
-                /* Consider all GPIO IRQs needed to be updated */
-                gen |= gen0 | gen1;
-
-                if (gen) {
-                        u32 old0, old1;
-
-                        if (cpu_is_omap24xx() || cpu_is_omap34xx()) {
-                                old0 = __raw_readl(bank->base +
-                                        OMAP24XX_GPIO_LEVELDETECT0);
-                                old1 = __raw_readl(bank->base +
-                                        OMAP24XX_GPIO_LEVELDETECT1);
-                                __raw_writel(old0 | gen, bank->base +
-                                        OMAP24XX_GPIO_LEVELDETECT0);
-                                __raw_writel(old1 | gen, bank->base +
-                                        OMAP24XX_GPIO_LEVELDETECT1);
-                                __raw_writel(old0, bank->base +
-                                        OMAP24XX_GPIO_LEVELDETECT0);
-                                __raw_writel(old1, bank->base +
-                                        OMAP24XX_GPIO_LEVELDETECT1);
-                        }
-
-                        if (cpu_is_omap44xx()) {
-                                old0 = __raw_readl(bank->base +
-                                                OMAP4_GPIO_LEVELDETECT0);
-                                old1 = __raw_readl(bank->base +
-                                                OMAP4_GPIO_LEVELDETECT1);
-                                __raw_writel(old0 | l, bank->base +
-                                                OMAP4_GPIO_LEVELDETECT0);
-                                __raw_writel(old1 | l, bank->base +
-                                                OMAP4_GPIO_LEVELDETECT1);
-                                __raw_writel(old0, bank->base +
-                                                OMAP4_GPIO_LEVELDETECT0);
-                                __raw_writel(old1, bank->base +
-                                                OMAP4_GPIO_LEVELDETECT1);
-                        }
-                }
-        }
-
-}
-
-#endif
-
-#ifdef CONFIG_ARCH_OMAP3
-/* save the registers of bank 2-6 */
-void omap_gpio_save_context(void)
-{
-        int i;
-
-        /* saving banks from 2-6 only since GPIO1 is in WKUP */
-        for (i = 1; i < gpio_bank_count; i++) {
-                struct gpio_bank *bank = &gpio_bank[i];
-                gpio_context[i].irqenable1 =
-                        __raw_readl(bank->base + OMAP24XX_GPIO_IRQENABLE1);
-                gpio_context[i].irqenable2 =
-                        __raw_readl(bank->base + OMAP24XX_GPIO_IRQENABLE2);
-                gpio_context[i].wake_en =
-                        __raw_readl(bank->base + OMAP24XX_GPIO_WAKE_EN);
-                gpio_context[i].ctrl =
-                        __raw_readl(bank->base + OMAP24XX_GPIO_CTRL);
-                gpio_context[i].oe =
-                        __raw_readl(bank->base + OMAP24XX_GPIO_OE);
-                gpio_context[i].leveldetect0 =
-                        __raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT0);
-                gpio_context[i].leveldetect1 =
-                        __raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT1);
-                gpio_context[i].risingdetect =
-                        __raw_readl(bank->base + OMAP24XX_GPIO_RISINGDETECT);
-                gpio_context[i].fallingdetect =
-                        __raw_readl(bank->base + OMAP24XX_GPIO_FALLINGDETECT);
-                gpio_context[i].dataout =
-                        __raw_readl(bank->base + OMAP24XX_GPIO_DATAOUT);
-        }
-}
-
-/* restore the required registers of bank 2-6 */
-void omap_gpio_restore_context(void)
-{
-        int i;
-
-        for (i = 1; i < gpio_bank_count; i++) {
-                struct gpio_bank *bank = &gpio_bank[i];
-                __raw_writel(gpio_context[i].irqenable1,
-                                bank->base + OMAP24XX_GPIO_IRQENABLE1);
-                __raw_writel(gpio_context[i].irqenable2,
-                                bank->base + OMAP24XX_GPIO_IRQENABLE2);
-                __raw_writel(gpio_context[i].wake_en,
-                                bank->base + OMAP24XX_GPIO_WAKE_EN);
-                __raw_writel(gpio_context[i].ctrl,
-                                bank->base + OMAP24XX_GPIO_CTRL);
-                __raw_writel(gpio_context[i].oe,
-                                bank->base + OMAP24XX_GPIO_OE);
-                __raw_writel(gpio_context[i].leveldetect0,
-                                bank->base + OMAP24XX_GPIO_LEVELDETECT0);
-                __raw_writel(gpio_context[i].leveldetect1,
-                                bank->base + OMAP24XX_GPIO_LEVELDETECT1);
-                __raw_writel(gpio_context[i].risingdetect,
-                                bank->base + OMAP24XX_GPIO_RISINGDETECT);
-                __raw_writel(gpio_context[i].fallingdetect,
-                                bank->base + OMAP24XX_GPIO_FALLINGDETECT);
-                __raw_writel(gpio_context[i].dataout,
-                                bank->base + OMAP24XX_GPIO_DATAOUT);
-        }
-}
-#endif
-
-static struct platform_driver omap_gpio_driver = {
-        .probe          = omap_gpio_probe,
-        .driver         = {
-                .name   = "omap_gpio",
-        },
-};
-
-/*
- * gpio driver register needs to be done before
- * machine_init functions access gpio APIs.
- * Hence omap_gpio_drv_reg() is a postcore_initcall.
- */
-static int __init omap_gpio_drv_reg(void)
-{
-        return platform_driver_register(&omap_gpio_driver);
-}
-postcore_initcall(omap_gpio_drv_reg);
-
-static int __init omap_gpio_sysinit(void)
-{
-        mpuio_init();
-
-#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2PLUS)
-        if (cpu_is_omap16xx() || cpu_class_is_omap2())
-                register_syscore_ops(&omap_gpio_syscore_ops);
-#endif
-
-        return 0;
-}
-
-arch_initcall(omap_gpio_sysinit);
diff --git a/arch/arm/plat-omap/include/plat/gpio.h b/arch/arm/plat-omap/include/plat/gpio.h
index cac2e8ac6968..ec97e00cb581 100644
--- a/arch/arm/plat-omap/include/plat/gpio.h
+++ b/arch/arm/plat-omap/include/plat/gpio.h
@@ -52,6 +52,109 @@
 
 #define OMAP34XX_NR_GPIOS               6
 
+/*
+ * OMAP1510 GPIO registers
+ */
+#define OMAP1510_GPIO_DATA_INPUT        0x00
+#define OMAP1510_GPIO_DATA_OUTPUT       0x04
+#define OMAP1510_GPIO_DIR_CONTROL       0x08
+#define OMAP1510_GPIO_INT_CONTROL       0x0c
+#define OMAP1510_GPIO_INT_MASK          0x10
+#define OMAP1510_GPIO_INT_STATUS        0x14
+#define OMAP1510_GPIO_PIN_CONTROL       0x18
+
+#define OMAP1510_IH_GPIO_BASE           64
+
+/*
+ * OMAP1610 specific GPIO registers
+ */
+#define OMAP1610_GPIO_REVISION          0x0000
+#define OMAP1610_GPIO_SYSCONFIG         0x0010
+#define OMAP1610_GPIO_SYSSTATUS         0x0014
+#define OMAP1610_GPIO_IRQSTATUS1        0x0018
+#define OMAP1610_GPIO_IRQENABLE1        0x001c
+#define OMAP1610_GPIO_WAKEUPENABLE      0x0028
+#define OMAP1610_GPIO_DATAIN            0x002c
+#define OMAP1610_GPIO_DATAOUT           0x0030
+#define OMAP1610_GPIO_DIRECTION         0x0034
+#define OMAP1610_GPIO_EDGE_CTRL1        0x0038
+#define OMAP1610_GPIO_EDGE_CTRL2        0x003c
+#define OMAP1610_GPIO_CLEAR_IRQENABLE1  0x009c
+#define OMAP1610_GPIO_CLEAR_WAKEUPENA   0x00a8
+#define OMAP1610_GPIO_CLEAR_DATAOUT     0x00b0
+#define OMAP1610_GPIO_SET_IRQENABLE1    0x00dc
+#define OMAP1610_GPIO_SET_WAKEUPENA     0x00e8
+#define OMAP1610_GPIO_SET_DATAOUT       0x00f0
+
+/*
+ * OMAP7XX specific GPIO registers
+ */
+#define OMAP7XX_GPIO_DATA_INPUT         0x00
+#define OMAP7XX_GPIO_DATA_OUTPUT        0x04
+#define OMAP7XX_GPIO_DIR_CONTROL        0x08
+#define OMAP7XX_GPIO_INT_CONTROL        0x0c
+#define OMAP7XX_GPIO_INT_MASK           0x10
+#define OMAP7XX_GPIO_INT_STATUS         0x14
+
+/*
+ * omap2+ specific GPIO registers
+ */
+#define OMAP24XX_GPIO_REVISION          0x0000
+#define OMAP24XX_GPIO_IRQSTATUS1        0x0018
+#define OMAP24XX_GPIO_IRQSTATUS2        0x0028
+#define OMAP24XX_GPIO_IRQENABLE2        0x002c
+#define OMAP24XX_GPIO_IRQENABLE1        0x001c
+#define OMAP24XX_GPIO_WAKE_EN           0x0020
+#define OMAP24XX_GPIO_CTRL              0x0030
+#define OMAP24XX_GPIO_OE                0x0034
+#define OMAP24XX_GPIO_DATAIN            0x0038
+#define OMAP24XX_GPIO_DATAOUT           0x003c
+#define OMAP24XX_GPIO_LEVELDETECT0      0x0040
+#define OMAP24XX_GPIO_LEVELDETECT1      0x0044
+#define OMAP24XX_GPIO_RISINGDETECT      0x0048
+#define OMAP24XX_GPIO_FALLINGDETECT     0x004c
+#define OMAP24XX_GPIO_DEBOUNCE_EN       0x0050
+#define OMAP24XX_GPIO_DEBOUNCE_VAL      0x0054
+#define OMAP24XX_GPIO_CLEARIRQENABLE1   0x0060
+#define OMAP24XX_GPIO_SETIRQENABLE1     0x0064
+#define OMAP24XX_GPIO_CLEARWKUENA       0x0080
+#define OMAP24XX_GPIO_SETWKUENA         0x0084
+#define OMAP24XX_GPIO_CLEARDATAOUT      0x0090
+#define OMAP24XX_GPIO_SETDATAOUT        0x0094
+
+#define OMAP4_GPIO_REVISION             0x0000
+#define OMAP4_GPIO_EOI                  0x0020
+#define OMAP4_GPIO_IRQSTATUSRAW0        0x0024
+#define OMAP4_GPIO_IRQSTATUSRAW1        0x0028
+#define OMAP4_GPIO_IRQSTATUS0           0x002c
+#define OMAP4_GPIO_IRQSTATUS1           0x0030
+#define OMAP4_GPIO_IRQSTATUSSET0        0x0034
+#define OMAP4_GPIO_IRQSTATUSSET1        0x0038
+#define OMAP4_GPIO_IRQSTATUSCLR0        0x003c
+#define OMAP4_GPIO_IRQSTATUSCLR1        0x0040
+#define OMAP4_GPIO_IRQWAKEN0            0x0044
+#define OMAP4_GPIO_IRQWAKEN1            0x0048
+#define OMAP4_GPIO_IRQENABLE1           0x011c
+#define OMAP4_GPIO_WAKE_EN              0x0120
+#define OMAP4_GPIO_IRQSTATUS2           0x0128
+#define OMAP4_GPIO_IRQENABLE2           0x012c
+#define OMAP4_GPIO_CTRL                 0x0130
+#define OMAP4_GPIO_OE                   0x0134
+#define OMAP4_GPIO_DATAIN               0x0138
+#define OMAP4_GPIO_DATAOUT              0x013c
+#define OMAP4_GPIO_LEVELDETECT0         0x0140
+#define OMAP4_GPIO_LEVELDETECT1         0x0144
+#define OMAP4_GPIO_RISINGDETECT         0x0148
+#define OMAP4_GPIO_FALLINGDETECT        0x014c
+#define OMAP4_GPIO_DEBOUNCENABLE        0x0150
+#define OMAP4_GPIO_DEBOUNCINGTIME       0x0154
+#define OMAP4_GPIO_CLEARIRQENABLE1      0x0160
+#define OMAP4_GPIO_SETIRQENABLE1        0x0164
+#define OMAP4_GPIO_CLEARWKUENA          0x0180
+#define OMAP4_GPIO_SETWKUENA            0x0184
+#define OMAP4_GPIO_CLEARDATAOUT         0x0190
+#define OMAP4_GPIO_SETDATAOUT           0x0194
+
 #define OMAP_MPUIO(nr)          (OMAP_MAX_GPIO_LINES + (nr))
 #define OMAP_GPIO_IS_MPUIO(nr)  ((nr) >= OMAP_MAX_GPIO_LINES)
 
diff --git a/arch/arm/plat-omap/include/plat/gpmc-smsc911x.h b/arch/arm/plat-omap/include/plat/gpmc-smsc911x.h
index 872de0bf1e6b..ea6c9c88c725 100644
--- a/arch/arm/plat-omap/include/plat/gpmc-smsc911x.h
+++ b/arch/arm/plat-omap/include/plat/gpmc-smsc911x.h
@@ -14,14 +14,14 @@
 #ifndef __ASM_ARCH_OMAP_GPMC_SMSC911X_H__
 
 struct omap_smsc911x_platform_data {
+        int     id;
         int     cs;
         int     gpio_irq;
         int     gpio_reset;
         u32     flags;
 };
 
-#if defined(CONFIG_SMSC911X) || \
-        defined(CONFIG_SMSC911X_MODULE)
+#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
 
 extern void gpmc_smsc911x_init(struct omap_smsc911x_platform_data *d);
 
diff --git a/arch/arm/plat-omap/include/plat/uncompress.h b/arch/arm/plat-omap/include/plat/uncompress.h
index 565d2664f5a7..ac4b60d9aa29 100644
--- a/arch/arm/plat-omap/include/plat/uncompress.h
+++ b/arch/arm/plat-omap/include/plat/uncompress.h
@@ -129,7 +129,6 @@ static inline void __arch_decomp_setup(unsigned long arch_id)
                 DEBUG_LL_OMAP1(3, sx1);
 
                 /* omap2 based boards using UART1 */
-                DEBUG_LL_OMAP2(1, omap2evm);
                 DEBUG_LL_OMAP2(1, omap_2430sdp);
                 DEBUG_LL_OMAP2(1, omap_apollon);
                 DEBUG_LL_OMAP2(1, omap_h4);
diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h
index 02b96c8f6a17..17d3c939775c 100644
--- a/arch/arm/plat-omap/include/plat/usb.h
+++ b/arch/arm/plat-omap/include/plat/usb.h
@@ -113,7 +113,7 @@ extern int omap4430_phy_suspend(struct device *dev, int suspend);
 extern void am35x_musb_reset(void);
 extern void am35x_musb_phy_power(u8 on);
 extern void am35x_musb_clear_irq(void);
-extern void am35x_musb_set_mode(u8 musb_mode);
+extern void am35x_set_mode(u8 musb_mode);
 
 /*
  * FIXME correct answer depends on hmc_mode,
diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig
index 6751bcf7b888..e98f5c5c7879 100644
--- a/arch/arm/plat-s5p/Kconfig
+++ b/arch/arm/plat-s5p/Kconfig
@@ -7,7 +7,7 @@
 
 config PLAT_S5P
         bool
-        depends on (ARCH_S5P64X0 || ARCH_S5P6442 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS4)
+        depends on (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS4)
         default y
         select ARM_VIC if !ARCH_EXYNOS4
         select ARM_GIC if ARCH_EXYNOS4
diff --git a/arch/arm/plat-s5p/cpu.c b/arch/arm/plat-s5p/cpu.c
index 5cf5e721e6ca..bbc2aa7449ca 100644
--- a/arch/arm/plat-s5p/cpu.c
+++ b/arch/arm/plat-s5p/cpu.c
@@ -21,7 +21,6 @@
 
 #include <plat/cpu.h>
 #include <plat/s5p6440.h>
-#include <plat/s5p6442.h>
 #include <plat/s5p6450.h>
 #include <plat/s5pc100.h>
 #include <plat/s5pv210.h>
@@ -30,7 +29,6 @@
 /* table of supported CPUs */
 
 static const char name_s5p6440[] = "S5P6440";
-static const char name_s5p6442[] = "S5P6442";
 static const char name_s5p6450[] = "S5P6450";
 static const char name_s5pc100[] = "S5PC100";
 static const char name_s5pv210[] = "S5PV210/S5PC110";
@@ -46,14 +44,6 @@ static struct cpu_table cpu_ids[] __initdata = {
                 .init           = s5p64x0_init,
                 .name           = name_s5p6440,
         }, {
-                .idcode         = 0x36442000,
-                .idmask         = 0xfffff000,
-                .map_io         = s5p6442_map_io,
-                .init_clocks    = s5p6442_init_clocks,
-                .init_uarts     = s5p6442_init_uarts,
-                .init           = s5p6442_init,
-                .name           = name_s5p6442,
-        }, {
                 .idcode         = 0x36450000,
                 .idmask         = 0xfffff000,
                 .map_io         = s5p6450_map_io,
diff --git a/arch/arm/plat-s5p/include/plat/s5p6442.h b/arch/arm/plat-s5p/include/plat/s5p6442.h
deleted file mode 100644
index 7b8801349c94..000000000000
--- a/arch/arm/plat-s5p/include/plat/s5p6442.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* arch/arm/plat-s5p/include/plat/s5p6442.h
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * Header file for s5p6442 cpu support
- *
- * 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.
-*/
-
-/* Common init code for S5P6442 related SoCs */
-
-extern void s5p6442_common_init_uarts(struct s3c2410_uartcfg *cfg, int no);
-extern void s5p6442_register_clocks(void);
-extern void s5p6442_setup_clocks(void);
-
-#ifdef CONFIG_CPU_S5P6442
-
-extern  int s5p6442_init(void);
-extern void s5p6442_init_irq(void);
-extern void s5p6442_map_io(void);
-extern void s5p6442_init_clocks(int xtal);
-
-#define s5p6442_init_uarts s5p6442_common_init_uarts
-
-#else
-#define s5p6442_init_clocks NULL
-#define s5p6442_init_uarts NULL
-#define s5p6442_map_io NULL
-#define s5p6442_init NULL
-#endif
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index e9de58a2e294..53eb15b0a07d 100644
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -19,7 +19,6 @@ obj-y				+= gpio.o
 obj-y                           += gpio-config.o
 obj-y                           += dev-asocdma.o
 
-obj-$(CONFIG_SAMSUNG_GPIOLIB_4BIT)      += gpiolib.o
 obj-$(CONFIG_SAMSUNG_CLKSRC)    += clock-clksrc.o
 
 obj-$(CONFIG_SAMSUNG_IRQ_UART)  += irq-uart.o
diff --git a/arch/arm/plat-samsung/gpiolib.c b/arch/arm/plat-samsung/gpiolib.c
deleted file mode 100644
index ea37c0461788..000000000000
--- a/arch/arm/plat-samsung/gpiolib.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/* arch/arm/plat-samsung/gpiolib.c
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * Copyright (c) 2009 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * SAMSUNG - GPIOlib support
- *
- * 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/irq.h>
-#include <linux/io.h>
-#include <linux/gpio.h>
-#include <plat/gpio-core.h>
-#include <plat/gpio-cfg.h>
-#include <plat/gpio-cfg-helpers.h>
-
-#ifndef DEBUG_GPIO
-#define gpio_dbg(x...) do { } while (0)
-#else
-#define gpio_dbg(x...) printk(KERN_DEBUG x)
-#endif
-
-/* The samsung_gpiolib_4bit routines are to control the gpio banks where
- * the gpio configuration register (GPxCON) has 4 bits per GPIO, as the
- * following example:
- *
- * base + 0x00: Control register, 4 bits per gpio
- *              gpio n: 4 bits starting at (4*n)
- *              0000 = input, 0001 = output, others mean special-function
- * base + 0x04: Data register, 1 bit per gpio
- *              bit n: data bit n
- *
- * Note, since the data register is one bit per gpio and is at base + 0x4
- * we can use s3c_gpiolib_get and s3c_gpiolib_set to change the state of
- * the output.
-*/
-
-static int samsung_gpiolib_4bit_input(struct gpio_chip *chip,
-                                      unsigned int offset)
-{
-        struct s3c_gpio_chip *ourchip = to_s3c_gpio(chip);
-        void __iomem *base = ourchip->base;
-        unsigned long con;
-
-        con = __raw_readl(base + GPIOCON_OFF);
-        con &= ~(0xf << con_4bit_shift(offset));
-        __raw_writel(con, base + GPIOCON_OFF);
-
-        gpio_dbg("%s: %p: CON now %08lx\n", __func__, base, con);
-
-        return 0;
-}
-
-static int samsung_gpiolib_4bit_output(struct gpio_chip *chip,
-                                       unsigned int offset, int value)
-{
-        struct s3c_gpio_chip *ourchip = to_s3c_gpio(chip);
-        void __iomem *base = ourchip->base;
-        unsigned long con;
-        unsigned long dat;
-
-        con = __raw_readl(base + GPIOCON_OFF);
-        con &= ~(0xf << con_4bit_shift(offset));
-        con |= 0x1 << con_4bit_shift(offset);
-
-        dat = __raw_readl(base + GPIODAT_OFF);
-
-        if (value)
-                dat |= 1 << offset;
-        else
-                dat &= ~(1 << offset);
-
-        __raw_writel(dat, base + GPIODAT_OFF);
-        __raw_writel(con, base + GPIOCON_OFF);
-        __raw_writel(dat, base + GPIODAT_OFF);
-
-        gpio_dbg("%s: %p: CON %08lx, DAT %08lx\n", __func__, base, con, dat);
-
-        return 0;
-}
-
-/* The next set of routines are for the case where the GPIO configuration
- * registers are 4 bits per GPIO but there is more than one register (the
- * bank has more than 8 GPIOs.
- *
- * This case is the similar to the 4 bit case, but the registers are as
- * follows:
- *
- * base + 0x00: Control register, 4 bits per gpio (lower 8 GPIOs)
- *              gpio n: 4 bits starting at (4*n)
- *              0000 = input, 0001 = output, others mean special-function
- * base + 0x04: Control register, 4 bits per gpio (up to 8 additions GPIOs)
- *              gpio n: 4 bits starting at (4*n)
- *              0000 = input, 0001 = output, others mean special-function
- * base + 0x08: Data register, 1 bit per gpio
- *              bit n: data bit n
- *
- * To allow us to use the s3c_gpiolib_get and s3c_gpiolib_set routines we
- * store the 'base + 0x4' address so that these routines see the data
- * register at ourchip->base + 0x04.
- */
-
-static int samsung_gpiolib_4bit2_input(struct gpio_chip *chip,
-                                       unsigned int offset)
-{
-        struct s3c_gpio_chip *ourchip = to_s3c_gpio(chip);
-        void __iomem *base = ourchip->base;
-        void __iomem *regcon = base;
-        unsigned long con;
-
-        if (offset > 7)
-                offset -= 8;
-        else
-                regcon -= 4;
-
-        con = __raw_readl(regcon);
-        con &= ~(0xf << con_4bit_shift(offset));
-        __raw_writel(con, regcon);
-
-        gpio_dbg("%s: %p: CON %08lx\n", __func__, base, con);
-
-        return 0;
-}
-
-static int samsung_gpiolib_4bit2_output(struct gpio_chip *chip,
-                                        unsigned int offset, int value)
-{
-        struct s3c_gpio_chip *ourchip = to_s3c_gpio(chip);
-        void __iomem *base = ourchip->base;
-        void __iomem *regcon = base;
-        unsigned long con;
-        unsigned long dat;
-        unsigned con_offset = offset;
-
-        if (con_offset > 7)
-                con_offset -= 8;
-        else
-                regcon -= 4;
-
-        con = __raw_readl(regcon);
-        con &= ~(0xf << con_4bit_shift(con_offset));
-        con |= 0x1 << con_4bit_shift(con_offset);
-
-        dat = __raw_readl(base + GPIODAT_OFF);
-
-        if (value)
-                dat |= 1 << offset;
-        else
-                dat &= ~(1 << offset);
-
-        __raw_writel(dat, base + GPIODAT_OFF);
-        __raw_writel(con, regcon);
-        __raw_writel(dat, base + GPIODAT_OFF);
-
-        gpio_dbg("%s: %p: CON %08lx, DAT %08lx\n", __func__, base, con, dat);
-
-        return 0;
-}
-
-void __init samsung_gpiolib_add_4bit(struct s3c_gpio_chip *chip)
-{
-        chip->chip.direction_input = samsung_gpiolib_4bit_input;
-        chip->chip.direction_output = samsung_gpiolib_4bit_output;
-        chip->pm = __gpio_pm(&s3c_gpio_pm_4bit);
-}
-
-void __init samsung_gpiolib_add_4bit2(struct s3c_gpio_chip *chip)
-{
-        chip->chip.direction_input = samsung_gpiolib_4bit2_input;
-        chip->chip.direction_output = samsung_gpiolib_4bit2_output;
-        chip->pm = __gpio_pm(&s3c_gpio_pm_4bit);
-}
-
-void __init samsung_gpiolib_add_4bit_chips(struct s3c_gpio_chip *chip,
-                                           int nr_chips)
-{
-        for (; nr_chips > 0; nr_chips--, chip++) {
-                samsung_gpiolib_add_4bit(chip);
-                s3c_gpiolib_add(chip);
-        }
-}
-
-void __init samsung_gpiolib_add_4bit2_chips(struct s3c_gpio_chip *chip,
-                                            int nr_chips)
-{
-        for (; nr_chips > 0; nr_chips--, chip++) {
-                samsung_gpiolib_add_4bit2(chip);
-                s3c_gpiolib_add(chip);
-        }
-}
-
-void __init samsung_gpiolib_add_2bit_chips(struct s3c_gpio_chip *chip,
-                                           int nr_chips)
-{
-        for (; nr_chips > 0; nr_chips--, chip++)
-                s3c_gpiolib_add(chip);
-}
diff --git a/arch/arm/plat-samsung/include/plat/cpu.h b/arch/arm/plat-samsung/include/plat/cpu.h
index 3aedac0034ba..c0a5741b23e6 100644
--- a/arch/arm/plat-samsung/include/plat/cpu.h
+++ b/arch/arm/plat-samsung/include/plat/cpu.h
@@ -86,7 +86,6 @@ extern struct sysdev_class s3c2443_sysclass;
 extern struct sysdev_class s3c6410_sysclass;
 extern struct sysdev_class s3c64xx_sysclass;
 extern struct sysdev_class s5p64x0_sysclass;
-extern struct sysdev_class s5p6442_sysclass;
 extern struct sysdev_class s5pv210_sysclass;
 extern struct sysdev_class exynos4_sysclass;
 
diff --git a/arch/arm/plat-samsung/include/plat/debug-macro.S b/arch/arm/plat-samsung/include/plat/debug-macro.S
index dc6efd90e8ff..207e275362a8 100644
--- a/arch/arm/plat-samsung/include/plat/debug-macro.S
+++ b/arch/arm/plat-samsung/include/plat/debug-macro.S
@@ -11,7 +11,7 @@
 
 #include <plat/regs-serial.h>
 
-/* The S5PV210/S5PC110 and S5P6442 implementations are as belows. */
+/* The S5PV210/S5PC110 implementations are as belows. */
 
         .macro fifo_level_s5pv210 rd, rx
                 ldr     \rd, [ \rx, # S3C2410_UFSTAT ]
diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h
index 39818d8da420..b61b8ee7cc52 100644
--- a/arch/arm/plat-samsung/include/plat/devs.h
+++ b/arch/arm/plat-samsung/include/plat/devs.h
@@ -111,12 +111,6 @@ extern struct platform_device exynos4_device_spdif;
 extern struct platform_device exynos4_device_pd[];
 extern struct platform_device exynos4_device_ahci;
 
-extern struct platform_device s5p6442_device_pcm0;
-extern struct platform_device s5p6442_device_pcm1;
-extern struct platform_device s5p6442_device_iis0;
-extern struct platform_device s5p6442_device_iis1;
-extern struct platform_device s5p6442_device_spi;
-
 extern struct platform_device s5p6440_device_pcm;
 extern struct platform_device s5p6440_device_iis;
 
diff --git a/arch/arm/plat-samsung/include/plat/regs-serial.h b/arch/arm/plat-samsung/include/plat/regs-serial.h
index 788837e99cb3..c151c5f94a87 100644
--- a/arch/arm/plat-samsung/include/plat/regs-serial.h
+++ b/arch/arm/plat-samsung/include/plat/regs-serial.h
@@ -194,7 +194,7 @@
 #define S3C64XX_UINTSP          0x34
 #define S3C64XX_UINTM           0x38
 
-/* Following are specific to S5PV210 and S5P6442 */
+/* Following are specific to S5PV210 */
 #define S5PV210_UCON_CLKMASK    (1<<10)
 #define S5PV210_UCON_PCLK       (0<<10)
 #define S5PV210_UCON_UCLK       (1<<10)
diff --git a/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h b/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h
index ff1a561b326e..0ffe34a21554 100644
--- a/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h
+++ b/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h
@@ -69,6 +69,5 @@ extern void s3c64xx_spi_set_info(int cntrlr, int src_clk_nr, int num_cs);
 extern void s5pc100_spi_set_info(int cntrlr, int src_clk_nr, int num_cs);
 extern void s5pv210_spi_set_info(int cntrlr, int src_clk_nr, int num_cs);
 extern void s5p64x0_spi_set_info(int cntrlr, int src_clk_nr, int num_cs);
-extern void s5p6442_spi_set_info(int cntrlr, int src_clk_nr, int num_cs);
 
 #endif /* __S3C64XX_PLAT_SPI_H */
diff --git a/arch/avr32/include/asm/bitops.h b/arch/avr32/include/asm/bitops.h
index 72444d97f80c..b70c19bab63a 100644
--- a/arch/avr32/include/asm/bitops.h
+++ b/arch/avr32/include/asm/bitops.h
@@ -270,14 +270,21 @@ static inline int __fls(unsigned long word)
 
 unsigned long find_first_zero_bit(const unsigned long *addr,
                                   unsigned long size);
+#define find_first_zero_bit find_first_zero_bit
+
 unsigned long find_next_zero_bit(const unsigned long *addr,
                                  unsigned long size,
                                  unsigned long offset);
+#define find_next_zero_bit find_next_zero_bit
+
 unsigned long find_first_bit(const unsigned long *addr,
                              unsigned long size);
+#define find_first_bit find_first_bit
+
 unsigned long find_next_bit(const unsigned long *addr,
                                  unsigned long size,
                                  unsigned long offset);
+#define find_next_bit find_next_bit
 
 /*
  * ffs: find first bit set. This is defined the same way as
@@ -299,6 +306,14 @@ static inline int ffs(unsigned long word)
 #include <asm-generic/bitops/hweight.h>
 #include <asm-generic/bitops/lock.h>
 
+extern unsigned long find_next_zero_bit_le(const void *addr,
+                unsigned long size, unsigned long offset);
+#define find_next_zero_bit_le find_next_zero_bit_le
+
+extern unsigned long find_next_bit_le(const void *addr,
+                unsigned long size, unsigned long offset);
+#define find_next_bit_le find_next_bit_le
+
 #include <asm-generic/bitops/le.h>
 #include <asm-generic/bitops/ext2-atomic.h>
 
diff --git a/arch/avr32/include/asm/unistd.h b/arch/avr32/include/asm/unistd.h
index 89861a27543e..f714544e5560 100644
--- a/arch/avr32/include/asm/unistd.h
+++ b/arch/avr32/include/asm/unistd.h
@@ -299,9 +299,10 @@
 #define __NR_signalfd           279
 /* 280 was __NR_timerfd */
 #define __NR_eventfd            281
+#define __NR_setns              283
 
 #ifdef __KERNEL__
-#define NR_syscalls             282
+#define NR_syscalls             284
 
 /* Old stuff */
 #define __IGNORE_uselib
diff --git a/arch/avr32/kernel/syscall_table.S b/arch/avr32/kernel/syscall_table.S
index e76bad16b0f0..c7fd394d28a4 100644
--- a/arch/avr32/kernel/syscall_table.S
+++ b/arch/avr32/kernel/syscall_table.S
@@ -296,4 +296,5 @@ sys_call_table:
         .long   sys_ni_syscall          /* 280, was sys_timerfd */
         .long   sys_eventfd
         .long   sys_recvmmsg
+        .long   sys_setns
         .long   sys_ni_syscall          /* r8 is saturated at nr_syscalls */
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index bfc9d071db9b..aa677e2a3823 100644
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -1014,6 +1014,7 @@ static struct platform_device *__initdata at32_usarts[4];
 void __init at32_map_usart(unsigned int hw_id, unsigned int line, int flags)
 {
         struct platform_device *pdev;
+        struct atmel_uart_data *pdata;
 
         switch (hw_id) {
         case 0:
@@ -1042,7 +1043,8 @@ void __init at32_map_usart(unsigned int hw_id, unsigned int line, int flags)
                 data->regs = (void __iomem *)pdev->resource[0].start;
         }
 
-        pdev->id = line;
+        pdata = pdev->dev.platform_data;
+        pdata->num = portnr;
         at32_usarts[line] = pdev;
 }
 
diff --git a/arch/avr32/mach-at32ap/include/mach/board.h b/arch/avr32/mach-at32ap/include/mach/board.h
index 61740201b311..679458d9a622 100644
--- a/arch/avr32/mach-at32ap/include/mach/board.h
+++ b/arch/avr32/mach-at32ap/include/mach/board.h
@@ -33,6 +33,7 @@ extern struct platform_device *atmel_default_console_device;
 #define ATMEL_USART_CLK         0x04
 
 struct atmel_uart_data {
+        int             num;            /* port num */
         short           use_dma_tx;     /* use transmit DMA? */
         short           use_dma_rx;     /* use receive DMA? */
         void __iomem    *regs;          /* virtual base address, if any */
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index a18180f2d007..d619b17c4413 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -47,9 +47,6 @@ config GENERIC_BUG
 config ZONE_DMA
         def_bool y
 
-config GENERIC_FIND_NEXT_BIT
-        def_bool y
-
 config GENERIC_GPIO
         def_bool y
 
diff --git a/arch/blackfin/include/asm/bfin_serial.h b/arch/blackfin/include/asm/bfin_serial.h
index 7dbc664eab1e..7fd0ec7b5b0f 100644
--- a/arch/blackfin/include/asm/bfin_serial.h
+++ b/arch/blackfin/include/asm/bfin_serial.h
@@ -184,7 +184,7 @@ struct bfin_uart_regs {
 #undef __BFP
 
 #ifndef port_membase
-# define port_membase(p) (((struct bfin_serial_port *)(p))->port.membase)
+# define port_membase(p) 0
 #endif
 
 #define UART_GET_CHAR(p)      bfin_read16(port_membase(p) + OFFSET_RBR)
@@ -235,10 +235,10 @@ struct bfin_uart_regs {
 #define UART_SET_DLAB(p)      do { UART_PUT_LCR(p, UART_GET_LCR(p) | DLAB); SSYNC(); } while (0)
 
 #ifndef put_lsr_cache
-# define put_lsr_cache(p, v) (((struct bfin_serial_port *)(p))->lsr = (v))
+# define put_lsr_cache(p, v)
 #endif
 #ifndef get_lsr_cache
-# define get_lsr_cache(p)    (((struct bfin_serial_port *)(p))->lsr)
+# define get_lsr_cache(p) 0
 #endif
 
 /* The hardware clears the LSR bits upon read, so we need to cache
diff --git a/arch/blackfin/include/asm/gptimers.h b/arch/blackfin/include/asm/gptimers.h
index c722acdda0d3..38657dac1235 100644
--- a/arch/blackfin/include/asm/gptimers.h
+++ b/arch/blackfin/include/asm/gptimers.h
@@ -193,4 +193,22 @@ uint16_t get_enabled_gptimers(void);
 uint32_t get_gptimer_status(unsigned int group);
 void     set_gptimer_status(unsigned int group, uint32_t value);
 
+/*
+ * All Blackfin system MMRs are padded to 32bits even if the register
+ * itself is only 16bits.  So use a helper macro to streamline this.
+ */
+#define __BFP(m) u16 m; u16 __pad_##m
+
+/*
+ * bfin timer registers layout
+ */
+struct bfin_gptimer_regs {
+        __BFP(config);
+        u32 counter;
+        u32 period;
+        u32 width;
+};
+
+#undef __BFP
+
 #endif
diff --git a/arch/blackfin/include/asm/kgdb.h b/arch/blackfin/include/asm/kgdb.h
index 3ac0c72e9fee..aaf884591b07 100644
--- a/arch/blackfin/include/asm/kgdb.h
+++ b/arch/blackfin/include/asm/kgdb.h
@@ -108,6 +108,7 @@ static inline void arch_kgdb_breakpoint(void)
 #else
 # define CACHE_FLUSH_IS_SAFE    1
 #endif
+#define GDB_ADJUSTS_BREAK_OFFSET
 #define HW_INST_WATCHPOINT_NUM  6
 #define HW_WATCHPOINT_NUM       8
 #define TYPE_INST_WATCHPOINT    0
diff --git a/arch/blackfin/include/asm/ptrace.h b/arch/blackfin/include/asm/ptrace.h
index 1066d63e62b5..7854d4367c15 100644
--- a/arch/blackfin/include/asm/ptrace.h
+++ b/arch/blackfin/include/asm/ptrace.h
@@ -102,9 +102,6 @@ struct pt_regs {
 /* user_mode returns true if only one bit is set in IPEND, other than the
    master interrupt enable.  */
 #define user_mode(regs) (!(((regs)->ipend & ~0x10) & (((regs)->ipend & ~0x10) - 1)))
-#define instruction_pointer(regs) ((regs)->pc)
-#define user_stack_pointer(regs)  ((regs)->usp)
-#define profile_pc(regs) instruction_pointer(regs)
 extern void show_regs(struct pt_regs *);
 
 #define arch_has_single_step()  (1)
@@ -128,6 +125,8 @@ extern int is_user_addr_valid(struct task_struct *child,
             ((unsigned long)task_stack_page(task) + \
              (THREAD_SIZE - sizeof(struct pt_regs)))
 
+#include <asm-generic/ptrace.h>
+
 #endif  /*  __KERNEL__  */
 
 #endif                          /* __ASSEMBLY__ */
diff --git a/arch/blackfin/include/asm/unistd.h b/arch/blackfin/include/asm/unistd.h
index ff9a9f35d50b..0ccba60b9ccf 100644
--- a/arch/blackfin/include/asm/unistd.h
+++ b/arch/blackfin/include/asm/unistd.h
@@ -397,8 +397,10 @@
 #define __NR_open_by_handle_at  376
 #define __NR_clock_adjtime      377
 #define __NR_syncfs             378
+#define __NR_setns              379
+#define __NR_sendmmsg           380
 
-#define __NR_syscall            379
+#define __NR_syscall            381
 #define NR_syscalls             __NR_syscall
 
 /* Old optional stuff no one actually uses */
diff --git a/arch/blackfin/kernel/debug-mmrs.c b/arch/blackfin/kernel/debug-mmrs.c
index 94b1d8a0256a..fce4807ceef9 100644
--- a/arch/blackfin/kernel/debug-mmrs.c
+++ b/arch/blackfin/kernel/debug-mmrs.c
@@ -13,6 +13,7 @@
 
 #include <asm/blackfin.h>
 #include <asm/gpio.h>
+#include <asm/gptimers.h>
 #include <asm/bfin_can.h>
 #include <asm/bfin_dma.h>
 #include <asm/bfin_ppi.h>
@@ -230,8 +231,8 @@ bfin_debug_mmrs_dma(struct dentry *parent, unsigned long base, int num, char mdm
 #define DMA(num)  _DMA(num, DMA##num##_NEXT_DESC_PTR, 0, "")
 #define _MDMA(num, x) \
         do { \
-                _DMA(num, x##DMA_D##num##_CONFIG, 'D', #x); \
-                _DMA(num, x##DMA_S##num##_CONFIG, 'S', #x); \
+                _DMA(num, x##DMA_D##num##_NEXT_DESC_PTR, 'D', #x); \
+                _DMA(num, x##DMA_S##num##_NEXT_DESC_PTR, 'S', #x); \
         } while (0)
 #define MDMA(num) _MDMA(num, M)
 #define IMDMA(num) _MDMA(num, IM)
@@ -264,20 +265,15 @@ bfin_debug_mmrs_eppi(struct dentry *parent, unsigned long base, int num)
 /*
  * General Purpose Timers
  */
-#define GPTIMER_OFF(mmr) (TIMER0_##mmr - TIMER0_CONFIG)
-#define __GPTIMER(name) \
-        do { \
-                strcpy(_buf, #name); \
-                debugfs_create_x16(buf, S_IRUSR|S_IWUSR, parent, (u16 *)(base + GPTIMER_OFF(name))); \
-        } while (0)
+#define __GPTIMER(uname, lname) __REGS(gptimer, #uname, lname)
 static void __init __maybe_unused
 bfin_debug_mmrs_gptimer(struct dentry *parent, unsigned long base, int num)
 {
         char buf[32], *_buf = REGS_STR_PFX(buf, TIMER, num);
-        __GPTIMER(CONFIG);
-        __GPTIMER(COUNTER);
-        __GPTIMER(PERIOD);
-        __GPTIMER(WIDTH);
+        __GPTIMER(CONFIG, config);
+        __GPTIMER(COUNTER, counter);
+        __GPTIMER(PERIOD, period);
+        __GPTIMER(WIDTH, width);
 }
 #define GPTIMER(num) bfin_debug_mmrs_gptimer(parent, TIMER##num##_CONFIG, num)
 
@@ -355,7 +351,7 @@ bfin_debug_mmrs_ppi(struct dentry *parent, unsigned long base, int num)
         __PPI(DELAY, delay);
         __PPI(FRAME, frame);
 }
-#define PPI(num) bfin_debug_mmrs_ppi(parent, PPI##num##_STATUS, num)
+#define PPI(num) bfin_debug_mmrs_ppi(parent, PPI##num##_CONTROL, num)
 
 /*
  * SPI
@@ -1288,15 +1284,15 @@ static int __init bfin_debug_mmrs_init(void)
         D16(VR_CTL);
         D32(CHIPID);    /* it's part of this hardware block */
 
-#if defined(PPI_STATUS) || defined(PPI0_STATUS) || defined(PPI1_STATUS)
+#if defined(PPI_CONTROL) || defined(PPI0_CONTROL) || defined(PPI1_CONTROL)
         parent = debugfs_create_dir("ppi", top);
-# ifdef PPI_STATUS
-        bfin_debug_mmrs_ppi(parent, PPI_STATUS, -1);
+# ifdef PPI_CONTROL
+        bfin_debug_mmrs_ppi(parent, PPI_CONTROL, -1);
 # endif
-# ifdef PPI0_STATUS
+# ifdef PPI0_CONTROL
         PPI(0);
 # endif
-# ifdef PPI1_STATUS
+# ifdef PPI1_CONTROL
         PPI(1);
 # endif
 #endif
@@ -1341,6 +1337,10 @@ static int __init bfin_debug_mmrs_init(void)
         D16(RSI_PID1);
         D16(RSI_PID2);
         D16(RSI_PID3);
+        D16(RSI_PID4);
+        D16(RSI_PID5);
+        D16(RSI_PID6);
+        D16(RSI_PID7);
         D16(RSI_PWR_CONTROL);
         D16(RSI_RD_WAIT_EN);
         D32(RSI_RESPONSE0);
diff --git a/arch/blackfin/mach-bf518/include/mach/bfin_serial_5xx.h b/arch/blackfin/mach-bf518/include/mach/bfin_serial_5xx.h
deleted file mode 100644
index f6d924ac0c44..000000000000
--- a/arch/blackfin/mach-bf518/include/mach/bfin_serial_5xx.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2008-2009 Analog Devices Inc.
- *
- * Licensed under the GPL-2 or later
- */
-
-#include <asm/dma.h>
-#include <asm/portmux.h>
-
-#if defined(CONFIG_BFIN_UART0_CTSRTS) || defined(CONFIG_BFIN_UART1_CTSRTS)
-# define CONFIG_SERIAL_BFIN_CTSRTS
-
-# ifndef CONFIG_UART0_CTS_PIN
-#  define CONFIG_UART0_CTS_PIN -1
-# endif
-
-# ifndef CONFIG_UART0_RTS_PIN
-#  define CONFIG_UART0_RTS_PIN -1
-# endif
-
-# ifndef CONFIG_UART1_CTS_PIN
-#  define CONFIG_UART1_CTS_PIN -1
-# endif
-
-# ifndef CONFIG_UART1_RTS_PIN
-#  define CONFIG_UART1_RTS_PIN -1
-# endif
-#endif
-
-struct bfin_serial_res {
-        unsigned long uart_base_addr;
-        int uart_irq;
-        int uart_status_irq;
-#ifdef CONFIG_SERIAL_BFIN_DMA
-        unsigned int uart_tx_dma_channel;
-        unsigned int uart_rx_dma_channel;
-#endif
-#ifdef CONFIG_SERIAL_BFIN_CTSRTS
-        int uart_cts_pin;
-        int uart_rts_pin;
-#endif
-};
-
-struct bfin_serial_res bfin_serial_resource[] = {
-#ifdef CONFIG_SERIAL_BFIN_UART0
-        {
-         0xFFC00400,
-         IRQ_UART0_RX,
-         IRQ_UART0_ERROR,
-#ifdef CONFIG_SERIAL_BFIN_DMA
-         CH_UART0_TX,
-         CH_UART0_RX,
-#endif
-#ifdef CONFIG_SERIAL_BFIN_CTSRTS
-         CONFIG_UART0_CTS_PIN,
-         CONFIG_UART0_RTS_PIN,
-#endif
-         },
-#endif
-#ifdef CONFIG_SERIAL_BFIN_UART1
-        {
-         0xFFC02000,
-         IRQ_UART1_RX,
-         IRQ_UART1_ERROR,
-#ifdef CONFIG_SERIAL_BFIN_DMA
-         CH_UART1_TX,
-         CH_UART1_RX,
-#endif
-#ifdef CONFIG_SERIAL_BFIN_CTSRTS
-         CONFIG_UART1_CTS_PIN,
-         CONFIG_UART1_RTS_PIN,
-#endif
-         },
-#endif
-};
-
-#define DRIVER_NAME "bfin-uart"
-
-#include <asm/bfin_serial.h>
diff --git a/arch/blackfin/mach-bf518/include/mach/defBF514.h b/arch/blackfin/mach-bf518/include/mach/defBF514.h
index 98a51c479290..cfab428e577c 100644
--- a/arch/blackfin/mach-bf518/include/mach/defBF514.h
+++ b/arch/blackfin/mach-bf518/include/mach/defBF514.h
@@ -36,13 +36,13 @@
 #define RSI_EMASK                      0xFFC038C4 /* RSI Exception Mask Register */
 #define RSI_CONFIG                     0xFFC038C8 /* RSI Configuration Register */
 #define RSI_RD_WAIT_EN                 0xFFC038CC /* RSI Read Wait Enable Register */
-#define RSI_PID0                       0xFFC03FE0 /* RSI Peripheral ID Register 0 */
-#define RSI_PID1                       0xFFC03FE4 /* RSI Peripheral ID Register 1 */
-#define RSI_PID2                       0xFFC03FE8 /* RSI Peripheral ID Register 2 */
-#define RSI_PID3                       0xFFC03FEC /* RSI Peripheral ID Register 3 */
-#define RSI_PID4                       0xFFC03FF0 /* RSI Peripheral ID Register 4 */
-#define RSI_PID5                       0xFFC03FF4 /* RSI Peripheral ID Register 5 */
-#define RSI_PID6                       0xFFC03FF8 /* RSI Peripheral ID Register 6 */
-#define RSI_PID7                       0xFFC03FFC /* RSI Peripheral ID Register 7 */
+#define RSI_PID0                       0xFFC038D0 /* RSI Peripheral ID Register 0 */
+#define RSI_PID1                       0xFFC038D4 /* RSI Peripheral ID Register 1 */
+#define RSI_PID2                       0xFFC038D8 /* RSI Peripheral ID Register 2 */
+#define RSI_PID3                       0xFFC038DC /* RSI Peripheral ID Register 3 */
+#define RSI_PID4                       0xFFC038E0 /* RSI Peripheral ID Register 0 */
+#define RSI_PID5                       0xFFC038E4 /* RSI Peripheral ID Register 1 */
+#define RSI_PID6                       0xFFC038E8 /* RSI Peripheral ID Register 2 */
+#define RSI_PID7                       0xFFC038EC /* RSI Peripheral ID Register 3 */
 
 #endif /* _DEF_BF514_H */
diff --git a/arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h b/arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h
deleted file mode 100644
index 960e08919def..000000000000
--- a/arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2007-2009 Analog Devices Inc.
- *
- * Licensed under the GPL-2 or later
- */
-
-#include <asm/dma.h>
-#include <asm/portmux.h>
-
-#if defined(CONFIG_BFIN_UART0_CTSRTS) || defined(CONFIG_BFIN_UART1_CTSRTS)
-# define CONFIG_SERIAL_BFIN_CTSRTS
-
-# ifndef CONFIG_UART0_CTS_PIN
-#  define CONFIG_UART0_CTS_PIN -1
-# endif
-
-# ifndef CONFIG_UART0_RTS_PIN
-#  define CONFIG_UART0_RTS_PIN -1
-# endif
-
-# ifndef CONFIG_UART1_CTS_PIN
-#  define CONFIG_UART1_CTS_PIN -1
-# endif
-
-# ifndef CONFIG_UART1_RTS_PIN
-#  define CONFIG_UART1_RTS_PIN -1
-# endif
-#endif
-
-struct bfin_serial_res {
-        unsigned long uart_base_addr;
-        int uart_irq;
-        int uart_status_irq;
-#ifdef CONFIG_SERIAL_BFIN_DMA
-        unsigned int uart_tx_dma_channel;
-        unsigned int uart_rx_dma_channel;
-#endif
-#ifdef CONFIG_SERIAL_BFIN_CTSRTS
-        int uart_cts_pin;
-        int uart_rts_pin;
-#endif
-};
-
-struct bfin_serial_res bfin_serial_resource[] = {
-#ifdef CONFIG_SERIAL_BFIN_UART0
-        {
-         0xFFC00400,
-         IRQ_UART0_RX,
-         IRQ_UART0_ERROR,
-#ifdef CONFIG_SERIAL_BFIN_DMA
-         CH_UART0_TX,
-         CH_UART0_RX,
-#endif
-#ifdef CONFIG_SERIAL_BFIN_CTSRTS
-         CONFIG_UART0_CTS_PIN,
-         CONFIG_UART0_RTS_PIN,
-#endif
-         },
-#endif
-#ifdef CONFIG_SERIAL_BFIN_UART1
-        {
-         0xFFC02000,
-         IRQ_UART1_RX,
-         IRQ_UART1_ERROR,
-#ifdef CONFIG_SERIAL_BFIN_DMA
-         CH_UART1_TX,
-         CH_UART1_RX,
-#endif
-#ifdef CONFIG_SERIAL_BFIN_CTSRTS
-         CONFIG_UART1_CTS_PIN,
-         CONFIG_UART1_RTS_PIN,
-#endif
-         },
-#endif
-};
-
-#define DRIVER_NAME "bfin-uart"
-
-#include <asm/bfin_serial.h>
diff --git a/arch/blackfin/mach-bf527/include/mach/defBF525.h b/arch/blackfin/mach-bf527/include/mach/defBF525.h
index cc383adfdffa..aab80bb1a683 100644
--- a/arch/blackfin/mach-bf527/include/mach/defBF525.h
+++ b/arch/blackfin/mach-bf527/include/mach/defBF525.h
@@ -185,8 +185,8 @@
 #define                USB_EP_NI7_TXTYPE  0xffc03bd4   /* Sets the transaction protocol and peripheral endpoint number for the Host Tx endpoint7 */
 #define            USB_EP_NI7_TXINTERVAL  0xffc03bd8   /* Sets the NAK response timeout on Endpoint7 */
 #define                USB_EP_NI7_RXTYPE  0xffc03bdc   /* Sets the transaction protocol and peripheral endpoint number for the Host Rx endpoint7 */
-#define            USB_EP_NI7_RXINTERVAL  0xffc03bf0   /* Sets the polling interval for Interrupt/Isochronous transfers or the NAK response timeout on Bulk transfers for Host Rx endpoint7 */
-#define               USB_EP_NI7_TXCOUNT  0xffc03bf8   /* Number of bytes to be written to the endpoint7 Tx FIFO */
+#define            USB_EP_NI7_RXINTERVAL  0xffc03be0   /* Sets the polling interval for Interrupt/Isochronous transfers or the NAK response timeout on Bulk transfers for Host Rx endpoint7 */
+#define               USB_EP_NI7_TXCOUNT  0xffc03be8   /* Number of bytes to be written to the endpoint7 Tx FIFO */
 
 #define                USB_DMA_INTERRUPT  0xffc03c00   /* Indicates pending interrupts for the DMA channels */
 
diff --git a/arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h b/arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h
deleted file mode 100644
index 45dcaa4f3e41..000000000000
--- a/arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2006-2009 Analog Devices Inc.
- *
- * Licensed under the GPL-2 or later
- */
-
-#include <asm/dma.h>
-#include <asm/portmux.h>
-
-#ifdef CONFIG_BFIN_UART0_CTSRTS
-# define CONFIG_SERIAL_BFIN_CTSRTS
-# ifndef CONFIG_UART0_CTS_PIN
-#  define CONFIG_UART0_CTS_PIN -1
-# endif
-# ifndef CONFIG_UART0_RTS_PIN
-#  define CONFIG_UART0_RTS_PIN -1
-# endif
-#endif
-
-struct bfin_serial_res {
-        unsigned long   uart_base_addr;
-        int             uart_irq;
-        int             uart_status_irq;
-#ifdef CONFIG_SERIAL_BFIN_DMA
-        unsigned int    uart_tx_dma_channel;
-        unsigned int    uart_rx_dma_channel;
-#endif
-#ifdef CONFIG_SERIAL_BFIN_CTSRTS
-        int             uart_cts_pin;
-        int             uart_rts_pin;
-#endif
-};
-
-struct bfin_serial_res bfin_serial_resource[] = {
-        {
-        0xFFC00400,
-        IRQ_UART0_RX,
-        IRQ_UART0_ERROR,
-#ifdef CONFIG_SERIAL_BFIN_DMA
-        CH_UART0_TX,
-        CH_UART0_RX,
-#endif
-#ifdef CONFIG_SERIAL_BFIN_CTSRTS
-        CONFIG_UART0_CTS_PIN,
-        CONFIG_UART0_RTS_PIN,
-#endif
-        }
-};
-
-#define DRIVER_NAME "bfin-uart"
-
-#include <asm/bfin_serial.h>
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index e16dc4560048..76db1d483173 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -382,7 +382,6 @@ static struct platform_device net2272_bfin_device = {
 #endif
 
 #if defined(CONFIG_MTD_NAND_PLATFORM) || defined(CONFIG_MTD_NAND_PLATFORM_MODULE)
-#ifdef CONFIG_MTD_PARTITIONS
 const char *part_probes[] = { "cmdlinepart", "RedBoot", NULL };
 
 static struct mtd_partition bfin_plat_nand_partitions[] = {
@@ -396,7 +395,6 @@ static struct mtd_partition bfin_plat_nand_partitions[] = {
                 .offset = MTDPART_OFS_APPEND,
         },
 };
-#endif
 
 #define BFIN_NAND_PLAT_CLE 2
 #define BFIN_NAND_PLAT_ALE 1
@@ -423,11 +421,9 @@ static struct platform_nand_data bfin_plat_nand_data = {
         .chip = {
                 .nr_chips = 1,
                 .chip_delay = 30,
-#ifdef CONFIG_MTD_PARTITIONS
                 .part_probe_types = part_probes,
                 .partitions = bfin_plat_nand_partitions,
                 .nr_partitions = ARRAY_SIZE(bfin_plat_nand_partitions),
-#endif
         },
         .ctrl = {
                 .cmd_ctrl  = bfin_plat_nand_cmd_ctrl,
diff --git a/arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h b/arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h
deleted file mode 100644
index 3e955dba8951..000000000000
--- a/arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2006-2009 Analog Devices Inc.
- *
- * Licensed under the GPL-2 or later
- */
-
-#include <asm/dma.h>
-#include <asm/portmux.h>
-
-#if defined(CONFIG_BFIN_UART0_CTSRTS) || defined(CONFIG_BFIN_UART1_CTSRTS)
-# define CONFIG_SERIAL_BFIN_CTSRTS
-
-# ifndef CONFIG_UART0_CTS_PIN
-#  define CONFIG_UART0_CTS_PIN -1
-# endif
-
-# ifndef CONFIG_UART0_RTS_PIN
-#  define CONFIG_UART0_RTS_PIN -1
-# endif
-
-# ifndef CONFIG_UART1_CTS_PIN
-#  define CONFIG_UART1_CTS_PIN -1
-# endif
-
-# ifndef CONFIG_UART1_RTS_PIN
-#  define CONFIG_UART1_RTS_PIN -1
-# endif
-#endif
-
-struct bfin_serial_res {
-        unsigned long   uart_base_addr;
-        int             uart_irq;
-        int             uart_status_irq;
-#ifdef CONFIG_SERIAL_BFIN_DMA
-        unsigned int    uart_tx_dma_channel;
-        unsigned int    uart_rx_dma_channel;
-#endif
-#ifdef CONFIG_SERIAL_BFIN_CTSRTS
-        int     uart_cts_pin;
-        int     uart_rts_pin;
-#endif
-};
-
-struct bfin_serial_res bfin_serial_resource[] = {
-#ifdef CONFIG_SERIAL_BFIN_UART0
-        {
-        0xFFC00400,
-        IRQ_UART0_RX,
-        IRQ_UART0_ERROR,
-#ifdef CONFIG_SERIAL_BFIN_DMA
-        CH_UART0_TX,
-        CH_UART0_RX,
-#endif
-#ifdef CONFIG_SERIAL_BFIN_CTSRTS
-        CONFIG_UART0_CTS_PIN,
-        CONFIG_UART0_RTS_PIN,
-#endif
-        },
-#endif
-#ifdef CONFIG_SERIAL_BFIN_UART1
-        {
-        0xFFC02000,
-        IRQ_UART1_RX,
-        IRQ_UART1_ERROR,
-#ifdef CONFIG_SERIAL_BFIN_DMA
-        CH_UART1_TX,
-        CH_UART1_RX,
-#endif
-#ifdef CONFIG_SERIAL_BFIN_CTSRTS
-        CONFIG_UART1_CTS_PIN,
-        CONFIG_UART1_RTS_PIN,
-#endif
-        },
-#endif
-};
-
-#define DRIVER_NAME "bfin-uart"
-
-#include <asm/bfin_serial.h>
diff --git a/arch/blackfin/mach-bf538/include/mach/bfin_serial_5xx.h b/arch/blackfin/mach-bf538/include/mach/bfin_serial_5xx.h
deleted file mode 100644
index beb502e9cb33..000000000000
--- a/arch/blackfin/mach-bf538/include/mach/bfin_serial_5xx.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 2008-2009 Analog Devices Inc.
- *
- * Licensed under the GPL-2 or later.
- */
-
-#include <asm/dma.h>
-#include <asm/portmux.h>
-
-#if defined(CONFIG_BFIN_UART0_CTSRTS) || defined(CONFIG_BFIN_UART1_CTSRTS)
-# define CONFIG_SERIAL_BFIN_CTSRTS
-
-# ifndef CONFIG_UART0_CTS_PIN
-#  define CONFIG_UART0_CTS_PIN -1
-# endif
-
-# ifndef CONFIG_UART0_RTS_PIN
-#  define CONFIG_UART0_RTS_PIN -1
-# endif
-
-# ifndef CONFIG_UART1_CTS_PIN
-#  define CONFIG_UART1_CTS_PIN -1
-# endif
-
-# ifndef CONFIG_UART1_RTS_PIN
-#  define CONFIG_UART1_RTS_PIN -1
-# endif
-#endif
-
-struct bfin_serial_res {
-        unsigned long   uart_base_addr;
-        int             uart_irq;
-        int             uart_status_irq;
-#ifdef CONFIG_SERIAL_BFIN_DMA
-        unsigned int    uart_tx_dma_channel;
-        unsigned int    uart_rx_dma_channel;
-#endif
-#ifdef CONFIG_SERIAL_BFIN_CTSRTS
-        int     uart_cts_pin;
-        int     uart_rts_pin;
-#endif
-};
-
-struct bfin_serial_res bfin_serial_resource[] = {
-#ifdef CONFIG_SERIAL_BFIN_UART0
-        {
-        0xFFC00400,
-        IRQ_UART0_RX,
-        IRQ_UART0_ERROR,
-#ifdef CONFIG_SERIAL_BFIN_DMA
-        CH_UART0_TX,
-        CH_UART0_RX,
-#endif
-#ifdef CONFIG_SERIAL_BFIN_CTSRTS
-        CONFIG_UART0_CTS_PIN,
-        CONFIG_UART0_RTS_PIN,
-#endif
-        },
-#endif
-#ifdef CONFIG_SERIAL_BFIN_UART1
-        {
-        0xFFC02000,
-        IRQ_UART1_RX,
-        IRQ_UART1_ERROR,
-#ifdef CONFIG_SERIAL_BFIN_DMA
-        CH_UART1_TX,
-        CH_UART1_RX,
-#endif
-#ifdef CONFIG_SERIAL_BFIN_CTSRTS
-        CONFIG_UART1_CTS_PIN,
-        CONFIG_UART1_RTS_PIN,
-#endif
-        },
-#endif
-#ifdef CONFIG_SERIAL_BFIN_UART2
-        {
-        0xFFC02100,
-        IRQ_UART2_RX,
-#ifdef CONFIG_SERIAL_BFIN_DMA
-        CH_UART2_TX,
-        CH_UART2_RX,
-#endif
-#ifdef CONFIG_BFIN_UART2_CTSRTS
-        CONFIG_UART2_CTS_PIN,
-        CONFIG_UART2_RTS_PIN,
-#endif
-        },
-#endif
-};
-
-#define DRIVER_NAME "bfin-uart"
-
-#include <asm/bfin_serial.h>
diff --git a/arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h b/arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h
deleted file mode 100644
index 0d94edaaaa2e..000000000000
--- a/arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 2007-2009 Analog Devices Inc.
- *
- * Licensed under the GPL-2 or later.
- */
-
-#include <asm/dma.h>
-#include <asm/portmux.h>
-
-#if defined(CONFIG_BFIN_UART0_CTSRTS) || defined(CONFIG_BFIN_UART1_CTSRTS) || \
-        defined(CONFIG_BFIN_UART2_CTSRTS) || defined(CONFIG_BFIN_UART3_CTSRTS)
-# define CONFIG_SERIAL_BFIN_HARD_CTSRTS
-#endif
-
-struct bfin_serial_res {
-        unsigned long   uart_base_addr;
-        int             uart_irq;
-        int             uart_status_irq;
-#ifdef CONFIG_SERIAL_BFIN_DMA
-        unsigned int    uart_tx_dma_channel;
-        unsigned int    uart_rx_dma_channel;
-#endif
-#ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
-        int             uart_cts_pin;
-        int             uart_rts_pin;
-#endif
-};
-
-struct bfin_serial_res bfin_serial_resource[] = {
-#ifdef CONFIG_SERIAL_BFIN_UART0
-        {
-        0xFFC00400,
-        IRQ_UART0_RX,
-        IRQ_UART0_ERROR,
-#ifdef CONFIG_SERIAL_BFIN_DMA
-        CH_UART0_TX,
-        CH_UART0_RX,
-#endif
-#ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
-        0,
-        0,
-#endif
-        },
-#endif
-#ifdef CONFIG_SERIAL_BFIN_UART1
-        {
-        0xFFC02000,
-        IRQ_UART1_RX,
-        IRQ_UART1_ERROR,
-#ifdef CONFIG_SERIAL_BFIN_DMA
-        CH_UART1_TX,
-        CH_UART1_RX,
-#endif
-#ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
-        GPIO_PE10,
-        GPIO_PE9,
-#endif
-        },
-#endif
-#ifdef CONFIG_SERIAL_BFIN_UART2
-        {
-        0xFFC02100,
-        IRQ_UART2_RX,
-        IRQ_UART2_ERROR,
-#ifdef CONFIG_SERIAL_BFIN_DMA
-        CH_UART2_TX,
-        CH_UART2_RX,
-#endif
-#ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
-        0,
-        0,
-#endif
-        },
-#endif
-#ifdef CONFIG_SERIAL_BFIN_UART3
-        {
-        0xFFC03100,
-        IRQ_UART3_RX,
-        IRQ_UART3_ERROR,
-#ifdef CONFIG_SERIAL_BFIN_DMA
-        CH_UART3_TX,
-        CH_UART3_RX,
-#endif
-#ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
-        GPIO_PB3,
-        GPIO_PB2,
-#endif
-        },
-#endif
-};
-
-#define DRIVER_NAME "bfin-uart"
-
-#include <asm/bfin_serial.h>
diff --git a/arch/blackfin/mach-bf548/include/mach/defBF547.h b/arch/blackfin/mach-bf548/include/mach/defBF547.h
index 1cbba115f96f..1fa41ec03f31 100644
--- a/arch/blackfin/mach-bf548/include/mach/defBF547.h
+++ b/arch/blackfin/mach-bf548/include/mach/defBF547.h
@@ -271,10 +271,10 @@
 #define            USB_EP_NI0_TXINTERVAL  0xffc03e18   /* Sets the NAK response timeout on Endpoint 0 */
 #define                USB_EP_NI0_RXTYPE  0xffc03e1c   /* Sets the transaction protocol and peripheral endpoint number for the Host Rx endpoint0 */
 #define            USB_EP_NI0_RXINTERVAL  0xffc03e20   /* Sets the polling interval for Interrupt/Isochronous transfers or the NAK response timeout on Bulk transfers for Host Rx endpoint0 */
+#define               USB_EP_NI0_TXCOUNT  0xffc03e28   /* Number of bytes to be written to the endpoint0 Tx FIFO */
 
 /* USB Endpoint 1 Control Registers */
 
-#define               USB_EP_NI0_TXCOUNT  0xffc03e28   /* Number of bytes to be written to the endpoint0 Tx FIFO */
 #define                USB_EP_NI1_TXMAXP  0xffc03e40   /* Maximum packet size for Host Tx endpoint1 */
 #define                 USB_EP_NI1_TXCSR  0xffc03e44   /* Control Status register for endpoint1 */
 #define                USB_EP_NI1_RXMAXP  0xffc03e48   /* Maximum packet size for Host Rx endpoint1 */
@@ -284,10 +284,10 @@
 #define            USB_EP_NI1_TXINTERVAL  0xffc03e58   /* Sets the NAK response timeout on Endpoint1 */
 #define                USB_EP_NI1_RXTYPE  0xffc03e5c   /* Sets the transaction protocol and peripheral endpoint number for the Host Rx endpoint1 */
 #define            USB_EP_NI1_RXINTERVAL  0xffc03e60   /* Sets the polling interval for Interrupt/Isochronous transfers or the NAK response timeout on Bulk transfers for Host Rx endpoint1 */
+#define               USB_EP_NI1_TXCOUNT  0xffc03e68   /* Number of bytes to be written to the+H102 endpoint1 Tx FIFO */
 
 /* USB Endpoint 2 Control Registers */
 
-#define               USB_EP_NI1_TXCOUNT  0xffc03e68   /* Number of bytes to be written to the+H102 endpoint1 Tx FIFO */
 #define                USB_EP_NI2_TXMAXP  0xffc03e80   /* Maximum packet size for Host Tx endpoint2 */
 #define                 USB_EP_NI2_TXCSR  0xffc03e84   /* Control Status register for endpoint2 */
 #define                USB_EP_NI2_RXMAXP  0xffc03e88   /* Maximum packet size for Host Rx endpoint2 */
@@ -297,10 +297,10 @@
 #define            USB_EP_NI2_TXINTERVAL  0xffc03e98   /* Sets the NAK response timeout on Endpoint2 */
 #define                USB_EP_NI2_RXTYPE  0xffc03e9c   /* Sets the transaction protocol and peripheral endpoint number for the Host Rx endpoint2 */
 #define            USB_EP_NI2_RXINTERVAL  0xffc03ea0   /* Sets the polling interval for Interrupt/Isochronous transfers or the NAK response timeout on Bulk transfers for Host Rx endpoint2 */
+#define               USB_EP_NI2_TXCOUNT  0xffc03ea8   /* Number of bytes to be written to the endpoint2 Tx FIFO */
 
 /* USB Endpoint 3 Control Registers */
 
-#define               USB_EP_NI2_TXCOUNT  0xffc03ea8   /* Number of bytes to be written to the endpoint2 Tx FIFO */
 #define                USB_EP_NI3_TXMAXP  0xffc03ec0   /* Maximum packet size for Host Tx endpoint3 */
 #define                 USB_EP_NI3_TXCSR  0xffc03ec4   /* Control Status register for endpoint3 */
 #define                USB_EP_NI3_RXMAXP  0xffc03ec8   /* Maximum packet size for Host Rx endpoint3 */
@@ -310,10 +310,10 @@
 #define            USB_EP_NI3_TXINTERVAL  0xffc03ed8   /* Sets the NAK response timeout on Endpoint3 */
 #define                USB_EP_NI3_RXTYPE  0xffc03edc   /* Sets the transaction protocol and peripheral endpoint number for the Host Rx endpoint3 */
 #define            USB_EP_NI3_RXINTERVAL  0xffc03ee0   /* Sets the polling interval for Interrupt/Isochronous transfers or the NAK response timeout on Bulk transfers for Host Rx endpoint3 */
+#define               USB_EP_NI3_TXCOUNT  0xffc03ee8   /* Number of bytes to be written to the H124endpoint3 Tx FIFO */
 
 /* USB Endpoint 4 Control Registers */
 
-#define               USB_EP_NI3_TXCOUNT  0xffc03ee8   /* Number of bytes to be written to the H124endpoint3 Tx FIFO */
 #define                USB_EP_NI4_TXMAXP  0xffc03f00   /* Maximum packet size for Host Tx endpoint4 */
 #define                 USB_EP_NI4_TXCSR  0xffc03f04   /* Control Status register for endpoint4 */
 #define                USB_EP_NI4_RXMAXP  0xffc03f08   /* Maximum packet size for Host Rx endpoint4 */
@@ -323,10 +323,10 @@
 #define            USB_EP_NI4_TXINTERVAL  0xffc03f18   /* Sets the NAK response timeout on Endpoint4 */
 #define                USB_EP_NI4_RXTYPE  0xffc03f1c   /* Sets the transaction protocol and peripheral endpoint number for the Host Rx endpoint4 */
 #define            USB_EP_NI4_RXINTERVAL  0xffc03f20   /* Sets the polling interval for Interrupt/Isochronous transfers or the NAK response timeout on Bulk transfers for Host Rx endpoint4 */
+#define               USB_EP_NI4_TXCOUNT  0xffc03f28   /* Number of bytes to be written to the endpoint4 Tx FIFO */
 
 /* USB Endpoint 5 Control Registers */
 
-#define               USB_EP_NI4_TXCOUNT  0xffc03f28   /* Number of bytes to be written to the endpoint4 Tx FIFO */
 #define                USB_EP_NI5_TXMAXP  0xffc03f40   /* Maximum packet size for Host Tx endpoint5 */
 #define                 USB_EP_NI5_TXCSR  0xffc03f44   /* Control Status register for endpoint5 */
 #define                USB_EP_NI5_RXMAXP  0xffc03f48   /* Maximum packet size for Host Rx endpoint5 */
@@ -336,10 +336,10 @@
 #define            USB_EP_NI5_TXINTERVAL  0xffc03f58   /* Sets the NAK response timeout on Endpoint5 */
 #define                USB_EP_NI5_RXTYPE  0xffc03f5c   /* Sets the transaction protocol and peripheral endpoint number for the Host Rx endpoint5 */
 #define            USB_EP_NI5_RXINTERVAL  0xffc03f60   /* Sets the polling interval for Interrupt/Isochronous transfers or the NAK response timeout on Bulk transfers for Host Rx endpoint5 */
+#define               USB_EP_NI5_TXCOUNT  0xffc03f68   /* Number of bytes to be written to the H145endpoint5 Tx FIFO */
 
 /* USB Endpoint 6 Control Registers */
 
-#define               USB_EP_NI5_TXCOUNT  0xffc03f68   /* Number of bytes to be written to the H145endpoint5 Tx FIFO */
 #define                USB_EP_NI6_TXMAXP  0xffc03f80   /* Maximum packet size for Host Tx endpoint6 */
 #define                 USB_EP_NI6_TXCSR  0xffc03f84   /* Control Status register for endpoint6 */
 #define                USB_EP_NI6_RXMAXP  0xffc03f88   /* Maximum packet size for Host Rx endpoint6 */
@@ -349,10 +349,10 @@
 #define            USB_EP_NI6_TXINTERVAL  0xffc03f98   /* Sets the NAK response timeout on Endpoint6 */
 #define                USB_EP_NI6_RXTYPE  0xffc03f9c   /* Sets the transaction protocol and peripheral endpoint number for the Host Rx endpoint6 */
 #define            USB_EP_NI6_RXINTERVAL  0xffc03fa0   /* Sets the polling interval for Interrupt/Isochronous transfers or the NAK response timeout on Bulk transfers for Host Rx endpoint6 */
+#define               USB_EP_NI6_TXCOUNT  0xffc03fa8   /* Number of bytes to be written to the endpoint6 Tx FIFO */
 
 /* USB Endpoint 7 Control Registers */
 
-#define               USB_EP_NI6_TXCOUNT  0xffc03fa8   /* Number of bytes to be written to the endpoint6 Tx FIFO */
 #define                USB_EP_NI7_TXMAXP  0xffc03fc0   /* Maximum packet size for Host Tx endpoint7 */
 #define                 USB_EP_NI7_TXCSR  0xffc03fc4   /* Control Status register for endpoint7 */
 #define                USB_EP_NI7_RXMAXP  0xffc03fc8   /* Maximum packet size for Host Rx endpoint7 */
@@ -361,8 +361,9 @@
 #define                USB_EP_NI7_TXTYPE  0xffc03fd4   /* Sets the transaction protocol and peripheral endpoint number for the Host Tx endpoint7 */
 #define            USB_EP_NI7_TXINTERVAL  0xffc03fd8   /* Sets the NAK response timeout on Endpoint7 */
 #define                USB_EP_NI7_RXTYPE  0xffc03fdc   /* Sets the transaction protocol and peripheral endpoint number for the Host Rx endpoint7 */
-#define            USB_EP_NI7_RXINTERVAL  0xffc03ff0   /* Sets the polling interval for Interrupt/Isochronous transfers or the NAK response timeout on Bulk transfers for Host Rx endpoint7 */
-#define               USB_EP_NI7_TXCOUNT  0xffc03ff8   /* Number of bytes to be written to the endpoint7 Tx FIFO */
+#define            USB_EP_NI7_RXINTERVAL  0xffc03fe0   /* Sets the polling interval for Interrupt/Isochronous transfers or the NAK response timeout on Bulk transfers for Host Rx endpoint7 */
+#define               USB_EP_NI7_TXCOUNT  0xffc03fe8   /* Number of bytes to be written to the endpoint7 Tx FIFO */
+
 #define                USB_DMA_INTERRUPT  0xffc04000   /* Indicates pending interrupts for the DMA channels */
 
 /* USB Channel 0 Config Registers */
diff --git a/arch/blackfin/mach-bf561/boards/acvilon.c b/arch/blackfin/mach-bf561/boards/acvilon.c
index 3926cd909b66..9231a942892b 100644
--- a/arch/blackfin/mach-bf561/boards/acvilon.c
+++ b/arch/blackfin/mach-bf561/boards/acvilon.c
@@ -243,7 +243,6 @@ static struct platform_device bfin_uart0_device = {
 
 #if defined(CONFIG_MTD_NAND_PLATFORM) || defined(CONFIG_MTD_NAND_PLATFORM_MODULE)
 
-#ifdef CONFIG_MTD_PARTITIONS
 const char *part_probes[] = { "cmdlinepart", NULL };
 
 static struct mtd_partition bfin_plat_nand_partitions[] = {
@@ -257,7 +256,6 @@ static struct mtd_partition bfin_plat_nand_partitions[] = {
              .offset = MTDPART_OFS_APPEND,
              },
 };
-#endif
 
 #define BFIN_NAND_PLAT_CLE 2
 #define BFIN_NAND_PLAT_ALE 3
@@ -286,11 +284,9 @@ static struct platform_nand_data bfin_plat_nand_data = {
         .chip = {
                  .nr_chips = 1,
                  .chip_delay = 30,
-#ifdef CONFIG_MTD_PARTITIONS
                  .part_probe_types = part_probes,
                  .partitions = bfin_plat_nand_partitions,
                  .nr_partitions = ARRAY_SIZE(bfin_plat_nand_partitions),
-#endif
                  },
         .ctrl = {
                  .cmd_ctrl = bfin_plat_nand_cmd_ctrl,
diff --git a/arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h b/arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h
deleted file mode 100644
index 3a6947456cf1..000000000000
--- a/arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2006-2009 Analog Devices Inc.
- *
- * Licensed under the GPL-2 or later.
- */
-
-#include <asm/dma.h>
-#include <asm/portmux.h>
-
-#ifdef CONFIG_BFIN_UART0_CTSRTS
-# define CONFIG_SERIAL_BFIN_CTSRTS
-# ifndef CONFIG_UART0_CTS_PIN
-#  define CONFIG_UART0_CTS_PIN -1
-# endif
-# ifndef CONFIG_UART0_RTS_PIN
-#  define CONFIG_UART0_RTS_PIN -1
-# endif
-#endif
-
-struct bfin_serial_res {
-        unsigned long   uart_base_addr;
-        int             uart_irq;
-        int             uart_status_irq;
-#ifdef CONFIG_SERIAL_BFIN_DMA
-        unsigned int    uart_tx_dma_channel;
-        unsigned int    uart_rx_dma_channel;
-#endif
-#ifdef CONFIG_SERIAL_BFIN_CTSRTS
-        int             uart_cts_pin;
-        int             uart_rts_pin;
-#endif
-};
-
-struct bfin_serial_res bfin_serial_resource[] = {
-        {
-        0xFFC00400,
-        IRQ_UART_RX,
-        IRQ_UART_ERROR,
-#ifdef CONFIG_SERIAL_BFIN_DMA
-        CH_UART_TX,
-        CH_UART_RX,
-#endif
-#ifdef CONFIG_SERIAL_BFIN_CTSRTS
-        CONFIG_UART0_CTS_PIN,
-        CONFIG_UART0_RTS_PIN,
-#endif
-        }
-};
-
-#define DRIVER_NAME "bfin-uart"
-
-#include <asm/bfin_serial.h>
diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S
index f96933f48a7f..225d311c9701 100644
--- a/arch/blackfin/mach-common/entry.S
+++ b/arch/blackfin/mach-common/entry.S
@@ -1753,6 +1753,8 @@ ENTRY(_sys_call_table)
         .long _sys_open_by_handle_at
         .long _sys_clock_adjtime
         .long _sys_syncfs
+        .long _sys_setns
+        .long _sys_sendmmsg             /* 380 */
 
         .rept NR_syscalls-(.-_sys_call_table)/4
         .long _sys_ni_syscall
diff --git a/arch/blackfin/mm/maccess.c b/arch/blackfin/mm/maccess.c
index b71cebc1f8a3..e2532114c5fd 100644
--- a/arch/blackfin/mm/maccess.c
+++ b/arch/blackfin/mm/maccess.c
@@ -16,7 +16,7 @@ static int validate_memory_access_address(unsigned long addr, int size)
         return bfin_mem_access_type(addr, size);
 }
 
-long probe_kernel_read(void *dst, void *src, size_t size)
+long probe_kernel_read(void *dst, const void *src, size_t size)
 {
         unsigned long lsrc = (unsigned long)src;
         int mem_type;
@@ -55,7 +55,7 @@ long probe_kernel_read(void *dst, void *src, size_t size)
         return -EFAULT;
 }
 
-long probe_kernel_write(void *dst, void *src, size_t size)
+long probe_kernel_write(void *dst, const void *src, size_t size)
 {
         unsigned long ldst = (unsigned long)dst;
         int mem_type;
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index a6d03069d0ff..17addacb169e 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -31,10 +31,6 @@ config ARCH_HAS_ILOG2_U64
         bool
         default n
 
-config GENERIC_FIND_NEXT_BIT
-        bool
-        default y
-
 config GENERIC_HWEIGHT
         bool
         default y
@@ -274,7 +270,6 @@ config ETRAX_AXISFLASHMAP
         select MTD_JEDECPROBE if ETRAX_ARCH_V32
         select MTD_CHAR
         select MTD_BLOCK
-        select MTD_PARTITIONS
         select MTD_COMPLEX_MAPPINGS
         help
           This option enables MTD mapping of flash devices.  Needed to use
diff --git a/arch/cris/arch-v10/drivers/axisflashmap.c b/arch/cris/arch-v10/drivers/axisflashmap.c
index ed708e19d09e..a4bbdfd37bd8 100644
--- a/arch/cris/arch-v10/drivers/axisflashmap.c
+++ b/arch/cris/arch-v10/drivers/axisflashmap.c
@@ -372,7 +372,7 @@ static int __init init_axis_flash(void)
 #ifdef CONFIG_ETRAX_AXISFLASHMAP_MTD0WHOLE
         if (mymtd) {
                 main_partition.size = mymtd->size;
-                err = add_mtd_partitions(mymtd, &main_partition, 1);
+                err = mtd_device_register(mymtd, &main_partition, 1);
                 if (err)
                         panic("axisflashmap: Could not initialize "
                               "partition for whole main mtd device!\n");
@@ -382,10 +382,12 @@ static int __init init_axis_flash(void)
         if (mymtd) {
                 if (use_default_ptable) {
                         printk(KERN_INFO " Using default partition table.\n");
-                        err = add_mtd_partitions(mymtd, axis_default_partitions,
-                                                 NUM_DEFAULT_PARTITIONS);
+                        err = mtd_device_register(mymtd,
+                                                  axis_default_partitions,
+                                                  NUM_DEFAULT_PARTITIONS);
                 } else {
-                        err = add_mtd_partitions(mymtd, axis_partitions, pidx);
+                        err = mtd_device_register(mymtd, axis_partitions,
+                                                  pidx);
                 }
 
                 if (err)
diff --git a/arch/cris/arch-v10/kernel/entry.S b/arch/cris/arch-v10/kernel/entry.S
index 0d6420d087fd..1161883eb582 100644
--- a/arch/cris/arch-v10/kernel/entry.S
+++ b/arch/cris/arch-v10/kernel/entry.S
@@ -937,6 +937,7 @@ sys_call_table:
         .long sys_inotify_init1
         .long sys_preadv
         .long sys_pwritev
+        .long sys_setns                 /* 335 */
 
         /*
          * NOTE!! This doesn't have to be exact - we just have
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig
index 1633b120aa81..41a2732e8b9c 100644
--- a/arch/cris/arch-v32/drivers/Kconfig
+++ b/arch/cris/arch-v32/drivers/Kconfig
@@ -405,7 +405,6 @@ config ETRAX_AXISFLASHMAP
         select MTD_JEDECPROBE
         select MTD_CHAR
         select MTD_BLOCK
-        select MTD_PARTITIONS
         select MTD_COMPLEX_MAPPINGS
         help
           This option enables MTD mapping of flash devices.  Needed to use
diff --git a/arch/cris/arch-v32/drivers/axisflashmap.c b/arch/cris/arch-v32/drivers/axisflashmap.c
index 7b155f8203b8..a2bde3744622 100644
--- a/arch/cris/arch-v32/drivers/axisflashmap.c
+++ b/arch/cris/arch-v32/drivers/axisflashmap.c
@@ -561,7 +561,7 @@ static int __init init_axis_flash(void)
 #ifdef CONFIG_ETRAX_AXISFLASHMAP_MTD0WHOLE
         if (main_mtd) {
                 main_partition.size = main_mtd->size;
-                err = add_mtd_partitions(main_mtd, &main_partition, 1);
+                err = mtd_device_register(main_mtd, &main_partition, 1);
                 if (err)
                         panic("axisflashmap: Could not initialize "
                               "partition for whole main mtd device!\n");
@@ -597,7 +597,8 @@ static int __init init_axis_flash(void)
                         mtd_ram->erasesize = (main_mtd ? main_mtd->erasesize :
                                 CONFIG_ETRAX_PTABLE_SECTOR);
                 } else {
-                        err = add_mtd_partitions(main_mtd, &partition[part], 1);
+                        err = mtd_device_register(main_mtd, &partition[part],
+                                                  1);
                         if (err)
                                 panic("axisflashmap: Could not add mtd "
                                         "partition %d\n", part);
@@ -633,7 +634,7 @@ static int __init init_axis_flash(void)
 #ifndef CONFIG_ETRAX_VCS_SIM
         if (aux_mtd) {
                 aux_partition.size = aux_mtd->size;
-                err = add_mtd_partitions(aux_mtd, &aux_partition, 1);
+                err = mtd_device_register(aux_mtd, &aux_partition, 1);
                 if (err)
                         panic("axisflashmap: Could not initialize "
                               "aux mtd device!\n");
diff --git a/arch/cris/arch-v32/kernel/entry.S b/arch/cris/arch-v32/kernel/entry.S
index 3abf12c23e5f..84fed7e91ada 100644
--- a/arch/cris/arch-v32/kernel/entry.S
+++ b/arch/cris/arch-v32/kernel/entry.S
@@ -880,6 +880,7 @@ sys_call_table:
         .long sys_inotify_init1
         .long sys_preadv
         .long sys_pwritev
+        .long sys_setns                 /* 335 */
 
         /*
          * NOTE!! This doesn't have to be exact - we just have
diff --git a/arch/cris/include/asm/unistd.h b/arch/cris/include/asm/unistd.h
index f6fad83b3a8c..f921b8b0f97e 100644
--- a/arch/cris/include/asm/unistd.h
+++ b/arch/cris/include/asm/unistd.h
@@ -339,10 +339,11 @@
 #define __NR_inotify_init1      332
 #define __NR_preadv             333
 #define __NR_pwritev            334
+#define __NR_setns              335
 
 #ifdef __KERNEL__
 
-#define NR_syscalls 335
+#define NR_syscalls 336
 
 #include <arch/unistd.h>
 
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index 064f62196745..cb884e489425 100644
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -19,14 +19,6 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
         bool
 
-config GENERIC_FIND_NEXT_BIT
-        bool
-        default y
-
-config GENERIC_FIND_BIT_LE
-        bool
-        default y
-
 config GENERIC_HWEIGHT
         bool
         default y
diff --git a/arch/frv/include/asm/suspend.h b/arch/frv/include/asm/suspend.h
deleted file mode 100644
index 5fa7b5a6ee40..000000000000
--- a/arch/frv/include/asm/suspend.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* suspend.h: suspension stuff
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * 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.
- */
-
-#ifndef _ASM_SUSPEND_H
-#define _ASM_SUSPEND_H
-
-static inline int arch_prepare_suspend(void)
-{
-        return 0;
-}
-
-#endif /* _ASM_SUSPEND_H */
diff --git a/arch/frv/include/asm/unistd.h b/arch/frv/include/asm/unistd.h
index b28da499e22a..a569dff7cd59 100644
--- a/arch/frv/include/asm/unistd.h
+++ b/arch/frv/include/asm/unistd.h
@@ -343,10 +343,11 @@
 #define __NR_pwritev            334
 #define __NR_rt_tgsigqueueinfo  335
 #define __NR_perf_event_open    336
+#define __NR_setns              337
 
 #ifdef __KERNEL__
 
-#define NR_syscalls 337
+#define NR_syscalls 338
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 /* #define __ARCH_WANT_OLD_READDIR */
diff --git a/arch/frv/kernel/entry.S b/arch/frv/kernel/entry.S
index 63d579bf1c29..017d6d7b784f 100644
--- a/arch/frv/kernel/entry.S
+++ b/arch/frv/kernel/entry.S
@@ -1526,5 +1526,6 @@ sys_call_table:
         .long sys_pwritev
         .long sys_rt_tgsigqueueinfo     /* 335 */
         .long sys_perf_event_open
+        .long sys_setns
 
 syscall_table_size = (. - sys_call_table)
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index e20322ffcaf8..091ed6192ae8 100644
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -41,14 +41,6 @@ config ARCH_HAS_ILOG2_U64
         bool
         default n
 
-config GENERIC_FIND_NEXT_BIT
-        bool
-        default y
-
-config GENERIC_FIND_BIT_LE
-        bool
-        default y
-
 config GENERIC_HWEIGHT
         bool
         default y
diff --git a/arch/h8300/include/asm/unistd.h b/arch/h8300/include/asm/unistd.h
index 50f2c5a36591..2c3f8e60b1e0 100644
--- a/arch/h8300/include/asm/unistd.h
+++ b/arch/h8300/include/asm/unistd.h
@@ -325,10 +325,11 @@
 #define __NR_move_pages         317
 #define __NR_getcpu             318
 #define __NR_epoll_pwait        319
+#define __NR_setns              320
 
 #ifdef __KERNEL__
 
-#define NR_syscalls 320
+#define NR_syscalls 321
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
diff --git a/arch/h8300/kernel/syscalls.S b/arch/h8300/kernel/syscalls.S
index faefaff7d43d..f4b2e67bcc34 100644
--- a/arch/h8300/kernel/syscalls.S
+++ b/arch/h8300/kernel/syscalls.S
@@ -333,6 +333,7 @@ SYMBOL_NAME_LABEL(sys_call_table)
         .long SYMBOL_NAME(sys_ni_syscall)       /* sys_move_pages */
         .long SYMBOL_NAME(sys_getcpu)
         .long SYMBOL_NAME(sys_ni_syscall)       /* sys_epoll_pwait */
+        .long SYMBOL_NAME(sys_setns)            /* 320 */
 
         .macro  call_sp addr
         mov.l   #SYMBOL_NAME(\addr),er6
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index e5cc56ae6ce3..38280ef4a2af 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -78,10 +78,6 @@ config HUGETLB_PAGE_SIZE_VARIABLE
         depends on HUGETLB_PAGE
         default y
 
-config GENERIC_FIND_NEXT_BIT
-        bool
-        default y
-
 config GENERIC_CALIBRATE_DELAY
         bool
         default y
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h
index 404d037c5e10..7c928da35b17 100644
--- a/arch/ia64/include/asm/unistd.h
+++ b/arch/ia64/include/asm/unistd.h
@@ -319,11 +319,13 @@
 #define __NR_open_by_handle_at          1327
 #define __NR_clock_adjtime              1328
 #define __NR_syncfs                     1329
+#define __NR_setns                      1330
+#define __NR_sendmmsg                   1331
 
 #ifdef __KERNEL__
 
 
-#define NR_syscalls                     306 /* length of syscall table */
+#define NR_syscalls                     308 /* length of syscall table */
 
 /*
  * The following defines stop scripts/checksyscalls.sh from complaining about
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index 6de2e23b3636..97dd2abdeb1a 100644
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -1775,6 +1775,8 @@ sys_call_table:
         data8 sys_open_by_handle_at
         data8 sys_clock_adjtime
         data8 sys_syncfs
+        data8 sys_setns                         // 1330
+        data8 sys_sendmmsg
 
         .org sys_call_table + 8*NR_syscalls     // guard against failures to increase NR_syscalls
 #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index 04440cc09b40..85118dfe9bb5 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -36,7 +36,7 @@
 static cycle_t itc_get_cycles(struct clocksource *cs);
 
 struct fsyscall_gtod_data_t fsyscall_gtod_data = {
-        .lock = SEQLOCK_UNLOCKED,
+        .lock = __SEQLOCK_UNLOCKED(fsyscall_gtod_data.lock),
 };
 
 struct itc_jitter_data_t itc_jitter_data;
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index 736b808d2291..85b44e858225 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -256,14 +256,6 @@ config ARCH_HAS_ILOG2_U64
         bool
         default n
 
-config GENERIC_FIND_NEXT_BIT
-        bool
-        default y
-
-config GENERIC_FIND_BIT_LE
-        bool
-        default y
-
 config GENERIC_HWEIGHT
         bool
         default y
diff --git a/arch/m32r/include/asm/smp.h b/arch/m32r/include/asm/smp.h
index 8accc1bb0263..cf7829a61551 100644
--- a/arch/m32r/include/asm/smp.h
+++ b/arch/m32r/include/asm/smp.h
@@ -81,11 +81,11 @@ static __inline__ int cpu_number_map(int cpu)
 
 static __inline__ unsigned int num_booting_cpus(void)
 {
-        return cpus_weight(cpu_callout_map);
+        return cpumask_weight(&cpu_callout_map);
 }
 
 extern void smp_send_timer(void);
-extern unsigned long send_IPI_mask_phys(cpumask_t, int, int);
+extern unsigned long send_IPI_mask_phys(const cpumask_t*, int, int);
 
 extern void arch_send_call_function_single_ipi(int cpu);
 extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);
diff --git a/arch/m32r/include/asm/unistd.h b/arch/m32r/include/asm/unistd.h
index c70545689da8..3e1db561aacc 100644
--- a/arch/m32r/include/asm/unistd.h
+++ b/arch/m32r/include/asm/unistd.h
@@ -330,10 +330,11 @@
 /* #define __NR_timerfd         322 removed */
 #define __NR_eventfd            323
 #define __NR_fallocate          324
+#define __NR_setns              325
 
 #ifdef __KERNEL__
 
-#define NR_syscalls 325
+#define NR_syscalls 326
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_STAT64
diff --git a/arch/m32r/kernel/smp.c b/arch/m32r/kernel/smp.c
index fc10b39893d4..092d40a6708e 100644
--- a/arch/m32r/kernel/smp.c
+++ b/arch/m32r/kernel/smp.c
@@ -30,6 +30,7 @@
 #include <asm/io.h>
 #include <asm/mmu_context.h>
 #include <asm/m32r.h>
+#include <asm/tlbflush.h>
 
 /*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
 /* Data structures and variables                                             */
@@ -61,33 +62,22 @@ extern spinlock_t ipi_lock[];
 /* Function Prototypes                                                       */
 /*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
 
-void smp_send_reschedule(int);
 void smp_reschedule_interrupt(void);
-
-void smp_flush_cache_all(void);
 void smp_flush_cache_all_interrupt(void);
 
-void smp_flush_tlb_all(void);
 static void flush_tlb_all_ipi(void *);
-
-void smp_flush_tlb_mm(struct mm_struct *);
-void smp_flush_tlb_range(struct vm_area_struct *, unsigned long, \
-        unsigned long);
-void smp_flush_tlb_page(struct vm_area_struct *, unsigned long);
 static void flush_tlb_others(cpumask_t, struct mm_struct *,
         struct vm_area_struct *, unsigned long);
+
 void smp_invalidate_interrupt(void);
 
-void smp_send_stop(void);
 static void stop_this_cpu(void *);
 
-void smp_send_timer(void);
 void smp_ipi_timer_interrupt(struct pt_regs *);
 void smp_local_timer_interrupt(void);
 
 static void send_IPI_allbutself(int, int);
 static void send_IPI_mask(const struct cpumask *, int, int);
-unsigned long send_IPI_mask_phys(cpumask_t, int, int);
 
 /*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
 /* Rescheduling request Routines                                             */
@@ -162,10 +152,10 @@ void smp_flush_cache_all(void)
         unsigned long *mask;
 
         preempt_disable();
-        cpumask = cpu_online_map;
-        cpu_clear(smp_processor_id(), cpumask);
+        cpumask_copy(&cpumask, cpu_online_mask);
+        cpumask_clear_cpu(smp_processor_id(), &cpumask);
         spin_lock(&flushcache_lock);
-        mask=cpus_addr(cpumask);
+        mask=cpumask_bits(&cpumask);
         atomic_set_mask(*mask, (atomic_t *)&flushcache_cpumask);
         send_IPI_mask(&cpumask, INVALIDATE_CACHE_IPI, 0);
         _flush_cache_copyback_all();
@@ -263,8 +253,8 @@ void smp_flush_tlb_mm(struct mm_struct *mm)
         preempt_disable();
         cpu_id = smp_processor_id();
         mmc = &mm->context[cpu_id];
-        cpu_mask = *mm_cpumask(mm);
-        cpu_clear(cpu_id, cpu_mask);
+        cpumask_copy(&cpu_mask, mm_cpumask(mm));
+        cpumask_clear_cpu(cpu_id, &cpu_mask);
 
         if (*mmc != NO_CONTEXT) {
                 local_irq_save(flags);
@@ -275,7 +265,7 @@ void smp_flush_tlb_mm(struct mm_struct *mm)
                         cpumask_clear_cpu(cpu_id, mm_cpumask(mm));
                 local_irq_restore(flags);
         }
-        if (!cpus_empty(cpu_mask))
+        if (!cpumask_empty(&cpu_mask))
                 flush_tlb_others(cpu_mask, mm, NULL, FLUSH_ALL);
 
         preempt_enable();
@@ -333,8 +323,8 @@ void smp_flush_tlb_page(struct vm_area_struct *vma, unsigned long va)
         preempt_disable();
         cpu_id = smp_processor_id();
         mmc = &mm->context[cpu_id];
-        cpu_mask = *mm_cpumask(mm);
-        cpu_clear(cpu_id, cpu_mask);
+        cpumask_copy(&cpu_mask, mm_cpumask(mm));
+        cpumask_clear_cpu(cpu_id, &cpu_mask);
 
 #ifdef DEBUG_SMP
         if (!mm)
@@ -348,7 +338,7 @@ void smp_flush_tlb_page(struct vm_area_struct *vma, unsigned long va)
                 __flush_tlb_page(va);
                 local_irq_restore(flags);
         }
-        if (!cpus_empty(cpu_mask))
+        if (!cpumask_empty(&cpu_mask))
                 flush_tlb_others(cpu_mask, mm, vma, va);
 
         preempt_enable();
@@ -395,14 +385,14 @@ static void flush_tlb_others(cpumask_t cpumask, struct mm_struct *mm,
          * - current CPU must not be in mask
          * - mask must exist :)
          */
-        BUG_ON(cpus_empty(cpumask));
+        BUG_ON(cpumask_empty(&cpumask));
 
-        BUG_ON(cpu_isset(smp_processor_id(), cpumask));
+        BUG_ON(cpumask_test_cpu(smp_processor_id(), &cpumask));
         BUG_ON(!mm);
 
         /* If a CPU which we ran on has gone down, OK. */
-        cpus_and(cpumask, cpumask, cpu_online_map);
-        if (cpus_empty(cpumask))
+        cpumask_and(&cpumask, &cpumask, cpu_online_mask);
+        if (cpumask_empty(&cpumask))
                 return;
 
         /*
@@ -416,7 +406,7 @@ static void flush_tlb_others(cpumask_t cpumask, struct mm_struct *mm,
         flush_mm = mm;
         flush_vma = vma;
         flush_va = va;
-        mask=cpus_addr(cpumask);
+        mask=cpumask_bits(&cpumask);
         atomic_set_mask(*mask, (atomic_t *)&flush_cpumask);
 
         /*
@@ -425,7 +415,7 @@ static void flush_tlb_others(cpumask_t cpumask, struct mm_struct *mm,
          */
         send_IPI_mask(&cpumask, INVALIDATE_TLB_IPI, 0);
 
-        while (!cpus_empty(flush_cpumask)) {
+        while (!cpumask_empty((cpumask_t*)&flush_cpumask)) {
                 /* nothing. lockup detection does not belong here */
                 mb();
         }
@@ -460,7 +450,7 @@ void smp_invalidate_interrupt(void)
         int cpu_id = smp_processor_id();
         unsigned long *mmc = &flush_mm->context[cpu_id];
 
-        if (!cpu_isset(cpu_id, flush_cpumask))
+        if (!cpumask_test_cpu(cpu_id, &flush_cpumask))
                 return;
 
         if (flush_va == FLUSH_ALL) {
@@ -478,7 +468,7 @@ void smp_invalidate_interrupt(void)
                         __flush_tlb_page(va);
                 }
         }
-        cpu_clear(cpu_id, flush_cpumask);
+        cpumask_clear_cpu(cpu_id, (cpumask_t*)&flush_cpumask);
 }
 
 /*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
@@ -530,7 +520,7 @@ static void stop_this_cpu(void *dummy)
         /*
          * Remove this CPU:
          */
-        cpu_clear(cpu_id, cpu_online_map);
+        set_cpu_online(cpu_id, false);
 
         /*
          * PSW IE = 1;
@@ -725,8 +715,8 @@ static void send_IPI_allbutself(int ipi_num, int try)
 {
         cpumask_t cpumask;
 
-        cpumask = cpu_online_map;
-        cpu_clear(smp_processor_id(), cpumask);
+        cpumask_copy(&cpumask, cpu_online_mask);
+        cpumask_clear_cpu(smp_processor_id(), &cpumask);
 
         send_IPI_mask(&cpumask, ipi_num, try);
 }
@@ -763,13 +753,13 @@ static void send_IPI_mask(const struct cpumask *cpumask, int ipi_num, int try)
         cpumask_and(&tmp, cpumask, cpu_online_mask);
         BUG_ON(!cpumask_equal(cpumask, &tmp));
 
-        physid_mask = CPU_MASK_NONE;
+        cpumask_clear(&physid_mask);
         for_each_cpu(cpu_id, cpumask) {
                 if ((phys_id = cpu_to_physid(cpu_id)) != -1)
-                        cpu_set(phys_id, physid_mask);
+                        cpumask_set_cpu(phys_id, &physid_mask);
         }
 
-        send_IPI_mask_phys(physid_mask, ipi_num, try);
+        send_IPI_mask_phys(&physid_mask, ipi_num, try);
 }
 
 /*==========================================================================*
@@ -792,14 +782,14 @@ static void send_IPI_mask(const struct cpumask *cpumask, int ipi_num, int try)
  * ---------- --- --------------------------------------------------------
  *
  *==========================================================================*/
-unsigned long send_IPI_mask_phys(cpumask_t physid_mask, int ipi_num,
+unsigned long send_IPI_mask_phys(const cpumask_t *physid_mask, int ipi_num,
         int try)
 {
         spinlock_t *ipilock;
         volatile unsigned long *ipicr_addr;
         unsigned long ipicr_val;
         unsigned long my_physid_mask;
-        unsigned long mask = cpus_addr(physid_mask)[0];
+        unsigned long mask = cpumask_bits(physid_mask)[0];
 
 
         if (mask & ~physids_coerce(phys_cpu_present_map))
diff --git a/arch/m32r/kernel/smpboot.c b/arch/m32r/kernel/smpboot.c
index e034844cfc0d..cfdbe5d15002 100644
--- a/arch/m32r/kernel/smpboot.c
+++ b/arch/m32r/kernel/smpboot.c
@@ -135,9 +135,9 @@ void __devinit smp_prepare_boot_cpu(void)
 {
         bsp_phys_id = hard_smp_processor_id();
         physid_set(bsp_phys_id, phys_cpu_present_map);
-        cpu_set(0, cpu_online_map);     /* BSP's cpu_id == 0 */
-        cpu_set(0, cpu_callout_map);
-        cpu_set(0, cpu_callin_map);
+        set_cpu_online(0, true);        /* BSP's cpu_id == 0 */
+        cpumask_set_cpu(0, &cpu_callout_map);
+        cpumask_set_cpu(0, &cpu_callin_map);
 
         /*
          * Initialize the logical to physical CPU number mapping
@@ -178,7 +178,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
         for (phys_id = 0 ; phys_id < nr_cpu ; phys_id++)
                 physid_set(phys_id, phys_cpu_present_map);
 #ifndef CONFIG_HOTPLUG_CPU
-        init_cpu_present(&cpu_possible_map);
+        init_cpu_present(cpu_possible_mask);
 #endif
 
         show_mp_info(nr_cpu);
@@ -294,10 +294,10 @@ static void __init do_boot_cpu(int phys_id)
         send_status = 0;
         boot_status = 0;
 
-        cpu_set(phys_id, cpu_bootout_map);
+        cpumask_set_cpu(phys_id, &cpu_bootout_map);
 
         /* Send Startup IPI */
-        send_IPI_mask_phys(cpumask_of_cpu(phys_id), CPU_BOOT_IPI, 0);
+        send_IPI_mask_phys(cpumask_of(phys_id), CPU_BOOT_IPI, 0);
 
         Dprintk("Waiting for send to finish...\n");
         timeout = 0;
@@ -306,7 +306,7 @@ static void __init do_boot_cpu(int phys_id)
         do {
                 Dprintk("+");
                 udelay(1000);
-                send_status = !cpu_isset(phys_id, cpu_bootin_map);
+                send_status = !cpumask_test_cpu(phys_id, &cpu_bootin_map);
         } while (send_status && (timeout++ < 100));
 
         Dprintk("After Startup.\n");
@@ -316,19 +316,19 @@ static void __init do_boot_cpu(int phys_id)
                  * allow APs to start initializing.
                  */
                 Dprintk("Before Callout %d.\n", cpu_id);
-                cpu_set(cpu_id, cpu_callout_map);
+                cpumask_set_cpu(cpu_id, &cpu_callout_map);
                 Dprintk("After Callout %d.\n", cpu_id);
 
                 /*
                  * Wait 5s total for a response
                  */
                 for (timeout = 0; timeout < 5000; timeout++) {
-                        if (cpu_isset(cpu_id, cpu_callin_map))
+                        if (cpumask_test_cpu(cpu_id, &cpu_callin_map))
                                 break;  /* It has booted */
                         udelay(1000);
                 }
 
-                if (cpu_isset(cpu_id, cpu_callin_map)) {
+                if (cpumask_test_cpu(cpu_id, &cpu_callin_map)) {
                         /* number CPUs logically, starting from 1 (BSP is 0) */
                         Dprintk("OK.\n");
                 } else {
@@ -340,9 +340,9 @@ static void __init do_boot_cpu(int phys_id)
 
         if (send_status || boot_status) {
                 unmap_cpu_to_physid(cpu_id, phys_id);
-                cpu_clear(cpu_id, cpu_callout_map);
-                cpu_clear(cpu_id, cpu_callin_map);
-                cpu_clear(cpu_id, cpu_initialized);
+                cpumask_clear_cpu(cpu_id, &cpu_callout_map);
+                cpumask_clear_cpu(cpu_id, &cpu_callin_map);
+                cpumask_clear_cpu(cpu_id, &cpu_initialized);
                 cpucount--;
         }
 }
@@ -351,17 +351,17 @@ int __cpuinit __cpu_up(unsigned int cpu_id)
 {
         int timeout;
 
-        cpu_set(cpu_id, smp_commenced_mask);
+        cpumask_set_cpu(cpu_id, &smp_commenced_mask);
 
         /*
          * Wait 5s total for a response
          */
         for (timeout = 0; timeout < 5000; timeout++) {
-                if (cpu_isset(cpu_id, cpu_online_map))
+                if (cpu_online(cpu_id))
                         break;
                 udelay(1000);
         }
-        if (!cpu_isset(cpu_id, cpu_online_map))
+        if (!cpu_online(cpu_id))
                 BUG();
 
         return 0;
@@ -373,11 +373,11 @@ void __init smp_cpus_done(unsigned int max_cpus)
         unsigned long bogosum = 0;
 
         for (timeout = 0; timeout < 5000; timeout++) {
-                if (cpus_equal(cpu_callin_map, cpu_online_map))
+                if (cpumask_equal(&cpu_callin_map, cpu_online_mask))
                         break;
                 udelay(1000);
         }
-        if (!cpus_equal(cpu_callin_map, cpu_online_map))
+        if (!cpumask_equal(&cpu_callin_map, cpu_online_mask))
                 BUG();
 
         for (cpu_id = 0 ; cpu_id < num_online_cpus() ; cpu_id++)
@@ -388,7 +388,7 @@ void __init smp_cpus_done(unsigned int max_cpus)
          */
         Dprintk("Before bogomips.\n");
         if (cpucount) {
-                for_each_cpu_mask(cpu_id, cpu_online_map)
+                for_each_cpu(cpu_id,cpu_online_mask)
                         bogosum += cpu_data[cpu_id].loops_per_jiffy;
 
                 printk(KERN_INFO "Total of %d processors activated " \
@@ -425,7 +425,7 @@ int __init start_secondary(void *unused)
         cpu_init();
         preempt_disable();
         smp_callin();
-        while (!cpu_isset(smp_processor_id(), smp_commenced_mask))
+        while (!cpumask_test_cpu(smp_processor_id(), &smp_commenced_mask))
                 cpu_relax();
 
         smp_online();
@@ -463,7 +463,7 @@ static void __init smp_callin(void)
         int cpu_id = smp_processor_id();
         unsigned long timeout;
 
-        if (cpu_isset(cpu_id, cpu_callin_map)) {
+        if (cpumask_test_cpu(cpu_id, &cpu_callin_map)) {
                 printk("huh, phys CPU#%d, CPU#%d already present??\n",
                         phys_id, cpu_id);
                 BUG();
@@ -474,7 +474,7 @@ static void __init smp_callin(void)
         timeout = jiffies + (2 * HZ);
         while (time_before(jiffies, timeout)) {
                 /* Has the boot CPU finished it's STARTUP sequence ? */
-                if (cpu_isset(cpu_id, cpu_callout_map))
+                if (cpumask_test_cpu(cpu_id, &cpu_callout_map))
                         break;
                 cpu_relax();
         }
@@ -486,7 +486,7 @@ static void __init smp_callin(void)
         }
 
         /* Allow the master to continue. */
-        cpu_set(cpu_id, cpu_callin_map);
+        cpumask_set_cpu(cpu_id, &cpu_callin_map);
 }
 
 static void __init smp_online(void)
@@ -503,7 +503,7 @@ static void __init smp_online(void)
         /* Save our processor parameters */
         smp_store_cpu_info(cpu_id);
 
-        cpu_set(cpu_id, cpu_online_map);
+        set_cpu_online(cpu_id, true);
 }
 
 /*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
diff --git a/arch/m32r/kernel/syscall_table.S b/arch/m32r/kernel/syscall_table.S
index 60536e271233..528f2e6ad064 100644
--- a/arch/m32r/kernel/syscall_table.S
+++ b/arch/m32r/kernel/syscall_table.S
@@ -324,3 +324,4 @@ ENTRY(sys_call_table)
         .long sys_ni_syscall
         .long sys_eventfd
         .long sys_fallocate
+        .long sys_setns                 /* 325 */
diff --git a/arch/m68k/Kconfig.nommu b/arch/m68k/Kconfig.nommu
index 273bccab9517..fc98f9b9d4d2 100644
--- a/arch/m68k/Kconfig.nommu
+++ b/arch/m68k/Kconfig.nommu
@@ -2,10 +2,6 @@ config FPU
         bool
         default n
 
-config GENERIC_FIND_NEXT_BIT
-        bool
-        default y
-
 config GENERIC_GPIO
         bool
         default n
diff --git a/arch/m68k/include/asm/bitops_mm.h b/arch/m68k/include/asm/bitops_mm.h
index e9020f88a748..89cf5b814a4d 100644
--- a/arch/m68k/include/asm/bitops_mm.h
+++ b/arch/m68k/include/asm/bitops_mm.h
@@ -200,6 +200,7 @@ out:
         res += ((long)p - (long)vaddr - 4) * 8;
         return res < size ? res : size;
 }
+#define find_first_zero_bit find_first_zero_bit
 
 static inline int find_next_zero_bit(const unsigned long *vaddr, int size,
                                      int offset)
@@ -229,6 +230,7 @@ static inline int find_next_zero_bit(const unsigned long *vaddr, int size,
         /* No zero yet, search remaining full bytes for a zero */
         return offset + find_first_zero_bit(p, size - offset);
 }
+#define find_next_zero_bit find_next_zero_bit
 
 static inline int find_first_bit(const unsigned long *vaddr, unsigned size)
 {
@@ -253,6 +255,7 @@ out:
         res += ((long)p - (long)vaddr - 4) * 8;
         return res < size ? res : size;
 }
+#define find_first_bit find_first_bit
 
 static inline int find_next_bit(const unsigned long *vaddr, int size,
                                 int offset)
@@ -282,6 +285,7 @@ static inline int find_next_bit(const unsigned long *vaddr, int size,
         /* No one yet, search remaining full bytes for a one */
         return offset + find_first_bit(p, size - offset);
 }
+#define find_next_bit find_next_bit
 
 /*
  * ffz = Find First Zero in word. Undefined if no zero exists,
@@ -398,6 +402,7 @@ out:
         res += (p - addr) * 32;
         return res < size ? res : size;
 }
+#define find_first_zero_bit_le find_first_zero_bit_le
 
 static inline unsigned long find_next_zero_bit_le(const void *addr,
                 unsigned long size, unsigned long offset)
@@ -427,6 +432,7 @@ static inline unsigned long find_next_zero_bit_le(const void *addr,
         /* No zero yet, search remaining full bytes for a zero */
         return offset + find_first_zero_bit_le(p, size - offset);
 }
+#define find_next_zero_bit_le find_next_zero_bit_le
 
 static inline int find_first_bit_le(const void *vaddr, unsigned size)
 {
@@ -451,6 +457,7 @@ out:
         res += (p - addr) * 32;
         return res < size ? res : size;
 }
+#define find_first_bit_le find_first_bit_le
 
 static inline unsigned long find_next_bit_le(const void *addr,
                 unsigned long size, unsigned long offset)
@@ -480,6 +487,7 @@ static inline unsigned long find_next_bit_le(const void *addr,
         /* No set bit yet, search remaining full bytes for a set bit */
         return offset + find_first_bit_le(p, size - offset);
 }
+#define find_next_bit_le find_next_bit_le
 
 /* Bitmap functions for the ext2 filesystem. */
 
diff --git a/arch/m68k/include/asm/bitops_no.h b/arch/m68k/include/asm/bitops_no.h
index 6b0e2d349f0e..72e85acdd7bd 100644
--- a/arch/m68k/include/asm/bitops_no.h
+++ b/arch/m68k/include/asm/bitops_no.h
@@ -319,6 +319,10 @@ found_first:
 found_middle:
         return result + ffz(__swab32(tmp));
 }
+#define find_next_zero_bit_le find_next_zero_bit_le
+
+extern unsigned long find_next_bit_le(const void *addr,
+                unsigned long size, unsigned long offset);
 
 #endif /* __KERNEL__ */
 
diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h
index f3b649de2a1b..43f984e93970 100644
--- a/arch/m68k/include/asm/unistd.h
+++ b/arch/m68k/include/asm/unistd.h
@@ -349,10 +349,11 @@
 #define __NR_open_by_handle_at  341
 #define __NR_clock_adjtime      342
 #define __NR_syncfs             343
+#define __NR_setns              344
 
 #ifdef __KERNEL__
 
-#define NR_syscalls             344
+#define NR_syscalls             345
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
diff --git a/arch/m68k/kernel/syscalltable.S b/arch/m68k/kernel/syscalltable.S
index 6f7b09122a00..00d1452f9571 100644
--- a/arch/m68k/kernel/syscalltable.S
+++ b/arch/m68k/kernel/syscalltable.S
@@ -364,4 +364,5 @@ ENTRY(sys_call_table)
         .long sys_open_by_handle_at
         .long sys_clock_adjtime
         .long sys_syncfs
+        .long sys_setns
 
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index eccdefe70d4e..e446bab2427b 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -33,12 +33,6 @@ config ARCH_HAS_ILOG2_U32
 config ARCH_HAS_ILOG2_U64
         def_bool n
 
-config GENERIC_FIND_NEXT_BIT
-        def_bool y
-
-config GENERIC_FIND_BIT_LE
-        def_bool y
-
 config GENERIC_HWEIGHT
         def_bool y
 
diff --git a/arch/microblaze/include/asm/unistd.h b/arch/microblaze/include/asm/unistd.h
index 30edd61a6b8f..7d7092b917ac 100644
--- a/arch/microblaze/include/asm/unistd.h
+++ b/arch/microblaze/include/asm/unistd.h
@@ -390,8 +390,9 @@
 #define __NR_open_by_handle_at  372
 #define __NR_clock_adjtime      373
 #define __NR_syncfs             374
+#define __NR_setns              375
 
-#define __NR_syscalls           375
+#define __NR_syscalls           376
 
 #ifdef __KERNEL__
 #ifndef __ASSEMBLY__
diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c
index 00ee90f08343..b15cc219b1d9 100644
--- a/arch/microblaze/kernel/prom.c
+++ b/arch/microblaze/kernel/prom.c
@@ -130,7 +130,7 @@ void __init early_init_devtree(void *params)
          * device-tree, including the platform type, initrd location and
          * size, TCE reserve, and more ...
          */
-        of_scan_flat_dt(early_init_dt_scan_chosen, NULL);
+        of_scan_flat_dt(early_init_dt_scan_chosen, cmd_line);
 
         /* Scan memory nodes and rebuild MEMBLOCKs */
         memblock_init();
diff --git a/arch/microblaze/kernel/syscall_table.S b/arch/microblaze/kernel/syscall_table.S
index 85cea81d1ca1..d915a122c865 100644
--- a/arch/microblaze/kernel/syscall_table.S
+++ b/arch/microblaze/kernel/syscall_table.S
@@ -379,3 +379,4 @@ ENTRY(sys_call_table)
         .long sys_open_by_handle_at
         .long sys_clock_adjtime
         .long sys_syncfs
+        .long sys_setns                 /* 375 */
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index cef1a854487d..653da62d0682 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -821,14 +821,6 @@ config ARCH_SUPPORTS_OPROFILE
         bool
         default y if !MIPS_MT_SMTC
 
-config GENERIC_FIND_NEXT_BIT
-        bool
-        default y
-
-config GENERIC_FIND_BIT_LE
-        bool
-        default y
-
 config GENERIC_HWEIGHT
         bool
         default y
diff --git a/arch/mips/cavium-octeon/flash_setup.c b/arch/mips/cavium-octeon/flash_setup.c
index 008f657116eb..0ee02f5e51cc 100644
--- a/arch/mips/cavium-octeon/flash_setup.c
+++ b/arch/mips/cavium-octeon/flash_setup.c
@@ -16,7 +16,6 @@
 
 static struct map_info flash_map;
 static struct mtd_info *mymtd;
-#ifdef CONFIG_MTD_PARTITIONS
 static int nr_parts;
 static struct mtd_partition *parts;
 static const char *part_probe_types[] = {
@@ -26,7 +25,6 @@ static const char *part_probe_types[] = {
 #endif
         NULL
 };
-#endif
 
 /**
  * Module/ driver initialization.
@@ -63,17 +61,10 @@ static int __init flash_init(void)
                 if (mymtd) {
                         mymtd->owner = THIS_MODULE;
 
-#ifdef CONFIG_MTD_PARTITIONS
                         nr_parts = parse_mtd_partitions(mymtd,
                                                         part_probe_types,
                                                         &parts, 0);
-                        if (nr_parts > 0)
-                                add_mtd_partitions(mymtd, parts, nr_parts);
-                        else
-                                add_mtd_device(mymtd);
-#else
-                        add_mtd_device(mymtd);
-#endif
+                        mtd_device_register(mymtd, parts, nr_parts);
                 } else {
                         pr_err("Failed to register MTD device for flash\n");
                 }
diff --git a/arch/mips/configs/bcm47xx_defconfig b/arch/mips/configs/bcm47xx_defconfig
index 22fdf2f0cc23..ad15fb10322b 100644
--- a/arch/mips/configs/bcm47xx_defconfig
+++ b/arch/mips/configs/bcm47xx_defconfig
@@ -16,7 +16,6 @@ CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_AUDIT=y
 CONFIG_TINY_RCU=y
 CONFIG_CGROUPS=y
-CONFIG_CGROUP_NS=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
diff --git a/arch/mips/include/asm/prom.h b/arch/mips/include/asm/prom.h
index f29b862d9db3..857d9b7858ad 100644
--- a/arch/mips/include/asm/prom.h
+++ b/arch/mips/include/asm/prom.h
@@ -14,9 +14,6 @@
 #ifdef CONFIG_OF
 #include <asm/bootinfo.h>
 
-/* which is compatible with the flattened device tree (FDT) */
-#define cmd_line arcs_cmdline
-
 extern int early_init_dt_scan_memory_arch(unsigned long node,
         const char *uname, int depth, void *data);
 
diff --git a/arch/mips/include/asm/suspend.h b/arch/mips/include/asm/suspend.h
index 294cdb66c5fc..3adac3b53d19 100644
--- a/arch/mips/include/asm/suspend.h
+++ b/arch/mips/include/asm/suspend.h
@@ -1,8 +1,6 @@
 #ifndef __ASM_SUSPEND_H
 #define __ASM_SUSPEND_H
 
-static inline int arch_prepare_suspend(void) { return 0; }
-
 /* References to section boundaries */
 extern const void __nosave_begin, __nosave_end;
 
diff --git a/arch/mips/include/asm/unistd.h b/arch/mips/include/asm/unistd.h
index fa2e37ea2be1..6fcfc480e9d0 100644
--- a/arch/mips/include/asm/unistd.h
+++ b/arch/mips/include/asm/unistd.h
@@ -363,16 +363,17 @@
 #define __NR_open_by_handle_at          (__NR_Linux + 340)
 #define __NR_clock_adjtime              (__NR_Linux + 341)
 #define __NR_syncfs                     (__NR_Linux + 342)
+#define __NR_setns                      (__NR_Linux + 343)
 
 /*
  * Offset of the last Linux o32 flavoured syscall
  */
-#define __NR_Linux_syscalls             342
+#define __NR_Linux_syscalls             343
 
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
 
 #define __NR_O32_Linux                  4000
-#define __NR_O32_Linux_syscalls         342
+#define __NR_O32_Linux_syscalls         343
 
 #if _MIPS_SIM == _MIPS_SIM_ABI64
 
@@ -682,16 +683,17 @@
 #define __NR_open_by_handle_at          (__NR_Linux + 299)
 #define __NR_clock_adjtime              (__NR_Linux + 300)
 #define __NR_syncfs                     (__NR_Linux + 301)
+#define __NR_setns                      (__NR_Linux + 302)
 
 /*
  * Offset of the last Linux 64-bit flavoured syscall
  */
-#define __NR_Linux_syscalls             301
+#define __NR_Linux_syscalls             302
 
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */
 
 #define __NR_64_Linux                   5000
-#define __NR_64_Linux_syscalls          301
+#define __NR_64_Linux_syscalls          302
 
 #if _MIPS_SIM == _MIPS_SIM_NABI32
 
@@ -1006,16 +1008,17 @@
 #define __NR_open_by_handle_at          (__NR_Linux + 304)
 #define __NR_clock_adjtime              (__NR_Linux + 305)
 #define __NR_syncfs                     (__NR_Linux + 306)
+#define __NR_setns                      (__NR_Linux + 307)
 
 /*
  * Offset of the last N32 flavoured syscall
  */
-#define __NR_Linux_syscalls             306
+#define __NR_Linux_syscalls             307
 
 #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */
 
 #define __NR_N32_Linux                  6000
-#define __NR_N32_Linux_syscalls         306
+#define __NR_N32_Linux_syscalls         307
 
 #ifdef __KERNEL__
 
diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c
index a19811e98a41..5b7eade41fa3 100644
--- a/arch/mips/kernel/prom.c
+++ b/arch/mips/kernel/prom.c
@@ -83,7 +83,8 @@ void __init early_init_devtree(void *params)
          * device-tree, including the platform type, initrd location and
          * size, and more ...
          */
-        of_scan_flat_dt(early_init_dt_scan_chosen, NULL);
+        of_scan_flat_dt(early_init_dt_scan_chosen, arcs_cmdline);
+
 
         /* Scan memory nodes */
         of_scan_flat_dt(early_init_dt_scan_root, NULL);
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
index 7a8e1dd7f6f2..99e656e425f3 100644
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
@@ -589,6 +589,7 @@ einval:	li	v0, -ENOSYS
         sys     sys_open_by_handle_at   3       /* 4340 */
         sys     sys_clock_adjtime       2
         sys     sys_syncfs              1
+        sys     sys_setns               2
         .endm
 
         /* We pre-compute the number of _instruction_ bytes needed to
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S
index 2d31c83224f9..fb0575f47f3d 100644
--- a/arch/mips/kernel/scall64-64.S
+++ b/arch/mips/kernel/scall64-64.S
@@ -428,4 +428,5 @@ sys_call_table:
         PTR     sys_open_by_handle_at
         PTR     sys_clock_adjtime               /* 5300 */
         PTR     sys_syncfs
+        PTR     sys_setns
         .size   sys_call_table,.-sys_call_table
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index 38a0503b9a4a..4de0c5534e73 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -428,4 +428,5 @@ EXPORT(sysn32_call_table)
         PTR     sys_open_by_handle_at
         PTR     compat_sys_clock_adjtime        /* 6305 */
         PTR     sys_syncfs
+        PTR     sys_setns
         .size   sysn32_call_table,.-sysn32_call_table
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index 91ea5e4041dd..4a387de08bfa 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -546,4 +546,5 @@ sys_call_table:
         PTR     compat_sys_open_by_handle_at    /* 4340 */
         PTR     compat_sys_clock_adjtime
         PTR     sys_syncfs
+        PTR     sys_setns
         .size   sys_call_table,.-sys_call_table
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index 812816c45662..ec38e00b2559 100644
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -639,7 +639,6 @@ void __init txx9_physmap_flash_init(int no, unsigned long addr,
                 .flags = IORESOURCE_MEM,
         };
         struct platform_device *pdev;
-#ifdef CONFIG_MTD_PARTITIONS
         static struct mtd_partition parts[2];
         struct physmap_flash_data pdata_part;
 
@@ -658,7 +657,7 @@ void __init txx9_physmap_flash_init(int no, unsigned long addr,
                 pdata_part.parts = parts;
                 pdata = &pdata_part;
         }
-#endif
+
         pdev = platform_device_alloc("physmap-flash", no);
         if (!pdev ||
             platform_device_add_resources(pdev, &res, 1) ||
diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig
index feaf09cc8632..1f870340ebdd 100644
--- a/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
@@ -44,9 +44,6 @@ config GENERIC_CALIBRATE_DELAY
 config GENERIC_CMOS_UPDATE
         def_bool n
 
-config GENERIC_FIND_NEXT_BIT
-        def_bool y
-
 config GENERIC_HWEIGHT
         def_bool y
 
diff --git a/arch/mn10300/configs/asb2364_defconfig b/arch/mn10300/configs/asb2364_defconfig
index 31d76261a3d5..fbb96ae3122a 100644
--- a/arch/mn10300/configs/asb2364_defconfig
+++ b/arch/mn10300/configs/asb2364_defconfig
@@ -8,7 +8,6 @@ CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_CGROUPS=y
-CONFIG_CGROUP_NS=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
diff --git a/arch/mn10300/include/asm/unistd.h b/arch/mn10300/include/asm/unistd.h
index 9d056f515929..9051f921cbc7 100644
--- a/arch/mn10300/include/asm/unistd.h
+++ b/arch/mn10300/include/asm/unistd.h
@@ -349,10 +349,11 @@
 #define __NR_rt_tgsigqueueinfo  336
 #define __NR_perf_event_open    337
 #define __NR_recvmmsg           338
+#define __NR_setns              339
 
 #ifdef __KERNEL__
 
-#define NR_syscalls 339
+#define NR_syscalls 340
 
 /*
  * specify the deprecated syscalls we want to support on this arch
diff --git a/arch/mn10300/kernel/entry.S b/arch/mn10300/kernel/entry.S
index fb93ad720b82..ae435e1d5669 100644
--- a/arch/mn10300/kernel/entry.S
+++ b/arch/mn10300/kernel/entry.S
@@ -759,6 +759,7 @@ ENTRY(sys_call_table)
         .long sys_rt_tgsigqueueinfo
         .long sys_perf_event_open
         .long sys_recvmmsg
+        .long sys_setns
 
 
 nr_syscalls=(.-sys_call_table)/4
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 69ff049c8571..65adc86a230e 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -47,14 +47,6 @@ config ARCH_HAS_ILOG2_U64
         bool
         default n
 
-config GENERIC_FIND_NEXT_BIT
-        bool
-        default y
-
-config GENERIC_FIND_BIT_LE
-        bool
-        default y
-
 config GENERIC_BUG
         bool
         default y
diff --git a/arch/parisc/include/asm/unistd.h b/arch/parisc/include/asm/unistd.h
index 9cbc2c3bf630..3392de3e7be0 100644
--- a/arch/parisc/include/asm/unistd.h
+++ b/arch/parisc/include/asm/unistd.h
@@ -820,8 +820,9 @@
 #define __NR_name_to_handle_at  (__NR_Linux + 325)
 #define __NR_open_by_handle_at  (__NR_Linux + 326)
 #define __NR_syncfs             (__NR_Linux + 327)
+#define __NR_setns              (__NR_Linux + 328)
 
-#define __NR_Linux_syscalls     (__NR_syncfs + 1)
+#define __NR_Linux_syscalls     (__NR_setns + 1)
 
 
 #define __IGNORE_select         /* newselect */
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S
index a5b02ce4d41e..34a4f5a2fffb 100644
--- a/arch/parisc/kernel/syscall_table.S
+++ b/arch/parisc/kernel/syscall_table.S
@@ -426,6 +426,7 @@
         ENTRY_SAME(name_to_handle_at)   /* 325 */
         ENTRY_COMP(open_by_handle_at)
         ENTRY_SAME(syncfs)
+        ENTRY_SAME(setns)
 
         /* Nothing yet */
 
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 423145a6f7ba..2729c6663d8a 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -91,14 +91,6 @@ config GENERIC_HWEIGHT
         bool
         default y
 
-config GENERIC_FIND_NEXT_BIT
-        bool
-        default y
-
-config GENERIC_FIND_BIT_LE
-        bool
-        default y
-
 config GENERIC_GPIO
         bool
         help
@@ -141,6 +133,7 @@ config PPC
         select GENERIC_IRQ_SHOW
         select GENERIC_IRQ_SHOW_LEVEL
         select HAVE_RCU_TABLE_FREE if SMP
+        select HAVE_SYSCALL_TRACEPOINTS
 
 config EARLY_PRINTK
         bool
diff --git a/arch/powerpc/boot/dts/canyonlands.dts b/arch/powerpc/boot/dts/canyonlands.dts
index 2779f08313a5..22dd6ae84da0 100644
--- a/arch/powerpc/boot/dts/canyonlands.dts
+++ b/arch/powerpc/boot/dts/canyonlands.dts
@@ -530,5 +530,23 @@
                                 0x0 0x0 0x0 0x3 &UIC3 0x12 0x4 /* swizzled int C */
                                 0x0 0x0 0x0 0x4 &UIC3 0x13 0x4 /* swizzled int D */>;
                 };
+
+                MSI: ppc4xx-msi@C10000000 {
+                        compatible = "amcc,ppc4xx-msi", "ppc4xx-msi";
+                        reg = < 0xC 0x10000000 0x100>;
+                        sdr-base = <0x36C>;
+                        msi-data = <0x00000000>;
+                        msi-mask = <0x44440000>;
+                        interrupt-count = <3>;
+                        interrupts = <0 1 2 3>;
+                        interrupt-parent = <&UIC3>;
+                        #interrupt-cells = <1>;
+                        #address-cells = <0>;
+                        #size-cells = <0>;
+                        interrupt-map = <0 &UIC3 0x18 1
+                                        1 &UIC3 0x19 1
+                                        2 &UIC3 0x1A 1
+                                        3 &UIC3 0x1B 1>;
+                };
         };
 };
diff --git a/arch/powerpc/boot/dts/katmai.dts b/arch/powerpc/boot/dts/katmai.dts
index 7c3be5e45748..f913dbe25d35 100644
--- a/arch/powerpc/boot/dts/katmai.dts
+++ b/arch/powerpc/boot/dts/katmai.dts
@@ -442,6 +442,24 @@
                                 0x0 0x0 0x0 0x4 &UIC3 0xb 0x4 /* swizzled int D */>;
                 };
 
+                MSI: ppc4xx-msi@400300000 {
+                                compatible = "amcc,ppc4xx-msi", "ppc4xx-msi";
+                                reg = < 0x4 0x00300000 0x100>;
+                                sdr-base = <0x3B0>;
+                                msi-data = <0x00000000>;
+                                msi-mask = <0x44440000>;
+                                interrupt-count = <3>;
+                                interrupts =<0 1 2 3>;
+                                interrupt-parent = <&UIC0>;
+                                #interrupt-cells = <1>;
+                                #address-cells = <0>;
+                                #size-cells = <0>;
+                                interrupt-map = <0 &UIC0 0xC 1
+                                        1 &UIC0 0x0D 1
+                                        2 &UIC0 0x0E 1
+                                        3 &UIC0 0x0F 1>;
+                };
+
                 I2O: i2o@400100000 {
                         compatible = "ibm,i2o-440spe";
                         reg = <0x00000004 0x00100000 0x100>;
diff --git a/arch/powerpc/boot/dts/kilauea.dts b/arch/powerpc/boot/dts/kilauea.dts
index 89edb16649c3..1613d6e4049e 100644
--- a/arch/powerpc/boot/dts/kilauea.dts
+++ b/arch/powerpc/boot/dts/kilauea.dts
@@ -403,5 +403,33 @@
                                 0x0 0x0 0x0 0x3 &UIC2 0xd 0x4 /* swizzled int C */
                                 0x0 0x0 0x0 0x4 &UIC2 0xe 0x4 /* swizzled int D */>;
                 };
+
+                MSI: ppc4xx-msi@C10000000 {
+                        compatible = "amcc,ppc4xx-msi", "ppc4xx-msi";
+                        reg = < 0x0 0xEF620000 0x100>;
+                        sdr-base = <0x4B0>;
+                        msi-data = <0x00000000>;
+                        msi-mask = <0x44440000>;
+                        interrupt-count = <12>;
+                        interrupts = <0 1 2 3 4 5 6 7 8 9 0xA 0xB 0xC 0xD>;
+                        interrupt-parent = <&UIC2>;
+                        #interrupt-cells = <1>;
+                        #address-cells = <0>;
+                        #size-cells = <0>;
+                        interrupt-map = <0 &UIC2 0x10 1
+                                        1 &UIC2 0x11 1
+                                        2 &UIC2 0x12 1
+                                        2 &UIC2 0x13 1
+                                        2 &UIC2 0x14 1
+                                        2 &UIC2 0x15 1
+                                        2 &UIC2 0x16 1
+                                        2 &UIC2 0x17 1
+                                        2 &UIC2 0x18 1
+                                        2 &UIC2 0x19 1
+                                        2 &UIC2 0x1A 1
+                                        2 &UIC2 0x1B 1
+                                        2 &UIC2 0x1C 1
+                                        3 &UIC2 0x1D 1>;
+                };
         };
 };
diff --git a/arch/powerpc/boot/dts/redwood.dts b/arch/powerpc/boot/dts/redwood.dts
index 81636c01d906..d86a3a498118 100644
--- a/arch/powerpc/boot/dts/redwood.dts
+++ b/arch/powerpc/boot/dts/redwood.dts
@@ -358,8 +358,28 @@
                                 0x0 0x0 0x0 0x4 &UIC3 0xb 0x4 /* swizzled int D */>;
                 };
 
+                MSI: ppc4xx-msi@400300000 {
+                                compatible = "amcc,ppc4xx-msi", "ppc4xx-msi";
+                                reg = < 0x4 0x00300000 0x100
+                                        0x4 0x00300000 0x100>;
+                                sdr-base = <0x3B0>;
+                                msi-data = <0x00000000>;
+                                msi-mask = <0x44440000>;
+                                interrupt-count = <3>;
+                                interrupts =<0 1 2 3>;
+                                interrupt-parent = <&UIC0>;
+                                #interrupt-cells = <1>;
+                                #address-cells = <0>;
+                                #size-cells = <0>;
+                                interrupt-map = <0 &UIC0 0xC 1
+                                        1 &UIC0 0x0D 1
+                                        2 &UIC0 0x0E 1
+                                        3 &UIC0 0x0F 1>;
+                };
+
         };
 
+
         chosen {
                 linux,stdout-path = "/plb/opb/serial@ef600200";
         };
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig
index 214208924a9c..04360f9b0109 100644
--- a/arch/powerpc/configs/ppc6xx_defconfig
+++ b/arch/powerpc/configs/ppc6xx_defconfig
@@ -10,7 +10,6 @@ CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_AUDIT=y
 CONFIG_CGROUPS=y
-CONFIG_CGROUP_NS=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index 7de13865508c..c9f212b5f3de 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -15,7 +15,6 @@ CONFIG_AUDITSYSCALL=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_CGROUPS=y
-CONFIG_CGROUP_NS=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CPUSETS=y
diff --git a/arch/powerpc/include/asm/fsl_lbc.h b/arch/powerpc/include/asm/fsl_lbc.h
index 5c1bf3466749..8a0b5ece8f76 100644
--- a/arch/powerpc/include/asm/fsl_lbc.h
+++ b/arch/powerpc/include/asm/fsl_lbc.h
@@ -157,6 +157,8 @@ struct fsl_lbc_regs {
 #define LBCR_EPAR_SHIFT    16
 #define LBCR_BMT   0x0000FF00
 #define LBCR_BMT_SHIFT      8
+#define LBCR_BMTPS 0x0000000F
+#define LBCR_BMTPS_SHIFT    0
 #define LBCR_INIT  0x00040000
         __be32 lcrr;            /**< Clock Ratio Register */
 #define LCRR_DBYP    0x80000000
diff --git a/arch/powerpc/include/asm/ftrace.h b/arch/powerpc/include/asm/ftrace.h
index dde1296b8b41..169d039ed402 100644
--- a/arch/powerpc/include/asm/ftrace.h
+++ b/arch/powerpc/include/asm/ftrace.h
@@ -60,4 +60,18 @@ struct dyn_arch_ftrace {
 
 #endif
 
+#if defined(CONFIG_FTRACE_SYSCALLS) && defined(CONFIG_PPC64) && !defined(__ASSEMBLY__)
+#define ARCH_HAS_SYSCALL_MATCH_SYM_NAME
+static inline bool arch_syscall_match_sym_name(const char *sym, const char *name)
+{
+        /*
+         * Compare the symbol name with the system call name. Skip the .sys or .SyS
+         * prefix from the symbol name and the sys prefix from the system call name and
+         * just match the rest. This is only needed on ppc64 since symbol names on
+         * 32bit do not start with a period so the generic function will work.
+         */
+        return !strcmp(sym + 4, name + 3);
+}
+#endif /* CONFIG_FTRACE_SYSCALLS && CONFIG_PPC64 && !__ASSEMBLY__ */
+
 #endif /* _ASM_POWERPC_FTRACE */
diff --git a/arch/powerpc/include/asm/hvcall.h b/arch/powerpc/include/asm/hvcall.h
index 852b8c1c09db..fd8201dddd4b 100644
--- a/arch/powerpc/include/asm/hvcall.h
+++ b/arch/powerpc/include/asm/hvcall.h
@@ -236,7 +236,7 @@
 #define H_HOME_NODE_ASSOCIATIVITY 0x2EC
 #define H_BEST_ENERGY           0x2F4
 #define H_GET_MPP_X             0x314
-#define MAX_HCALL_OPCODE        H_BEST_ENERGY
+#define MAX_HCALL_OPCODE        H_GET_MPP_X
 
 #ifndef __ASSEMBLY__
 
diff --git a/arch/powerpc/include/asm/rio.h b/arch/powerpc/include/asm/rio.h
index 0018bf80cb25..d902abd33995 100644
--- a/arch/powerpc/include/asm/rio.h
+++ b/arch/powerpc/include/asm/rio.h
@@ -14,5 +14,10 @@
 #define ASM_PPC_RIO_H
 
 extern void platform_rio_init(void);
+#ifdef CONFIG_RAPIDIO
+extern int fsl_rio_mcheck_exception(struct pt_regs *);
+#else
+static inline int fsl_rio_mcheck_exception(struct pt_regs *regs) {return 0; }
+#endif
 
 #endif                          /* ASM_PPC_RIO_H */
diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
index 880b8c1e6e53..11eb404b5606 100644
--- a/arch/powerpc/include/asm/smp.h
+++ b/arch/powerpc/include/asm/smp.h
@@ -191,8 +191,6 @@ extern unsigned long __secondary_hold_spinloop;
 extern unsigned long __secondary_hold_acknowledge;
 extern char __secondary_hold;
 
-extern irqreturn_t debug_ipi_action(int irq, void *data);
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */
diff --git a/arch/powerpc/include/asm/suspend.h b/arch/powerpc/include/asm/suspend.h
deleted file mode 100644
index c6efc3466aa6..000000000000
--- a/arch/powerpc/include/asm/suspend.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_POWERPC_SUSPEND_H
-#define __ASM_POWERPC_SUSPEND_H
-
-static inline int arch_prepare_suspend(void) { return 0; }
-
-#endif /* __ASM_POWERPC_SUSPEND_H */
diff --git a/arch/powerpc/include/asm/syscall.h b/arch/powerpc/include/asm/syscall.h
index 23913e902fc3..b54b2add07be 100644
--- a/arch/powerpc/include/asm/syscall.h
+++ b/arch/powerpc/include/asm/syscall.h
@@ -15,6 +15,11 @@
 
 #include <linux/sched.h>
 
+/* ftrace syscalls requires exporting the sys_call_table */
+#ifdef CONFIG_FTRACE_SYSCALLS
+extern const unsigned long *sys_call_table;
+#endif /* CONFIG_FTRACE_SYSCALLS */
+
 static inline long syscall_get_nr(struct task_struct *task,
                                   struct pt_regs *regs)
 {
diff --git a/arch/powerpc/include/asm/systbl.h b/arch/powerpc/include/asm/systbl.h
index 8489d372077f..f6736b7da463 100644
--- a/arch/powerpc/include/asm/systbl.h
+++ b/arch/powerpc/include/asm/systbl.h
@@ -353,3 +353,4 @@ COMPAT_SYS_SPU(open_by_handle_at)
 COMPAT_SYS_SPU(clock_adjtime)
 SYSCALL_SPU(syncfs)
 COMPAT_SYS_SPU(sendmmsg)
+SYSCALL_SPU(setns)
diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
index 37c353e8af7c..836f231ec1f0 100644
--- a/arch/powerpc/include/asm/thread_info.h
+++ b/arch/powerpc/include/asm/thread_info.h
@@ -110,7 +110,8 @@ static inline struct thread_info *current_thread_info(void)
 #define TIF_NOERROR             12      /* Force successful syscall return */
 #define TIF_NOTIFY_RESUME       13      /* callback before returning to user */
 #define TIF_FREEZE              14      /* Freezing for suspend */
-#define TIF_RUNLATCH            15      /* Is the runlatch enabled? */
+#define TIF_SYSCALL_TRACEPOINT  15      /* syscall tracepoint instrumentation */
+#define TIF_RUNLATCH            16      /* Is the runlatch enabled? */
 
 /* as above, but as bit values */
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
@@ -127,8 +128,10 @@ static inline struct thread_info *current_thread_info(void)
 #define _TIF_NOERROR            (1<<TIF_NOERROR)
 #define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
 #define _TIF_FREEZE             (1<<TIF_FREEZE)
+#define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
 #define _TIF_RUNLATCH           (1<<TIF_RUNLATCH)
-#define _TIF_SYSCALL_T_OR_A     (_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP)
+#define _TIF_SYSCALL_T_OR_A     (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
+                                 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT)
 
 #define _TIF_USER_WORK_MASK     (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
                                  _TIF_NOTIFY_RESUME)
diff --git a/arch/powerpc/include/asm/unistd.h b/arch/powerpc/include/asm/unistd.h
index 6d23c8193caa..b8b3f599362b 100644
--- a/arch/powerpc/include/asm/unistd.h
+++ b/arch/powerpc/include/asm/unistd.h
@@ -372,10 +372,11 @@
 #define __NR_clock_adjtime      347
 #define __NR_syncfs             348
 #define __NR_sendmmsg           349
+#define __NR_setns              350
 
 #ifdef __KERNEL__
 
-#define __NR_syscalls           350
+#define __NR_syscalls           351
 
 #define __NR__exit __NR_exit
 #define NR_syscalls     __NR_syscalls
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 9aab36312572..e8b981897d44 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -109,6 +109,7 @@ obj-$(CONFIG_PPC_IO_WORKAROUNDS)	+= io-workarounds.o
 
 obj-$(CONFIG_DYNAMIC_FTRACE)    += ftrace.o
 obj-$(CONFIG_FUNCTION_GRAPH_TRACER)     += ftrace.o
+obj-$(CONFIG_FTRACE_SYSCALLS)   += ftrace.o
 obj-$(CONFIG_PERF_EVENTS)       += perf_callchain.o
 
 obj-$(CONFIG_PPC_PERF_CTRS)     += perf_event.o
diff --git a/arch/powerpc/kernel/ftrace.c b/arch/powerpc/kernel/ftrace.c
index ce1f3e44c24f..bf99cfa6bbfe 100644
--- a/arch/powerpc/kernel/ftrace.c
+++ b/arch/powerpc/kernel/ftrace.c
@@ -22,6 +22,7 @@
 #include <asm/cacheflush.h>
 #include <asm/code-patching.h>
 #include <asm/ftrace.h>
+#include <asm/syscall.h>
 
 
 #ifdef CONFIG_DYNAMIC_FTRACE
@@ -600,3 +601,10 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
         }
 }
 #endif /* CONFIG_FUNCTION_GRAPH_TRACER */
+
+#if defined(CONFIG_FTRACE_SYSCALLS) && defined(CONFIG_PPC64)
+unsigned long __init arch_syscall_addr(int nr)
+{
+        return sys_call_table[nr*2];
+}
+#endif /* CONFIG_FTRACE_SYSCALLS && CONFIG_PPC64 */
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index a24d37d4cf51..5b428e308666 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -295,17 +295,20 @@ static inline void handle_one_irq(unsigned int irq)
         unsigned long saved_sp_limit;
         struct irq_desc *desc;
 
+        desc = irq_to_desc(irq);
+        if (!desc)
+                return;
+
         /* Switch to the irq stack to handle this */
         curtp = current_thread_info();
         irqtp = hardirq_ctx[smp_processor_id()];
 
         if (curtp == irqtp) {
                 /* We're already on the irq stack, just handle it */
-                generic_handle_irq(irq);
+                desc->handle_irq(irq, desc);
                 return;
         }
 
-        desc = irq_to_desc(irq);
         saved_sp_limit = current->thread.ksp_limit;
 
         irqtp->task = curtp->task;
@@ -557,15 +560,8 @@ struct irq_host *irq_alloc_host(struct device_node *of_node,
         if (revmap_type == IRQ_HOST_MAP_LEGACY) {
                 if (irq_map[0].host != NULL) {
                         raw_spin_unlock_irqrestore(&irq_big_lock, flags);
-                        /* If we are early boot, we can't free the structure,
-                         * too bad...
-                         * this will be fixed once slab is made available early
-                         * instead of the current cruft
-                         */
-                        if (mem_init_done) {
-                                of_node_put(host->of_node);
-                                kfree(host);
-                        }
+                        of_node_put(host->of_node);
+                        kfree(host);
                         return NULL;
                 }
                 irq_map[0].host = host;
@@ -727,9 +723,7 @@ unsigned int irq_create_mapping(struct irq_host *host,
         }
         pr_debug("irq: -> using host @%p\n", host);
 
-        /* Check if mapping already exist, if it does, call
-         * host->ops->map() to update the flags
-         */
+        /* Check if mapping already exists */
         virq = irq_find_mapping(host, hwirq);
         if (virq != NO_IRQ) {
                 pr_debug("irq: -> existing mapping on virq %d\n", virq);
@@ -899,10 +893,13 @@ unsigned int irq_radix_revmap_lookup(struct irq_host *host,
                 return irq_find_mapping(host, hwirq);
 
         /*
-         * No rcu_read_lock(ing) needed, the ptr returned can't go under us
-         * as it's referencing an entry in the static irq_map table.
+         * The ptr returned references the static global irq_map.
+         * but freeing an irq can delete nodes along the path to
+         * do the lookup via call_rcu.
          */
+        rcu_read_lock();
         ptr = radix_tree_lookup(&host->revmap_data.tree, hwirq);
+        rcu_read_unlock();
 
         /*
          * If found in radix tree, then fine.
@@ -1010,14 +1007,23 @@ void irq_free_virt(unsigned int virq, unsigned int count)
         WARN_ON (virq < NUM_ISA_INTERRUPTS);
         WARN_ON (count == 0 || (virq + count) > irq_virq_count);
 
+        if (virq < NUM_ISA_INTERRUPTS) {
+                if (virq + count < NUM_ISA_INTERRUPTS)
+                        return;
+                count  =- NUM_ISA_INTERRUPTS - virq;
+                virq = NUM_ISA_INTERRUPTS;
+        }
+
+        if (count > irq_virq_count || virq > irq_virq_count - count) {
+                if (virq > irq_virq_count)
+                        return;
+                count = irq_virq_count - virq;
+        }
+
         raw_spin_lock_irqsave(&irq_big_lock, flags);
         for (i = virq; i < (virq + count); i++) {
                 struct irq_host *host;
 
-                if (i < NUM_ISA_INTERRUPTS ||
-                    (virq + count) > irq_virq_count)
-                        continue;
-
                 host = irq_map[i].host;
                 irq_map[i].hwirq = host->inval_irq;
                 smp_wmb();
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 48aeb55faae9..f2c906b1d8d3 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -694,7 +694,7 @@ void __init early_init_devtree(void *params)
          * device-tree, including the platform type, initrd location and
          * size, TCE reserve, and more ...
          */
-        of_scan_flat_dt(early_init_dt_scan_chosen_ppc, NULL);
+        of_scan_flat_dt(early_init_dt_scan_chosen_ppc, cmd_line);
 
         /* Scan memory nodes and rebuild MEMBLOCKs */
         memblock_init();
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index a6ae1cfad86c..cb22024f2b42 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -29,6 +29,7 @@
 #include <linux/signal.h>
 #include <linux/seccomp.h>
 #include <linux/audit.h>
+#include <trace/syscall.h>
 #ifdef CONFIG_PPC32
 #include <linux/module.h>
 #endif
@@ -40,6 +41,9 @@
 #include <asm/pgtable.h>
 #include <asm/system.h>
 
+#define CREATE_TRACE_POINTS
+#include <trace/events/syscalls.h>
+
 /*
  * The parameter save area on the stack is used to store arguments being passed
  * to callee function and is located at fixed offset from stack pointer.
@@ -1710,6 +1714,9 @@ long do_syscall_trace_enter(struct pt_regs *regs)
                  */
                 ret = -1L;
 
+        if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
+                trace_sys_enter(regs, regs->gpr[0]);
+
         if (unlikely(current->audit_context)) {
 #ifdef CONFIG_PPC64
                 if (!is_32bit_task())
@@ -1738,6 +1745,9 @@ void do_syscall_trace_leave(struct pt_regs *regs)
                 audit_syscall_exit((regs->ccr&0x10000000)?AUDITSC_FAILURE:AUDITSC_SUCCESS,
                                    regs->result);
 
+        if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
+                trace_sys_exit(regs, regs->result);
+
         step = test_thread_flag(TIF_SINGLESTEP);
         if (step || test_thread_flag(TIF_SYSCALL_TRACE))
                 tracehook_report_syscall_exit(regs, step);
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 4a6f2ec7e761..8ebc6700b98d 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -129,7 +129,7 @@ static irqreturn_t call_function_single_action(int irq, void *data)
         return IRQ_HANDLED;
 }
 
-irqreturn_t debug_ipi_action(int irq, void *data)
+static irqreturn_t debug_ipi_action(int irq, void *data)
 {
         if (crash_ipi_function_ptr) {
                 crash_ipi_function_ptr(get_irq_regs());
diff --git a/arch/powerpc/kernel/swsusp.c b/arch/powerpc/kernel/swsusp.c
index 560c96119501..aa17b76dd427 100644
--- a/arch/powerpc/kernel/swsusp.c
+++ b/arch/powerpc/kernel/swsusp.c
@@ -10,7 +10,6 @@
  */
 
 #include <linux/sched.h>
-#include <asm/suspend.h>
 #include <asm/system.h>
 #include <asm/current.h>
 #include <asm/mmu_context.h>
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index b13306b0d925..0ff4ab98d50c 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -55,6 +55,7 @@
 #endif
 #include <asm/kexec.h>
 #include <asm/ppc-opcode.h>
+#include <asm/rio.h>
 
 #if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)
 int (*__debugger)(struct pt_regs *regs) __read_mostly;
@@ -424,6 +425,12 @@ int machine_check_e500mc(struct pt_regs *regs)
         unsigned long reason = mcsr;
         int recoverable = 1;
 
+        if (reason & MCSR_BUS_RBERR) {
+                recoverable = fsl_rio_mcheck_exception(regs);
+                if (recoverable == 1)
+                        goto silent_out;
+        }
+
         printk("Machine check in kernel mode.\n");
         printk("Caused by (from MCSR=%lx): ", reason);
 
@@ -499,6 +506,7 @@ int machine_check_e500mc(struct pt_regs *regs)
                        reason & MCSR_MEA ? "Effective" : "Physical", addr);
         }
 
+silent_out:
         mtspr(SPRN_MCSR, mcsr);
         return mfspr(SPRN_MCSR) == 0 && recoverable;
 }
@@ -507,6 +515,11 @@ int machine_check_e500(struct pt_regs *regs)
 {
         unsigned long reason = get_mc_reason(regs);
 
+        if (reason & MCSR_BUS_RBERR) {
+                if (fsl_rio_mcheck_exception(regs))
+                        return 1;
+        }
+
         printk("Machine check in kernel mode.\n");
         printk("Caused by (from MCSR=%lx): ", reason);
 
diff --git a/arch/powerpc/oprofile/op_model_power4.c b/arch/powerpc/oprofile/op_model_power4.c
index 8ee51a252cf1..e6bec74be131 100644
--- a/arch/powerpc/oprofile/op_model_power4.c
+++ b/arch/powerpc/oprofile/op_model_power4.c
@@ -261,6 +261,28 @@ static int get_kernel(unsigned long pc, unsigned long mmcra)
         return is_kernel;
 }
 
+static bool pmc_overflow(unsigned long val)
+{
+        if ((int)val < 0)
+                return true;
+
+        /*
+         * Events on POWER7 can roll back if a speculative event doesn't
+         * eventually complete. Unfortunately in some rare cases they will
+         * raise a performance monitor exception. We need to catch this to
+         * ensure we reset the PMC. In all cases the PMC will be 256 or less
+         * cycles from overflow.
+         *
+         * We only do this if the first pass fails to find any overflowing
+         * PMCs because a user might set a period of less than 256 and we
+         * don't want to mistakenly reset them.
+         */
+        if (__is_processor(PV_POWER7) && ((0x80000000 - val) <= 256))
+                return true;
+
+        return false;
+}
+
 static void power4_handle_interrupt(struct pt_regs *regs,
                                     struct op_counter_config *ctr)
 {
@@ -281,7 +303,7 @@ static void power4_handle_interrupt(struct pt_regs *regs,
 
         for (i = 0; i < cur_cpu_spec->num_pmcs; ++i) {
                 val = classic_ctr_read(i);
-                if (val < 0) {
+                if (pmc_overflow(val)) {
                         if (oprofile_running && ctr[i].enabled) {
                                 oprofile_add_ext_sample(pc, regs, i, is_kernel);
                                 classic_ctr_write(i, reset_value[i]);
diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig
index b72176434ebe..d733d7ca939c 100644
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -57,6 +57,8 @@ config KILAUEA
         select 405EX
         select PPC40x_SIMPLE
         select PPC4xx_PCI_EXPRESS
+        select PCI_MSI
+        select PPC4xx_MSI
         help
           This option enables support for the AMCC PPC405EX evaluation board.
 
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index f485fc5f6d5e..e958b6f48ec2 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -74,6 +74,8 @@ config KATMAI
         select 440SPe
         select PCI
         select PPC4xx_PCI_EXPRESS
+        select PCI_MSI
+        select PCC4xx_MSI
         help
           This option enables support for the AMCC PPC440SPe evaluation board.
 
@@ -118,6 +120,8 @@ config CANYONLANDS
         select 460EX
         select PCI
         select PPC4xx_PCI_EXPRESS
+        select PCI_MSI
+        select PPC4xx_MSI
         select IBM_NEW_EMAC_RGMII
         select IBM_NEW_EMAC_ZMII
         help
@@ -144,6 +148,8 @@ config REDWOOD
         select 460SX
         select PCI
         select PPC4xx_PCI_EXPRESS
+        select PCI_MSI
+        select PPC4xx_MSI
         help
           This option enables support for the AMCC PPC460SX Redwood board.
 
diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c
index 449c08c15862..3e4eba603e6b 100644
--- a/arch/powerpc/platforms/cell/interrupt.c
+++ b/arch/powerpc/platforms/cell/interrupt.c
@@ -176,14 +176,14 @@ EXPORT_SYMBOL_GPL(iic_get_target_id);
 #ifdef CONFIG_SMP
 
 /* Use the highest interrupt priorities for IPI */
-static inline int iic_ipi_to_irq(int ipi)
+static inline int iic_msg_to_irq(int msg)
 {
-        return IIC_IRQ_TYPE_IPI + 0xf - ipi;
+        return IIC_IRQ_TYPE_IPI + 0xf - msg;
 }
 
-void iic_cause_IPI(int cpu, int mesg)
+void iic_message_pass(int cpu, int msg)
 {
-        out_be64(&per_cpu(cpu_iic, cpu).regs->generate, (0xf - mesg) << 4);
+        out_be64(&per_cpu(cpu_iic, cpu).regs->generate, (0xf - msg) << 4);
 }
 
 struct irq_host *iic_get_irq_host(int node)
@@ -192,50 +192,31 @@ struct irq_host *iic_get_irq_host(int node)
 }
 EXPORT_SYMBOL_GPL(iic_get_irq_host);
 
-static irqreturn_t iic_ipi_action(int irq, void *dev_id)
-{
-        int ipi = (int)(long)dev_id;
-
-        switch(ipi) {
-        case PPC_MSG_CALL_FUNCTION:
-                generic_smp_call_function_interrupt();
-                break;
-        case PPC_MSG_RESCHEDULE:
-                scheduler_ipi();
-                break;
-        case PPC_MSG_CALL_FUNC_SINGLE:
-                generic_smp_call_function_single_interrupt();
-                break;
-        case PPC_MSG_DEBUGGER_BREAK:
-                debug_ipi_action(0, NULL);
-                break;
-        }
-        return IRQ_HANDLED;
-}
-static void iic_request_ipi(int ipi, const char *name)
+static void iic_request_ipi(int msg)
 {
         int virq;
 
-        virq = irq_create_mapping(iic_host, iic_ipi_to_irq(ipi));
+        virq = irq_create_mapping(iic_host, iic_msg_to_irq(msg));
         if (virq == NO_IRQ) {
                 printk(KERN_ERR
-                       "iic: failed to map IPI %s\n", name);
+                       "iic: failed to map IPI %s\n", smp_ipi_name[msg]);
                 return;
         }
-        if (request_irq(virq, iic_ipi_action, IRQF_DISABLED, name,
-                        (void *)(long)ipi))
-                printk(KERN_ERR
-                       "iic: failed to request IPI %s\n", name);
+
+        /*
+         * If smp_request_message_ipi encounters an error it will notify
+         * the error.  If a message is not needed it will return non-zero.
+         */
+        if (smp_request_message_ipi(virq, msg))
+                irq_dispose_mapping(virq);
 }
 
 void iic_request_IPIs(void)
 {
-        iic_request_ipi(PPC_MSG_CALL_FUNCTION, "IPI-call");
-        iic_request_ipi(PPC_MSG_RESCHEDULE, "IPI-resched");
-        iic_request_ipi(PPC_MSG_CALL_FUNC_SINGLE, "IPI-call-single");
-#ifdef CONFIG_DEBUGGER
-        iic_request_ipi(PPC_MSG_DEBUGGER_BREAK, "IPI-debug");
-#endif /* CONFIG_DEBUGGER */
+        iic_request_ipi(PPC_MSG_CALL_FUNCTION);
+        iic_request_ipi(PPC_MSG_RESCHEDULE);
+        iic_request_ipi(PPC_MSG_CALL_FUNC_SINGLE);
+        iic_request_ipi(PPC_MSG_DEBUGGER_BREAK);
 }
 
 #endif /* CONFIG_SMP */
diff --git a/arch/powerpc/platforms/cell/interrupt.h b/arch/powerpc/platforms/cell/interrupt.h
index 942dc39d6045..4f60ae6ca358 100644
--- a/arch/powerpc/platforms/cell/interrupt.h
+++ b/arch/powerpc/platforms/cell/interrupt.h
@@ -75,7 +75,7 @@ enum {
 };
 
 extern void iic_init_IRQ(void);
-extern void iic_cause_IPI(int cpu, int mesg);
+extern void iic_message_pass(int cpu, int msg);
 extern void iic_request_IPIs(void);
 extern void iic_setup_cpu(void);
 
diff --git a/arch/powerpc/platforms/cell/smp.c b/arch/powerpc/platforms/cell/smp.c
index d176e6148e3f..dbb641ea90dd 100644
--- a/arch/powerpc/platforms/cell/smp.c
+++ b/arch/powerpc/platforms/cell/smp.c
@@ -152,7 +152,7 @@ static int smp_cell_cpu_bootable(unsigned int nr)
         return 1;
 }
 static struct smp_ops_t bpa_iic_smp_ops = {
-        .message_pass   = iic_cause_IPI,
+        .message_pass   = iic_message_pass,
         .probe          = smp_iic_probe,
         .kick_cpu       = smp_cell_kick_cpu,
         .setup_cpu      = smp_cell_setup_cpu,
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index 9089b0421191..7667db448aa7 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -715,7 +715,8 @@ static struct syscore_ops pmacpic_syscore_ops = {
 
 static int __init init_pmacpic_syscore(void)
 {
-        register_syscore_ops(&pmacpic_syscore_ops);
+        if (pmac_irq_hw[0])
+                register_syscore_ops(&pmacpic_syscore_ops);
         return 0;
 }
 
diff --git a/arch/powerpc/sysdev/Kconfig b/arch/powerpc/sysdev/Kconfig
index d775fd148d13..7b4df37ac381 100644
--- a/arch/powerpc/sysdev/Kconfig
+++ b/arch/powerpc/sysdev/Kconfig
@@ -7,11 +7,18 @@ config PPC4xx_PCI_EXPRESS
         depends on PCI && 4xx
         default n
 
+config PPC4xx_MSI
+        bool
+        depends on PCI_MSI
+        depends on PCI && 4xx
+        default n
+
 config PPC_MSI_BITMAP
         bool
         depends on PCI_MSI
         default y if MPIC
         default y if FSL_PCI
+        default y if PPC4xx_MSI
 
 source "arch/powerpc/sysdev/xics/Kconfig"
 
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index 6076e0074a87..0efa990e3344 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -41,6 +41,7 @@ obj-$(CONFIG_OF_RTC)		+= of_rtc.o
 ifeq ($(CONFIG_PCI),y)
 obj-$(CONFIG_4xx)               += ppc4xx_pci.o
 endif
+obj-$(CONFIG_PPC4xx_MSI)        += ppc4xx_msi.o
 obj-$(CONFIG_PPC4xx_CPM)        += ppc4xx_cpm.o
 obj-$(CONFIG_PPC4xx_GPIO)       += ppc4xx_gpio.o
 
diff --git a/arch/powerpc/sysdev/fsl_lbc.c b/arch/powerpc/sysdev/fsl_lbc.c
index 4fcb5a4e60dd..0608b1657da4 100644
--- a/arch/powerpc/sysdev/fsl_lbc.c
+++ b/arch/powerpc/sysdev/fsl_lbc.c
@@ -184,7 +184,8 @@ int fsl_upm_run_pattern(struct fsl_upm *upm, void __iomem *io_base, u32 mar)
 }
 EXPORT_SYMBOL(fsl_upm_run_pattern);
 
-static int __devinit fsl_lbc_ctrl_init(struct fsl_lbc_ctrl *ctrl)
+static int __devinit fsl_lbc_ctrl_init(struct fsl_lbc_ctrl *ctrl,
+                                       struct device_node *node)
 {
         struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
 
@@ -198,6 +199,10 @@ static int __devinit fsl_lbc_ctrl_init(struct fsl_lbc_ctrl *ctrl)
         /* Enable interrupts for any detected events */
         out_be32(&lbc->lteir, LTEIR_ENABLE);
 
+        /* Set the monitor timeout value to the maximum for erratum A001 */
+        if (of_device_is_compatible(node, "fsl,elbc"))
+                clrsetbits_be32(&lbc->lbcr, LBCR_BMT, LBCR_BMTPS);
+
         return 0;
 }
 
@@ -304,7 +309,7 @@ static int __devinit fsl_lbc_ctrl_probe(struct platform_device *dev)
 
         fsl_lbc_ctrl_dev->dev = &dev->dev;
 
-        ret = fsl_lbc_ctrl_init(fsl_lbc_ctrl_dev);
+        ret = fsl_lbc_ctrl_init(fsl_lbc_ctrl_dev, dev->dev.of_node);
         if (ret < 0)
                 goto err;
 
diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c
index 49798532b477..5b206a2fe17c 100644
--- a/arch/powerpc/sysdev/fsl_rio.c
+++ b/arch/powerpc/sysdev/fsl_rio.c
@@ -10,7 +10,7 @@
  * - Added Port-Write message handling
  * - Added Machine Check exception handling
  *
- * Copyright (C) 2007, 2008 Freescale Semiconductor, Inc.
+ * Copyright (C) 2007, 2008, 2010 Freescale Semiconductor, Inc.
  * Zhang Wei <wei.zhang@freescale.com>
  *
  * Copyright 2005 MontaVista Software, Inc.
@@ -47,15 +47,33 @@
 #define IRQ_RIO_RX(m)           (((struct rio_priv *)(m->priv))->rxirq)
 #define IRQ_RIO_PW(m)           (((struct rio_priv *)(m->priv))->pwirq)
 
+#define IPWSR_CLEAR             0x98
+#define OMSR_CLEAR              0x1cb3
+#define IMSR_CLEAR              0x491
+#define IDSR_CLEAR              0x91
+#define ODSR_CLEAR              0x1c00
+#define LTLEECSR_ENABLE_ALL     0xFFC000FC
+#define ESCSR_CLEAR             0x07120204
+
+#define RIO_PORT1_EDCSR         0x0640
+#define RIO_PORT2_EDCSR         0x0680
+#define RIO_PORT1_IECSR         0x10130
+#define RIO_PORT2_IECSR         0x101B0
+#define RIO_IM0SR               0x13064
+#define RIO_IM1SR               0x13164
+#define RIO_OM0SR               0x13004
+#define RIO_OM1SR               0x13104
+
 #define RIO_ATMU_REGS_OFFSET    0x10c00
 #define RIO_P_MSG_REGS_OFFSET   0x11000
 #define RIO_S_MSG_REGS_OFFSET   0x13000
 #define RIO_GCCSR               0x13c
 #define RIO_ESCSR               0x158
+#define RIO_PORT2_ESCSR         0x178
 #define RIO_CCSR                0x15c
 #define RIO_LTLEDCSR            0x0608
-#define  RIO_LTLEDCSR_IER       0x80000000
-#define  RIO_LTLEDCSR_PRT       0x01000000
+#define RIO_LTLEDCSR_IER        0x80000000
+#define RIO_LTLEDCSR_PRT        0x01000000
 #define RIO_LTLEECSR            0x060c
 #define RIO_EPWISR              0x10010
 #define RIO_ISR_AACR            0x10120
@@ -88,7 +106,10 @@
 #define RIO_IPWSR_PWD           0x00000008
 #define RIO_IPWSR_PWB           0x00000004
 
-#define RIO_EPWISR_PINT         0x80000000
+/* EPWISR Error match value */
+#define RIO_EPWISR_PINT1        0x80000000
+#define RIO_EPWISR_PINT2        0x40000000
+#define RIO_EPWISR_MU           0x00000002
 #define RIO_EPWISR_PW           0x00000001
 
 #define RIO_MSG_DESC_SIZE       32
@@ -260,9 +281,7 @@ struct rio_priv {
 static void __iomem *rio_regs_win;
 
 #ifdef CONFIG_E500
-static int (*saved_mcheck_exception)(struct pt_regs *regs);
-
-static int fsl_rio_mcheck_exception(struct pt_regs *regs)
+int fsl_rio_mcheck_exception(struct pt_regs *regs)
 {
         const struct exception_table_entry *entry = NULL;
         unsigned long reason = mfspr(SPRN_MCSR);
@@ -284,11 +303,9 @@ static int fsl_rio_mcheck_exception(struct pt_regs *regs)
                 }
         }
 
-        if (saved_mcheck_exception)
-                return saved_mcheck_exception(regs);
-        else
-                return cur_cpu_spec->machine_check(regs);
+        return 0;
 }
+EXPORT_SYMBOL_GPL(fsl_rio_mcheck_exception);
 #endif
 
 /**
@@ -1064,6 +1081,40 @@ static int fsl_rio_doorbell_init(struct rio_mport *mport)
         return rc;
 }
 
+static void port_error_handler(struct rio_mport *port, int offset)
+{
+        /*XXX: Error recovery is not implemented, we just clear errors */
+        out_be32((u32 *)(rio_regs_win + RIO_LTLEDCSR), 0);
+
+        if (offset == 0) {
+                out_be32((u32 *)(rio_regs_win + RIO_PORT1_EDCSR), 0);
+                out_be32((u32 *)(rio_regs_win + RIO_PORT1_IECSR), 0);
+                out_be32((u32 *)(rio_regs_win + RIO_ESCSR), ESCSR_CLEAR);
+        } else {
+                out_be32((u32 *)(rio_regs_win + RIO_PORT2_EDCSR), 0);
+                out_be32((u32 *)(rio_regs_win + RIO_PORT2_IECSR), 0);
+                out_be32((u32 *)(rio_regs_win + RIO_PORT2_ESCSR), ESCSR_CLEAR);
+        }
+}
+
+static void msg_unit_error_handler(struct rio_mport *port)
+{
+        struct rio_priv *priv = port->priv;
+
+        /*XXX: Error recovery is not implemented, we just clear errors */
+        out_be32((u32 *)(rio_regs_win + RIO_LTLEDCSR), 0);
+
+        out_be32((u32 *)(rio_regs_win + RIO_IM0SR), IMSR_CLEAR);
+        out_be32((u32 *)(rio_regs_win + RIO_IM1SR), IMSR_CLEAR);
+        out_be32((u32 *)(rio_regs_win + RIO_OM0SR), OMSR_CLEAR);
+        out_be32((u32 *)(rio_regs_win + RIO_OM1SR), OMSR_CLEAR);
+
+        out_be32(&priv->msg_regs->odsr, ODSR_CLEAR);
+        out_be32(&priv->msg_regs->dsr, IDSR_CLEAR);
+
+        out_be32(&priv->msg_regs->pwsr, IPWSR_CLEAR);
+}
+
 /**
  * fsl_rio_port_write_handler - MPC85xx port write interrupt handler
  * @irq: Linux interrupt number
@@ -1144,10 +1195,22 @@ fsl_rio_port_write_handler(int irq, void *dev_instance)
         }
 
 pw_done:
-        if (epwisr & RIO_EPWISR_PINT) {
+        if (epwisr & RIO_EPWISR_PINT1) {
+                tmp = in_be32(priv->regs_win + RIO_LTLEDCSR);
+                pr_debug("RIO_LTLEDCSR = 0x%x\n", tmp);
+                port_error_handler(port, 0);
+        }
+
+        if (epwisr & RIO_EPWISR_PINT2) {
                 tmp = in_be32(priv->regs_win + RIO_LTLEDCSR);
                 pr_debug("RIO_LTLEDCSR = 0x%x\n", tmp);
-                out_be32(priv->regs_win + RIO_LTLEDCSR, 0);
+                port_error_handler(port, 1);
+        }
+
+        if (epwisr & RIO_EPWISR_MU) {
+                tmp = in_be32(priv->regs_win + RIO_LTLEDCSR);
+                pr_debug("RIO_LTLEDCSR = 0x%x\n", tmp);
+                msg_unit_error_handler(port);
         }
 
         return IRQ_HANDLED;
@@ -1258,12 +1321,14 @@ static int fsl_rio_port_write_init(struct rio_mport *mport)
 
 
         /* Hook up port-write handler */
-        rc = request_irq(IRQ_RIO_PW(mport), fsl_rio_port_write_handler, 0,
-                         "port-write", (void *)mport);
+        rc = request_irq(IRQ_RIO_PW(mport), fsl_rio_port_write_handler,
+                        IRQF_SHARED, "port-write", (void *)mport);
         if (rc < 0) {
                 pr_err("MPC85xx RIO: unable to request inbound doorbell irq");
                 goto err_out;
         }
+        /* Enable Error Interrupt */
+        out_be32((u32 *)(rio_regs_win + RIO_LTLEECSR), LTLEECSR_ENABLE_ALL);
 
         INIT_WORK(&priv->pw_work, fsl_pw_dpc);
         spin_lock_init(&priv->pw_fifo_lock);
@@ -1538,11 +1603,6 @@ int fsl_rio_setup(struct platform_device *dev)
         fsl_rio_doorbell_init(port);
         fsl_rio_port_write_init(port);
 
-#ifdef CONFIG_E500
-        saved_mcheck_exception = ppc_md.machine_check_exception;
-        ppc_md.machine_check_exception = fsl_rio_mcheck_exception;
-#endif
-
         return 0;
 err:
         iounmap(priv->regs_win);
diff --git a/arch/powerpc/sysdev/ppc4xx_msi.c b/arch/powerpc/sysdev/ppc4xx_msi.c
new file mode 100644
index 000000000000..367af0241851
--- /dev/null
+++ b/arch/powerpc/sysdev/ppc4xx_msi.c
@@ -0,0 +1,276 @@
+/*
+ * Adding PCI-E MSI support for PPC4XX SoCs.
+ *
+ * Copyright (c) 2010, Applied Micro Circuits Corporation
+ * Authors:     Tirumala R Marri <tmarri@apm.com>
+ *              Feng Kan <fkan@apm.com>
+ *
+ * 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 program 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
+ */
+
+#include <linux/irq.h>
+#include <linux/bootmem.h>
+#include <linux/pci.h>
+#include <linux/msi.h>
+#include <linux/of_platform.h>
+#include <linux/interrupt.h>
+#include <asm/prom.h>
+#include <asm/hw_irq.h>
+#include <asm/ppc-pci.h>
+#include <boot/dcr.h>
+#include <asm/dcr-regs.h>
+#include <asm/msi_bitmap.h>
+
+#define PEIH_TERMADH    0x00
+#define PEIH_TERMADL    0x08
+#define PEIH_MSIED      0x10
+#define PEIH_MSIMK      0x18
+#define PEIH_MSIASS     0x20
+#define PEIH_FLUSH0     0x30
+#define PEIH_FLUSH1     0x38
+#define PEIH_CNTRST     0x48
+#define NR_MSI_IRQS     4
+
+struct ppc4xx_msi {
+        u32 msi_addr_lo;
+        u32 msi_addr_hi;
+        void __iomem *msi_regs;
+        int msi_virqs[NR_MSI_IRQS];
+        struct msi_bitmap bitmap;
+        struct device_node *msi_dev;
+};
+
+static struct ppc4xx_msi ppc4xx_msi;
+
+static int ppc4xx_msi_init_allocator(struct platform_device *dev,
+                struct ppc4xx_msi *msi_data)
+{
+        int err;
+
+        err = msi_bitmap_alloc(&msi_data->bitmap, NR_MSI_IRQS,
+                              dev->dev.of_node);
+        if (err)
+                return err;
+
+        err = msi_bitmap_reserve_dt_hwirqs(&msi_data->bitmap);
+        if (err < 0) {
+                msi_bitmap_free(&msi_data->bitmap);
+                return err;
+        }
+
+        return 0;
+}
+
+static int ppc4xx_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
+{
+        int int_no = -ENOMEM;
+        unsigned int virq;
+        struct msi_msg msg;
+        struct msi_desc *entry;
+        struct ppc4xx_msi *msi_data = &ppc4xx_msi;
+
+        list_for_each_entry(entry, &dev->msi_list, list) {
+                int_no = msi_bitmap_alloc_hwirqs(&msi_data->bitmap, 1);
+                if (int_no >= 0)
+                        break;
+                if (int_no < 0) {
+                        pr_debug("%s: fail allocating msi interrupt\n",
+                                        __func__);
+                }
+                virq = irq_of_parse_and_map(msi_data->msi_dev, int_no);
+                if (virq == NO_IRQ) {
+                        dev_err(&dev->dev, "%s: fail mapping irq\n", __func__);
+                        msi_bitmap_free_hwirqs(&msi_data->bitmap, int_no, 1);
+                        return -ENOSPC;
+                }
+                dev_dbg(&dev->dev, "%s: virq = %d\n", __func__, virq);
+
+                /* Setup msi address space */
+                msg.address_hi = msi_data->msi_addr_hi;
+                msg.address_lo = msi_data->msi_addr_lo;
+
+                irq_set_msi_desc(virq, entry);
+                msg.data = int_no;
+                write_msi_msg(virq, &msg);
+        }
+        return 0;
+}
+
+void ppc4xx_teardown_msi_irqs(struct pci_dev *dev)
+{
+        struct msi_desc *entry;
+        struct ppc4xx_msi *msi_data = &ppc4xx_msi;
+
+        dev_dbg(&dev->dev, "PCIE-MSI: tearing down msi irqs\n");
+
+        list_for_each_entry(entry, &dev->msi_list, list) {
+                if (entry->irq == NO_IRQ)
+                        continue;
+                irq_set_msi_desc(entry->irq, NULL);
+                msi_bitmap_free_hwirqs(&msi_data->bitmap,
+                                virq_to_hw(entry->irq), 1);
+                irq_dispose_mapping(entry->irq);
+        }
+}
+
+static int ppc4xx_msi_check_device(struct pci_dev *pdev, int nvec, int type)
+{
+        dev_dbg(&pdev->dev, "PCIE-MSI:%s called. vec %x type %d\n",
+                __func__, nvec, type);
+        if (type == PCI_CAP_ID_MSIX)
+                pr_debug("ppc4xx msi: MSI-X untested, trying anyway.\n");
+
+        return 0;
+}
+
+static int ppc4xx_setup_pcieh_hw(struct platform_device *dev,
+                                 struct resource res, struct ppc4xx_msi *msi)
+{
+        const u32 *msi_data;
+        const u32 *msi_mask;
+        const u32 *sdr_addr;
+        dma_addr_t msi_phys;
+        void *msi_virt;
+
+        sdr_addr = of_get_property(dev->dev.of_node, "sdr-base", NULL);
+        if (!sdr_addr)
+                return -1;
+
+        SDR0_WRITE(sdr_addr, (u64)res.start >> 32);      /*HIGH addr */
+        SDR0_WRITE(sdr_addr + 1, res.start & 0xFFFFFFFF); /* Low addr */
+
+
+        msi->msi_dev = of_find_node_by_name(NULL, "ppc4xx-msi");
+        if (msi->msi_dev)
+                return -ENODEV;
+
+        msi->msi_regs = of_iomap(msi->msi_dev, 0);
+        if (!msi->msi_regs) {
+                dev_err(&dev->dev, "of_iomap problem failed\n");
+                return -ENOMEM;
+        }
+        dev_dbg(&dev->dev, "PCIE-MSI: msi register mapped 0x%x 0x%x\n",
+                (u32) (msi->msi_regs + PEIH_TERMADH), (u32) (msi->msi_regs));
+
+        msi_virt = dma_alloc_coherent(&dev->dev, 64, &msi_phys, GFP_KERNEL);
+        msi->msi_addr_hi = 0x0;
+        msi->msi_addr_lo = (u32) msi_phys;
+        dev_dbg(&dev->dev, "PCIE-MSI: msi address 0x%x\n", msi->msi_addr_lo);
+
+        /* Progam the Interrupt handler Termination addr registers */
+        out_be32(msi->msi_regs + PEIH_TERMADH, msi->msi_addr_hi);
+        out_be32(msi->msi_regs + PEIH_TERMADL, msi->msi_addr_lo);
+
+        msi_data = of_get_property(dev->dev.of_node, "msi-data", NULL);
+        if (!msi_data)
+                return -1;
+        msi_mask = of_get_property(dev->dev.of_node, "msi-mask", NULL);
+        if (!msi_mask)
+                return -1;
+        /* Program MSI Expected data and Mask bits */
+        out_be32(msi->msi_regs + PEIH_MSIED, *msi_data);
+        out_be32(msi->msi_regs + PEIH_MSIMK, *msi_mask);
+
+        return 0;
+}
+
+static int ppc4xx_of_msi_remove(struct platform_device *dev)
+{
+        struct ppc4xx_msi *msi = dev->dev.platform_data;
+        int i;
+        int virq;
+
+        for (i = 0; i < NR_MSI_IRQS; i++) {
+                virq = msi->msi_virqs[i];
+                if (virq != NO_IRQ)
+                        irq_dispose_mapping(virq);
+        }
+
+        if (msi->bitmap.bitmap)
+                msi_bitmap_free(&msi->bitmap);
+        iounmap(msi->msi_regs);
+        of_node_put(msi->msi_dev);
+        kfree(msi);
+
+        return 0;
+}
+
+static int __devinit ppc4xx_msi_probe(struct platform_device *dev)
+{
+        struct ppc4xx_msi *msi;
+        struct resource res;
+        int err = 0;
+
+        msi = &ppc4xx_msi;/*keep the msi data for further use*/
+
+        dev_dbg(&dev->dev, "PCIE-MSI: Setting up MSI support...\n");
+
+        msi = kzalloc(sizeof(struct ppc4xx_msi), GFP_KERNEL);
+        if (!msi) {
+                dev_err(&dev->dev, "No memory for MSI structure\n");
+                return -ENOMEM;
+        }
+        dev->dev.platform_data = msi;
+
+        /* Get MSI ranges */
+        err = of_address_to_resource(dev->dev.of_node, 0, &res);
+        if (err) {
+                dev_err(&dev->dev, "%s resource error!\n",
+                        dev->dev.of_node->full_name);
+                goto error_out;
+        }
+
+        if (ppc4xx_setup_pcieh_hw(dev, res, msi))
+                goto error_out;
+
+        err = ppc4xx_msi_init_allocator(dev, msi);
+        if (err) {
+                dev_err(&dev->dev, "Error allocating MSI bitmap\n");
+                goto error_out;
+        }
+
+        ppc_md.setup_msi_irqs = ppc4xx_setup_msi_irqs;
+        ppc_md.teardown_msi_irqs = ppc4xx_teardown_msi_irqs;
+        ppc_md.msi_check_device = ppc4xx_msi_check_device;
+        return err;
+
+error_out:
+        ppc4xx_of_msi_remove(dev);
+        return err;
+}
+static const struct of_device_id ppc4xx_msi_ids[] = {
+        {
+                .compatible = "amcc,ppc4xx-msi",
+        },
+        {}
+};
+static struct platform_driver ppc4xx_msi_driver = {
+        .probe = ppc4xx_msi_probe,
+        .remove = ppc4xx_of_msi_remove,
+        .driver = {
+                   .name = "ppc4xx-msi",
+                   .owner = THIS_MODULE,
+                   .of_match_table = ppc4xx_msi_ids,
+                   },
+
+};
+
+static __init int ppc4xx_msi_init(void)
+{
+        return platform_driver_register(&ppc4xx_msi_driver);
+}
+
+subsys_initcall(ppc4xx_msi_init);
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index ff2d2371b2e9..9fab2aa9c2c8 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -2,7 +2,7 @@ config MMU
         def_bool y
 
 config ZONE_DMA
-        def_bool y if 64BIT
+        def_bool y
 
 config LOCKDEP_SUPPORT
         def_bool y
diff --git a/arch/s390/appldata/appldata_mem.c b/arch/s390/appldata/appldata_mem.c
index e43fe7537031..f7d3dc555bdb 100644
--- a/arch/s390/appldata/appldata_mem.c
+++ b/arch/s390/appldata/appldata_mem.c
@@ -92,9 +92,7 @@ static void appldata_get_mem_data(void *data)
         mem_data->pswpin     = ev[PSWPIN];
         mem_data->pswpout    = ev[PSWPOUT];
         mem_data->pgalloc    = ev[PGALLOC_NORMAL];
-#ifdef CONFIG_ZONE_DMA
         mem_data->pgalloc    += ev[PGALLOC_DMA];
-#endif
         mem_data->pgfault    = ev[PGFAULT];
         mem_data->pgmajfault = ev[PGMAJFAULT];
 
diff --git a/arch/s390/include/asm/bitops.h b/arch/s390/include/asm/bitops.h
index e1c8f3a49884..667c6e9f6a34 100644
--- a/arch/s390/include/asm/bitops.h
+++ b/arch/s390/include/asm/bitops.h
@@ -621,6 +621,7 @@ static inline unsigned long find_first_zero_bit(const unsigned long *addr,
         bits = __ffz_word(bytes*8, __load_ulong_be(addr, bytes));
         return (bits < size) ? bits : size;
 }
+#define find_first_zero_bit find_first_zero_bit
 
 /**
  * find_first_bit - find the first set bit in a memory region
@@ -641,6 +642,7 @@ static inline unsigned long find_first_bit(const unsigned long * addr,
         bits = __ffs_word(bytes*8, __load_ulong_be(addr, bytes));
         return (bits < size) ? bits : size;
 }
+#define find_first_bit find_first_bit
 
 /**
  * find_next_zero_bit - find the first zero bit in a memory region
@@ -677,6 +679,7 @@ static inline int find_next_zero_bit (const unsigned long * addr,
         }
         return offset + find_first_zero_bit(p, size);
 }
+#define find_next_zero_bit find_next_zero_bit
 
 /**
  * find_next_bit - find the first set bit in a memory region
@@ -713,6 +716,7 @@ static inline int find_next_bit (const unsigned long * addr,
         }
         return offset + find_first_bit(p, size);
 }
+#define find_next_bit find_next_bit
 
 /*
  * Every architecture must define this function. It's the fastest
@@ -742,41 +746,6 @@ static inline int sched_find_first_bit(unsigned long *b)
  *    23 22 21 20 19 18 17 16 31 30 29 28 27 26 25 24
  */
 
-static inline void __set_bit_le(unsigned long nr, void *addr)
-{
-        __set_bit(nr ^ (__BITOPS_WORDSIZE - 8), addr);
-}
-
-static inline void __clear_bit_le(unsigned long nr, void *addr)
-{
-        __clear_bit(nr ^ (__BITOPS_WORDSIZE - 8), addr);
-}
-
-static inline int __test_and_set_bit_le(unsigned long nr, void *addr)
-{
-        return __test_and_set_bit(nr ^ (__BITOPS_WORDSIZE - 8), addr);
-}
-
-static inline int test_and_set_bit_le(unsigned long nr, void *addr)
-{
-        return test_and_set_bit(nr ^ (__BITOPS_WORDSIZE - 8), addr);
-}
-
-static inline int __test_and_clear_bit_le(unsigned long nr, void *addr)
-{
-        return __test_and_clear_bit(nr ^ (__BITOPS_WORDSIZE - 8), addr);
-}
-
-static inline int test_and_clear_bit_le(unsigned long nr, void *addr)
-{
-        return test_and_clear_bit(nr ^ (__BITOPS_WORDSIZE - 8), addr);
-}
-
-static inline int test_bit_le(unsigned long nr, const void *addr)
-{
-        return test_bit(nr ^ (__BITOPS_WORDSIZE - 8), addr);
-}
-
 static inline int find_first_zero_bit_le(void *vaddr, unsigned int size)
 {
         unsigned long bytes, bits;
@@ -787,6 +756,7 @@ static inline int find_first_zero_bit_le(void *vaddr, unsigned int size)
         bits = __ffz_word(bytes*8, __load_ulong_le(vaddr, bytes));
         return (bits < size) ? bits : size;
 }
+#define find_first_zero_bit_le find_first_zero_bit_le
 
 static inline int find_next_zero_bit_le(void *vaddr, unsigned long size,
                                           unsigned long offset)
@@ -816,6 +786,7 @@ static inline int find_next_zero_bit_le(void *vaddr, unsigned long size,
         }
         return offset + find_first_zero_bit_le(p, size);
 }
+#define find_next_zero_bit_le find_next_zero_bit_le
 
 static inline unsigned long find_first_bit_le(void *vaddr, unsigned long size)
 {
@@ -827,6 +798,7 @@ static inline unsigned long find_first_bit_le(void *vaddr, unsigned long size)
         bits = __ffs_word(bytes*8, __load_ulong_le(vaddr, bytes));
         return (bits < size) ? bits : size;
 }
+#define find_first_bit_le find_first_bit_le
 
 static inline int find_next_bit_le(void *vaddr, unsigned long size,
                                      unsigned long offset)
@@ -856,6 +828,9 @@ static inline int find_next_bit_le(void *vaddr, unsigned long size,
         }
         return offset + find_first_bit_le(p, size);
 }
+#define find_next_bit_le find_next_bit_le
+
+#include <asm-generic/bitops/le.h>
 
 #define ext2_set_bit_atomic(lock, nr, addr)     \
         test_and_set_bit_le(nr, addr)
diff --git a/arch/s390/include/asm/delay.h b/arch/s390/include/asm/delay.h
index 8a096b83f51f..0e3b35f96be1 100644
--- a/arch/s390/include/asm/delay.h
+++ b/arch/s390/include/asm/delay.h
@@ -14,10 +14,12 @@
 #ifndef _S390_DELAY_H
 #define _S390_DELAY_H
 
-extern void __udelay(unsigned long long usecs);
-extern void udelay_simple(unsigned long long usecs);
-extern void __delay(unsigned long loops);
+void __ndelay(unsigned long long nsecs);
+void __udelay(unsigned long long usecs);
+void udelay_simple(unsigned long long usecs);
+void __delay(unsigned long loops);
 
+#define ndelay(n) __ndelay((unsigned long long) (n))
 #define udelay(n) __udelay((unsigned long long) (n))
 #define mdelay(n) __udelay((unsigned long long) (n) * 1000)
 
diff --git a/arch/s390/include/asm/irq.h b/arch/s390/include/asm/irq.h
index 1544b90bd6d6..ba7b01c726a3 100644
--- a/arch/s390/include/asm/irq.h
+++ b/arch/s390/include/asm/irq.h
@@ -2,6 +2,7 @@
 #define _ASM_IRQ_H
 
 #include <linux/hardirq.h>
+#include <linux/types.h>
 
 enum interruption_class {
         EXTERNAL_INTERRUPT,
@@ -31,4 +32,11 @@ enum interruption_class {
         NR_IRQS,
 };
 
+typedef void (*ext_int_handler_t)(unsigned int, unsigned int, unsigned long);
+
+int register_external_interrupt(u16 code, ext_int_handler_t handler);
+int unregister_external_interrupt(u16 code, ext_int_handler_t handler);
+void service_subclass_irq_register(void);
+void service_subclass_irq_unregister(void);
+
 #endif /* _ASM_IRQ_H */
diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h
index c4773a2ef3d3..e4efacfe1b63 100644
--- a/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
@@ -577,16 +577,16 @@ static inline void pgste_set_unlock(pte_t *ptep, pgste_t pgste)
 static inline pgste_t pgste_update_all(pte_t *ptep, pgste_t pgste)
 {
 #ifdef CONFIG_PGSTE
-        unsigned long pfn, bits;
+        unsigned long address, bits;
         unsigned char skey;
 
-        pfn = pte_val(*ptep) >> PAGE_SHIFT;
-        skey = page_get_storage_key(pfn);
+        address = pte_val(*ptep) & PAGE_MASK;
+        skey = page_get_storage_key(address);
         bits = skey & (_PAGE_CHANGED | _PAGE_REFERENCED);
         /* Clear page changed & referenced bit in the storage key */
         if (bits) {
                 skey ^= bits;
-                page_set_storage_key(pfn, skey, 1);
+                page_set_storage_key(address, skey, 1);
         }
         /* Transfer page changed & referenced bit to guest bits in pgste */
         pgste_val(pgste) |= bits << 48;         /* RCP_GR_BIT & RCP_GC_BIT */
@@ -628,16 +628,16 @@ static inline pgste_t pgste_update_young(pte_t *ptep, pgste_t pgste)
 static inline void pgste_set_pte(pte_t *ptep, pgste_t pgste)
 {
 #ifdef CONFIG_PGSTE
-        unsigned long pfn;
+        unsigned long address;
         unsigned long okey, nkey;
 
-        pfn = pte_val(*ptep) >> PAGE_SHIFT;
-        okey = nkey = page_get_storage_key(pfn);
+        address = pte_val(*ptep) & PAGE_MASK;
+        okey = nkey = page_get_storage_key(address);
         nkey &= ~(_PAGE_ACC_BITS | _PAGE_FP_BIT);
         /* Set page access key and fetch protection bit from pgste */
         nkey |= (pgste_val(pgste) & (RCP_ACC_BITS | RCP_FP_BIT)) >> 56;
         if (okey != nkey)
-                page_set_storage_key(pfn, nkey, 1);
+                page_set_storage_key(address, nkey, 1);
 #endif
 }
 
diff --git a/arch/s390/include/asm/s390_ext.h b/arch/s390/include/asm/s390_ext.h
deleted file mode 100644
index 080876d5f196..000000000000
--- a/arch/s390/include/asm/s390_ext.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- *    Copyright IBM Corp. 1999,2010
- *    Author(s): Holger Smolinski <Holger.Smolinski@de.ibm.com>,
- *               Martin Schwidefsky <schwidefsky@de.ibm.com>,
- */
-
-#ifndef _S390_EXTINT_H
-#define _S390_EXTINT_H
-
-#include <linux/types.h>
-
-typedef void (*ext_int_handler_t)(unsigned int, unsigned int, unsigned long);
-
-int register_external_interrupt(__u16 code, ext_int_handler_t handler);
-int unregister_external_interrupt(__u16 code, ext_int_handler_t handler);
-
-#endif /* _S390_EXTINT_H */
diff --git a/arch/s390/include/asm/suspend.h b/arch/s390/include/asm/suspend.h
deleted file mode 100644
index dc75c616eafe..000000000000
--- a/arch/s390/include/asm/suspend.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __ASM_S390_SUSPEND_H
-#define __ASM_S390_SUSPEND_H
-
-static inline int arch_prepare_suspend(void)
-{
-        return 0;
-}
-
-#endif
-
diff --git a/arch/s390/include/asm/topology.h b/arch/s390/include/asm/topology.h
index c5338834ddbd..005d77d8ae2a 100644
--- a/arch/s390/include/asm/topology.h
+++ b/arch/s390/include/asm/topology.h
@@ -7,7 +7,7 @@
 extern unsigned char cpu_core_id[NR_CPUS];
 extern cpumask_t cpu_core_map[NR_CPUS];
 
-static inline const struct cpumask *cpu_coregroup_mask(unsigned int cpu)
+static inline const struct cpumask *cpu_coregroup_mask(int cpu)
 {
         return &cpu_core_map[cpu];
 }
@@ -21,7 +21,7 @@ static inline const struct cpumask *cpu_coregroup_mask(unsigned int cpu)
 extern unsigned char cpu_book_id[NR_CPUS];
 extern cpumask_t cpu_book_map[NR_CPUS];
 
-static inline const struct cpumask *cpu_book_mask(unsigned int cpu)
+static inline const struct cpumask *cpu_book_mask(int cpu)
 {
         return &cpu_book_map[cpu];
 }
diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
index 2d9ea11f919a..2b23885e81e9 100644
--- a/arch/s390/include/asm/uaccess.h
+++ b/arch/s390/include/asm/uaccess.h
@@ -49,12 +49,13 @@
 
 #define segment_eq(a,b) ((a).ar4 == (b).ar4)
 
+#define __access_ok(addr, size) \
+({                              \
+        __chk_user_ptr(addr);   \
+        1;                      \
+})
 
-static inline int __access_ok(const void __user *addr, unsigned long size)
-{
-        return 1;
-}
-#define access_ok(type,addr,size) __access_ok(addr,size)
+#define access_ok(type, addr, size) __access_ok(addr, size)
 
 /*
  * The exception table consists of pairs of addresses: the first is the
diff --git a/arch/s390/include/asm/unistd.h b/arch/s390/include/asm/unistd.h
index 9208e69245a0..404bdb9671b4 100644
--- a/arch/s390/include/asm/unistd.h
+++ b/arch/s390/include/asm/unistd.h
@@ -276,7 +276,8 @@
 #define __NR_open_by_handle_at  336
 #define __NR_clock_adjtime      337
 #define __NR_syncfs             338
-#define NR_syscalls 339
+#define __NR_setns              339
+#define NR_syscalls 340
 
 /* 
  * There are some system calls that are not present on 64 bit, some
diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index 5ff15dacb571..df3732249baa 100644
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -20,10 +20,10 @@ CFLAGS_ptrace.o		+= -DUTS_MACHINE='"$(UTS_MACHINE)"'
 
 CFLAGS_sysinfo.o += -Iinclude/math-emu -Iarch/s390/math-emu -w
 
-obj-y   :=  bitmap.o traps.o time.o process.o base.o early.o setup.o \
-            processor.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \
-            s390_ext.o debug.o irq.o ipl.o dis.o diag.o mem_detect.o \
-            vdso.o vtime.o sysinfo.o nmi.o sclp.o jump_label.o
+obj-y   :=  bitmap.o traps.o time.o process.o base.o early.o setup.o vtime.o \
+            processor.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o nmi.o \
+            debug.o irq.o ipl.o dis.o diag.o mem_detect.o sclp.o vdso.o \
+            sysinfo.o jump_label.o
 
 obj-y   += $(if $(CONFIG_64BIT),entry64.o,entry.o)
 obj-y   += $(if $(CONFIG_64BIT),reipl64.o,reipl.o)
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S
index 1dc96ea08fa8..1f5eb789c3a7 100644
--- a/arch/s390/kernel/compat_wrapper.S
+++ b/arch/s390/kernel/compat_wrapper.S
@@ -1904,3 +1904,9 @@ compat_sys_clock_adjtime_wrapper:
 sys_syncfs_wrapper:
         lgfr    %r2,%r2                 # int
         jg      sys_syncfs
+
+        .globl  sys_setns_wrapper
+sys_setns_wrapper:
+        lgfr    %r2,%r2                 # int
+        lgfr    %r3,%r3                 # int
+        jg      sys_setns
diff --git a/arch/s390/kernel/dis.c b/arch/s390/kernel/dis.c
index 3d4a78fc1adc..1ca3d1d6a86c 100644
--- a/arch/s390/kernel/dis.c
+++ b/arch/s390/kernel/dis.c
@@ -30,9 +30,9 @@
 #include <asm/atomic.h>
 #include <asm/mathemu.h>
 #include <asm/cpcmd.h>
-#include <asm/s390_ext.h>
 #include <asm/lowcore.h>
 #include <asm/debug.h>
+#include <asm/irq.h>
 
 #ifndef CONFIG_64BIT
 #define ONELONG "%08lx: "
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index e204f9597aaf..e3264f6a9720 100644
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -1,19 +1,28 @@
 /*
- *    Copyright IBM Corp. 2004,2010
- *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
- *               Thomas Spatzier (tspat@de.ibm.com)
+ *    Copyright IBM Corp. 2004,2011
+ *    Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>,
+ *               Holger Smolinski <Holger.Smolinski@de.ibm.com>,
+ *               Thomas Spatzier <tspat@de.ibm.com>,
  *
  * This file contains interrupt related functions.
  */
 
-#include <linux/module.h>
-#include <linux/kernel.h>
 #include <linux/kernel_stat.h>
 #include <linux/interrupt.h>
 #include <linux/seq_file.h>
-#include <linux/cpu.h>
 #include <linux/proc_fs.h>
 #include <linux/profile.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/ftrace.h>
+#include <linux/errno.h>
+#include <linux/slab.h>
+#include <linux/cpu.h>
+#include <asm/irq_regs.h>
+#include <asm/cputime.h>
+#include <asm/lowcore.h>
+#include <asm/irq.h>
+#include "entry.h"
 
 struct irq_class {
         char *name;
@@ -82,8 +91,7 @@ int show_interrupts(struct seq_file *p, void *v)
  * For compatibilty only. S/390 specific setup of interrupts et al. is done
  * much later in init_channel_subsystem().
  */
-void __init
-init_IRQ(void)
+void __init init_IRQ(void)
 {
         /* nothing... */
 }
@@ -134,3 +142,116 @@ void init_irq_proc(void)
         create_prof_cpu_mask(root_irq_dir);
 }
 #endif
+
+/*
+ * ext_int_hash[index] is the start of the list for all external interrupts
+ * that hash to this index. With the current set of external interrupts
+ * (0x1202 external call, 0x1004 cpu timer, 0x2401 hwc console, 0x4000
+ * iucv and 0x2603 pfault) this is always the first element.
+ */
+
+struct ext_int_info {
+        struct ext_int_info *next;
+        ext_int_handler_t handler;
+        u16 code;
+};
+
+static struct ext_int_info *ext_int_hash[256];
+
+static inline int ext_hash(u16 code)
+{
+        return (code + (code >> 9)) & 0xff;
+}
+
+int register_external_interrupt(u16 code, ext_int_handler_t handler)
+{
+        struct ext_int_info *p;
+        int index;
+
+        p = kmalloc(sizeof(*p), GFP_ATOMIC);
+        if (!p)
+                return -ENOMEM;
+        p->code = code;
+        p->handler = handler;
+        index = ext_hash(code);
+        p->next = ext_int_hash[index];
+        ext_int_hash[index] = p;
+        return 0;
+}
+EXPORT_SYMBOL(register_external_interrupt);
+
+int unregister_external_interrupt(u16 code, ext_int_handler_t handler)
+{
+        struct ext_int_info *p, *q;
+        int index;
+
+        index = ext_hash(code);
+        q = NULL;
+        p = ext_int_hash[index];
+        while (p) {
+                if (p->code == code && p->handler == handler)
+                        break;
+                q = p;
+                p = p->next;
+        }
+        if (!p)
+                return -ENOENT;
+        if (q)
+                q->next = p->next;
+        else
+                ext_int_hash[index] = p->next;
+        kfree(p);
+        return 0;
+}
+EXPORT_SYMBOL(unregister_external_interrupt);
+
+void __irq_entry do_extint(struct pt_regs *regs, unsigned int ext_int_code,
+                           unsigned int param32, unsigned long param64)
+{
+        struct pt_regs *old_regs;
+        unsigned short code;
+        struct ext_int_info *p;
+        int index;
+
+        code = (unsigned short) ext_int_code;
+        old_regs = set_irq_regs(regs);
+        s390_idle_check(regs, S390_lowcore.int_clock,
+                        S390_lowcore.async_enter_timer);
+        irq_enter();
+        if (S390_lowcore.int_clock >= S390_lowcore.clock_comparator)
+                /* Serve timer interrupts first. */
+                clock_comparator_work();
+        kstat_cpu(smp_processor_id()).irqs[EXTERNAL_INTERRUPT]++;
+        if (code != 0x1004)
+                __get_cpu_var(s390_idle).nohz_delay = 1;
+        index = ext_hash(code);
+        for (p = ext_int_hash[index]; p; p = p->next) {
+                if (likely(p->code == code))
+                        p->handler(ext_int_code, param32, param64);
+        }
+        irq_exit();
+        set_irq_regs(old_regs);
+}
+
+static DEFINE_SPINLOCK(sc_irq_lock);
+static int sc_irq_refcount;
+
+void service_subclass_irq_register(void)
+{
+        spin_lock(&sc_irq_lock);
+        if (!sc_irq_refcount)
+                ctl_set_bit(0, 9);
+        sc_irq_refcount++;
+        spin_unlock(&sc_irq_lock);
+}
+EXPORT_SYMBOL(service_subclass_irq_register);
+
+void service_subclass_irq_unregister(void)
+{
+        spin_lock(&sc_irq_lock);
+        sc_irq_refcount--;
+        if (!sc_irq_refcount)
+                ctl_clear_bit(0, 9);
+        spin_unlock(&sc_irq_lock);
+}
+EXPORT_SYMBOL(service_subclass_irq_unregister);
diff --git a/arch/s390/kernel/s390_ext.c b/arch/s390/kernel/s390_ext.c
deleted file mode 100644
index 185029919c4d..000000000000
--- a/arch/s390/kernel/s390_ext.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- *    Copyright IBM Corp. 1999,2010
- *    Author(s): Holger Smolinski <Holger.Smolinski@de.ibm.com>,
- *               Martin Schwidefsky <schwidefsky@de.ibm.com>,
- */
-
-#include <linux/kernel_stat.h>
-#include <linux/interrupt.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/ftrace.h>
-#include <linux/errno.h>
-#include <linux/slab.h>
-#include <asm/s390_ext.h>
-#include <asm/irq_regs.h>
-#include <asm/cputime.h>
-#include <asm/lowcore.h>
-#include <asm/irq.h>
-#include "entry.h"
-
-struct ext_int_info {
-        struct ext_int_info *next;
-        ext_int_handler_t handler;
-        __u16 code;
-};
-
-/*
- * ext_int_hash[index] is the start of the list for all external interrupts
- * that hash to this index. With the current set of external interrupts 
- * (0x1202 external call, 0x1004 cpu timer, 0x2401 hwc console, 0x4000
- * iucv and 0x2603 pfault) this is always the first element. 
- */
-static struct ext_int_info *ext_int_hash[256];
-
-static inline int ext_hash(__u16 code)
-{
-        return (code + (code >> 9)) & 0xff;
-}
-
-int register_external_interrupt(__u16 code, ext_int_handler_t handler)
-{
-        struct ext_int_info *p;
-        int index;
-
-        p = kmalloc(sizeof(*p), GFP_ATOMIC);
-        if (!p)
-                return -ENOMEM;
-        p->code = code;
-        p->handler = handler;
-        index = ext_hash(code);
-        p->next = ext_int_hash[index];
-        ext_int_hash[index] = p;
-        return 0;
-}
-EXPORT_SYMBOL(register_external_interrupt);
-
-int unregister_external_interrupt(__u16 code, ext_int_handler_t handler)
-{
-        struct ext_int_info *p, *q;
-        int index;
-
-        index = ext_hash(code);
-        q = NULL;
-        p = ext_int_hash[index];
-        while (p) {
-                if (p->code == code && p->handler == handler)
-                        break;
-                q = p;
-                p = p->next;
-        }
-        if (!p)
-                return -ENOENT;
-        if (q)
-                q->next = p->next;
-        else
-                ext_int_hash[index] = p->next;
-        kfree(p);
-        return 0;
-}
-EXPORT_SYMBOL(unregister_external_interrupt);
-
-void __irq_entry do_extint(struct pt_regs *regs, unsigned int ext_int_code,
-                           unsigned int param32, unsigned long param64)
-{
-        struct pt_regs *old_regs;
-        unsigned short code;
-        struct ext_int_info *p;
-        int index;
-
-        code = (unsigned short) ext_int_code;
-        old_regs = set_irq_regs(regs);
-        s390_idle_check(regs, S390_lowcore.int_clock,
-                        S390_lowcore.async_enter_timer);
-        irq_enter();
-        if (S390_lowcore.int_clock >= S390_lowcore.clock_comparator)
-                /* Serve timer interrupts first. */
-                clock_comparator_work();
-        kstat_cpu(smp_processor_id()).irqs[EXTERNAL_INTERRUPT]++;
-        if (code != 0x1004)
-                __get_cpu_var(s390_idle).nohz_delay = 1;
-        index = ext_hash(code);
-        for (p = ext_int_hash[index]; p; p = p->next) {
-                if (likely(p->code == code))
-                        p->handler(ext_int_code, param32, param64);
-        }
-        irq_exit();
-        set_irq_regs(old_regs);
-}
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index f8e85ecbc459..52420d2785b3 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -44,7 +44,6 @@
 #include <asm/sigp.h>
 #include <asm/pgalloc.h>
 #include <asm/irq.h>
-#include <asm/s390_ext.h>
 #include <asm/cpcmd.h>
 #include <asm/tlbflush.h>
 #include <asm/timer.h>
diff --git a/arch/s390/kernel/syscalls.S b/arch/s390/kernel/syscalls.S
index 9c65fd4ddce0..6ee39ef8fe4a 100644
--- a/arch/s390/kernel/syscalls.S
+++ b/arch/s390/kernel/syscalls.S
@@ -347,3 +347,4 @@ SYSCALL(sys_name_to_handle_at,sys_name_to_handle_at,sys_name_to_handle_at_wrappe
 SYSCALL(sys_open_by_handle_at,sys_open_by_handle_at,compat_sys_open_by_handle_at_wrapper)
 SYSCALL(sys_clock_adjtime,sys_clock_adjtime,compat_sys_clock_adjtime_wrapper)
 SYSCALL(sys_syncfs,sys_syncfs,sys_syncfs_wrapper)
+SYSCALL(sys_setns,sys_setns,sys_setns_wrapper)
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index a59557f1fb5f..dff933065ab6 100644
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -41,7 +41,6 @@
 #include <linux/kprobes.h>
 #include <asm/uaccess.h>
 #include <asm/delay.h>
-#include <asm/s390_ext.h>
 #include <asm/div64.h>
 #include <asm/vdso.h>
 #include <asm/irq.h>
diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index 2eafb8c7a746..0cd340b72632 100644
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -17,7 +17,6 @@
 #include <linux/smp.h>
 #include <linux/cpuset.h>
 #include <asm/delay.h>
-#include <asm/s390_ext.h>
 
 #define PTF_HORIZONTAL  (0UL)
 #define PTF_VERTICAL    (1UL)
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index b5a4a739b477..a65d2e82f61d 100644
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -39,7 +39,6 @@
 #include <asm/atomic.h>
 #include <asm/mathemu.h>
 #include <asm/cpcmd.h>
-#include <asm/s390_ext.h>
 #include <asm/lowcore.h>
 #include <asm/debug.h>
 #include "entry.h"
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index 5e8ead4b4aba..2d6228f60cd6 100644
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -22,10 +22,10 @@
 #include <linux/cpu.h>
 #include <linux/kprobes.h>
 
-#include <asm/s390_ext.h>
 #include <asm/timer.h>
 #include <asm/irq_regs.h>
 #include <asm/cputime.h>
+#include <asm/irq.h>
 
 static DEFINE_PER_CPU(struct vtimer_queue, virt_cpu_timer);
 
diff --git a/arch/s390/lib/delay.c b/arch/s390/lib/delay.c
index 0f53110e1d09..a65229d91c92 100644
--- a/arch/s390/lib/delay.c
+++ b/arch/s390/lib/delay.c
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/irqflags.h>
 #include <linux/interrupt.h>
+#include <asm/div64.h>
 
 void __delay(unsigned long loops)
 {
@@ -116,3 +117,17 @@ void udelay_simple(unsigned long long usecs)
         while (get_clock() < end)
                 cpu_relax();
 }
+
+void __ndelay(unsigned long long nsecs)
+{
+        u64 end;
+
+        nsecs <<= 9;
+        do_div(nsecs, 125);
+        end = get_clock() + nsecs;
+        if (nsecs & ~0xfffUL)
+                __udelay(nsecs >> 12);
+        while (get_clock() < end)
+                barrier();
+}
+EXPORT_SYMBOL(__ndelay);
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index a0f9e730f26a..fe103e891e7a 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -34,7 +34,7 @@
 #include <asm/asm-offsets.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
-#include <asm/s390_ext.h>
+#include <asm/irq.h>
 #include <asm/mmu_context.h>
 #include <asm/compat.h>
 #include "../kernel/entry.h"
@@ -245,9 +245,12 @@ static noinline void do_fault_error(struct pt_regs *regs, long int_code,
                 do_no_context(regs, int_code, trans_exc_code);
                 break;
         default: /* fault & VM_FAULT_ERROR */
-                if (fault & VM_FAULT_OOM)
-                        pagefault_out_of_memory();
-                else if (fault & VM_FAULT_SIGBUS) {
+                if (fault & VM_FAULT_OOM) {
+                        if (!(regs->psw.mask & PSW_MASK_PSTATE))
+                                do_no_context(regs, int_code, trans_exc_code);
+                        else
+                                pagefault_out_of_memory();
+                } else if (fault & VM_FAULT_SIGBUS) {
                         /* Kernel mode? Handle exceptions or die */
                         if (!(regs->psw.mask & PSW_MASK_PSTATE))
                                 do_no_context(regs, int_code, trans_exc_code);
@@ -277,7 +280,8 @@ static inline int do_exception(struct pt_regs *regs, int access,
         struct mm_struct *mm;
         struct vm_area_struct *vma;
         unsigned long address;
-        int fault, write;
+        unsigned int flags;
+        int fault;
 
         if (notify_page_fault(regs))
                 return 0;
@@ -296,6 +300,10 @@ static inline int do_exception(struct pt_regs *regs, int access,
 
         address = trans_exc_code & __FAIL_ADDR_MASK;
         perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, 0, regs, address);
+        flags = FAULT_FLAG_ALLOW_RETRY;
+        if (access == VM_WRITE || (trans_exc_code & store_indication) == 0x400)
+                flags |= FAULT_FLAG_WRITE;
+retry:
         down_read(&mm->mmap_sem);
 
         fault = VM_FAULT_BADMAP;
@@ -325,21 +333,31 @@ static inline int do_exception(struct pt_regs *regs, int access,
          * make sure we exit gracefully rather than endlessly redo
          * the fault.
          */
-        write = (access == VM_WRITE ||
-                 (trans_exc_code & store_indication) == 0x400) ?
-                FAULT_FLAG_WRITE : 0;
-        fault = handle_mm_fault(mm, vma, address, write);
+        fault = handle_mm_fault(mm, vma, address, flags);
         if (unlikely(fault & VM_FAULT_ERROR))
                 goto out_up;
 
-        if (fault & VM_FAULT_MAJOR) {
-                tsk->maj_flt++;
-                perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, 0,
-                                     regs, address);
-        } else {
-                tsk->min_flt++;
-                perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, 0,
-                                     regs, address);
+        /*
+         * Major/minor page fault accounting is only done on the
+         * initial attempt. If we go through a retry, it is extremely
+         * likely that the page will be found in page cache at that point.
+         */
+        if (flags & FAULT_FLAG_ALLOW_RETRY) {
+                if (fault & VM_FAULT_MAJOR) {
+                        tsk->maj_flt++;
+                        perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, 0,
+                                      regs, address);
+                } else {
+                        tsk->min_flt++;
+                        perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, 0,
+                                      regs, address);
+                }
+                if (fault & VM_FAULT_RETRY) {
+                        /* Clear FAULT_FLAG_ALLOW_RETRY to avoid any risk
+                         * of starvation. */
+                        flags &= ~FAULT_FLAG_ALLOW_RETRY;
+                        goto retry;
+                }
         }
         /*
          * The instruction that caused the program check will
@@ -429,10 +447,9 @@ int __handle_fault(unsigned long uaddr, unsigned long pgm_int_code, int write)
         access = write ? VM_WRITE : VM_READ;
         fault = do_exception(&regs, access, uaddr | 2);
         if (unlikely(fault)) {
-                if (fault & VM_FAULT_OOM) {
-                        pagefault_out_of_memory();
-                        fault = 0;
-                } else if (fault & VM_FAULT_SIGBUS)
+                if (fault & VM_FAULT_OOM)
+                        return -EFAULT;
+                else if (fault & VM_FAULT_SIGBUS)
                         do_sigbus(&regs, pgm_int_code, uaddr);
         }
         return fault ? -EFAULT : 0;
@@ -485,7 +502,6 @@ int pfault_init(void)
                 "2:\n"
                 EX_TABLE(0b,1b)
                 : "=d" (rc) : "a" (&refbk), "m" (refbk) : "cc");
-        __ctl_set_bit(0, 9);
         return rc;
 }
 
@@ -500,7 +516,6 @@ void pfault_fini(void)
 
         if (!MACHINE_IS_VM || pfault_disable)
                 return;
-        __ctl_clear_bit(0,9);
         asm volatile(
                 "       diag    %0,0,0x258\n"
                 "0:\n"
@@ -615,6 +630,7 @@ static int __init pfault_irq_init(void)
         rc = pfault_init() == 0 ? 0 : -EOPNOTSUPP;
         if (rc)
                 goto out_pfault;
+        service_subclass_irq_register();
         hotcpu_notifier(pfault_cpu_notify, 0);
         return 0;
 
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index dfefc2171691..59b663109d90 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -119,9 +119,7 @@ void __init paging_init(void)
         sparse_memory_present_with_active_regions(MAX_NUMNODES);
         sparse_init();
         memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
-#ifdef CONFIG_ZONE_DMA
         max_zone_pfns[ZONE_DMA] = PFN_DOWN(MAX_DMA_ADDRESS);
-#endif
         max_zone_pfns[ZONE_NORMAL] = max_low_pfn;
         free_area_init_nodes(max_zone_pfns);
         fault_init();
diff --git a/arch/s390/mm/maccess.c b/arch/s390/mm/maccess.c
index 71a4b0d34be0..51e5cd9b906a 100644
--- a/arch/s390/mm/maccess.c
+++ b/arch/s390/mm/maccess.c
@@ -19,7 +19,7 @@
  * using the stura instruction.
  * Returns the number of bytes copied or -EFAULT.
  */
-static long probe_kernel_write_odd(void *dst, void *src, size_t size)
+static long probe_kernel_write_odd(void *dst, const void *src, size_t size)
 {
         unsigned long count, aligned;
         int offset, mask;
@@ -45,7 +45,7 @@ static long probe_kernel_write_odd(void *dst, void *src, size_t size)
         return rc ? rc : count;
 }
 
-long probe_kernel_write(void *dst, void *src, size_t size)
+long probe_kernel_write(void *dst, const void *src, size_t size)
 {
         long copied = 0;
 
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
index 14c6fae6fe6b..b09763fe5da1 100644
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -71,12 +71,15 @@ static void rcu_table_freelist_callback(struct rcu_head *head)
 
 void rcu_table_freelist_finish(void)
 {
-        struct rcu_table_freelist *batch = __get_cpu_var(rcu_table_freelist);
+        struct rcu_table_freelist **batchp = &get_cpu_var(rcu_table_freelist);
+        struct rcu_table_freelist *batch = *batchp;
 
         if (!batch)
-                return;
+                goto out;
         call_rcu(&batch->rcu, rcu_table_freelist_callback);
-        __get_cpu_var(rcu_table_freelist) = NULL;
+        *batchp = NULL;
+out:
+        put_cpu_var(rcu_table_freelist);
 }
 
 static void smp_sync(void *arg)
@@ -141,20 +144,23 @@ void crst_table_free_rcu(struct mm_struct *mm, unsigned long *table)
 {
         struct rcu_table_freelist *batch;
 
+        preempt_disable();
         if (atomic_read(&mm->mm_users) < 2 &&
             cpumask_equal(mm_cpumask(mm), cpumask_of(smp_processor_id()))) {
                 crst_table_free(mm, table);
-                return;
+                goto out;
         }
         batch = rcu_table_freelist_get(mm);
         if (!batch) {
                 smp_call_function(smp_sync, NULL, 1);
                 crst_table_free(mm, table);
-                return;
+                goto out;
         }
         batch->table[--batch->crst_index] = table;
         if (batch->pgt_index >= batch->crst_index)
                 rcu_table_freelist_finish();
+out:
+        preempt_enable();
 }
 
 #ifdef CONFIG_64BIT
@@ -323,16 +329,17 @@ void page_table_free_rcu(struct mm_struct *mm, unsigned long *table)
         struct page *page;
         unsigned long bits;
 
+        preempt_disable();
         if (atomic_read(&mm->mm_users) < 2 &&
             cpumask_equal(mm_cpumask(mm), cpumask_of(smp_processor_id()))) {
                 page_table_free(mm, table);
-                return;
+                goto out;
         }
         batch = rcu_table_freelist_get(mm);
         if (!batch) {
                 smp_call_function(smp_sync, NULL, 1);
                 page_table_free(mm, table);
-                return;
+                goto out;
         }
         bits = (mm->context.has_pgste) ? 3UL : 1UL;
         bits <<= (__pa(table) & (PAGE_SIZE - 1)) / 256 / sizeof(unsigned long);
@@ -345,6 +352,8 @@ void page_table_free_rcu(struct mm_struct *mm, unsigned long *table)
         batch->table[batch->pgt_index++] = table;
         if (batch->pgt_index >= batch->crst_index)
                 rcu_table_freelist_finish();
+out:
+        preempt_enable();
 }
 
 /*
diff --git a/arch/s390/oprofile/hwsampler.c b/arch/s390/oprofile/hwsampler.c
index 053caa0fd276..4552ce40c81a 100644
--- a/arch/s390/oprofile/hwsampler.c
+++ b/arch/s390/oprofile/hwsampler.c
@@ -19,7 +19,7 @@
 #include <linux/oprofile.h>
 
 #include <asm/lowcore.h>
-#include <asm/s390_ext.h>
+#include <asm/irq.h>
 
 #include "hwsampler.h"
 
@@ -580,7 +580,7 @@ static int hws_cpu_callback(struct notifier_block *nfb,
 {
         /* We do not have sampler space available for all possible CPUs.
            All CPUs should be online when hw sampling is activated. */
-        return NOTIFY_BAD;
+        return (hws_state <= HWS_DEALLOCATED) ? NOTIFY_OK : NOTIFY_BAD;
 }
 
 static struct notifier_block hws_cpu_notifier = {
diff --git a/arch/score/Kconfig b/arch/score/Kconfig
index e73bc781cc14..288add8d168f 100644
--- a/arch/score/Kconfig
+++ b/arch/score/Kconfig
@@ -43,9 +43,6 @@ config NO_DMA
 config RWSEM_GENERIC_SPINLOCK
         def_bool y
 
-config GENERIC_FIND_NEXT_BIT
-        def_bool y
-
 config GENERIC_HWEIGHT
         def_bool y
 
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index b44e37753b9a..f03338c2f088 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -71,12 +71,6 @@ config GENERIC_CSUM
         def_bool y
         depends on SUPERH64
 
-config GENERIC_FIND_NEXT_BIT
-        def_bool y
-
-config GENERIC_FIND_BIT_LE
-        def_bool y
-
 config GENERIC_HWEIGHT
         def_bool y
 
@@ -167,7 +161,7 @@ config ARCH_HAS_CPU_IDLE_WAIT
 
 config NO_IOPORT
         def_bool !PCI
-        depends on !SH_CAYMAN && !SH_SH4202_MICRODEV
+        depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN
 
 config IO_TRAPPED
         bool
diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c
index 618bd566cf53..969421f64a15 100644
--- a/arch/sh/boards/mach-ap325rxa/setup.c
+++ b/arch/sh/boards/mach-ap325rxa/setup.c
@@ -359,37 +359,31 @@ static struct soc_camera_link camera_link = {
         .priv           = &camera_info,
 };
 
-static void dummy_release(struct device *dev)
+static struct platform_device *camera_device;
+
+static void ap325rxa_camera_release(struct device *dev)
 {
+        soc_camera_platform_release(&camera_device);
 }
 
-static struct platform_device camera_device = {
-        .name           = "soc_camera_platform",
-        .dev            = {
-                .platform_data  = &camera_info,
-                .release        = dummy_release,
-        },
-};
-
 static int ap325rxa_camera_add(struct soc_camera_link *icl,
                                struct device *dev)
 {
-        if (icl != &camera_link || camera_probe() <= 0)
-                return -ENODEV;
+        int ret = soc_camera_platform_add(icl, dev, &camera_device, &camera_link,
+                                          ap325rxa_camera_release, 0);
+        if (ret < 0)
+                return ret;
 
-        camera_info.dev = dev;
+        ret = camera_probe();
+        if (ret < 0)
+                soc_camera_platform_del(icl, camera_device, &camera_link);
 
-        return platform_device_register(&camera_device);
+        return ret;
 }
 
 static void ap325rxa_camera_del(struct soc_camera_link *icl)
 {
-        if (icl != &camera_link)
-                return;
-
-        platform_device_unregister(&camera_device);
-        memset(&camera_device.dev.kobj, 0,
-               sizeof(camera_device.dev.kobj));
+        soc_camera_platform_del(icl, camera_device, &camera_link);
 }
 #endif /* CONFIG_I2C */
 
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index bb13d0e1b964..3a32741cc0ac 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -885,6 +885,9 @@ static struct platform_device sh_mmcif_device = {
         },
         .num_resources  = ARRAY_SIZE(sh_mmcif_resources),
         .resource       = sh_mmcif_resources,
+        .archdata = {
+                .hwblk_id = HWBLK_MMC,
+        },
 };
 #endif
 
diff --git a/arch/sh/configs/apsh4ad0a_defconfig b/arch/sh/configs/apsh4ad0a_defconfig
index 77ec0e7b8ddf..e7583484cc07 100644
--- a/arch/sh/configs/apsh4ad0a_defconfig
+++ b/arch/sh/configs/apsh4ad0a_defconfig
@@ -7,7 +7,6 @@ CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_CGROUPS=y
-CONFIG_CGROUP_NS=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
diff --git a/arch/sh/configs/sdk7786_defconfig b/arch/sh/configs/sdk7786_defconfig
index c41650572d79..8a7dd7b59c5c 100644
--- a/arch/sh/configs/sdk7786_defconfig
+++ b/arch/sh/configs/sdk7786_defconfig
@@ -12,7 +12,6 @@ CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_DEBUG=y
-CONFIG_CGROUP_NS=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CPUSETS=y
diff --git a/arch/sh/configs/se7206_defconfig b/arch/sh/configs/se7206_defconfig
index a468ff227fc6..72c3fad7383f 100644
--- a/arch/sh/configs/se7206_defconfig
+++ b/arch/sh/configs/se7206_defconfig
@@ -8,7 +8,6 @@ CONFIG_RCU_TRACE=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_DEBUG=y
-CONFIG_CGROUP_NS=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
diff --git a/arch/sh/configs/shx3_defconfig b/arch/sh/configs/shx3_defconfig
index 3f92d37c6374..6bb413036892 100644
--- a/arch/sh/configs/shx3_defconfig
+++ b/arch/sh/configs/shx3_defconfig
@@ -9,7 +9,6 @@ CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_CGROUPS=y
-CONFIG_CGROUP_NS=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
diff --git a/arch/sh/configs/urquell_defconfig b/arch/sh/configs/urquell_defconfig
index 7b3daec6fefe..8bfa4d056d7a 100644
--- a/arch/sh/configs/urquell_defconfig
+++ b/arch/sh/configs/urquell_defconfig
@@ -9,7 +9,6 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_DEBUG=y
-CONFIG_CGROUP_NS=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CPUSETS=y
diff --git a/arch/sh/include/asm/kgdb.h b/arch/sh/include/asm/kgdb.h
index 4235e228d921..f3613952d1ae 100644
--- a/arch/sh/include/asm/kgdb.h
+++ b/arch/sh/include/asm/kgdb.h
@@ -34,5 +34,6 @@ static inline void arch_kgdb_breakpoint(void)
 
 #define CACHE_FLUSH_IS_SAFE     1
 #define BREAK_INSTR_SIZE        2
+#define GDB_ADJUSTS_BREAK_OFFSET
 
 #endif /* __ASM_SH_KGDB_H */
diff --git a/arch/sh/include/asm/pgtable.h b/arch/sh/include/asm/pgtable.h
index db85916b9e95..9210e93a92c3 100644
--- a/arch/sh/include/asm/pgtable.h
+++ b/arch/sh/include/asm/pgtable.h
@@ -18,6 +18,7 @@
 #include <asm/pgtable-2level.h>
 #endif
 #include <asm/page.h>
+#include <asm/mmu.h>
 
 #ifndef __ASSEMBLY__
 #include <asm/addrspace.h>
diff --git a/arch/sh/include/asm/ptrace.h b/arch/sh/include/asm/ptrace.h
index de167d3a1a80..88bd6be168a9 100644
--- a/arch/sh/include/asm/ptrace.h
+++ b/arch/sh/include/asm/ptrace.h
@@ -40,9 +40,10 @@
 #include <asm/system.h>
 
 #define user_mode(regs)                 (((regs)->sr & 0x40000000)==0)
-#define user_stack_pointer(_regs)       ((unsigned long)(_regs)->regs[15])
 #define kernel_stack_pointer(_regs)     ((unsigned long)(_regs)->regs[15])
-#define instruction_pointer(regs)       ((unsigned long)(regs)->pc)
+
+#define GET_FP(regs)    ((regs)->regs[14])
+#define GET_USP(regs)   ((regs)->regs[15])
 
 extern void show_regs(struct pt_regs *);
 
@@ -132,13 +133,16 @@ extern void ptrace_triggered(struct perf_event *bp, int nmi,
 
 static inline unsigned long profile_pc(struct pt_regs *regs)
 {
-        unsigned long pc = instruction_pointer(regs);
+        unsigned long pc = regs->pc;
 
         if (virt_addr_uncached(pc))
                 return CAC_ADDR(pc);
 
         return pc;
 }
+#define profile_pc profile_pc
+
+#include <asm-generic/ptrace.h>
 #endif /* __KERNEL__ */
 
 #endif /* __ASM_SH_PTRACE_H */
diff --git a/arch/sh/include/asm/suspend.h b/arch/sh/include/asm/suspend.h
index 64eb41a063e8..e14567a7e9a1 100644
--- a/arch/sh/include/asm/suspend.h
+++ b/arch/sh/include/asm/suspend.h
@@ -3,7 +3,6 @@
 
 #ifndef __ASSEMBLY__
 #include <linux/notifier.h>
-static inline int arch_prepare_suspend(void) { return 0; }
 
 #include <asm/ptrace.h>
 
diff --git a/arch/sh/include/asm/tlb.h b/arch/sh/include/asm/tlb.h
index 6c308d8b9a50..ec88bfcdf7ce 100644
--- a/arch/sh/include/asm/tlb.h
+++ b/arch/sh/include/asm/tlb.h
@@ -9,6 +9,7 @@
 #include <linux/pagemap.h>
 
 #ifdef CONFIG_MMU
+#include <linux/swap.h>
 #include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
 #include <asm/mmu_context.h>
diff --git a/arch/sh/include/asm/unistd_32.h b/arch/sh/include/asm/unistd_32.h
index bb7d2702c2c9..3432008d2888 100644
--- a/arch/sh/include/asm/unistd_32.h
+++ b/arch/sh/include/asm/unistd_32.h
@@ -374,8 +374,9 @@
 #define __NR_clock_adjtime      361
 #define __NR_syncfs             362
 #define __NR_sendmmsg           363
+#define __NR_setns              364
 
-#define NR_syscalls 364
+#define NR_syscalls 365
 
 #ifdef __KERNEL__
 
diff --git a/arch/sh/include/asm/unistd_64.h b/arch/sh/include/asm/unistd_64.h
index 46327cea1e5c..ec9898665f23 100644
--- a/arch/sh/include/asm/unistd_64.h
+++ b/arch/sh/include/asm/unistd_64.h
@@ -395,10 +395,11 @@
 #define __NR_clock_adjtime      372
 #define __NR_syncfs             373
 #define __NR_sendmmsg           374
+#define __NR_setns              375
 
 #ifdef __KERNEL__
 
-#define NR_syscalls 375
+#define NR_syscalls 376
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
diff --git a/arch/sh/include/cpu-sh4/cpu/sh7722.h b/arch/sh/include/cpu-sh4/cpu/sh7722.h
index 7a5b8a331b4a..bd0622788d64 100644
--- a/arch/sh/include/cpu-sh4/cpu/sh7722.h
+++ b/arch/sh/include/cpu-sh4/cpu/sh7722.h
@@ -236,6 +236,7 @@ enum {
 };
 
 enum {
+        SHDMA_SLAVE_INVALID,
         SHDMA_SLAVE_SCIF0_TX,
         SHDMA_SLAVE_SCIF0_RX,
         SHDMA_SLAVE_SCIF1_TX,
diff --git a/arch/sh/include/cpu-sh4/cpu/sh7724.h b/arch/sh/include/cpu-sh4/cpu/sh7724.h
index 7eb435999426..3daef8ecbc63 100644
--- a/arch/sh/include/cpu-sh4/cpu/sh7724.h
+++ b/arch/sh/include/cpu-sh4/cpu/sh7724.h
@@ -285,6 +285,7 @@ enum {
 };
 
 enum {
+        SHDMA_SLAVE_INVALID,
         SHDMA_SLAVE_SCIF0_TX,
         SHDMA_SLAVE_SCIF0_RX,
         SHDMA_SLAVE_SCIF1_TX,
diff --git a/arch/sh/include/cpu-sh4/cpu/sh7757.h b/arch/sh/include/cpu-sh4/cpu/sh7757.h
index 05b8196c7753..41f9f8b9db73 100644
--- a/arch/sh/include/cpu-sh4/cpu/sh7757.h
+++ b/arch/sh/include/cpu-sh4/cpu/sh7757.h
@@ -252,6 +252,7 @@ enum {
 };
 
 enum {
+        SHDMA_SLAVE_INVALID,
         SHDMA_SLAVE_SDHI_TX,
         SHDMA_SLAVE_SDHI_RX,
         SHDMA_SLAVE_MMCIF_TX,
diff --git a/arch/sh/kernel/process_32.c b/arch/sh/kernel/process_32.c
index 762a13984bbd..b473f0c06fbc 100644
--- a/arch/sh/kernel/process_32.c
+++ b/arch/sh/kernel/process_32.c
@@ -21,6 +21,7 @@
 #include <linux/fs.h>
 #include <linux/ftrace.h>
 #include <linux/hw_breakpoint.h>
+#include <linux/prefetch.h>
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>
 #include <asm/system.h>
diff --git a/arch/sh/kernel/syscalls_32.S b/arch/sh/kernel/syscalls_32.S
index 7c486f3e3a3c..39b051de4c7c 100644
--- a/arch/sh/kernel/syscalls_32.S
+++ b/arch/sh/kernel/syscalls_32.S
@@ -381,3 +381,4 @@ ENTRY(sys_call_table)
         .long sys_clock_adjtime
         .long sys_syncfs
         .long sys_sendmmsg
+        .long sys_setns
diff --git a/arch/sh/kernel/syscalls_64.S b/arch/sh/kernel/syscalls_64.S
index ba1a737afe80..089c4d825d08 100644
--- a/arch/sh/kernel/syscalls_64.S
+++ b/arch/sh/kernel/syscalls_64.S
@@ -401,3 +401,4 @@ sys_call_table:
         .long sys_clock_adjtime
         .long sys_syncfs
         .long sys_sendmmsg
+        .long sys_setns                 /* 375 */
diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c
index 40733a952402..f251b5f27652 100644
--- a/arch/sh/mm/consistent.c
+++ b/arch/sh/mm/consistent.c
@@ -82,7 +82,7 @@ void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
         void *addr;
 
         addr = __in_29bit_mode() ?
-               (void *)P1SEGADDR((unsigned long)vaddr) : vaddr;
+               (void *)CAC_ADDR((unsigned long)vaddr) : vaddr;
 
         switch (direction) {
         case DMA_FROM_DEVICE:           /* invalidate only */
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 63a027c9ada5..af32e17fa170 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -190,14 +190,6 @@ config RWSEM_XCHGADD_ALGORITHM
         bool
         default y if SPARC64
 
-config GENERIC_FIND_NEXT_BIT
-        bool
-        default y
-
-config GENERIC_FIND_BIT_LE
-        bool
-        default y
-
 config GENERIC_HWEIGHT
         bool
         default y if !ULTRA_HAS_POPULATION_COUNT
diff --git a/arch/sparc/include/asm/unistd.h b/arch/sparc/include/asm/unistd.h
index c5387ed0add8..6260d5deeabc 100644
--- a/arch/sparc/include/asm/unistd.h
+++ b/arch/sparc/include/asm/unistd.h
@@ -405,8 +405,9 @@
 #define __NR_clock_adjtime      334
 #define __NR_syncfs             335
 #define __NR_sendmmsg           336
+#define __NR_setns              337
 
-#define NR_syscalls             337
+#define NR_syscalls             338
 
 #ifdef __32bit_syscall_numbers__
 /* Sparc 32-bit only has the "setresuid32", "getresuid32" variants,
diff --git a/arch/sparc/kernel/systbls_32.S b/arch/sparc/kernel/systbls_32.S
index 332c83ff7701..6e492d59f6b1 100644
--- a/arch/sparc/kernel/systbls_32.S
+++ b/arch/sparc/kernel/systbls_32.S
@@ -84,4 +84,4 @@ sys_call_table:
 /*320*/ .long sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4, sys_preadv
 /*325*/ .long sys_pwritev, sys_rt_tgsigqueueinfo, sys_perf_event_open, sys_recvmmsg, sys_fanotify_init
 /*330*/ .long sys_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, sys_open_by_handle_at, sys_clock_adjtime
-/*335*/ .long sys_syncfs, sys_sendmmsg
+/*335*/ .long sys_syncfs, sys_sendmmsg, sys_setns
diff --git a/arch/sparc/kernel/systbls_64.S b/arch/sparc/kernel/systbls_64.S
index 43887ca0be0e..f566518483b5 100644
--- a/arch/sparc/kernel/systbls_64.S
+++ b/arch/sparc/kernel/systbls_64.S
@@ -85,7 +85,7 @@ sys_call_table32:
 /*320*/ .word sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4, compat_sys_preadv
         .word compat_sys_pwritev, compat_sys_rt_tgsigqueueinfo, sys_perf_event_open, compat_sys_recvmmsg, sys_fanotify_init
 /*330*/ .word sys32_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, compat_sys_open_by_handle_at, compat_sys_clock_adjtime
-        .word sys_syncfs, compat_sys_sendmmsg
+        .word sys_syncfs, compat_sys_sendmmsg, sys_setns
 
 #endif /* CONFIG_COMPAT */
 
@@ -162,4 +162,4 @@ sys_call_table:
 /*320*/ .word sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4, sys_preadv
         .word sys_pwritev, sys_rt_tgsigqueueinfo, sys_perf_event_open, sys_recvmmsg, sys_fanotify_init
 /*330*/ .word sys_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, sys_open_by_handle_at, sys_clock_adjtime
-        .word sys_syncfs, sys_sendmmsg
+        .word sys_syncfs, sys_sendmmsg, sys_setns
diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index 635e1bfb1c5d..0249b8b4db54 100644
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -5,13 +5,13 @@ config TILE
         def_bool y
         select HAVE_KVM if !TILEGX
         select GENERIC_FIND_FIRST_BIT
-        select GENERIC_FIND_NEXT_BIT
         select USE_GENERIC_SMP_HELPERS
         select CC_OPTIMIZE_FOR_SIZE
         select HAVE_GENERIC_HARDIRQS
         select GENERIC_IRQ_PROBE
         select GENERIC_PENDING_IRQ if SMP
         select GENERIC_IRQ_SHOW
+        select SYS_HYPERVISOR
 
 # FIXME: investigate whether we need/want these options.
 #       select HAVE_IOREMAP_PROT
diff --git a/arch/tile/include/asm/hardwall.h b/arch/tile/include/asm/hardwall.h
index 0bed3ec7b42c..2ac422848c7d 100644
--- a/arch/tile/include/asm/hardwall.h
+++ b/arch/tile/include/asm/hardwall.h
@@ -40,6 +40,10 @@
 #define HARDWALL_DEACTIVATE \
  _IO(HARDWALL_IOCTL_BASE, _HARDWALL_DEACTIVATE)
 
+#define _HARDWALL_GET_ID 4
+#define HARDWALL_GET_ID \
+ _IO(HARDWALL_IOCTL_BASE, _HARDWALL_GET_ID)
+
 #ifndef __KERNEL__
 
 /* This is the canonical name expected by userspace. */
@@ -47,9 +51,14 @@
 
 #else
 
-/* Hook for /proc/tile/hardwall. */
-struct seq_file;
-int proc_tile_hardwall_show(struct seq_file *sf, void *v);
+/* /proc hooks for hardwall. */
+struct proc_dir_entry;
+#ifdef CONFIG_HARDWALL
+void proc_tile_hardwall_init(struct proc_dir_entry *root);
+int proc_pid_hardwall(struct task_struct *task, char *buffer);
+#else
+static inline void proc_tile_hardwall_init(struct proc_dir_entry *root) {}
+#endif
 
 #endif
 
diff --git a/arch/tile/kernel/Makefile b/arch/tile/kernel/Makefile
index b4c8e8ec45dc..b4dbc057baad 100644
--- a/arch/tile/kernel/Makefile
+++ b/arch/tile/kernel/Makefile
@@ -5,7 +5,7 @@
 extra-y := vmlinux.lds head_$(BITS).o
 obj-y := backtrace.o entry.o init_task.o irq.o messaging.o \
         pci-dma.o proc.o process.o ptrace.o reboot.o \
-        setup.o signal.o single_step.o stack.o sys.o time.o traps.o \
+        setup.o signal.o single_step.o stack.o sys.o sysfs.o time.o traps.o \
         intvec_$(BITS).o regs_$(BITS).o tile-desc_$(BITS).o
 
 obj-$(CONFIG_HARDWALL)          += hardwall.o
diff --git a/arch/tile/kernel/hardwall.c b/arch/tile/kernel/hardwall.c
index 3bddef710de4..8c41891aab34 100644
--- a/arch/tile/kernel/hardwall.c
+++ b/arch/tile/kernel/hardwall.c
@@ -40,16 +40,25 @@
 struct hardwall_info {
         struct list_head list;             /* "rectangles" list */
         struct list_head task_head;        /* head of tasks in this hardwall */
+        struct cpumask cpumask;            /* cpus in the rectangle */
         int ulhc_x;                        /* upper left hand corner x coord */
         int ulhc_y;                        /* upper left hand corner y coord */
         int width;                         /* rectangle width */
         int height;                        /* rectangle height */
+        int id;                            /* integer id for this hardwall */
         int teardown_in_progress;          /* are we tearing this one down? */
 };
 
 /* Currently allocated hardwall rectangles */
 static LIST_HEAD(rectangles);
 
+/* /proc/tile/hardwall */
+static struct proc_dir_entry *hardwall_proc_dir;
+
+/* Functions to manage files in /proc/tile/hardwall. */
+static void hardwall_add_proc(struct hardwall_info *rect);
+static void hardwall_remove_proc(struct hardwall_info *rect);
+
 /*
  * Guard changes to the hardwall data structures.
  * This could be finer grained (e.g. one lock for the list of hardwall
@@ -105,6 +114,8 @@ static int setup_rectangle(struct hardwall_info *r, struct cpumask *mask)
         r->ulhc_y = cpu_y(ulhc);
         r->width = cpu_x(lrhc) - r->ulhc_x + 1;
         r->height = cpu_y(lrhc) - r->ulhc_y + 1;
+        cpumask_copy(&r->cpumask, mask);
+        r->id = ulhc;   /* The ulhc cpu id can be the hardwall id. */
 
         /* Width and height must be positive */
         if (r->width <= 0 || r->height <= 0)
@@ -388,6 +399,9 @@ static struct hardwall_info *hardwall_create(
         /* Set up appropriate hardwalling on all affected cpus. */
         hardwall_setup(rect);
 
+        /* Create a /proc/tile/hardwall entry. */
+        hardwall_add_proc(rect);
+
         return rect;
 }
 
@@ -645,6 +659,9 @@ static void hardwall_destroy(struct hardwall_info *rect)
         /* Restart switch and disable firewall. */
         on_each_cpu_mask(&mask, restart_udn_switch, NULL, 1);
 
+        /* Remove the /proc/tile/hardwall entry. */
+        hardwall_remove_proc(rect);
+
         /* Now free the rectangle from the list. */
         spin_lock_irqsave(&hardwall_lock, flags);
         BUG_ON(!list_empty(&rect->task_head));
@@ -654,35 +671,57 @@ static void hardwall_destroy(struct hardwall_info *rect)
 }
 
 
-/*
- * Dump hardwall state via /proc; initialized in arch/tile/sys/proc.c.
- */
-int proc_tile_hardwall_show(struct seq_file *sf, void *v)
+static int hardwall_proc_show(struct seq_file *sf, void *v)
 {
-        struct hardwall_info *r;
+        struct hardwall_info *rect = sf->private;
+        char buf[256];
 
-        if (udn_disabled) {
-                seq_printf(sf, "%dx%d 0,0 pids:\n", smp_width, smp_height);
-                return 0;
-        }
-
-        spin_lock_irq(&hardwall_lock);
-        list_for_each_entry(r, &rectangles, list) {
-                struct task_struct *p;
-                seq_printf(sf, "%dx%d %d,%d pids:",
-                           r->width, r->height, r->ulhc_x, r->ulhc_y);
-                list_for_each_entry(p, &r->task_head, thread.hardwall_list) {
-                        unsigned int cpu = cpumask_first(&p->cpus_allowed);
-                        unsigned int x = cpu % smp_width;
-                        unsigned int y = cpu / smp_width;
-                        seq_printf(sf, " %d@%d,%d", p->pid, x, y);
-                }
-                seq_printf(sf, "\n");
-        }
-        spin_unlock_irq(&hardwall_lock);
+        int rc = cpulist_scnprintf(buf, sizeof(buf), &rect->cpumask);
+        buf[rc++] = '\n';
+        seq_write(sf, buf, rc);
         return 0;
 }
 
+static int hardwall_proc_open(struct inode *inode,
+                              struct file *file)
+{
+        return single_open(file, hardwall_proc_show, PDE(inode)->data);
+}
+
+static const struct file_operations hardwall_proc_fops = {
+        .open           = hardwall_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
+static void hardwall_add_proc(struct hardwall_info *rect)
+{
+        char buf[64];
+        snprintf(buf, sizeof(buf), "%d", rect->id);
+        proc_create_data(buf, 0444, hardwall_proc_dir,
+                         &hardwall_proc_fops, rect);
+}
+
+static void hardwall_remove_proc(struct hardwall_info *rect)
+{
+        char buf[64];
+        snprintf(buf, sizeof(buf), "%d", rect->id);
+        remove_proc_entry(buf, hardwall_proc_dir);
+}
+
+int proc_pid_hardwall(struct task_struct *task, char *buffer)
+{
+        struct hardwall_info *rect = task->thread.hardwall;
+        return rect ? sprintf(buffer, "%d\n", rect->id) : 0;
+}
+
+void proc_tile_hardwall_init(struct proc_dir_entry *root)
+{
+        if (!udn_disabled)
+                hardwall_proc_dir = proc_mkdir("hardwall", root);
+}
+
 
 /*
  * Character device support via ioctl/close.
@@ -716,6 +755,9 @@ static long hardwall_ioctl(struct file *file, unsigned int a, unsigned long b)
                         return -EINVAL;
                 return hardwall_deactivate(current);
 
+        case _HARDWALL_GET_ID:
+                return rect ? rect->id : -EINVAL;
+
         default:
                 return -EINVAL;
         }
diff --git a/arch/tile/kernel/proc.c b/arch/tile/kernel/proc.c
index 2e02c41ddf3b..62d820833c68 100644
--- a/arch/tile/kernel/proc.c
+++ b/arch/tile/kernel/proc.c
@@ -27,6 +27,7 @@
 #include <asm/processor.h>
 #include <asm/sections.h>
 #include <asm/homecache.h>
+#include <asm/hardwall.h>
 #include <arch/chip.h>
 
 
@@ -88,3 +89,75 @@ const struct seq_operations cpuinfo_op = {
         .stop   = c_stop,
         .show   = show_cpuinfo,
 };
+
+/*
+ * Support /proc/tile directory
+ */
+
+static int __init proc_tile_init(void)
+{
+        struct proc_dir_entry *root = proc_mkdir("tile", NULL);
+        if (root == NULL)
+                return 0;
+
+        proc_tile_hardwall_init(root);
+
+        return 0;
+}
+
+arch_initcall(proc_tile_init);
+
+/*
+ * Support /proc/sys/tile directory
+ */
+
+#ifndef __tilegx__  /* FIXME: GX: no support for unaligned access yet */
+static ctl_table unaligned_subtable[] = {
+        {
+                .procname       = "enabled",
+                .data           = &unaligned_fixup,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = &proc_dointvec
+        },
+        {
+                .procname       = "printk",
+                .data           = &unaligned_printk,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = &proc_dointvec
+        },
+        {
+                .procname       = "count",
+                .data           = &unaligned_fixup_count,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = &proc_dointvec
+        },
+        {}
+};
+
+static ctl_table unaligned_table[] = {
+        {
+                .procname       = "unaligned_fixup",
+                .mode           = 0555,
+                .child          = unaligned_subtable
+        },
+        {}
+};
+#endif
+
+static struct ctl_path tile_path[] = {
+        { .procname = "tile" },
+        { }
+};
+
+static int __init proc_sys_tile_init(void)
+{
+#ifndef __tilegx__  /* FIXME: GX: no support for unaligned access yet */
+        register_sysctl_paths(tile_path, unaligned_table);
+#endif
+        return 0;
+}
+
+arch_initcall(proc_sys_tile_init);
diff --git a/arch/tile/kernel/sysfs.c b/arch/tile/kernel/sysfs.c
new file mode 100644
index 000000000000..b671a86f4515
--- /dev/null
+++ b/arch/tile/kernel/sysfs.c
@@ -0,0 +1,185 @@
+/*
+ * Copyright 2011 Tilera Corporation. 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
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   This program 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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ *
+ * /sys entry support.
+ */
+
+#include <linux/sysdev.h>
+#include <linux/cpu.h>
+#include <linux/slab.h>
+#include <linux/smp.h>
+#include <hv/hypervisor.h>
+
+/* Return a string queried from the hypervisor, truncated to page size. */
+static ssize_t get_hv_confstr(char *page, int query)
+{
+        ssize_t n = hv_confstr(query, (unsigned long)page, PAGE_SIZE - 1);
+        n = n < 0 ? 0 : min(n, (ssize_t)PAGE_SIZE - 1) - 1;
+        if (n)
+                page[n++] = '\n';
+        page[n] = '\0';
+        return n;
+}
+
+static ssize_t chip_width_show(struct sysdev_class *dev,
+                               struct sysdev_class_attribute *attr,
+                               char *page)
+{
+        return sprintf(page, "%u\n", smp_width);
+}
+static SYSDEV_CLASS_ATTR(chip_width, 0444, chip_width_show, NULL);
+
+static ssize_t chip_height_show(struct sysdev_class *dev,
+                                struct sysdev_class_attribute *attr,
+                                char *page)
+{
+        return sprintf(page, "%u\n", smp_height);
+}
+static SYSDEV_CLASS_ATTR(chip_height, 0444, chip_height_show, NULL);
+
+static ssize_t chip_serial_show(struct sysdev_class *dev,
+                                struct sysdev_class_attribute *attr,
+                                char *page)
+{
+        return get_hv_confstr(page, HV_CONFSTR_CHIP_SERIAL_NUM);
+}
+static SYSDEV_CLASS_ATTR(chip_serial, 0444, chip_serial_show, NULL);
+
+static ssize_t chip_revision_show(struct sysdev_class *dev,
+                                  struct sysdev_class_attribute *attr,
+                                  char *page)
+{
+        return get_hv_confstr(page, HV_CONFSTR_CHIP_REV);
+}
+static SYSDEV_CLASS_ATTR(chip_revision, 0444, chip_revision_show, NULL);
+
+
+static ssize_t type_show(struct sysdev_class *dev,
+                            struct sysdev_class_attribute *attr,
+                            char *page)
+{
+        return sprintf(page, "tilera\n");
+}
+static SYSDEV_CLASS_ATTR(type, 0444, type_show, NULL);
+
+#define HV_CONF_ATTR(name, conf)                                        \
+        static ssize_t name ## _show(struct sysdev_class *dev,          \
+                                     struct sysdev_class_attribute *attr, \
+                                     char *page)                        \
+        {                                                               \
+                return get_hv_confstr(page, conf);                      \
+        }                                                               \
+        static SYSDEV_CLASS_ATTR(name, 0444, name ## _show, NULL);
+
+HV_CONF_ATTR(version,           HV_CONFSTR_HV_SW_VER)
+HV_CONF_ATTR(config_version,    HV_CONFSTR_HV_CONFIG_VER)
+
+HV_CONF_ATTR(board_part,        HV_CONFSTR_BOARD_PART_NUM)
+HV_CONF_ATTR(board_serial,      HV_CONFSTR_BOARD_SERIAL_NUM)
+HV_CONF_ATTR(board_revision,    HV_CONFSTR_BOARD_REV)
+HV_CONF_ATTR(board_description, HV_CONFSTR_BOARD_DESC)
+HV_CONF_ATTR(mezz_part,         HV_CONFSTR_MEZZ_PART_NUM)
+HV_CONF_ATTR(mezz_serial,       HV_CONFSTR_MEZZ_SERIAL_NUM)
+HV_CONF_ATTR(mezz_revision,     HV_CONFSTR_MEZZ_REV)
+HV_CONF_ATTR(mezz_description,  HV_CONFSTR_MEZZ_DESC)
+HV_CONF_ATTR(switch_control,    HV_CONFSTR_SWITCH_CONTROL)
+
+static struct attribute *board_attrs[] = {
+        &attr_board_part.attr,
+        &attr_board_serial.attr,
+        &attr_board_revision.attr,
+        &attr_board_description.attr,
+        &attr_mezz_part.attr,
+        &attr_mezz_serial.attr,
+        &attr_mezz_revision.attr,
+        &attr_mezz_description.attr,
+        &attr_switch_control.attr,
+        NULL
+};
+
+static struct attribute_group board_attr_group = {
+        .name   = "board",
+        .attrs  = board_attrs,
+};
+
+
+static struct bin_attribute hvconfig_bin;
+
+static ssize_t
+hvconfig_bin_read(struct file *filp, struct kobject *kobj,
+                  struct bin_attribute *bin_attr,
+                  char *buf, loff_t off, size_t count)
+{
+        static size_t size;
+
+        /* Lazily learn the true size (minus the trailing NUL). */
+        if (size == 0)
+                size = hv_confstr(HV_CONFSTR_HV_CONFIG, 0, 0) - 1;
+
+        /* Check and adjust input parameters. */
+        if (off > size)
+                return -EINVAL;
+        if (count > size - off)
+                count = size - off;
+
+        if (count) {
+                /* Get a copy of the hvc and copy out the relevant portion. */
+                char *hvc;
+
+                size = off + count;
+                hvc = kmalloc(size, GFP_KERNEL);
+                if (hvc == NULL)
+                        return -ENOMEM;
+                hv_confstr(HV_CONFSTR_HV_CONFIG, (unsigned long)hvc, size);
+                memcpy(buf, hvc + off, count);
+                kfree(hvc);
+        }
+
+        return count;
+}
+
+static int __init create_sysfs_entries(void)
+{
+        struct sysdev_class *cls = &cpu_sysdev_class;
+        int err = 0;
+
+#define create_cpu_attr(name)                                           \
+        if (!err)                                                       \
+                err = sysfs_create_file(&cls->kset.kobj, &attr_##name.attr);
+        create_cpu_attr(chip_width);
+        create_cpu_attr(chip_height);
+        create_cpu_attr(chip_serial);
+        create_cpu_attr(chip_revision);
+
+#define create_hv_attr(name)                                            \
+        if (!err)                                                       \
+                err = sysfs_create_file(hypervisor_kobj, &attr_##name.attr);
+        create_hv_attr(type);
+        create_hv_attr(version);
+        create_hv_attr(config_version);
+
+        if (!err)
+                err = sysfs_create_group(hypervisor_kobj, &board_attr_group);
+
+        if (!err) {
+                sysfs_bin_attr_init(&hvconfig_bin);
+                hvconfig_bin.attr.name = "hvconfig";
+                hvconfig_bin.attr.mode = S_IRUGO;
+                hvconfig_bin.read = hvconfig_bin_read;
+                hvconfig_bin.size = PAGE_SIZE;
+                err = sysfs_create_bin_file(hypervisor_kobj, &hvconfig_bin);
+        }
+
+        return err;
+}
+subsys_initcall(create_sysfs_entries);
diff --git a/arch/um/Kconfig.x86 b/arch/um/Kconfig.x86
index 795ea8e869f4..8aae429a56e2 100644
--- a/arch/um/Kconfig.x86
+++ b/arch/um/Kconfig.x86
@@ -15,7 +15,6 @@ endmenu
 config UML_X86
         def_bool y
         select GENERIC_FIND_FIRST_BIT
-        select GENERIC_FIND_NEXT_BIT
 
 config 64BIT
         bool
diff --git a/arch/unicore32/include/asm/suspend.h b/arch/unicore32/include/asm/suspend.h
index 88a9c0f32b21..65bad75c7e96 100644
--- a/arch/unicore32/include/asm/suspend.h
+++ b/arch/unicore32/include/asm/suspend.h
@@ -14,7 +14,6 @@
 #define __UNICORE_SUSPEND_H__
 
 #ifndef __ASSEMBLY__
-static inline int arch_prepare_suspend(void) { return 0; }
 
 #include <asm/ptrace.h>
 
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 483775f42d2a..da349723d411 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -64,7 +64,6 @@ config X86
         select HAVE_GENERIC_HARDIRQS
         select HAVE_SPARSE_IRQ
         select GENERIC_FIND_FIRST_BIT
-        select GENERIC_FIND_NEXT_BIT
         select GENERIC_IRQ_PROBE
         select GENERIC_PENDING_IRQ if SMP
         select GENERIC_IRQ_SHOW
diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig
index 6f9872658dd2..2bf18059fbea 100644
--- a/arch/x86/configs/i386_defconfig
+++ b/arch/x86/configs/i386_defconfig
@@ -10,7 +10,6 @@ CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_AUDIT=y
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_CGROUPS=y
-CONFIG_CGROUP_NS=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CPUSETS=y
 CONFIG_CGROUP_CPUACCT=y
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig
index ee01a9d5d4f0..22a0dc8e51dd 100644
--- a/arch/x86/configs/x86_64_defconfig
+++ b/arch/x86/configs/x86_64_defconfig
@@ -11,7 +11,6 @@ CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_AUDIT=y
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_CGROUPS=y
-CONFIG_CGROUP_NS=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CPUSETS=y
 CONFIG_CGROUP_CPUACCT=y
diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
index 95f5826be458..c1870dddd322 100644
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
@@ -849,4 +849,5 @@ ia32_sys_call_table:
         .quad compat_sys_clock_adjtime
         .quad sys_syncfs
         .quad compat_sys_sendmmsg       /* 345 */
+        .quad sys_setns
 ia32_syscall_end:
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
index 416d865eae39..610001d385dd 100644
--- a/arch/x86/include/asm/acpi.h
+++ b/arch/x86/include/asm/acpi.h
@@ -139,7 +139,7 @@ static inline unsigned int acpi_processor_cstate_check(unsigned int max_cstate)
             boot_cpu_data.x86_model <= 0x05 &&
             boot_cpu_data.x86_mask < 0x0A)
                 return 1;
-        else if (c1e_detected)
+        else if (amd_e400_c1e_detected)
                 return 1;
         else
                 return max_cstate;
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
index 5dc6acc98dbd..71cc3800712c 100644
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
@@ -125,7 +125,7 @@
 #define X86_FEATURE_OSXSAVE     (4*32+27) /* "" XSAVE enabled in the OS */
 #define X86_FEATURE_AVX         (4*32+28) /* Advanced Vector Extensions */
 #define X86_FEATURE_F16C        (4*32+29) /* 16-bit fp conversions */
-#define X86_FEATURE_RDRND       (4*32+30) /* The RDRAND instruction */
+#define X86_FEATURE_RDRAND      (4*32+30) /* The RDRAND instruction */
 #define X86_FEATURE_HYPERVISOR  (4*32+31) /* Running on a hypervisor */
 
 /* VIA/Cyrix/Centaur-defined CPU features, CPUID level 0xC0000001, word 5 */
diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
index 617bd56b3070..7b439d9aea2a 100644
--- a/arch/x86/include/asm/desc.h
+++ b/arch/x86/include/asm/desc.h
@@ -4,30 +4,33 @@
 #include <asm/desc_defs.h>
 #include <asm/ldt.h>
 #include <asm/mmu.h>
+
 #include <linux/smp.h>
 
-static inline void fill_ldt(struct desc_struct *desc,
-                            const struct user_desc *info)
-{
-        desc->limit0 = info->limit & 0x0ffff;
-        desc->base0 = info->base_addr & 0x0000ffff;
-
-        desc->base1 = (info->base_addr & 0x00ff0000) >> 16;
-        desc->type = (info->read_exec_only ^ 1) << 1;
-        desc->type |= info->contents << 2;
-        desc->s = 1;
-        desc->dpl = 0x3;
-        desc->p = info->seg_not_present ^ 1;
-        desc->limit = (info->limit & 0xf0000) >> 16;
-        desc->avl = info->useable;
-        desc->d = info->seg_32bit;
-        desc->g = info->limit_in_pages;
-        desc->base2 = (info->base_addr & 0xff000000) >> 24;
+static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *info)
+{
+        desc->limit0            = info->limit & 0x0ffff;
+
+        desc->base0             = (info->base_addr & 0x0000ffff);
+        desc->base1             = (info->base_addr & 0x00ff0000) >> 16;
+
+        desc->type              = (info->read_exec_only ^ 1) << 1;
+        desc->type             |= info->contents << 2;
+
+        desc->s                 = 1;
+        desc->dpl               = 0x3;
+        desc->p                 = info->seg_not_present ^ 1;
+        desc->limit             = (info->limit & 0xf0000) >> 16;
+        desc->avl               = info->useable;
+        desc->d                 = info->seg_32bit;
+        desc->g                 = info->limit_in_pages;
+
+        desc->base2             = (info->base_addr & 0xff000000) >> 24;
         /*
          * Don't allow setting of the lm bit. It is useless anyway
          * because 64bit system calls require __USER_CS:
          */
-        desc->l = 0;
+        desc->l                 = 0;
 }
 
 extern struct desc_ptr idt_descr;
@@ -36,6 +39,7 @@ extern gate_desc idt_table[];
 struct gdt_page {
         struct desc_struct gdt[GDT_ENTRIES];
 } __attribute__((aligned(PAGE_SIZE)));
+
 DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
 
 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
@@ -48,16 +52,16 @@ static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
 static inline void pack_gate(gate_desc *gate, unsigned type, unsigned long func,
                              unsigned dpl, unsigned ist, unsigned seg)
 {
-        gate->offset_low = PTR_LOW(func);
-        gate->segment = __KERNEL_CS;
-        gate->ist = ist;
-        gate->p = 1;
-        gate->dpl = dpl;
-        gate->zero0 = 0;
-        gate->zero1 = 0;
-        gate->type = type;
-        gate->offset_middle = PTR_MIDDLE(func);
-        gate->offset_high = PTR_HIGH(func);
+        gate->offset_low        = PTR_LOW(func);
+        gate->segment           = __KERNEL_CS;
+        gate->ist               = ist;
+        gate->p                 = 1;
+        gate->dpl               = dpl;
+        gate->zero0             = 0;
+        gate->zero1             = 0;
+        gate->type              = type;
+        gate->offset_middle     = PTR_MIDDLE(func);
+        gate->offset_high       = PTR_HIGH(func);
 }
 
 #else
@@ -66,8 +70,7 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
                              unsigned short seg)
 {
         gate->a = (seg << 16) | (base & 0xffff);
-        gate->b = (base & 0xffff0000) |
-                  (((0x80 | type | (dpl << 5)) & 0xff) << 8);
+        gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
 }
 
 #endif
@@ -75,31 +78,29 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
 static inline int desc_empty(const void *ptr)
 {
         const u32 *desc = ptr;
+
         return !(desc[0] | desc[1]);
 }
 
 #ifdef CONFIG_PARAVIRT
 #include <asm/paravirt.h>
 #else
-#define load_TR_desc() native_load_tr_desc()
-#define load_gdt(dtr) native_load_gdt(dtr)
-#define load_idt(dtr) native_load_idt(dtr)
-#define load_tr(tr) asm volatile("ltr %0"::"m" (tr))
-#define load_ldt(ldt) asm volatile("lldt %0"::"m" (ldt))
-
-#define store_gdt(dtr) native_store_gdt(dtr)
-#define store_idt(dtr) native_store_idt(dtr)
-#define store_tr(tr) (tr = native_store_tr())
-
-#define load_TLS(t, cpu) native_load_tls(t, cpu)
-#define set_ldt native_set_ldt
-
-#define write_ldt_entry(dt, entry, desc)        \
-        native_write_ldt_entry(dt, entry, desc)
-#define write_gdt_entry(dt, entry, desc, type)          \
-        native_write_gdt_entry(dt, entry, desc, type)
-#define write_idt_entry(dt, entry, g)           \
-        native_write_idt_entry(dt, entry, g)
+#define load_TR_desc()                          native_load_tr_desc()
+#define load_gdt(dtr)                           native_load_gdt(dtr)
+#define load_idt(dtr)                           native_load_idt(dtr)
+#define load_tr(tr)                             asm volatile("ltr %0"::"m" (tr))
+#define load_ldt(ldt)                           asm volatile("lldt %0"::"m" (ldt))
+
+#define store_gdt(dtr)                          native_store_gdt(dtr)
+#define store_idt(dtr)                          native_store_idt(dtr)
+#define store_tr(tr)                            (tr = native_store_tr())
+
+#define load_TLS(t, cpu)                        native_load_tls(t, cpu)
+#define set_ldt                                 native_set_ldt
+
+#define write_ldt_entry(dt, entry, desc)        native_write_ldt_entry(dt, entry, desc)
+#define write_gdt_entry(dt, entry, desc, type)  native_write_gdt_entry(dt, entry, desc, type)
+#define write_idt_entry(dt, entry, g)           native_write_idt_entry(dt, entry, g)
 
 static inline void paravirt_alloc_ldt(struct desc_struct *ldt, unsigned entries)
 {
@@ -112,33 +113,27 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
 
 #define store_ldt(ldt) asm("sldt %0" : "=m"(ldt))
 
-static inline void native_write_idt_entry(gate_desc *idt, int entry,
-                                          const gate_desc *gate)
+static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
 {
         memcpy(&idt[entry], gate, sizeof(*gate));
 }
 
-static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry,
-                                          const void *desc)
+static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
 {
         memcpy(&ldt[entry], desc, 8);
 }
 
-static inline void native_write_gdt_entry(struct desc_struct *gdt, int entry,
-                                          const void *desc, int type)
+static inline void
+native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int type)
 {
         unsigned int size;
+
         switch (type) {
-        case DESC_TSS:
-                size = sizeof(tss_desc);
-                break;
-        case DESC_LDT:
-                size = sizeof(ldt_desc);
-                break;
-        default:
-                size = sizeof(struct desc_struct);
-                break;
+        case DESC_TSS:  size = sizeof(tss_desc);        break;
+        case DESC_LDT:  size = sizeof(ldt_desc);        break;
+        default:        size = sizeof(*gdt);            break;
         }
+
         memcpy(&gdt[entry], desc, size);
 }
 
@@ -154,20 +149,21 @@ static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
 }
 
 
-static inline void set_tssldt_descriptor(void *d, unsigned long addr,
-                                         unsigned type, unsigned size)
+static inline void set_tssldt_descriptor(void *d, unsigned long addr, unsigned type, unsigned size)
 {
 #ifdef CONFIG_X86_64
         struct ldttss_desc64 *desc = d;
+
         memset(desc, 0, sizeof(*desc));
-        desc->limit0 = size & 0xFFFF;
-        desc->base0 = PTR_LOW(addr);
-        desc->base1 = PTR_MIDDLE(addr) & 0xFF;
-        desc->type = type;
-        desc->p = 1;
-        desc->limit1 = (size >> 16) & 0xF;
-        desc->base2 = (PTR_MIDDLE(addr) >> 8) & 0xFF;
-        desc->base3 = PTR_HIGH(addr);
+
+        desc->limit0            = size & 0xFFFF;
+        desc->base0             = PTR_LOW(addr);
+        desc->base1             = PTR_MIDDLE(addr) & 0xFF;
+        desc->type              = type;
+        desc->p                 = 1;
+        desc->limit1            = (size >> 16) & 0xF;
+        desc->base2             = (PTR_MIDDLE(addr) >> 8) & 0xFF;
+        desc->base3             = PTR_HIGH(addr);
 #else
         pack_descriptor((struct desc_struct *)d, addr, size, 0x80 | type, 0);
 #endif
@@ -237,14 +233,16 @@ static inline void native_store_idt(struct desc_ptr *dtr)
 static inline unsigned long native_store_tr(void)
 {
         unsigned long tr;
+
         asm volatile("str %0":"=r" (tr));
+
         return tr;
 }
 
 static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
 {
-        unsigned int i;
         struct desc_struct *gdt = get_cpu_gdt_table(cpu);
+        unsigned int i;
 
         for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
                 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
@@ -313,6 +311,7 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
                              unsigned dpl, unsigned ist, unsigned seg)
 {
         gate_desc s;
+
         pack_gate(&s, type, (unsigned long)addr, dpl, ist, seg);
         /*
          * does not need to be atomic because it is only done once at
@@ -343,8 +342,9 @@ static inline void alloc_system_vector(int vector)
                 set_bit(vector, used_vectors);
                 if (first_system_vector > vector)
                         first_system_vector = vector;
-        } else
+        } else {
                 BUG();
+        }
 }
 
 static inline void alloc_intr_gate(unsigned int n, void *addr)
diff --git a/arch/x86/include/asm/idle.h b/arch/x86/include/asm/idle.h
index 38d87379e270..f49253d75710 100644
--- a/arch/x86/include/asm/idle.h
+++ b/arch/x86/include/asm/idle.h
@@ -16,6 +16,6 @@ static inline void enter_idle(void) { }
 static inline void exit_idle(void) { }
 #endif /* CONFIG_X86_64 */
 
-void c1e_remove_cpu(int cpu);
+void amd_e400_remove_cpu(int cpu);
 
 #endif /* _ASM_X86_IDLE_H */
diff --git a/arch/x86/include/asm/kgdb.h b/arch/x86/include/asm/kgdb.h
index 396f5b5fc4d7..77e95f54570a 100644
--- a/arch/x86/include/asm/kgdb.h
+++ b/arch/x86/include/asm/kgdb.h
@@ -77,6 +77,7 @@ static inline void arch_kgdb_breakpoint(void)
 }
 #define BREAK_INSTR_SIZE        1
 #define CACHE_FLUSH_IS_SAFE     1
+#define GDB_ADJUSTS_BREAK_OFFSET
 
 extern int kgdb_ll_trap(int cmd, const char *str,
                         struct pt_regs *regs, long err, int trap, int sig);
diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
index aeff3e89b222..5f55e6962769 100644
--- a/arch/x86/include/asm/mmu.h
+++ b/arch/x86/include/asm/mmu.h
@@ -11,14 +11,14 @@
 typedef struct {
         void *ldt;
         int size;
-        struct mutex lock;
-        void *vdso;
 
 #ifdef CONFIG_X86_64
         /* True if mm supports a task running in 32 bit compatibility mode. */
         unsigned short ia32_compat;
 #endif
 
+        struct mutex lock;
+        void *vdso;
 } mm_context_t;
 
 #ifdef CONFIG_SMP
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 4c25ab48257b..219371546afd 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -754,10 +754,10 @@ static inline void __sti_mwait(unsigned long eax, unsigned long ecx)
 extern void mwait_idle_with_hints(unsigned long eax, unsigned long ecx);
 
 extern void select_idle_routine(const struct cpuinfo_x86 *c);
-extern void init_c1e_mask(void);
+extern void init_amd_e400_c1e_mask(void);
 
 extern unsigned long            boot_option_idle_override;
-extern bool                     c1e_detected;
+extern bool                     amd_e400_c1e_detected;
 
 enum idle_boot_override {IDLE_NO_OVERRIDE=0, IDLE_HALT, IDLE_NOMWAIT,
                          IDLE_POLL, IDLE_FORCE_MWAIT};
diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
index 1babf8adecdf..94e7618fcac8 100644
--- a/arch/x86/include/asm/ptrace.h
+++ b/arch/x86/include/asm/ptrace.h
@@ -136,6 +136,7 @@ struct cpuinfo_x86;
 struct task_struct;
 
 extern unsigned long profile_pc(struct pt_regs *regs);
+#define profile_pc profile_pc
 
 extern unsigned long
 convert_ip_to_linear(struct task_struct *child, struct pt_regs *regs);
@@ -202,20 +203,11 @@ static inline unsigned long kernel_stack_pointer(struct pt_regs *regs)
 #endif
 }
 
-static inline unsigned long instruction_pointer(struct pt_regs *regs)
-{
-        return regs->ip;
-}
-
-static inline unsigned long frame_pointer(struct pt_regs *regs)
-{
-        return regs->bp;
-}
+#define GET_IP(regs) ((regs)->ip)
+#define GET_FP(regs) ((regs)->bp)
+#define GET_USP(regs) ((regs)->sp)
 
-static inline unsigned long user_stack_pointer(struct pt_regs *regs)
-{
-        return regs->sp;
-}
+#include <asm-generic/ptrace.h>
 
 /* Query offset/name of register from its name/offset */
 extern int regs_query_register_offset(const char *name);
diff --git a/arch/x86/include/asm/suspend_32.h b/arch/x86/include/asm/suspend_32.h
index fd921c3a6841..487055c8c1aa 100644
--- a/arch/x86/include/asm/suspend_32.h
+++ b/arch/x86/include/asm/suspend_32.h
@@ -9,8 +9,6 @@
 #include <asm/desc.h>
 #include <asm/i387.h>
 
-static inline int arch_prepare_suspend(void) { return 0; }
-
 /* image of the saved processor state */
 struct saved_context {
         u16 es, fs, gs, ss;
diff --git a/arch/x86/include/asm/suspend_64.h b/arch/x86/include/asm/suspend_64.h
index 8d942afae681..09b0bf104156 100644
--- a/arch/x86/include/asm/suspend_64.h
+++ b/arch/x86/include/asm/suspend_64.h
@@ -9,11 +9,6 @@
 #include <asm/desc.h>
 #include <asm/i387.h>
 
-static inline int arch_prepare_suspend(void)
-{
-        return 0;
-}
-
 /*
  * Image of the saved processor state, used by the low level ACPI suspend to
  * RAM code and by the low level hibernation code.
diff --git a/arch/x86/include/asm/tsc.h b/arch/x86/include/asm/tsc.h
index 83e2efd181e2..9db5583b6d38 100644
--- a/arch/x86/include/asm/tsc.h
+++ b/arch/x86/include/asm/tsc.h
@@ -51,6 +51,10 @@ extern int unsynchronized_tsc(void);
 extern int check_tsc_unstable(void);
 extern unsigned long native_calibrate_tsc(void);
 
+#ifdef CONFIG_X86_64
+extern cycles_t vread_tsc(void);
+#endif
+
 /*
  * Boot-time check whether the TSCs are synchronized across
  * all CPUs/cores:
diff --git a/arch/x86/include/asm/unistd_32.h b/arch/x86/include/asm/unistd_32.h
index fb6a625c99bf..593485b38ab3 100644
--- a/arch/x86/include/asm/unistd_32.h
+++ b/arch/x86/include/asm/unistd_32.h
@@ -351,10 +351,11 @@
 #define __NR_clock_adjtime      343
 #define __NR_syncfs             344
 #define __NR_sendmmsg           345
+#define __NR_setns              346
 
 #ifdef __KERNEL__
 
-#define NR_syscalls 346
+#define NR_syscalls 347
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
diff --git a/arch/x86/include/asm/unistd_64.h b/arch/x86/include/asm/unistd_64.h
index 79f90eb15aad..705bf139288c 100644
--- a/arch/x86/include/asm/unistd_64.h
+++ b/arch/x86/include/asm/unistd_64.h
@@ -679,6 +679,8 @@ __SYSCALL(__NR_clock_adjtime, sys_clock_adjtime)
 __SYSCALL(__NR_syncfs, sys_syncfs)
 #define __NR_sendmmsg                           307
 __SYSCALL(__NR_sendmmsg, sys_sendmmsg)
+#define __NR_setns                              308
+__SYSCALL(__NR_setns, sys_setns)
 
 #ifndef __NO_STUBS
 #define __ARCH_WANT_OLD_READDIR
diff --git a/arch/x86/include/asm/uv/uv_bau.h b/arch/x86/include/asm/uv/uv_bau.h
index 130f1eeee5fe..a291c40efd43 100644
--- a/arch/x86/include/asm/uv/uv_bau.h
+++ b/arch/x86/include/asm/uv/uv_bau.h
@@ -5,7 +5,7 @@
  *
  * SGI UV Broadcast Assist Unit definitions
  *
- * Copyright (C) 2008 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 2008-2011 Silicon Graphics, Inc. All rights reserved.
  */
 
 #ifndef _ASM_X86_UV_UV_BAU_H
@@ -35,17 +35,20 @@
 
 #define MAX_CPUS_PER_UVHUB              64
 #define MAX_CPUS_PER_SOCKET             32
-#define UV_ADP_SIZE                     64 /* hardware-provided max. */
-#define UV_CPUS_PER_ACT_STATUS          32 /* hardware-provided max. */
-#define UV_ITEMS_PER_DESCRIPTOR         8
+#define ADP_SZ                          64 /* hardware-provided max. */
+#define UV_CPUS_PER_AS                  32 /* hardware-provided max. */
+#define ITEMS_PER_DESC                  8
 /* the 'throttle' to prevent the hardware stay-busy bug */
 #define MAX_BAU_CONCURRENT              3
 #define UV_ACT_STATUS_MASK              0x3
 #define UV_ACT_STATUS_SIZE              2
 #define UV_DISTRIBUTION_SIZE            256
 #define UV_SW_ACK_NPENDING              8
-#define UV_NET_ENDPOINT_INTD            0x38
-#define UV_DESC_BASE_PNODE_SHIFT        49
+#define UV1_NET_ENDPOINT_INTD           0x38
+#define UV2_NET_ENDPOINT_INTD           0x28
+#define UV_NET_ENDPOINT_INTD            (is_uv1_hub() ?                 \
+                        UV1_NET_ENDPOINT_INTD : UV2_NET_ENDPOINT_INTD)
+#define UV_DESC_PSHIFT                  49
 #define UV_PAYLOADQ_PNODE_SHIFT         49
 #define UV_PTC_BASENAME                 "sgi_uv/ptc_statistics"
 #define UV_BAU_BASENAME                 "sgi_uv/bau_tunables"
@@ -53,29 +56,64 @@
 #define UV_BAU_TUNABLES_FILE            "bau_tunables"
 #define WHITESPACE                      " \t\n"
 #define uv_physnodeaddr(x)              ((__pa((unsigned long)(x)) & uv_mmask))
-#define UV_ENABLE_INTD_SOFT_ACK_MODE_SHIFT 15
-#define UV_INTD_SOFT_ACK_TIMEOUT_PERIOD_SHIFT 16
-#define UV_INTD_SOFT_ACK_TIMEOUT_PERIOD 0x0000000009UL
+#define cpubit_isset(cpu, bau_local_cpumask) \
+        test_bit((cpu), (bau_local_cpumask).bits)
+
 /* [19:16] SOFT_ACK timeout period  19: 1 is urgency 7  17:16 1 is multiplier */
-#define BAU_MISC_CONTROL_MULT_MASK 3
+/*
+ * UV2: Bit 19 selects between
+ *  (0): 10 microsecond timebase and
+ *  (1): 80 microseconds
+ *  we're using 655us, similar to UV1: 65 units of 10us
+ */
+#define UV1_INTD_SOFT_ACK_TIMEOUT_PERIOD (9UL)
+#define UV2_INTD_SOFT_ACK_TIMEOUT_PERIOD (65*10UL)
+
+#define UV_INTD_SOFT_ACK_TIMEOUT_PERIOD (is_uv1_hub() ?                 \
+                UV1_INTD_SOFT_ACK_TIMEOUT_PERIOD :                      \
+                UV2_INTD_SOFT_ACK_TIMEOUT_PERIOD)
 
-#define UVH_AGING_PRESCALE_SEL 0x000000b000UL
+#define BAU_MISC_CONTROL_MULT_MASK      3
+
+#define UVH_AGING_PRESCALE_SEL          0x000000b000UL
 /* [30:28] URGENCY_7  an index into a table of times */
-#define BAU_URGENCY_7_SHIFT 28
-#define BAU_URGENCY_7_MASK 7
+#define BAU_URGENCY_7_SHIFT             28
+#define BAU_URGENCY_7_MASK              7
 
-#define UVH_TRANSACTION_TIMEOUT 0x000000b200UL
+#define UVH_TRANSACTION_TIMEOUT         0x000000b200UL
 /* [45:40] BAU - BAU transaction timeout select - a multiplier */
-#define BAU_TRANS_SHIFT 40
-#define BAU_TRANS_MASK 0x3f
+#define BAU_TRANS_SHIFT                 40
+#define BAU_TRANS_MASK                  0x3f
+
+/*
+ * shorten some awkward names
+ */
+#define AS_PUSH_SHIFT UVH_LB_BAU_SB_ACTIVATION_CONTROL_PUSH_SHFT
+#define SOFTACK_MSHIFT UVH_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_SHFT
+#define SOFTACK_PSHIFT UVH_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_SHFT
+#define SOFTACK_TIMEOUT_PERIOD UV_INTD_SOFT_ACK_TIMEOUT_PERIOD
+#define write_gmmr      uv_write_global_mmr64
+#define write_lmmr      uv_write_local_mmr
+#define read_lmmr       uv_read_local_mmr
+#define read_gmmr       uv_read_global_mmr64
 
 /*
  * bits in UVH_LB_BAU_SB_ACTIVATION_STATUS_0/1
  */
-#define DESC_STATUS_IDLE                0
-#define DESC_STATUS_ACTIVE              1
-#define DESC_STATUS_DESTINATION_TIMEOUT 2
-#define DESC_STATUS_SOURCE_TIMEOUT      3
+#define DS_IDLE                         0
+#define DS_ACTIVE                       1
+#define DS_DESTINATION_TIMEOUT          2
+#define DS_SOURCE_TIMEOUT               3
+/*
+ * bits put together from HRP_LB_BAU_SB_ACTIVATION_STATUS_0/1/2
+ * values 1 and 5 will not occur
+ */
+#define UV2H_DESC_IDLE                  0
+#define UV2H_DESC_DEST_TIMEOUT          2
+#define UV2H_DESC_DEST_STRONG_NACK      3
+#define UV2H_DESC_BUSY                  4
+#define UV2H_DESC_SOURCE_TIMEOUT        6
+#define UV2H_DESC_DEST_PUT_ERR          7
 
 /*
  * delay for 'plugged' timeout retries, in microseconds
@@ -86,15 +124,24 @@
  * threshholds at which to use IPI to free resources
  */
 /* after this # consecutive 'plugged' timeouts, use IPI to release resources */
-#define PLUGSB4RESET 100
+#define PLUGSB4RESET                    100
 /* after this many consecutive timeouts, use IPI to release resources */
-#define TIMEOUTSB4RESET 1
+#define TIMEOUTSB4RESET                 1
 /* at this number uses of IPI to release resources, giveup the request */
-#define IPI_RESET_LIMIT 1
+#define IPI_RESET_LIMIT                 1
 /* after this # consecutive successes, bump up the throttle if it was lowered */
-#define COMPLETE_THRESHOLD 5
+#define COMPLETE_THRESHOLD              5
+
+#define UV_LB_SUBNODEID                 0x10
 
-#define UV_LB_SUBNODEID 0x10
+/* these two are the same for UV1 and UV2: */
+#define UV_SA_SHFT UVH_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_SHFT
+#define UV_SA_MASK UVH_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_MASK
+/* 4 bits of software ack period */
+#define UV2_ACK_MASK                    0x7UL
+#define UV2_ACK_UNITS_SHFT              3
+#define UV2_LEG_SHFT UV2H_LB_BAU_MISC_CONTROL_USE_LEGACY_DESCRIPTOR_FORMATS_SHFT
+#define UV2_EXT_SHFT UV2H_LB_BAU_MISC_CONTROL_ENABLE_EXTENDED_SB_STATUS_SHFT
 
 /*
  * number of entries in the destination side payload queue
@@ -115,9 +162,16 @@
 /*
  * tuning the action when the numalink network is extremely delayed
  */
-#define CONGESTED_RESPONSE_US 1000 /* 'long' response time, in microseconds */
-#define CONGESTED_REPS 10 /* long delays averaged over this many broadcasts */
-#define CONGESTED_PERIOD 30 /* time for the bau to be disabled, in seconds */
+#define CONGESTED_RESPONSE_US           1000    /* 'long' response time, in
+                                                   microseconds */
+#define CONGESTED_REPS                  10      /* long delays averaged over
+                                                   this many broadcasts */
+#define CONGESTED_PERIOD                30      /* time for the bau to be
+                                                   disabled, in seconds */
+/* see msg_type: */
+#define MSG_NOOP                        0
+#define MSG_REGULAR                     1
+#define MSG_RETRY                       2
 
 /*
  * Distribution: 32 bytes (256 bits) (bytes 0-0x1f of descriptor)
@@ -129,8 +183,8 @@
  * 'base_dest_nasid' field of the header corresponds to the
  * destination nodeID associated with that specified bit.
  */
-struct bau_target_uvhubmask {
-        unsigned long bits[BITS_TO_LONGS(UV_DISTRIBUTION_SIZE)];
+struct bau_targ_hubmask {
+        unsigned long           bits[BITS_TO_LONGS(UV_DISTRIBUTION_SIZE)];
 };
 
 /*
@@ -139,7 +193,7 @@ struct bau_target_uvhubmask {
  *  enough bits for max. cpu's per uvhub)
  */
 struct bau_local_cpumask {
-        unsigned long bits;
+        unsigned long           bits;
 };
 
 /*
@@ -160,14 +214,14 @@ struct bau_local_cpumask {
  * The payload is software-defined for INTD transactions
  */
 struct bau_msg_payload {
-        unsigned long address;          /* signifies a page or all TLB's
-                                                of the cpu */
+        unsigned long   address;                /* signifies a page or all
+                                                   TLB's of the cpu */
         /* 64 bits */
-        unsigned short sending_cpu;     /* filled in by sender */
+        unsigned short  sending_cpu;            /* filled in by sender */
         /* 16 bits */
-        unsigned short acknowledge_count;/* filled in by destination */
+        unsigned short  acknowledge_count;      /* filled in by destination */
         /* 16 bits */
-        unsigned int reserved1:32;      /* not usable */
+        unsigned int    reserved1:32;           /* not usable */
 };
 
 
@@ -176,93 +230,96 @@ struct bau_msg_payload {
  * see table 4.2.3.0.1 in broacast_assist spec.
  */
 struct bau_msg_header {
-        unsigned int dest_subnodeid:6;  /* must be 0x10, for the LB */
+        unsigned int    dest_subnodeid:6;       /* must be 0x10, for the LB */
         /* bits 5:0 */
-        unsigned int base_dest_nasid:15; /* nasid of the */
-        /* bits 20:6 */                   /* first bit in uvhub map */
-        unsigned int command:8; /* message type */
+        unsigned int    base_dest_nasid:15;     /* nasid of the first bit */
+        /* bits 20:6 */                         /* in uvhub map */
+        unsigned int    command:8;              /* message type */
         /* bits 28:21 */
-                                /* 0x38: SN3net EndPoint Message */
-        unsigned int rsvd_1:3;  /* must be zero */
+        /* 0x38: SN3net EndPoint Message */
+        unsigned int    rsvd_1:3;               /* must be zero */
         /* bits 31:29 */
-                                /* int will align on 32 bits */
-        unsigned int rsvd_2:9;  /* must be zero */
+        /* int will align on 32 bits */
+        unsigned int    rsvd_2:9;               /* must be zero */
         /* bits 40:32 */
-                                /* Suppl_A is 56-41 */
-        unsigned int sequence:16;/* message sequence number */
-        /* bits 56:41 */        /* becomes bytes 16-17 of msg */
-                                /* Address field (96:57) is never used as an
-                                   address (these are address bits 42:3) */
-
-        unsigned int rsvd_3:1;  /* must be zero */
+        /* Suppl_A is 56-41 */
+        unsigned int    sequence:16;            /* message sequence number */
+        /* bits 56:41 */                        /* becomes bytes 16-17 of msg */
+                                                /* Address field (96:57) is
+                                                   never used as an address
+                                                   (these are address bits
+                                                   42:3) */
+
+        unsigned int    rsvd_3:1;               /* must be zero */
         /* bit 57 */
-                                /* address bits 27:4 are payload */
+        /* address bits 27:4 are payload */
         /* these next 24  (58-81) bits become bytes 12-14 of msg */
-
         /* bits 65:58 land in byte 12 */
-        unsigned int replied_to:1;/* sent as 0 by the source to byte 12 */
+        unsigned int    replied_to:1;           /* sent as 0 by the source to
+                                                   byte 12 */
         /* bit 58 */
-        unsigned int msg_type:3; /* software type of the message*/
+        unsigned int    msg_type:3;             /* software type of the
+                                                   message */
         /* bits 61:59 */
-        unsigned int canceled:1; /* message canceled, resource to be freed*/
+        unsigned int    canceled:1;             /* message canceled, resource
+                                                   is to be freed*/
         /* bit 62 */
-        unsigned int payload_1a:1;/* not currently used */
+        unsigned int    payload_1a:1;           /* not currently used */
         /* bit 63 */
-        unsigned int payload_1b:2;/* not currently used */
+        unsigned int    payload_1b:2;           /* not currently used */
         /* bits 65:64 */
 
         /* bits 73:66 land in byte 13 */
-        unsigned int payload_1ca:6;/* not currently used */
+        unsigned int    payload_1ca:6;          /* not currently used */
         /* bits 71:66 */
-        unsigned int payload_1c:2;/* not currently used */
+        unsigned int    payload_1c:2;           /* not currently used */
         /* bits 73:72 */
 
         /* bits 81:74 land in byte 14 */
-        unsigned int payload_1d:6;/* not currently used */
+        unsigned int    payload_1d:6;           /* not currently used */
         /* bits 79:74 */
-        unsigned int payload_1e:2;/* not currently used */
+        unsigned int    payload_1e:2;           /* not currently used */
         /* bits 81:80 */
 
-        unsigned int rsvd_4:7;  /* must be zero */
+        unsigned int    rsvd_4:7;               /* must be zero */
         /* bits 88:82 */
-        unsigned int sw_ack_flag:1;/* software acknowledge flag */
+        unsigned int    swack_flag:1;           /* software acknowledge flag */
         /* bit 89 */
-                                /* INTD trasactions at destination are to
-                                   wait for software acknowledge */
-        unsigned int rsvd_5:6;  /* must be zero */
+                                                /* INTD trasactions at
+                                                   destination are to wait for
+                                                   software acknowledge */
+        unsigned int    rsvd_5:6;               /* must be zero */
         /* bits 95:90 */
-        unsigned int rsvd_6:5;  /* must be zero */
+        unsigned int    rsvd_6:5;               /* must be zero */
         /* bits 100:96 */
-        unsigned int int_both:1;/* if 1, interrupt both sockets on the uvhub */
+        unsigned int    int_both:1;             /* if 1, interrupt both sockets
+                                                   on the uvhub */
         /* bit 101*/
-        unsigned int fairness:3;/* usually zero */
+        unsigned int    fairness:3;             /* usually zero */
         /* bits 104:102 */
-        unsigned int multilevel:1;      /* multi-level multicast format */
+        unsigned int    multilevel:1;           /* multi-level multicast
+                                                   format */
         /* bit 105 */
-                                /* 0 for TLB: endpoint multi-unicast messages */
-        unsigned int chaining:1;/* next descriptor is part of this activation*/
+        /* 0 for TLB: endpoint multi-unicast messages */
+        unsigned int    chaining:1;             /* next descriptor is part of
+                                                   this activation*/
         /* bit 106 */
-        unsigned int rsvd_7:21; /* must be zero */
+        unsigned int    rsvd_7:21;              /* must be zero */
         /* bits 127:107 */
 };
 
-/* see msg_type: */
-#define MSG_NOOP 0
-#define MSG_REGULAR 1
-#define MSG_RETRY 2
-
 /*
  * The activation descriptor:
  * The format of the message to send, plus all accompanying control
  * Should be 64 bytes
  */
 struct bau_desc {
-        struct bau_target_uvhubmask distribution;
+        struct bau_targ_hubmask distribution;
         /*
          * message template, consisting of header and payload:
          */
-        struct bau_msg_header header;
-        struct bau_msg_payload payload;
+        struct bau_msg_header           header;
+        struct bau_msg_payload          payload;
 };
 /*
  *   -payload--    ---------header------
@@ -281,59 +338,51 @@ struct bau_desc {
  * are 32 bytes (2 micropackets) (256 bits) in length, but contain only 17
  * bytes of usable data, including the sw ack vector in byte 15 (bits 127:120)
  * (12 bytes come from bau_msg_payload, 3 from payload_1, 2 from
- *  sw_ack_vector and payload_2)
+ *  swack_vec and payload_2)
  * "Enabling Software Acknowledgment mode (see Section 4.3.3 Software
  *  Acknowledge Processing) also selects 32 byte (17 bytes usable) payload
  *  operation."
  */
-struct bau_payload_queue_entry {
-        unsigned long address;          /* signifies a page or all TLB's
-                                                of the cpu */
+struct bau_pq_entry {
+        unsigned long   address;        /* signifies a page or all TLB's
+                                           of the cpu */
         /* 64 bits, bytes 0-7 */
-
-        unsigned short sending_cpu;     /* cpu that sent the message */
+        unsigned short  sending_cpu;    /* cpu that sent the message */
         /* 16 bits, bytes 8-9 */
-
-        unsigned short acknowledge_count; /* filled in by destination */
+        unsigned short  acknowledge_count; /* filled in by destination */
         /* 16 bits, bytes 10-11 */
-
         /* these next 3 bytes come from bits 58-81 of the message header */
-        unsigned short replied_to:1;    /* sent as 0 by the source */
-        unsigned short msg_type:3;      /* software message type */
-        unsigned short canceled:1;      /* sent as 0 by the source */
-        unsigned short unused1:3;       /* not currently using */
+        unsigned short  replied_to:1;   /* sent as 0 by the source */
+        unsigned short  msg_type:3;     /* software message type */
+        unsigned short  canceled:1;     /* sent as 0 by the source */
+        unsigned short  unused1:3;      /* not currently using */
         /* byte 12 */
-
-        unsigned char unused2a;         /* not currently using */
+        unsigned char   unused2a;       /* not currently using */
         /* byte 13 */
-        unsigned char unused2;          /* not currently using */
+        unsigned char   unused2;        /* not currently using */
         /* byte 14 */
-
-        unsigned char sw_ack_vector;    /* filled in by the hardware */
+        unsigned char   swack_vec;      /* filled in by the hardware */
         /* byte 15 (bits 127:120) */
-
-        unsigned short sequence;        /* message sequence number */
+        unsigned short  sequence;       /* message sequence number */
         /* bytes 16-17 */
-        unsigned char unused4[2];       /* not currently using bytes 18-19 */
+        unsigned char   unused4[2];     /* not currently using bytes 18-19 */
         /* bytes 18-19 */
-
-        int number_of_cpus;             /* filled in at destination */
+        int             number_of_cpus; /* filled in at destination */
         /* 32 bits, bytes 20-23 (aligned) */
-
-        unsigned char unused5[8];       /* not using */
+        unsigned char   unused5[8];     /* not using */
         /* bytes 24-31 */
 };
 
 struct msg_desc {
-        struct bau_payload_queue_entry *msg;
-        int msg_slot;
-        int sw_ack_slot;
-        struct bau_payload_queue_entry *va_queue_first;
-        struct bau_payload_queue_entry *va_queue_last;
+        struct bau_pq_entry     *msg;
+        int                     msg_slot;
+        int                     swack_slot;
+        struct bau_pq_entry     *queue_first;
+        struct bau_pq_entry     *queue_last;
 };
 
 struct reset_args {
-        int sender;
+        int                     sender;
 };
 
 /*
@@ -341,112 +390,226 @@ struct reset_args {
  */
 struct ptc_stats {
         /* sender statistics */
-        unsigned long s_giveup; /* number of fall backs to IPI-style flushes */
-        unsigned long s_requestor; /* number of shootdown requests */
-        unsigned long s_stimeout; /* source side timeouts */
-        unsigned long s_dtimeout; /* destination side timeouts */
-        unsigned long s_time; /* time spent in sending side */
-        unsigned long s_retriesok; /* successful retries */
-        unsigned long s_ntargcpu; /* total number of cpu's targeted */
-        unsigned long s_ntargself; /* times the sending cpu was targeted */
-        unsigned long s_ntarglocals; /* targets of cpus on the local blade */
-        unsigned long s_ntargremotes; /* targets of cpus on remote blades */
-        unsigned long s_ntarglocaluvhub; /* targets of the local hub */
-        unsigned long s_ntargremoteuvhub; /* remotes hubs targeted */
-        unsigned long s_ntarguvhub; /* total number of uvhubs targeted */
-        unsigned long s_ntarguvhub16; /* number of times target hubs >= 16*/
-        unsigned long s_ntarguvhub8; /* number of times target hubs >= 8 */
-        unsigned long s_ntarguvhub4; /* number of times target hubs >= 4 */
-        unsigned long s_ntarguvhub2; /* number of times target hubs >= 2 */
-        unsigned long s_ntarguvhub1; /* number of times target hubs == 1 */
-        unsigned long s_resets_plug; /* ipi-style resets from plug state */
-        unsigned long s_resets_timeout; /* ipi-style resets from timeouts */
-        unsigned long s_busy; /* status stayed busy past s/w timer */
-        unsigned long s_throttles; /* waits in throttle */
-        unsigned long s_retry_messages; /* retry broadcasts */
-        unsigned long s_bau_reenabled; /* for bau enable/disable */
-        unsigned long s_bau_disabled; /* for bau enable/disable */
+        unsigned long   s_giveup;               /* number of fall backs to
+                                                   IPI-style flushes */
+        unsigned long   s_requestor;            /* number of shootdown
+                                                   requests */
+        unsigned long   s_stimeout;             /* source side timeouts */
+        unsigned long   s_dtimeout;             /* destination side timeouts */
+        unsigned long   s_time;                 /* time spent in sending side */
+        unsigned long   s_retriesok;            /* successful retries */
+        unsigned long   s_ntargcpu;             /* total number of cpu's
+                                                   targeted */
+        unsigned long   s_ntargself;            /* times the sending cpu was
+                                                   targeted */
+        unsigned long   s_ntarglocals;          /* targets of cpus on the local
+                                                   blade */
+        unsigned long   s_ntargremotes;         /* targets of cpus on remote
+                                                   blades */
+        unsigned long   s_ntarglocaluvhub;      /* targets of the local hub */
+        unsigned long   s_ntargremoteuvhub;     /* remotes hubs targeted */
+        unsigned long   s_ntarguvhub;           /* total number of uvhubs
+                                                   targeted */
+        unsigned long   s_ntarguvhub16;         /* number of times target
+                                                   hubs >= 16*/
+        unsigned long   s_ntarguvhub8;          /* number of times target
+                                                   hubs >= 8 */
+        unsigned long   s_ntarguvhub4;          /* number of times target
+                                                   hubs >= 4 */
+        unsigned long   s_ntarguvhub2;          /* number of times target
+                                                   hubs >= 2 */
+        unsigned long   s_ntarguvhub1;          /* number of times target
+                                                   hubs == 1 */
+        unsigned long   s_resets_plug;          /* ipi-style resets from plug
+                                                   state */
+        unsigned long   s_resets_timeout;       /* ipi-style resets from
+                                                   timeouts */
+        unsigned long   s_busy;                 /* status stayed busy past
+                                                   s/w timer */
+        unsigned long   s_throttles;            /* waits in throttle */
+        unsigned long   s_retry_messages;       /* retry broadcasts */
+        unsigned long   s_bau_reenabled;        /* for bau enable/disable */
+        unsigned long   s_bau_disabled;         /* for bau enable/disable */
         /* destination statistics */
-        unsigned long d_alltlb; /* times all tlb's on this cpu were flushed */
-        unsigned long d_onetlb; /* times just one tlb on this cpu was flushed */
-        unsigned long d_multmsg; /* interrupts with multiple messages */
-        unsigned long d_nomsg; /* interrupts with no message */
-        unsigned long d_time; /* time spent on destination side */
-        unsigned long d_requestee; /* number of messages processed */
-        unsigned long d_retries; /* number of retry messages processed */
-        unsigned long d_canceled; /* number of messages canceled by retries */
-        unsigned long d_nocanceled; /* retries that found nothing to cancel */
-        unsigned long d_resets; /* number of ipi-style requests processed */
-        unsigned long d_rcanceled; /* number of messages canceled by resets */
+        unsigned long   d_alltlb;               /* times all tlb's on this
+                                                   cpu were flushed */
+        unsigned long   d_onetlb;               /* times just one tlb on this
+                                                   cpu was flushed */
+        unsigned long   d_multmsg;              /* interrupts with multiple
+                                                   messages */
+        unsigned long   d_nomsg;                /* interrupts with no message */
+        unsigned long   d_time;                 /* time spent on destination
+                                                   side */
+        unsigned long   d_requestee;            /* number of messages
+                                                   processed */
+        unsigned long   d_retries;              /* number of retry messages
+                                                   processed */
+        unsigned long   d_canceled;             /* number of messages canceled
+                                                   by retries */
+        unsigned long   d_nocanceled;           /* retries that found nothing
+                                                   to cancel */
+        unsigned long   d_resets;               /* number of ipi-style requests
+                                                   processed */
+        unsigned long   d_rcanceled;            /* number of messages canceled
+                                                   by resets */
+};
+
+struct tunables {
+        int                     *tunp;
+        int                     deflt;
 };
 
 struct hub_and_pnode {
-        short uvhub;
-        short pnode;
+        short                   uvhub;
+        short                   pnode;
 };
+
+struct socket_desc {
+        short                   num_cpus;
+        short                   cpu_number[MAX_CPUS_PER_SOCKET];
+};
+
+struct uvhub_desc {
+        unsigned short          socket_mask;
+        short                   num_cpus;
+        short                   uvhub;
+        short                   pnode;
+        struct socket_desc      socket[2];
+};
+
 /*
  * one per-cpu; to locate the software tables
  */
 struct bau_control {
-        struct bau_desc *descriptor_base;
-        struct bau_payload_queue_entry *va_queue_first;
-        struct bau_payload_queue_entry *va_queue_last;
-        struct bau_payload_queue_entry *bau_msg_head;
-        struct bau_control *uvhub_master;
-        struct bau_control *socket_master;
-        struct ptc_stats *statp;
-        unsigned long timeout_interval;
-        unsigned long set_bau_on_time;
-        atomic_t active_descriptor_count;
-        int plugged_tries;
-        int timeout_tries;
-        int ipi_attempts;
-        int conseccompletes;
-        int baudisabled;
-        int set_bau_off;
-        short cpu;
-        short osnode;
-        short uvhub_cpu;
-        short uvhub;
-        short cpus_in_socket;
-        short cpus_in_uvhub;
-        short partition_base_pnode;
-        unsigned short message_number;
-        unsigned short uvhub_quiesce;
-        short socket_acknowledge_count[DEST_Q_SIZE];
-        cycles_t send_message;
-        spinlock_t uvhub_lock;
-        spinlock_t queue_lock;
+        struct bau_desc         *descriptor_base;
+        struct bau_pq_entry     *queue_first;
+        struct bau_pq_entry     *queue_last;
+        struct bau_pq_entry     *bau_msg_head;
+        struct bau_control      *uvhub_master;
+        struct bau_control      *socket_master;
+        struct ptc_stats        *statp;
+        unsigned long           timeout_interval;
+        unsigned long           set_bau_on_time;
+        atomic_t                active_descriptor_count;
+        int                     plugged_tries;
+        int                     timeout_tries;
+        int                     ipi_attempts;
+        int                     conseccompletes;
+        int                     baudisabled;
+        int                     set_bau_off;
+        short                   cpu;
+        short                   osnode;
+        short                   uvhub_cpu;
+        short                   uvhub;
+        short                   cpus_in_socket;
+        short                   cpus_in_uvhub;
+        short                   partition_base_pnode;
+        unsigned short          message_number;
+        unsigned short          uvhub_quiesce;
+        short                   socket_acknowledge_count[DEST_Q_SIZE];
+        cycles_t                send_message;
+        spinlock_t              uvhub_lock;
+        spinlock_t              queue_lock;
         /* tunables */
-        int max_bau_concurrent;
-        int max_bau_concurrent_constant;
-        int plugged_delay;
-        int plugsb4reset;
-        int timeoutsb4reset;
-        int ipi_reset_limit;
-        int complete_threshold;
-        int congested_response_us;
-        int congested_reps;
-        int congested_period;
-        cycles_t period_time;
-        long period_requests;
-        struct hub_and_pnode *target_hub_and_pnode;
+        int                     max_concurr;
+        int                     max_concurr_const;
+        int                     plugged_delay;
+        int                     plugsb4reset;
+        int                     timeoutsb4reset;
+        int                     ipi_reset_limit;
+        int                     complete_threshold;
+        int                     cong_response_us;
+        int                     cong_reps;
+        int                     cong_period;
+        cycles_t                period_time;
+        long                    period_requests;
+        struct hub_and_pnode    *thp;
 };
 
-static inline int bau_uvhub_isset(int uvhub, struct bau_target_uvhubmask *dstp)
+static unsigned long read_mmr_uv2_status(void)
+{
+        return read_lmmr(UV2H_LB_BAU_SB_ACTIVATION_STATUS_2);
+}
+
+static void write_mmr_data_broadcast(int pnode, unsigned long mmr_image)
+{
+        write_gmmr(pnode, UVH_BAU_DATA_BROADCAST, mmr_image);
+}
+
+static void write_mmr_descriptor_base(int pnode, unsigned long mmr_image)
+{
+        write_gmmr(pnode, UVH_LB_BAU_SB_DESCRIPTOR_BASE, mmr_image);
+}
+
+static void write_mmr_activation(unsigned long index)
+{
+        write_lmmr(UVH_LB_BAU_SB_ACTIVATION_CONTROL, index);
+}
+
+static void write_gmmr_activation(int pnode, unsigned long mmr_image)
+{
+        write_gmmr(pnode, UVH_LB_BAU_SB_ACTIVATION_CONTROL, mmr_image);
+}
+
+static void write_mmr_payload_first(int pnode, unsigned long mmr_image)
+{
+        write_gmmr(pnode, UVH_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST, mmr_image);
+}
+
+static void write_mmr_payload_tail(int pnode, unsigned long mmr_image)
+{
+        write_gmmr(pnode, UVH_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL, mmr_image);
+}
+
+static void write_mmr_payload_last(int pnode, unsigned long mmr_image)
+{
+        write_gmmr(pnode, UVH_LB_BAU_INTD_PAYLOAD_QUEUE_LAST, mmr_image);
+}
+
+static void write_mmr_misc_control(int pnode, unsigned long mmr_image)
+{
+        write_gmmr(pnode, UVH_LB_BAU_MISC_CONTROL, mmr_image);
+}
+
+static unsigned long read_mmr_misc_control(int pnode)
+{
+        return read_gmmr(pnode, UVH_LB_BAU_MISC_CONTROL);
+}
+
+static void write_mmr_sw_ack(unsigned long mr)
+{
+        uv_write_local_mmr(UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS, mr);
+}
+
+static unsigned long read_mmr_sw_ack(void)
+{
+        return read_lmmr(UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE);
+}
+
+static unsigned long read_gmmr_sw_ack(int pnode)
+{
+        return read_gmmr(pnode, UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE);
+}
+
+static void write_mmr_data_config(int pnode, unsigned long mr)
+{
+        uv_write_global_mmr64(pnode, UVH_BAU_DATA_CONFIG, mr);
+}
+
+static inline int bau_uvhub_isset(int uvhub, struct bau_targ_hubmask *dstp)
 {
         return constant_test_bit(uvhub, &dstp->bits[0]);
 }
-static inline void bau_uvhub_set(int pnode, struct bau_target_uvhubmask *dstp)
+static inline void bau_uvhub_set(int pnode, struct bau_targ_hubmask *dstp)
 {
         __set_bit(pnode, &dstp->bits[0]);
 }
-static inline void bau_uvhubs_clear(struct bau_target_uvhubmask *dstp,
+static inline void bau_uvhubs_clear(struct bau_targ_hubmask *dstp,
                                     int nbits)
 {
         bitmap_zero(&dstp->bits[0], nbits);
 }
-static inline int bau_uvhub_weight(struct bau_target_uvhubmask *dstp)
+static inline int bau_uvhub_weight(struct bau_targ_hubmask *dstp)
 {
         return bitmap_weight((unsigned long *)&dstp->bits[0],
                                 UV_DISTRIBUTION_SIZE);
@@ -457,9 +620,6 @@ static inline void bau_cpubits_clear(struct bau_local_cpumask *dstp, int nbits)
         bitmap_zero(&dstp->bits, nbits);
 }
 
-#define cpubit_isset(cpu, bau_local_cpumask) \
-        test_bit((cpu), (bau_local_cpumask).bits)
-
 extern void uv_bau_message_intr1(void);
 extern void uv_bau_timeout_intr1(void);
 
@@ -467,7 +627,7 @@ struct atomic_short {
         short counter;
 };
 
-/**
+/*
  * atomic_read_short - read a short atomic variable
  * @v: pointer of type atomic_short
  *
@@ -478,14 +638,14 @@ static inline int atomic_read_short(const struct atomic_short *v)
         return v->counter;
 }
 
-/**
- * atomic_add_short_return - add and return a short int
+/*
+ * atom_asr - add and return a short int
  * @i: short value to add
  * @v: pointer of type atomic_short
  *
  * Atomically adds @i to @v and returns @i + @v
  */
-static inline int atomic_add_short_return(short i, struct atomic_short *v)
+static inline int atom_asr(short i, struct atomic_short *v)
 {
         short __i = i;
         asm volatile(LOCK_PREFIX "xaddw %0, %1"
@@ -494,4 +654,26 @@ static inline int atomic_add_short_return(short i, struct atomic_short *v)
         return i + __i;
 }
 
+/*
+ * conditionally add 1 to *v, unless *v is >= u
+ * return 0 if we cannot add 1 to *v because it is >= u
+ * return 1 if we can add 1 to *v because it is < u
+ * the add is atomic
+ *
+ * This is close to atomic_add_unless(), but this allows the 'u' value
+ * to be lowered below the current 'v'.  atomic_add_unless can only stop
+ * on equal.
+ */
+static inline int atomic_inc_unless_ge(spinlock_t *lock, atomic_t *v, int u)
+{
+        spin_lock(lock);
+        if (atomic_read(v) >= u) {
+                spin_unlock(lock);
+                return 0;
+        }
+        atomic_inc(v);
+        spin_unlock(lock);
+        return 1;
+}
+
 #endif /* _ASM_X86_UV_UV_BAU_H */
diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h
index 4298002d0c83..f26544a15214 100644
--- a/arch/x86/include/asm/uv/uv_hub.h
+++ b/arch/x86/include/asm/uv/uv_hub.h
@@ -77,8 +77,9 @@
  *
  *              1111110000000000
  *              5432109876543210
- *              pppppppppplc0cch        Nehalem-EX
- *              ppppppppplcc0cch        Westmere-EX
+ *              pppppppppplc0cch        Nehalem-EX (12 bits in hdw reg)
+ *              ppppppppplcc0cch        Westmere-EX (12 bits in hdw reg)
+ *              pppppppppppcccch        SandyBridge (15 bits in hdw reg)
  *              sssssssssss
  *
  *                      p  = pnode bits
@@ -87,7 +88,7 @@
  *                      h  = hyperthread
  *                      s  = bits that are in the SOCKET_ID CSR
  *
- *      Note: Processor only supports 12 bits in the APICID register. The ACPI
+ *      Note: Processor may support fewer bits in the APICID register. The ACPI
  *            tables hold all 16 bits. Software needs to be aware of this.
  *
  *            Unless otherwise specified, all references to APICID refer to
@@ -138,6 +139,8 @@ struct uv_hub_info_s {
         unsigned long           global_mmr_base;
         unsigned long           gpa_mask;
         unsigned int            gnode_extra;
+        unsigned char           hub_revision;
+        unsigned char           apic_pnode_shift;
         unsigned long           gnode_upper;
         unsigned long           lowmem_remap_top;
         unsigned long           lowmem_remap_base;
@@ -149,13 +152,31 @@ struct uv_hub_info_s {
         unsigned char           m_val;
         unsigned char           n_val;
         struct uv_scir_s        scir;
-        unsigned char           apic_pnode_shift;
 };
 
 DECLARE_PER_CPU(struct uv_hub_info_s, __uv_hub_info);
 #define uv_hub_info             (&__get_cpu_var(__uv_hub_info))
 #define uv_cpu_hub_info(cpu)    (&per_cpu(__uv_hub_info, cpu))
 
+/*
+ * Hub revisions less than UV2_HUB_REVISION_BASE are UV1 hubs. All UV2
+ * hubs have revision numbers greater than or equal to UV2_HUB_REVISION_BASE.
+ * This is a software convention - NOT the hardware revision numbers in
+ * the hub chip.
+ */
+#define UV1_HUB_REVISION_BASE           1
+#define UV2_HUB_REVISION_BASE           3
+
+static inline int is_uv1_hub(void)
+{
+        return uv_hub_info->hub_revision < UV2_HUB_REVISION_BASE;
+}
+
+static inline int is_uv2_hub(void)
+{
+        return uv_hub_info->hub_revision >= UV2_HUB_REVISION_BASE;
+}
+
 union uvh_apicid {
     unsigned long       v;
     struct uvh_apicid_s {
@@ -180,11 +201,25 @@ union uvh_apicid {
 #define UV_PNODE_TO_GNODE(p)            ((p) |uv_hub_info->gnode_extra)
 #define UV_PNODE_TO_NASID(p)            (UV_PNODE_TO_GNODE(p) << 1)
 
-#define UV_LOCAL_MMR_BASE               0xf4000000UL
-#define UV_GLOBAL_MMR32_BASE            0xf8000000UL
+#define UV1_LOCAL_MMR_BASE              0xf4000000UL
+#define UV1_GLOBAL_MMR32_BASE           0xf8000000UL
+#define UV1_LOCAL_MMR_SIZE              (64UL * 1024 * 1024)
+#define UV1_GLOBAL_MMR32_SIZE           (64UL * 1024 * 1024)
+
+#define UV2_LOCAL_MMR_BASE              0xfa000000UL
+#define UV2_GLOBAL_MMR32_BASE           0xfc000000UL
+#define UV2_LOCAL_MMR_SIZE              (32UL * 1024 * 1024)
+#define UV2_GLOBAL_MMR32_SIZE           (32UL * 1024 * 1024)
+
+#define UV_LOCAL_MMR_BASE               (is_uv1_hub() ? UV1_LOCAL_MMR_BASE     \
+                                                : UV2_LOCAL_MMR_BASE)
+#define UV_GLOBAL_MMR32_BASE            (is_uv1_hub() ? UV1_GLOBAL_MMR32_BASE  \
+                                                : UV2_GLOBAL_MMR32_BASE)
+#define UV_LOCAL_MMR_SIZE               (is_uv1_hub() ? UV1_LOCAL_MMR_SIZE :   \
+                                                UV2_LOCAL_MMR_SIZE)
+#define UV_GLOBAL_MMR32_SIZE            (is_uv1_hub() ? UV1_GLOBAL_MMR32_SIZE :\
+                                                UV2_GLOBAL_MMR32_SIZE)
 #define UV_GLOBAL_MMR64_BASE            (uv_hub_info->global_mmr_base)
-#define UV_LOCAL_MMR_SIZE               (64UL * 1024 * 1024)
-#define UV_GLOBAL_MMR32_SIZE            (64UL * 1024 * 1024)
 
 #define UV_GLOBAL_GRU_MMR_BASE          0x4000000
 
@@ -301,6 +336,17 @@ static inline int uv_apicid_to_pnode(int apicid)
 }
 
 /*
+ * Convert an apicid to the socket number on the blade
+ */
+static inline int uv_apicid_to_socket(int apicid)
+{
+        if (is_uv1_hub())
+                return (apicid >> (uv_hub_info->apic_pnode_shift - 1)) & 1;
+        else
+                return 0;
+}
+
+/*
  * Access global MMRs using the low memory MMR32 space. This region supports
  * faster MMR access but not all MMRs are accessible in this space.
  */
@@ -519,14 +565,13 @@ static inline void uv_hub_send_ipi(int pnode, int apicid, int vector)
 
 /*
  * Get the minimum revision number of the hub chips within the partition.
- *     1 - initial rev 1.0 silicon
- *     2 - rev 2.0 production silicon
+ *     1 - UV1 rev 1.0 initial silicon
+ *     2 - UV1 rev 2.0 production silicon
+ *     3 - UV2 rev 1.0 initial silicon
  */
 static inline int uv_get_min_hub_revision_id(void)
 {
-        extern int uv_min_hub_revision_id;
-
-        return uv_min_hub_revision_id;
+        return uv_hub_info->hub_revision;
 }
 
 #endif /* CONFIG_X86_64 */
diff --git a/arch/x86/include/asm/uv/uv_mmrs.h b/arch/x86/include/asm/uv/uv_mmrs.h
index f5bb64a823d7..4be52c863448 100644
--- a/arch/x86/include/asm/uv/uv_mmrs.h
+++ b/arch/x86/include/asm/uv/uv_mmrs.h
@@ -11,13 +11,64 @@
 #ifndef _ASM_X86_UV_UV_MMRS_H
 #define _ASM_X86_UV_UV_MMRS_H
 
+/*
+ * This file contains MMR definitions for both UV1 & UV2 hubs.
+ *
+ * In general, MMR addresses and structures are identical on both hubs.
+ * These MMRs are identified as:
+ *      #define UVH_xxx         <address>
+ *      union uvh_xxx {
+ *              unsigned long       v;
+ *              struct uvh_int_cmpd_s {
+ *              } s;
+ *      };
+ *
+ * If the MMR exists on both hub type but has different addresses or
+ * contents, the MMR definition is similar to:
+ *      #define UV1H_xxx        <uv1 address>
+ *      #define UV2H_xxx        <uv2address>
+ *      #define UVH_xxx         (is_uv1_hub() ? UV1H_xxx : UV2H_xxx)
+ *      union uvh_xxx {
+ *              unsigned long       v;
+ *              struct uv1h_int_cmpd_s {         (Common fields only)
+ *              } s;
+ *              struct uv1h_int_cmpd_s {         (Full UV1 definition)
+ *              } s1;
+ *              struct uv2h_int_cmpd_s {         (Full UV2 definition)
+ *              } s2;
+ *      };
+ *
+ * Only essential difference are enumerated. For example, if the address is
+ * the same for both UV1 & UV2, only a single #define is generated. Likewise,
+ * if the contents is the same for both hubs, only the "s" structure is
+ * generated.
+ *
+ * If the MMR exists on ONLY 1 type of hub, no generic definition is
+ * generated:
+ *      #define UVnH_xxx        <uvn address>
+ *      union uvnh_xxx {
+ *              unsigned long       v;
+ *              struct uvh_int_cmpd_s {
+ *              } sn;
+ *      };
+ */
+
 #define UV_MMR_ENABLE           (1UL << 63)
 
+#define UV1_HUB_PART_NUMBER     0x88a5
+#define UV2_HUB_PART_NUMBER     0x8eb8
+
+/* Compat: if this #define is present, UV headers support UV2 */
+#define UV2_HUB_IS_SUPPORTED    1
+
+/* KABI compat: if this #define is present, KABI hacks are present */
+#define UV2_HUB_KABI_HACKS      1
+
 /* ========================================================================= */
 /*                          UVH_BAU_DATA_BROADCAST                           */
 /* ========================================================================= */
 #define UVH_BAU_DATA_BROADCAST 0x61688UL
-#define UVH_BAU_DATA_BROADCAST_32 0x0440
+#define UVH_BAU_DATA_BROADCAST_32 0x440
 
 #define UVH_BAU_DATA_BROADCAST_ENABLE_SHFT 0
 #define UVH_BAU_DATA_BROADCAST_ENABLE_MASK 0x0000000000000001UL
@@ -34,7 +85,7 @@ union uvh_bau_data_broadcast_u {
 /*                           UVH_BAU_DATA_CONFIG                             */
 /* ========================================================================= */
 #define UVH_BAU_DATA_CONFIG 0x61680UL
-#define UVH_BAU_DATA_CONFIG_32 0x0438
+#define UVH_BAU_DATA_CONFIG_32 0x438
 
 #define UVH_BAU_DATA_CONFIG_VECTOR_SHFT 0
 #define UVH_BAU_DATA_CONFIG_VECTOR_MASK 0x00000000000000ffUL
@@ -73,125 +124,245 @@ union uvh_bau_data_config_u {
 /*                           UVH_EVENT_OCCURRED0                             */
 /* ========================================================================= */
 #define UVH_EVENT_OCCURRED0 0x70000UL
-#define UVH_EVENT_OCCURRED0_32 0x005e8
-
-#define UVH_EVENT_OCCURRED0_LB_HCERR_SHFT 0
-#define UVH_EVENT_OCCURRED0_LB_HCERR_MASK 0x0000000000000001UL
-#define UVH_EVENT_OCCURRED0_GR0_HCERR_SHFT 1
-#define UVH_EVENT_OCCURRED0_GR0_HCERR_MASK 0x0000000000000002UL
-#define UVH_EVENT_OCCURRED0_GR1_HCERR_SHFT 2
-#define UVH_EVENT_OCCURRED0_GR1_HCERR_MASK 0x0000000000000004UL
-#define UVH_EVENT_OCCURRED0_LH_HCERR_SHFT 3
-#define UVH_EVENT_OCCURRED0_LH_HCERR_MASK 0x0000000000000008UL
-#define UVH_EVENT_OCCURRED0_RH_HCERR_SHFT 4
-#define UVH_EVENT_OCCURRED0_RH_HCERR_MASK 0x0000000000000010UL
-#define UVH_EVENT_OCCURRED0_XN_HCERR_SHFT 5
-#define UVH_EVENT_OCCURRED0_XN_HCERR_MASK 0x0000000000000020UL
-#define UVH_EVENT_OCCURRED0_SI_HCERR_SHFT 6
-#define UVH_EVENT_OCCURRED0_SI_HCERR_MASK 0x0000000000000040UL
-#define UVH_EVENT_OCCURRED0_LB_AOERR0_SHFT 7
-#define UVH_EVENT_OCCURRED0_LB_AOERR0_MASK 0x0000000000000080UL
-#define UVH_EVENT_OCCURRED0_GR0_AOERR0_SHFT 8
-#define UVH_EVENT_OCCURRED0_GR0_AOERR0_MASK 0x0000000000000100UL
-#define UVH_EVENT_OCCURRED0_GR1_AOERR0_SHFT 9
-#define UVH_EVENT_OCCURRED0_GR1_AOERR0_MASK 0x0000000000000200UL
-#define UVH_EVENT_OCCURRED0_LH_AOERR0_SHFT 10
-#define UVH_EVENT_OCCURRED0_LH_AOERR0_MASK 0x0000000000000400UL
-#define UVH_EVENT_OCCURRED0_RH_AOERR0_SHFT 11
-#define UVH_EVENT_OCCURRED0_RH_AOERR0_MASK 0x0000000000000800UL
-#define UVH_EVENT_OCCURRED0_XN_AOERR0_SHFT 12
-#define UVH_EVENT_OCCURRED0_XN_AOERR0_MASK 0x0000000000001000UL
-#define UVH_EVENT_OCCURRED0_SI_AOERR0_SHFT 13
-#define UVH_EVENT_OCCURRED0_SI_AOERR0_MASK 0x0000000000002000UL
-#define UVH_EVENT_OCCURRED0_LB_AOERR1_SHFT 14
-#define UVH_EVENT_OCCURRED0_LB_AOERR1_MASK 0x0000000000004000UL
-#define UVH_EVENT_OCCURRED0_GR0_AOERR1_SHFT 15
-#define UVH_EVENT_OCCURRED0_GR0_AOERR1_MASK 0x0000000000008000UL
-#define UVH_EVENT_OCCURRED0_GR1_AOERR1_SHFT 16
-#define UVH_EVENT_OCCURRED0_GR1_AOERR1_MASK 0x0000000000010000UL
-#define UVH_EVENT_OCCURRED0_LH_AOERR1_SHFT 17
-#define UVH_EVENT_OCCURRED0_LH_AOERR1_MASK 0x0000000000020000UL
-#define UVH_EVENT_OCCURRED0_RH_AOERR1_SHFT 18
-#define UVH_EVENT_OCCURRED0_RH_AOERR1_MASK 0x0000000000040000UL
-#define UVH_EVENT_OCCURRED0_XN_AOERR1_SHFT 19
-#define UVH_EVENT_OCCURRED0_XN_AOERR1_MASK 0x0000000000080000UL
-#define UVH_EVENT_OCCURRED0_SI_AOERR1_SHFT 20
-#define UVH_EVENT_OCCURRED0_SI_AOERR1_MASK 0x0000000000100000UL
-#define UVH_EVENT_OCCURRED0_RH_VPI_INT_SHFT 21
-#define UVH_EVENT_OCCURRED0_RH_VPI_INT_MASK 0x0000000000200000UL
-#define UVH_EVENT_OCCURRED0_SYSTEM_SHUTDOWN_INT_SHFT 22
-#define UVH_EVENT_OCCURRED0_SYSTEM_SHUTDOWN_INT_MASK 0x0000000000400000UL
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_0_SHFT 23
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_0_MASK 0x0000000000800000UL
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_1_SHFT 24
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_1_MASK 0x0000000001000000UL
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_2_SHFT 25
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_2_MASK 0x0000000002000000UL
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_3_SHFT 26
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_3_MASK 0x0000000004000000UL
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_4_SHFT 27
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_4_MASK 0x0000000008000000UL
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_5_SHFT 28
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_5_MASK 0x0000000010000000UL
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_6_SHFT 29
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_6_MASK 0x0000000020000000UL
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_7_SHFT 30
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_7_MASK 0x0000000040000000UL
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_8_SHFT 31
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_8_MASK 0x0000000080000000UL
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_9_SHFT 32
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_9_MASK 0x0000000100000000UL
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_10_SHFT 33
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_10_MASK 0x0000000200000000UL
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_11_SHFT 34
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_11_MASK 0x0000000400000000UL
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_12_SHFT 35
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_12_MASK 0x0000000800000000UL
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_13_SHFT 36
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_13_MASK 0x0000001000000000UL
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_14_SHFT 37
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_14_MASK 0x0000002000000000UL
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_15_SHFT 38
-#define UVH_EVENT_OCCURRED0_LB_IRQ_INT_15_MASK 0x0000004000000000UL
-#define UVH_EVENT_OCCURRED0_L1_NMI_INT_SHFT 39
-#define UVH_EVENT_OCCURRED0_L1_NMI_INT_MASK 0x0000008000000000UL
-#define UVH_EVENT_OCCURRED0_STOP_CLOCK_SHFT 40
-#define UVH_EVENT_OCCURRED0_STOP_CLOCK_MASK 0x0000010000000000UL
-#define UVH_EVENT_OCCURRED0_ASIC_TO_L1_SHFT 41
-#define UVH_EVENT_OCCURRED0_ASIC_TO_L1_MASK 0x0000020000000000UL
-#define UVH_EVENT_OCCURRED0_L1_TO_ASIC_SHFT 42
-#define UVH_EVENT_OCCURRED0_L1_TO_ASIC_MASK 0x0000040000000000UL
-#define UVH_EVENT_OCCURRED0_LTC_INT_SHFT 43
-#define UVH_EVENT_OCCURRED0_LTC_INT_MASK 0x0000080000000000UL
-#define UVH_EVENT_OCCURRED0_LA_SEQ_TRIGGER_SHFT 44
-#define UVH_EVENT_OCCURRED0_LA_SEQ_TRIGGER_MASK 0x0000100000000000UL
-#define UVH_EVENT_OCCURRED0_IPI_INT_SHFT 45
-#define UVH_EVENT_OCCURRED0_IPI_INT_MASK 0x0000200000000000UL
-#define UVH_EVENT_OCCURRED0_EXTIO_INT0_SHFT 46
-#define UVH_EVENT_OCCURRED0_EXTIO_INT0_MASK 0x0000400000000000UL
-#define UVH_EVENT_OCCURRED0_EXTIO_INT1_SHFT 47
-#define UVH_EVENT_OCCURRED0_EXTIO_INT1_MASK 0x0000800000000000UL
-#define UVH_EVENT_OCCURRED0_EXTIO_INT2_SHFT 48
-#define UVH_EVENT_OCCURRED0_EXTIO_INT2_MASK 0x0001000000000000UL
-#define UVH_EVENT_OCCURRED0_EXTIO_INT3_SHFT 49
-#define UVH_EVENT_OCCURRED0_EXTIO_INT3_MASK 0x0002000000000000UL
-#define UVH_EVENT_OCCURRED0_PROFILE_INT_SHFT 50
-#define UVH_EVENT_OCCURRED0_PROFILE_INT_MASK 0x0004000000000000UL
-#define UVH_EVENT_OCCURRED0_RTC0_SHFT 51
-#define UVH_EVENT_OCCURRED0_RTC0_MASK 0x0008000000000000UL
-#define UVH_EVENT_OCCURRED0_RTC1_SHFT 52
-#define UVH_EVENT_OCCURRED0_RTC1_MASK 0x0010000000000000UL
-#define UVH_EVENT_OCCURRED0_RTC2_SHFT 53
-#define UVH_EVENT_OCCURRED0_RTC2_MASK 0x0020000000000000UL
-#define UVH_EVENT_OCCURRED0_RTC3_SHFT 54
-#define UVH_EVENT_OCCURRED0_RTC3_MASK 0x0040000000000000UL
-#define UVH_EVENT_OCCURRED0_BAU_DATA_SHFT 55
-#define UVH_EVENT_OCCURRED0_BAU_DATA_MASK 0x0080000000000000UL
-#define UVH_EVENT_OCCURRED0_POWER_MANAGEMENT_REQ_SHFT 56
-#define UVH_EVENT_OCCURRED0_POWER_MANAGEMENT_REQ_MASK 0x0100000000000000UL
+#define UVH_EVENT_OCCURRED0_32 0x5e8
+
+#define UV1H_EVENT_OCCURRED0_LB_HCERR_SHFT 0
+#define UV1H_EVENT_OCCURRED0_LB_HCERR_MASK 0x0000000000000001UL
+#define UV1H_EVENT_OCCURRED0_GR0_HCERR_SHFT 1
+#define UV1H_EVENT_OCCURRED0_GR0_HCERR_MASK 0x0000000000000002UL
+#define UV1H_EVENT_OCCURRED0_GR1_HCERR_SHFT 2
+#define UV1H_EVENT_OCCURRED0_GR1_HCERR_MASK 0x0000000000000004UL
+#define UV1H_EVENT_OCCURRED0_LH_HCERR_SHFT 3
+#define UV1H_EVENT_OCCURRED0_LH_HCERR_MASK 0x0000000000000008UL
+#define UV1H_EVENT_OCCURRED0_RH_HCERR_SHFT 4
+#define UV1H_EVENT_OCCURRED0_RH_HCERR_MASK 0x0000000000000010UL
+#define UV1H_EVENT_OCCURRED0_XN_HCERR_SHFT 5
+#define UV1H_EVENT_OCCURRED0_XN_HCERR_MASK 0x0000000000000020UL
+#define UV1H_EVENT_OCCURRED0_SI_HCERR_SHFT 6
+#define UV1H_EVENT_OCCURRED0_SI_HCERR_MASK 0x0000000000000040UL
+#define UV1H_EVENT_OCCURRED0_LB_AOERR0_SHFT 7
+#define UV1H_EVENT_OCCURRED0_LB_AOERR0_MASK 0x0000000000000080UL
+#define UV1H_EVENT_OCCURRED0_GR0_AOERR0_SHFT 8
+#define UV1H_EVENT_OCCURRED0_GR0_AOERR0_MASK 0x0000000000000100UL
+#define UV1H_EVENT_OCCURRED0_GR1_AOERR0_SHFT 9
+#define UV1H_EVENT_OCCURRED0_GR1_AOERR0_MASK 0x0000000000000200UL
+#define UV1H_EVENT_OCCURRED0_LH_AOERR0_SHFT 10
+#define UV1H_EVENT_OCCURRED0_LH_AOERR0_MASK 0x0000000000000400UL
+#define UV1H_EVENT_OCCURRED0_RH_AOERR0_SHFT 11
+#define UV1H_EVENT_OCCURRED0_RH_AOERR0_MASK 0x0000000000000800UL
+#define UV1H_EVENT_OCCURRED0_XN_AOERR0_SHFT 12
+#define UV1H_EVENT_OCCURRED0_XN_AOERR0_MASK 0x0000000000001000UL
+#define UV1H_EVENT_OCCURRED0_SI_AOERR0_SHFT 13
+#define UV1H_EVENT_OCCURRED0_SI_AOERR0_MASK 0x0000000000002000UL
+#define UV1H_EVENT_OCCURRED0_LB_AOERR1_SHFT 14
+#define UV1H_EVENT_OCCURRED0_LB_AOERR1_MASK 0x0000000000004000UL
+#define UV1H_EVENT_OCCURRED0_GR0_AOERR1_SHFT 15
+#define UV1H_EVENT_OCCURRED0_GR0_AOERR1_MASK 0x0000000000008000UL
+#define UV1H_EVENT_OCCURRED0_GR1_AOERR1_SHFT 16
+#define UV1H_EVENT_OCCURRED0_GR1_AOERR1_MASK 0x0000000000010000UL
+#define UV1H_EVENT_OCCURRED0_LH_AOERR1_SHFT 17
+#define UV1H_EVENT_OCCURRED0_LH_AOERR1_MASK 0x0000000000020000UL
+#define UV1H_EVENT_OCCURRED0_RH_AOERR1_SHFT 18
+#define UV1H_EVENT_OCCURRED0_RH_AOERR1_MASK 0x0000000000040000UL
+#define UV1H_EVENT_OCCURRED0_XN_AOERR1_SHFT 19
+#define UV1H_EVENT_OCCURRED0_XN_AOERR1_MASK 0x0000000000080000UL
+#define UV1H_EVENT_OCCURRED0_SI_AOERR1_SHFT 20
+#define UV1H_EVENT_OCCURRED0_SI_AOERR1_MASK 0x0000000000100000UL
+#define UV1H_EVENT_OCCURRED0_RH_VPI_INT_SHFT 21
+#define UV1H_EVENT_OCCURRED0_RH_VPI_INT_MASK 0x0000000000200000UL
+#define UV1H_EVENT_OCCURRED0_SYSTEM_SHUTDOWN_INT_SHFT 22
+#define UV1H_EVENT_OCCURRED0_SYSTEM_SHUTDOWN_INT_MASK 0x0000000000400000UL
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_0_SHFT 23
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_0_MASK 0x0000000000800000UL
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_1_SHFT 24
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_1_MASK 0x0000000001000000UL
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_2_SHFT 25
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_2_MASK 0x0000000002000000UL
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_3_SHFT 26
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_3_MASK 0x0000000004000000UL
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_4_SHFT 27
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_4_MASK 0x0000000008000000UL
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_5_SHFT 28
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_5_MASK 0x0000000010000000UL
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_6_SHFT 29
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_6_MASK 0x0000000020000000UL
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_7_SHFT 30
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_7_MASK 0x0000000040000000UL
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_8_SHFT 31
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_8_MASK 0x0000000080000000UL
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_9_SHFT 32
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_9_MASK 0x0000000100000000UL
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_10_SHFT 33
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_10_MASK 0x0000000200000000UL
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_11_SHFT 34
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_11_MASK 0x0000000400000000UL
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_12_SHFT 35
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_12_MASK 0x0000000800000000UL
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_13_SHFT 36
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_13_MASK 0x0000001000000000UL
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_14_SHFT 37
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_14_MASK 0x0000002000000000UL
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_15_SHFT 38
+#define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_15_MASK 0x0000004000000000UL
+#define UV1H_EVENT_OCCURRED0_L1_NMI_INT_SHFT 39
+#define UV1H_EVENT_OCCURRED0_L1_NMI_INT_MASK 0x0000008000000000UL
+#define UV1H_EVENT_OCCURRED0_STOP_CLOCK_SHFT 40
+#define UV1H_EVENT_OCCURRED0_STOP_CLOCK_MASK 0x0000010000000000UL
+#define UV1H_EVENT_OCCURRED0_ASIC_TO_L1_SHFT 41
+#define UV1H_EVENT_OCCURRED0_ASIC_TO_L1_MASK 0x0000020000000000UL
+#define UV1H_EVENT_OCCURRED0_L1_TO_ASIC_SHFT 42
+#define UV1H_EVENT_OCCURRED0_L1_TO_ASIC_MASK 0x0000040000000000UL
+#define UV1H_EVENT_OCCURRED0_LTC_INT_SHFT 43
+#define UV1H_EVENT_OCCURRED0_LTC_INT_MASK 0x0000080000000000UL
+#define UV1H_EVENT_OCCURRED0_LA_SEQ_TRIGGER_SHFT 44
+#define UV1H_EVENT_OCCURRED0_LA_SEQ_TRIGGER_MASK 0x0000100000000000UL
+#define UV1H_EVENT_OCCURRED0_IPI_INT_SHFT 45
+#define UV1H_EVENT_OCCURRED0_IPI_INT_MASK 0x0000200000000000UL
+#define UV1H_EVENT_OCCURRED0_EXTIO_INT0_SHFT 46
+#define UV1H_EVENT_OCCURRED0_EXTIO_INT0_MASK 0x0000400000000000UL
+#define UV1H_EVENT_OCCURRED0_EXTIO_INT1_SHFT 47
+#define UV1H_EVENT_OCCURRED0_EXTIO_INT1_MASK 0x0000800000000000UL
+#define UV1H_EVENT_OCCURRED0_EXTIO_INT2_SHFT 48
+#define UV1H_EVENT_OCCURRED0_EXTIO_INT2_MASK 0x0001000000000000UL
+#define UV1H_EVENT_OCCURRED0_EXTIO_INT3_SHFT 49
+#define UV1H_EVENT_OCCURRED0_EXTIO_INT3_MASK 0x0002000000000000UL
+#define UV1H_EVENT_OCCURRED0_PROFILE_INT_SHFT 50
+#define UV1H_EVENT_OCCURRED0_PROFILE_INT_MASK 0x0004000000000000UL
+#define UV1H_EVENT_OCCURRED0_RTC0_SHFT 51
+#define UV1H_EVENT_OCCURRED0_RTC0_MASK 0x0008000000000000UL
+#define UV1H_EVENT_OCCURRED0_RTC1_SHFT 52
+#define UV1H_EVENT_OCCURRED0_RTC1_MASK 0x0010000000000000UL
+#define UV1H_EVENT_OCCURRED0_RTC2_SHFT 53
+#define UV1H_EVENT_OCCURRED0_RTC2_MASK 0x0020000000000000UL
+#define UV1H_EVENT_OCCURRED0_RTC3_SHFT 54
+#define UV1H_EVENT_OCCURRED0_RTC3_MASK 0x0040000000000000UL
+#define UV1H_EVENT_OCCURRED0_BAU_DATA_SHFT 55
+#define UV1H_EVENT_OCCURRED0_BAU_DATA_MASK 0x0080000000000000UL
+#define UV1H_EVENT_OCCURRED0_POWER_MANAGEMENT_REQ_SHFT 56
+#define UV1H_EVENT_OCCURRED0_POWER_MANAGEMENT_REQ_MASK 0x0100000000000000UL
+
+#define UV2H_EVENT_OCCURRED0_LB_HCERR_SHFT 0
+#define UV2H_EVENT_OCCURRED0_LB_HCERR_MASK 0x0000000000000001UL
+#define UV2H_EVENT_OCCURRED0_QP_HCERR_SHFT 1
+#define UV2H_EVENT_OCCURRED0_QP_HCERR_MASK 0x0000000000000002UL
+#define UV2H_EVENT_OCCURRED0_RH_HCERR_SHFT 2
+#define UV2H_EVENT_OCCURRED0_RH_HCERR_MASK 0x0000000000000004UL
+#define UV2H_EVENT_OCCURRED0_LH0_HCERR_SHFT 3
+#define UV2H_EVENT_OCCURRED0_LH0_HCERR_MASK 0x0000000000000008UL
+#define UV2H_EVENT_OCCURRED0_LH1_HCERR_SHFT 4
+#define UV2H_EVENT_OCCURRED0_LH1_HCERR_MASK 0x0000000000000010UL
+#define UV2H_EVENT_OCCURRED0_GR0_HCERR_SHFT 5
+#define UV2H_EVENT_OCCURRED0_GR0_HCERR_MASK 0x0000000000000020UL
+#define UV2H_EVENT_OCCURRED0_GR1_HCERR_SHFT 6
+#define UV2H_EVENT_OCCURRED0_GR1_HCERR_MASK 0x0000000000000040UL
+#define UV2H_EVENT_OCCURRED0_NI0_HCERR_SHFT 7
+#define UV2H_EVENT_OCCURRED0_NI0_HCERR_MASK 0x0000000000000080UL
+#define UV2H_EVENT_OCCURRED0_NI1_HCERR_SHFT 8
+#define UV2H_EVENT_OCCURRED0_NI1_HCERR_MASK 0x0000000000000100UL
+#define UV2H_EVENT_OCCURRED0_LB_AOERR0_SHFT 9
+#define UV2H_EVENT_OCCURRED0_LB_AOERR0_MASK 0x0000000000000200UL
+#define UV2H_EVENT_OCCURRED0_QP_AOERR0_SHFT 10
+#define UV2H_EVENT_OCCURRED0_QP_AOERR0_MASK 0x0000000000000400UL
+#define UV2H_EVENT_OCCURRED0_RH_AOERR0_SHFT 11
+#define UV2H_EVENT_OCCURRED0_RH_AOERR0_MASK 0x0000000000000800UL
+#define UV2H_EVENT_OCCURRED0_LH0_AOERR0_SHFT 12
+#define UV2H_EVENT_OCCURRED0_LH0_AOERR0_MASK 0x0000000000001000UL
+#define UV2H_EVENT_OCCURRED0_LH1_AOERR0_SHFT 13
+#define UV2H_EVENT_OCCURRED0_LH1_AOERR0_MASK 0x0000000000002000UL
+#define UV2H_EVENT_OCCURRED0_GR0_AOERR0_SHFT 14
+#define UV2H_EVENT_OCCURRED0_GR0_AOERR0_MASK 0x0000000000004000UL
+#define UV2H_EVENT_OCCURRED0_GR1_AOERR0_SHFT 15
+#define UV2H_EVENT_OCCURRED0_GR1_AOERR0_MASK 0x0000000000008000UL
+#define UV2H_EVENT_OCCURRED0_XB_AOERR0_SHFT 16
+#define UV2H_EVENT_OCCURRED0_XB_AOERR0_MASK 0x0000000000010000UL
+#define UV2H_EVENT_OCCURRED0_RT_AOERR0_SHFT 17
+#define UV2H_EVENT_OCCURRED0_RT_AOERR0_MASK 0x0000000000020000UL
+#define UV2H_EVENT_OCCURRED0_NI0_AOERR0_SHFT 18
+#define UV2H_EVENT_OCCURRED0_NI0_AOERR0_MASK 0x0000000000040000UL
+#define UV2H_EVENT_OCCURRED0_NI1_AOERR0_SHFT 19
+#define UV2H_EVENT_OCCURRED0_NI1_AOERR0_MASK 0x0000000000080000UL
+#define UV2H_EVENT_OCCURRED0_LB_AOERR1_SHFT 20
+#define UV2H_EVENT_OCCURRED0_LB_AOERR1_MASK 0x0000000000100000UL
+#define UV2H_EVENT_OCCURRED0_QP_AOERR1_SHFT 21
+#define UV2H_EVENT_OCCURRED0_QP_AOERR1_MASK 0x0000000000200000UL
+#define UV2H_EVENT_OCCURRED0_RH_AOERR1_SHFT 22
+#define UV2H_EVENT_OCCURRED0_RH_AOERR1_MASK 0x0000000000400000UL
+#define UV2H_EVENT_OCCURRED0_LH0_AOERR1_SHFT 23
+#define UV2H_EVENT_OCCURRED0_LH0_AOERR1_MASK 0x0000000000800000UL
+#define UV2H_EVENT_OCCURRED0_LH1_AOERR1_SHFT 24
+#define UV2H_EVENT_OCCURRED0_LH1_AOERR1_MASK 0x0000000001000000UL
+#define UV2H_EVENT_OCCURRED0_GR0_AOERR1_SHFT 25
+#define UV2H_EVENT_OCCURRED0_GR0_AOERR1_MASK 0x0000000002000000UL
+#define UV2H_EVENT_OCCURRED0_GR1_AOERR1_SHFT 26
+#define UV2H_EVENT_OCCURRED0_GR1_AOERR1_MASK 0x0000000004000000UL
+#define UV2H_EVENT_OCCURRED0_XB_AOERR1_SHFT 27
+#define UV2H_EVENT_OCCURRED0_XB_AOERR1_MASK 0x0000000008000000UL
+#define UV2H_EVENT_OCCURRED0_RT_AOERR1_SHFT 28
+#define UV2H_EVENT_OCCURRED0_RT_AOERR1_MASK 0x0000000010000000UL
+#define UV2H_EVENT_OCCURRED0_NI0_AOERR1_SHFT 29
+#define UV2H_EVENT_OCCURRED0_NI0_AOERR1_MASK 0x0000000020000000UL
+#define UV2H_EVENT_OCCURRED0_NI1_AOERR1_SHFT 30
+#define UV2H_EVENT_OCCURRED0_NI1_AOERR1_MASK 0x0000000040000000UL
+#define UV2H_EVENT_OCCURRED0_SYSTEM_SHUTDOWN_INT_SHFT 31
+#define UV2H_EVENT_OCCURRED0_SYSTEM_SHUTDOWN_INT_MASK 0x0000000080000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_0_SHFT 32
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_0_MASK 0x0000000100000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_1_SHFT 33
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_1_MASK 0x0000000200000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_2_SHFT 34
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_2_MASK 0x0000000400000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_3_SHFT 35
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_3_MASK 0x0000000800000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_4_SHFT 36
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_4_MASK 0x0000001000000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_5_SHFT 37
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_5_MASK 0x0000002000000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_6_SHFT 38
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_6_MASK 0x0000004000000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_7_SHFT 39
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_7_MASK 0x0000008000000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_8_SHFT 40
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_8_MASK 0x0000010000000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_9_SHFT 41
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_9_MASK 0x0000020000000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_10_SHFT 42
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_10_MASK 0x0000040000000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_11_SHFT 43
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_11_MASK 0x0000080000000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_12_SHFT 44
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_12_MASK 0x0000100000000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_13_SHFT 45
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_13_MASK 0x0000200000000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_14_SHFT 46
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_14_MASK 0x0000400000000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_15_SHFT 47
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_15_MASK 0x0000800000000000UL
+#define UV2H_EVENT_OCCURRED0_L1_NMI_INT_SHFT 48
+#define UV2H_EVENT_OCCURRED0_L1_NMI_INT_MASK 0x0001000000000000UL
+#define UV2H_EVENT_OCCURRED0_STOP_CLOCK_SHFT 49
+#define UV2H_EVENT_OCCURRED0_STOP_CLOCK_MASK 0x0002000000000000UL
+#define UV2H_EVENT_OCCURRED0_ASIC_TO_L1_SHFT 50
+#define UV2H_EVENT_OCCURRED0_ASIC_TO_L1_MASK 0x0004000000000000UL
+#define UV2H_EVENT_OCCURRED0_L1_TO_ASIC_SHFT 51
+#define UV2H_EVENT_OCCURRED0_L1_TO_ASIC_MASK 0x0008000000000000UL
+#define UV2H_EVENT_OCCURRED0_LA_SEQ_TRIGGER_SHFT 52
+#define UV2H_EVENT_OCCURRED0_LA_SEQ_TRIGGER_MASK 0x0010000000000000UL
+#define UV2H_EVENT_OCCURRED0_IPI_INT_SHFT 53
+#define UV2H_EVENT_OCCURRED0_IPI_INT_MASK 0x0020000000000000UL
+#define UV2H_EVENT_OCCURRED0_EXTIO_INT0_SHFT 54
+#define UV2H_EVENT_OCCURRED0_EXTIO_INT0_MASK 0x0040000000000000UL
+#define UV2H_EVENT_OCCURRED0_EXTIO_INT1_SHFT 55
+#define UV2H_EVENT_OCCURRED0_EXTIO_INT1_MASK 0x0080000000000000UL
+#define UV2H_EVENT_OCCURRED0_EXTIO_INT2_SHFT 56
+#define UV2H_EVENT_OCCURRED0_EXTIO_INT2_MASK 0x0100000000000000UL
+#define UV2H_EVENT_OCCURRED0_EXTIO_INT3_SHFT 57
+#define UV2H_EVENT_OCCURRED0_EXTIO_INT3_MASK 0x0200000000000000UL
+#define UV2H_EVENT_OCCURRED0_PROFILE_INT_SHFT 58
+#define UV2H_EVENT_OCCURRED0_PROFILE_INT_MASK 0x0400000000000000UL
+
 union uvh_event_occurred0_u {
     unsigned long       v;
-    struct uvh_event_occurred0_s {
+    struct uv1h_event_occurred0_s {
         unsigned long   lb_hcerr             :  1;  /* RW, W1C */
         unsigned long   gr0_hcerr            :  1;  /* RW, W1C */
         unsigned long   gr1_hcerr            :  1;  /* RW, W1C */
@@ -250,14 +421,76 @@ union uvh_event_occurred0_u {
         unsigned long   bau_data             :  1;  /* RW, W1C */
         unsigned long   power_management_req :  1;  /* RW, W1C */
         unsigned long   rsvd_57_63           :  7;  /*    */
-    } s;
+    } s1;
+    struct uv2h_event_occurred0_s {
+        unsigned long   lb_hcerr            :  1;  /* RW */
+        unsigned long   qp_hcerr            :  1;  /* RW */
+        unsigned long   rh_hcerr            :  1;  /* RW */
+        unsigned long   lh0_hcerr           :  1;  /* RW */
+        unsigned long   lh1_hcerr           :  1;  /* RW */
+        unsigned long   gr0_hcerr           :  1;  /* RW */
+        unsigned long   gr1_hcerr           :  1;  /* RW */
+        unsigned long   ni0_hcerr           :  1;  /* RW */
+        unsigned long   ni1_hcerr           :  1;  /* RW */
+        unsigned long   lb_aoerr0           :  1;  /* RW */
+        unsigned long   qp_aoerr0           :  1;  /* RW */
+        unsigned long   rh_aoerr0           :  1;  /* RW */
+        unsigned long   lh0_aoerr0          :  1;  /* RW */
+        unsigned long   lh1_aoerr0          :  1;  /* RW */
+        unsigned long   gr0_aoerr0          :  1;  /* RW */
+        unsigned long   gr1_aoerr0          :  1;  /* RW */
+        unsigned long   xb_aoerr0           :  1;  /* RW */
+        unsigned long   rt_aoerr0           :  1;  /* RW */
+        unsigned long   ni0_aoerr0          :  1;  /* RW */
+        unsigned long   ni1_aoerr0          :  1;  /* RW */
+        unsigned long   lb_aoerr1           :  1;  /* RW */
+        unsigned long   qp_aoerr1           :  1;  /* RW */
+        unsigned long   rh_aoerr1           :  1;  /* RW */
+        unsigned long   lh0_aoerr1          :  1;  /* RW */
+        unsigned long   lh1_aoerr1          :  1;  /* RW */
+        unsigned long   gr0_aoerr1          :  1;  /* RW */
+        unsigned long   gr1_aoerr1          :  1;  /* RW */
+        unsigned long   xb_aoerr1           :  1;  /* RW */
+        unsigned long   rt_aoerr1           :  1;  /* RW */
+        unsigned long   ni0_aoerr1          :  1;  /* RW */
+        unsigned long   ni1_aoerr1          :  1;  /* RW */
+        unsigned long   system_shutdown_int :  1;  /* RW */
+        unsigned long   lb_irq_int_0        :  1;  /* RW */
+        unsigned long   lb_irq_int_1        :  1;  /* RW */
+        unsigned long   lb_irq_int_2        :  1;  /* RW */
+        unsigned long   lb_irq_int_3        :  1;  /* RW */
+        unsigned long   lb_irq_int_4        :  1;  /* RW */
+        unsigned long   lb_irq_int_5        :  1;  /* RW */
+        unsigned long   lb_irq_int_6        :  1;  /* RW */
+        unsigned long   lb_irq_int_7        :  1;  /* RW */
+        unsigned long   lb_irq_int_8        :  1;  /* RW */
+        unsigned long   lb_irq_int_9        :  1;  /* RW */
+        unsigned long   lb_irq_int_10       :  1;  /* RW */
+        unsigned long   lb_irq_int_11       :  1;  /* RW */
+        unsigned long   lb_irq_int_12       :  1;  /* RW */
+        unsigned long   lb_irq_int_13       :  1;  /* RW */
+        unsigned long   lb_irq_int_14       :  1;  /* RW */
+        unsigned long   lb_irq_int_15       :  1;  /* RW */
+        unsigned long   l1_nmi_int          :  1;  /* RW */
+        unsigned long   stop_clock          :  1;  /* RW */
+        unsigned long   asic_to_l1          :  1;  /* RW */
+        unsigned long   l1_to_asic          :  1;  /* RW */
+        unsigned long   la_seq_trigger      :  1;  /* RW */
+        unsigned long   ipi_int             :  1;  /* RW */
+        unsigned long   extio_int0          :  1;  /* RW */
+        unsigned long   extio_int1          :  1;  /* RW */
+        unsigned long   extio_int2          :  1;  /* RW */
+        unsigned long   extio_int3          :  1;  /* RW */
+        unsigned long   profile_int         :  1;  /* RW */
+        unsigned long   rsvd_59_63          :  5;  /*    */
+    } s2;
 };
 
 /* ========================================================================= */
 /*                        UVH_EVENT_OCCURRED0_ALIAS                          */
 /* ========================================================================= */
 #define UVH_EVENT_OCCURRED0_ALIAS 0x0000000000070008UL
-#define UVH_EVENT_OCCURRED0_ALIAS_32 0x005f0
+#define UVH_EVENT_OCCURRED0_ALIAS_32 0x5f0
 
 /* ========================================================================= */
 /*                         UVH_GR0_TLB_INT0_CONFIG                           */
@@ -432,8 +665,16 @@ union uvh_int_cmpb_u {
 /* ========================================================================= */
 #define UVH_INT_CMPC 0x22100UL
 
-#define UVH_INT_CMPC_REAL_TIME_CMPC_SHFT 0
-#define UVH_INT_CMPC_REAL_TIME_CMPC_MASK 0x00ffffffffffffffUL
+#define UV1H_INT_CMPC_REAL_TIME_CMPC_SHFT       0
+#define UV2H_INT_CMPC_REAL_TIME_CMPC_SHFT       0
+#define UVH_INT_CMPC_REAL_TIME_CMPC_SHFT        (is_uv1_hub() ?         \
+                        UV1H_INT_CMPC_REAL_TIME_CMPC_SHFT :     \
+                        UV2H_INT_CMPC_REAL_TIME_CMPC_SHFT)
+#define UV1H_INT_CMPC_REAL_TIME_CMPC_MASK       0xffffffffffffffUL
+#define UV2H_INT_CMPC_REAL_TIME_CMPC_MASK       0xffffffffffffffUL
+#define UVH_INT_CMPC_REAL_TIME_CMPC_MASK        (is_uv1_hub() ?         \
+                        UV1H_INT_CMPC_REAL_TIME_CMPC_MASK :     \
+                        UV2H_INT_CMPC_REAL_TIME_CMPC_MASK)
 
 union uvh_int_cmpc_u {
     unsigned long       v;
@@ -448,8 +689,16 @@ union uvh_int_cmpc_u {
 /* ========================================================================= */
 #define UVH_INT_CMPD 0x22180UL
 
-#define UVH_INT_CMPD_REAL_TIME_CMPD_SHFT 0
-#define UVH_INT_CMPD_REAL_TIME_CMPD_MASK 0x00ffffffffffffffUL
+#define UV1H_INT_CMPD_REAL_TIME_CMPD_SHFT       0
+#define UV2H_INT_CMPD_REAL_TIME_CMPD_SHFT       0
+#define UVH_INT_CMPD_REAL_TIME_CMPD_SHFT        (is_uv1_hub() ?         \
+                        UV1H_INT_CMPD_REAL_TIME_CMPD_SHFT :     \
+                        UV2H_INT_CMPD_REAL_TIME_CMPD_SHFT)
+#define UV1H_INT_CMPD_REAL_TIME_CMPD_MASK       0xffffffffffffffUL
+#define UV2H_INT_CMPD_REAL_TIME_CMPD_MASK       0xffffffffffffffUL
+#define UVH_INT_CMPD_REAL_TIME_CMPD_MASK        (is_uv1_hub() ?         \
+                        UV1H_INT_CMPD_REAL_TIME_CMPD_MASK :     \
+                        UV2H_INT_CMPD_REAL_TIME_CMPD_MASK)
 
 union uvh_int_cmpd_u {
     unsigned long       v;
@@ -463,7 +712,7 @@ union uvh_int_cmpd_u {
 /*                               UVH_IPI_INT                                 */
 /* ========================================================================= */
 #define UVH_IPI_INT 0x60500UL
-#define UVH_IPI_INT_32 0x0348
+#define UVH_IPI_INT_32 0x348
 
 #define UVH_IPI_INT_VECTOR_SHFT 0
 #define UVH_IPI_INT_VECTOR_MASK 0x00000000000000ffUL
@@ -493,7 +742,7 @@ union uvh_ipi_int_u {
 /*                   UVH_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST                     */
 /* ========================================================================= */
 #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST 0x320050UL
-#define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST_32 0x009c0
+#define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST_32 0x9c0
 
 #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST_ADDRESS_SHFT 4
 #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST_ADDRESS_MASK 0x000007fffffffff0UL
@@ -515,7 +764,7 @@ union uvh_lb_bau_intd_payload_queue_first_u {
 /*                    UVH_LB_BAU_INTD_PAYLOAD_QUEUE_LAST                     */
 /* ========================================================================= */
 #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_LAST 0x320060UL
-#define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_LAST_32 0x009c8
+#define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_LAST_32 0x9c8
 
 #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_LAST_ADDRESS_SHFT 4
 #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_LAST_ADDRESS_MASK 0x000007fffffffff0UL
@@ -533,7 +782,7 @@ union uvh_lb_bau_intd_payload_queue_last_u {
 /*                    UVH_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL                     */
 /* ========================================================================= */
 #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL 0x320070UL
-#define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL_32 0x009d0
+#define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL_32 0x9d0
 
 #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL_ADDRESS_SHFT 4
 #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL_ADDRESS_MASK 0x000007fffffffff0UL
@@ -551,7 +800,7 @@ union uvh_lb_bau_intd_payload_queue_tail_u {
 /*                   UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE                    */
 /* ========================================================================= */
 #define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE 0x320080UL
-#define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_32 0x0a68
+#define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_32 0xa68
 
 #define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_0_SHFT 0
 #define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_0_MASK 0x0000000000000001UL
@@ -585,6 +834,7 @@ union uvh_lb_bau_intd_payload_queue_tail_u {
 #define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_6_MASK 0x0000000000004000UL
 #define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_7_SHFT 15
 #define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_7_MASK 0x0000000000008000UL
+
 union uvh_lb_bau_intd_software_acknowledge_u {
     unsigned long       v;
     struct uvh_lb_bau_intd_software_acknowledge_s {
@@ -612,13 +862,13 @@ union uvh_lb_bau_intd_software_acknowledge_u {
 /*                UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS                 */
 /* ========================================================================= */
 #define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS 0x0000000000320088UL
-#define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS_32 0x0a70
+#define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS_32 0xa70
 
 /* ========================================================================= */
 /*                         UVH_LB_BAU_MISC_CONTROL                           */
 /* ========================================================================= */
 #define UVH_LB_BAU_MISC_CONTROL 0x320170UL
-#define UVH_LB_BAU_MISC_CONTROL_32 0x00a10
+#define UVH_LB_BAU_MISC_CONTROL_32 0xa10
 
 #define UVH_LB_BAU_MISC_CONTROL_REJECTION_DELAY_SHFT 0
 #define UVH_LB_BAU_MISC_CONTROL_REJECTION_DELAY_MASK 0x00000000000000ffUL
@@ -628,8 +878,8 @@ union uvh_lb_bau_intd_software_acknowledge_u {
 #define UVH_LB_BAU_MISC_CONTROL_FORCE_BROADCAST_MASK 0x0000000000000200UL
 #define UVH_LB_BAU_MISC_CONTROL_FORCE_LOCK_NOP_SHFT 10
 #define UVH_LB_BAU_MISC_CONTROL_FORCE_LOCK_NOP_MASK 0x0000000000000400UL
-#define UVH_LB_BAU_MISC_CONTROL_CSI_AGENT_PRESENCE_VECTOR_SHFT 11
-#define UVH_LB_BAU_MISC_CONTROL_CSI_AGENT_PRESENCE_VECTOR_MASK 0x0000000000003800UL
+#define UVH_LB_BAU_MISC_CONTROL_QPI_AGENT_PRESENCE_VECTOR_SHFT 11
+#define UVH_LB_BAU_MISC_CONTROL_QPI_AGENT_PRESENCE_VECTOR_MASK 0x0000000000003800UL
 #define UVH_LB_BAU_MISC_CONTROL_DESCRIPTOR_FETCH_MODE_SHFT 14
 #define UVH_LB_BAU_MISC_CONTROL_DESCRIPTOR_FETCH_MODE_MASK 0x0000000000004000UL
 #define UVH_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_SHFT 15
@@ -650,8 +900,86 @@ union uvh_lb_bau_intd_software_acknowledge_u {
 #define UVH_LB_BAU_MISC_CONTROL_USE_INCOMING_PRIORITY_MASK 0x0000000008000000UL
 #define UVH_LB_BAU_MISC_CONTROL_ENABLE_PROGRAMMED_INITIAL_PRIORITY_SHFT 28
 #define UVH_LB_BAU_MISC_CONTROL_ENABLE_PROGRAMMED_INITIAL_PRIORITY_MASK 0x0000000010000000UL
-#define UVH_LB_BAU_MISC_CONTROL_FUN_SHFT 48
-#define UVH_LB_BAU_MISC_CONTROL_FUN_MASK 0xffff000000000000UL
+
+#define UV1H_LB_BAU_MISC_CONTROL_REJECTION_DELAY_SHFT 0
+#define UV1H_LB_BAU_MISC_CONTROL_REJECTION_DELAY_MASK 0x00000000000000ffUL
+#define UV1H_LB_BAU_MISC_CONTROL_APIC_MODE_SHFT 8
+#define UV1H_LB_BAU_MISC_CONTROL_APIC_MODE_MASK 0x0000000000000100UL
+#define UV1H_LB_BAU_MISC_CONTROL_FORCE_BROADCAST_SHFT 9
+#define UV1H_LB_BAU_MISC_CONTROL_FORCE_BROADCAST_MASK 0x0000000000000200UL
+#define UV1H_LB_BAU_MISC_CONTROL_FORCE_LOCK_NOP_SHFT 10
+#define UV1H_LB_BAU_MISC_CONTROL_FORCE_LOCK_NOP_MASK 0x0000000000000400UL
+#define UV1H_LB_BAU_MISC_CONTROL_QPI_AGENT_PRESENCE_VECTOR_SHFT 11
+#define UV1H_LB_BAU_MISC_CONTROL_QPI_AGENT_PRESENCE_VECTOR_MASK 0x0000000000003800UL
+#define UV1H_LB_BAU_MISC_CONTROL_DESCRIPTOR_FETCH_MODE_SHFT 14
+#define UV1H_LB_BAU_MISC_CONTROL_DESCRIPTOR_FETCH_MODE_MASK 0x0000000000004000UL
+#define UV1H_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_SHFT 15
+#define UV1H_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_MASK 0x0000000000008000UL
+#define UV1H_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_SHFT 16
+#define UV1H_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_MASK 0x00000000000f0000UL
+#define UV1H_LB_BAU_MISC_CONTROL_ENABLE_DUAL_MAPPING_MODE_SHFT 20
+#define UV1H_LB_BAU_MISC_CONTROL_ENABLE_DUAL_MAPPING_MODE_MASK 0x0000000000100000UL
+#define UV1H_LB_BAU_MISC_CONTROL_VGA_IO_PORT_DECODE_ENABLE_SHFT 21
+#define UV1H_LB_BAU_MISC_CONTROL_VGA_IO_PORT_DECODE_ENABLE_MASK 0x0000000000200000UL
+#define UV1H_LB_BAU_MISC_CONTROL_VGA_IO_PORT_16_BIT_DECODE_SHFT 22
+#define UV1H_LB_BAU_MISC_CONTROL_VGA_IO_PORT_16_BIT_DECODE_MASK 0x0000000000400000UL
+#define UV1H_LB_BAU_MISC_CONTROL_SUPPRESS_DEST_REGISTRATION_SHFT 23
+#define UV1H_LB_BAU_MISC_CONTROL_SUPPRESS_DEST_REGISTRATION_MASK 0x0000000000800000UL
+#define UV1H_LB_BAU_MISC_CONTROL_PROGRAMMED_INITIAL_PRIORITY_SHFT 24
+#define UV1H_LB_BAU_MISC_CONTROL_PROGRAMMED_INITIAL_PRIORITY_MASK 0x0000000007000000UL
+#define UV1H_LB_BAU_MISC_CONTROL_USE_INCOMING_PRIORITY_SHFT 27
+#define UV1H_LB_BAU_MISC_CONTROL_USE_INCOMING_PRIORITY_MASK 0x0000000008000000UL
+#define UV1H_LB_BAU_MISC_CONTROL_ENABLE_PROGRAMMED_INITIAL_PRIORITY_SHFT 28
+#define UV1H_LB_BAU_MISC_CONTROL_ENABLE_PROGRAMMED_INITIAL_PRIORITY_MASK 0x0000000010000000UL
+#define UV1H_LB_BAU_MISC_CONTROL_FUN_SHFT 48
+#define UV1H_LB_BAU_MISC_CONTROL_FUN_MASK 0xffff000000000000UL
+
+#define UV2H_LB_BAU_MISC_CONTROL_REJECTION_DELAY_SHFT 0
+#define UV2H_LB_BAU_MISC_CONTROL_REJECTION_DELAY_MASK 0x00000000000000ffUL
+#define UV2H_LB_BAU_MISC_CONTROL_APIC_MODE_SHFT 8
+#define UV2H_LB_BAU_MISC_CONTROL_APIC_MODE_MASK 0x0000000000000100UL
+#define UV2H_LB_BAU_MISC_CONTROL_FORCE_BROADCAST_SHFT 9
+#define UV2H_LB_BAU_MISC_CONTROL_FORCE_BROADCAST_MASK 0x0000000000000200UL
+#define UV2H_LB_BAU_MISC_CONTROL_FORCE_LOCK_NOP_SHFT 10
+#define UV2H_LB_BAU_MISC_CONTROL_FORCE_LOCK_NOP_MASK 0x0000000000000400UL
+#define UV2H_LB_BAU_MISC_CONTROL_QPI_AGENT_PRESENCE_VECTOR_SHFT 11
+#define UV2H_LB_BAU_MISC_CONTROL_QPI_AGENT_PRESENCE_VECTOR_MASK 0x0000000000003800UL
+#define UV2H_LB_BAU_MISC_CONTROL_DESCRIPTOR_FETCH_MODE_SHFT 14
+#define UV2H_LB_BAU_MISC_CONTROL_DESCRIPTOR_FETCH_MODE_MASK 0x0000000000004000UL
+#define UV2H_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_SHFT 15
+#define UV2H_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_MASK 0x0000000000008000UL
+#define UV2H_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_SHFT 16
+#define UV2H_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_MASK 0x00000000000f0000UL
+#define UV2H_LB_BAU_MISC_CONTROL_ENABLE_DUAL_MAPPING_MODE_SHFT 20
+#define UV2H_LB_BAU_MISC_CONTROL_ENABLE_DUAL_MAPPING_MODE_MASK 0x0000000000100000UL
+#define UV2H_LB_BAU_MISC_CONTROL_VGA_IO_PORT_DECODE_ENABLE_SHFT 21
+#define UV2H_LB_BAU_MISC_CONTROL_VGA_IO_PORT_DECODE_ENABLE_MASK 0x0000000000200000UL
+#define UV2H_LB_BAU_MISC_CONTROL_VGA_IO_PORT_16_BIT_DECODE_SHFT 22
+#define UV2H_LB_BAU_MISC_CONTROL_VGA_IO_PORT_16_BIT_DECODE_MASK 0x0000000000400000UL
+#define UV2H_LB_BAU_MISC_CONTROL_SUPPRESS_DEST_REGISTRATION_SHFT 23
+#define UV2H_LB_BAU_MISC_CONTROL_SUPPRESS_DEST_REGISTRATION_MASK 0x0000000000800000UL
+#define UV2H_LB_BAU_MISC_CONTROL_PROGRAMMED_INITIAL_PRIORITY_SHFT 24
+#define UV2H_LB_BAU_MISC_CONTROL_PROGRAMMED_INITIAL_PRIORITY_MASK 0x0000000007000000UL
+#define UV2H_LB_BAU_MISC_CONTROL_USE_INCOMING_PRIORITY_SHFT 27
+#define UV2H_LB_BAU_MISC_CONTROL_USE_INCOMING_PRIORITY_MASK 0x0000000008000000UL
+#define UV2H_LB_BAU_MISC_CONTROL_ENABLE_PROGRAMMED_INITIAL_PRIORITY_SHFT 28
+#define UV2H_LB_BAU_MISC_CONTROL_ENABLE_PROGRAMMED_INITIAL_PRIORITY_MASK 0x0000000010000000UL
+#define UV2H_LB_BAU_MISC_CONTROL_ENABLE_AUTOMATIC_APIC_MODE_SELECTION_SHFT 29
+#define UV2H_LB_BAU_MISC_CONTROL_ENABLE_AUTOMATIC_APIC_MODE_SELECTION_MASK 0x0000000020000000UL
+#define UV2H_LB_BAU_MISC_CONTROL_APIC_MODE_STATUS_SHFT 30
+#define UV2H_LB_BAU_MISC_CONTROL_APIC_MODE_STATUS_MASK 0x0000000040000000UL
+#define UV2H_LB_BAU_MISC_CONTROL_SUPPRESS_INTERRUPTS_TO_SELF_SHFT 31
+#define UV2H_LB_BAU_MISC_CONTROL_SUPPRESS_INTERRUPTS_TO_SELF_MASK 0x0000000080000000UL
+#define UV2H_LB_BAU_MISC_CONTROL_ENABLE_LOCK_BASED_SYSTEM_FLUSH_SHFT 32
+#define UV2H_LB_BAU_MISC_CONTROL_ENABLE_LOCK_BASED_SYSTEM_FLUSH_MASK 0x0000000100000000UL
+#define UV2H_LB_BAU_MISC_CONTROL_ENABLE_EXTENDED_SB_STATUS_SHFT 33
+#define UV2H_LB_BAU_MISC_CONTROL_ENABLE_EXTENDED_SB_STATUS_MASK 0x0000000200000000UL
+#define UV2H_LB_BAU_MISC_CONTROL_SUPPRESS_INT_PRIO_UDT_TO_SELF_SHFT 34
+#define UV2H_LB_BAU_MISC_CONTROL_SUPPRESS_INT_PRIO_UDT_TO_SELF_MASK 0x0000000400000000UL
+#define UV2H_LB_BAU_MISC_CONTROL_USE_LEGACY_DESCRIPTOR_FORMATS_SHFT 35
+#define UV2H_LB_BAU_MISC_CONTROL_USE_LEGACY_DESCRIPTOR_FORMATS_MASK 0x0000000800000000UL
+#define UV2H_LB_BAU_MISC_CONTROL_FUN_SHFT 48
+#define UV2H_LB_BAU_MISC_CONTROL_FUN_MASK 0xffff000000000000UL
 
 union uvh_lb_bau_misc_control_u {
     unsigned long       v;
@@ -660,7 +988,25 @@ union uvh_lb_bau_misc_control_u {
         unsigned long   apic_mode                          :  1;  /* RW */
         unsigned long   force_broadcast                    :  1;  /* RW */
         unsigned long   force_lock_nop                     :  1;  /* RW */
-        unsigned long   csi_agent_presence_vector          :  3;  /* RW */
+        unsigned long   qpi_agent_presence_vector          :  3;  /* RW */
+        unsigned long   descriptor_fetch_mode              :  1;  /* RW */
+        unsigned long   enable_intd_soft_ack_mode          :  1;  /* RW */
+        unsigned long   intd_soft_ack_timeout_period       :  4;  /* RW */
+        unsigned long   enable_dual_mapping_mode           :  1;  /* RW */
+        unsigned long   vga_io_port_decode_enable          :  1;  /* RW */
+        unsigned long   vga_io_port_16_bit_decode          :  1;  /* RW */
+        unsigned long   suppress_dest_registration         :  1;  /* RW */
+        unsigned long   programmed_initial_priority        :  3;  /* RW */
+        unsigned long   use_incoming_priority              :  1;  /* RW */
+        unsigned long   enable_programmed_initial_priority :  1;  /* RW */
+        unsigned long   rsvd_29_63    : 35;
+    } s;
+    struct uv1h_lb_bau_misc_control_s {
+        unsigned long   rejection_delay                    :  8;  /* RW */
+        unsigned long   apic_mode                          :  1;  /* RW */
+        unsigned long   force_broadcast                    :  1;  /* RW */
+        unsigned long   force_lock_nop                     :  1;  /* RW */
+        unsigned long   qpi_agent_presence_vector          :  3;  /* RW */
         unsigned long   descriptor_fetch_mode              :  1;  /* RW */
         unsigned long   enable_intd_soft_ack_mode          :  1;  /* RW */
         unsigned long   intd_soft_ack_timeout_period       :  4;  /* RW */
@@ -673,14 +1019,40 @@ union uvh_lb_bau_misc_control_u {
         unsigned long   enable_programmed_initial_priority :  1;  /* RW */
         unsigned long   rsvd_29_47                         : 19;  /*    */
         unsigned long   fun                                : 16;  /* RW */
-    } s;
+    } s1;
+    struct uv2h_lb_bau_misc_control_s {
+        unsigned long   rejection_delay                      :  8;  /* RW */
+        unsigned long   apic_mode                            :  1;  /* RW */
+        unsigned long   force_broadcast                      :  1;  /* RW */
+        unsigned long   force_lock_nop                       :  1;  /* RW */
+        unsigned long   qpi_agent_presence_vector            :  3;  /* RW */
+        unsigned long   descriptor_fetch_mode                :  1;  /* RW */
+        unsigned long   enable_intd_soft_ack_mode            :  1;  /* RW */
+        unsigned long   intd_soft_ack_timeout_period         :  4;  /* RW */
+        unsigned long   enable_dual_mapping_mode             :  1;  /* RW */
+        unsigned long   vga_io_port_decode_enable            :  1;  /* RW */
+        unsigned long   vga_io_port_16_bit_decode            :  1;  /* RW */
+        unsigned long   suppress_dest_registration           :  1;  /* RW */
+        unsigned long   programmed_initial_priority          :  3;  /* RW */
+        unsigned long   use_incoming_priority                :  1;  /* RW */
+        unsigned long   enable_programmed_initial_priority   :  1;  /* RW */
+        unsigned long   enable_automatic_apic_mode_selection :  1;  /* RW */
+        unsigned long   apic_mode_status                     :  1;  /* RO */
+        unsigned long   suppress_interrupts_to_self          :  1;  /* RW */
+        unsigned long   enable_lock_based_system_flush       :  1;  /* RW */
+        unsigned long   enable_extended_sb_status            :  1;  /* RW */
+        unsigned long   suppress_int_prio_udt_to_self        :  1;  /* RW */
+        unsigned long   use_legacy_descriptor_formats        :  1;  /* RW */
+        unsigned long   rsvd_36_47                           : 12;  /*    */
+        unsigned long   fun                                  : 16;  /* RW */
+    } s2;
 };
 
 /* ========================================================================= */
 /*                     UVH_LB_BAU_SB_ACTIVATION_CONTROL                      */
 /* ========================================================================= */
 #define UVH_LB_BAU_SB_ACTIVATION_CONTROL 0x320020UL
-#define UVH_LB_BAU_SB_ACTIVATION_CONTROL_32 0x009a8
+#define UVH_LB_BAU_SB_ACTIVATION_CONTROL_32 0x9a8
 
 #define UVH_LB_BAU_SB_ACTIVATION_CONTROL_INDEX_SHFT 0
 #define UVH_LB_BAU_SB_ACTIVATION_CONTROL_INDEX_MASK 0x000000000000003fUL
@@ -703,7 +1075,7 @@ union uvh_lb_bau_sb_activation_control_u {
 /*                    UVH_LB_BAU_SB_ACTIVATION_STATUS_0                      */
 /* ========================================================================= */
 #define UVH_LB_BAU_SB_ACTIVATION_STATUS_0 0x320030UL
-#define UVH_LB_BAU_SB_ACTIVATION_STATUS_0_32 0x009b0
+#define UVH_LB_BAU_SB_ACTIVATION_STATUS_0_32 0x9b0
 
 #define UVH_LB_BAU_SB_ACTIVATION_STATUS_0_STATUS_SHFT 0
 #define UVH_LB_BAU_SB_ACTIVATION_STATUS_0_STATUS_MASK 0xffffffffffffffffUL
@@ -719,7 +1091,7 @@ union uvh_lb_bau_sb_activation_status_0_u {
 /*                    UVH_LB_BAU_SB_ACTIVATION_STATUS_1                      */
 /* ========================================================================= */
 #define UVH_LB_BAU_SB_ACTIVATION_STATUS_1 0x320040UL
-#define UVH_LB_BAU_SB_ACTIVATION_STATUS_1_32 0x009b8
+#define UVH_LB_BAU_SB_ACTIVATION_STATUS_1_32 0x9b8
 
 #define UVH_LB_BAU_SB_ACTIVATION_STATUS_1_STATUS_SHFT 0
 #define UVH_LB_BAU_SB_ACTIVATION_STATUS_1_STATUS_MASK 0xffffffffffffffffUL
@@ -735,7 +1107,7 @@ union uvh_lb_bau_sb_activation_status_1_u {
 /*                      UVH_LB_BAU_SB_DESCRIPTOR_BASE                        */
 /* ========================================================================= */
 #define UVH_LB_BAU_SB_DESCRIPTOR_BASE 0x320010UL
-#define UVH_LB_BAU_SB_DESCRIPTOR_BASE_32 0x009a0
+#define UVH_LB_BAU_SB_DESCRIPTOR_BASE_32 0x9a0
 
 #define UVH_LB_BAU_SB_DESCRIPTOR_BASE_PAGE_ADDRESS_SHFT 12
 #define UVH_LB_BAU_SB_DESCRIPTOR_BASE_PAGE_ADDRESS_MASK 0x000007fffffff000UL
@@ -754,23 +1126,6 @@ union uvh_lb_bau_sb_descriptor_base_u {
 };
 
 /* ========================================================================= */
-/*                   UVH_LB_TARGET_PHYSICAL_APIC_ID_MASK                     */
-/* ========================================================================= */
-#define UVH_LB_TARGET_PHYSICAL_APIC_ID_MASK 0x320130UL
-#define UVH_LB_TARGET_PHYSICAL_APIC_ID_MASK_32 0x009f0
-
-#define UVH_LB_TARGET_PHYSICAL_APIC_ID_MASK_BIT_ENABLES_SHFT 0
-#define UVH_LB_TARGET_PHYSICAL_APIC_ID_MASK_BIT_ENABLES_MASK 0x00000000ffffffffUL
-
-union uvh_lb_target_physical_apic_id_mask_u {
-        unsigned long v;
-        struct uvh_lb_target_physical_apic_id_mask_s {
-                unsigned long bit_enables : 32;  /* RW */
-                unsigned long rsvd_32_63  : 32;  /*    */
-        } s;
-};
-
-/* ========================================================================= */
 /*                               UVH_NODE_ID                                 */
 /* ========================================================================= */
 #define UVH_NODE_ID 0x0UL
@@ -785,10 +1140,36 @@ union uvh_lb_target_physical_apic_id_mask_u {
 #define UVH_NODE_ID_REVISION_MASK 0x00000000f0000000UL
 #define UVH_NODE_ID_NODE_ID_SHFT 32
 #define UVH_NODE_ID_NODE_ID_MASK 0x00007fff00000000UL
-#define UVH_NODE_ID_NODES_PER_BIT_SHFT 48
-#define UVH_NODE_ID_NODES_PER_BIT_MASK 0x007f000000000000UL
-#define UVH_NODE_ID_NI_PORT_SHFT 56
-#define UVH_NODE_ID_NI_PORT_MASK 0x0f00000000000000UL
+
+#define UV1H_NODE_ID_FORCE1_SHFT 0
+#define UV1H_NODE_ID_FORCE1_MASK 0x0000000000000001UL
+#define UV1H_NODE_ID_MANUFACTURER_SHFT 1
+#define UV1H_NODE_ID_MANUFACTURER_MASK 0x0000000000000ffeUL
+#define UV1H_NODE_ID_PART_NUMBER_SHFT 12
+#define UV1H_NODE_ID_PART_NUMBER_MASK 0x000000000ffff000UL
+#define UV1H_NODE_ID_REVISION_SHFT 28
+#define UV1H_NODE_ID_REVISION_MASK 0x00000000f0000000UL
+#define UV1H_NODE_ID_NODE_ID_SHFT 32
+#define UV1H_NODE_ID_NODE_ID_MASK 0x00007fff00000000UL
+#define UV1H_NODE_ID_NODES_PER_BIT_SHFT 48
+#define UV1H_NODE_ID_NODES_PER_BIT_MASK 0x007f000000000000UL
+#define UV1H_NODE_ID_NI_PORT_SHFT 56
+#define UV1H_NODE_ID_NI_PORT_MASK 0x0f00000000000000UL
+
+#define UV2H_NODE_ID_FORCE1_SHFT 0
+#define UV2H_NODE_ID_FORCE1_MASK 0x0000000000000001UL
+#define UV2H_NODE_ID_MANUFACTURER_SHFT 1
+#define UV2H_NODE_ID_MANUFACTURER_MASK 0x0000000000000ffeUL
+#define UV2H_NODE_ID_PART_NUMBER_SHFT 12
+#define UV2H_NODE_ID_PART_NUMBER_MASK 0x000000000ffff000UL
+#define UV2H_NODE_ID_REVISION_SHFT 28
+#define UV2H_NODE_ID_REVISION_MASK 0x00000000f0000000UL
+#define UV2H_NODE_ID_NODE_ID_SHFT 32
+#define UV2H_NODE_ID_NODE_ID_MASK 0x00007fff00000000UL
+#define UV2H_NODE_ID_NODES_PER_BIT_SHFT 50
+#define UV2H_NODE_ID_NODES_PER_BIT_MASK 0x01fc000000000000UL
+#define UV2H_NODE_ID_NI_PORT_SHFT 57
+#define UV2H_NODE_ID_NI_PORT_MASK 0x3e00000000000000UL
 
 union uvh_node_id_u {
     unsigned long       v;
@@ -798,12 +1179,31 @@ union uvh_node_id_u {
         unsigned long   part_number   : 16;  /* RO */
         unsigned long   revision      :  4;  /* RO */
         unsigned long   node_id       : 15;  /* RW */
+        unsigned long   rsvd_47_63    : 17;
+    } s;
+    struct uv1h_node_id_s {
+        unsigned long   force1        :  1;  /* RO */
+        unsigned long   manufacturer  : 11;  /* RO */
+        unsigned long   part_number   : 16;  /* RO */
+        unsigned long   revision      :  4;  /* RO */
+        unsigned long   node_id       : 15;  /* RW */
         unsigned long   rsvd_47       :  1;  /*    */
         unsigned long   nodes_per_bit :  7;  /* RW */
         unsigned long   rsvd_55       :  1;  /*    */
         unsigned long   ni_port       :  4;  /* RO */
         unsigned long   rsvd_60_63    :  4;  /*    */
-    } s;
+    } s1;
+    struct uv2h_node_id_s {
+        unsigned long   force1        :  1;  /* RO */
+        unsigned long   manufacturer  : 11;  /* RO */
+        unsigned long   part_number   : 16;  /* RO */
+        unsigned long   revision      :  4;  /* RO */
+        unsigned long   node_id       : 15;  /* RW */
+        unsigned long   rsvd_47_49    :  3;  /*    */
+        unsigned long   nodes_per_bit :  7;  /* RO */
+        unsigned long   ni_port       :  5;  /* RO */
+        unsigned long   rsvd_62_63    :  2;  /*    */
+    } s2;
 };
 
 /* ========================================================================= */
@@ -954,18 +1354,38 @@ union uvh_rh_gam_alias210_redirect_config_2_mmr_u {
 #define UVH_RH_GAM_CONFIG_MMR_M_SKT_MASK 0x000000000000003fUL
 #define UVH_RH_GAM_CONFIG_MMR_N_SKT_SHFT 6
 #define UVH_RH_GAM_CONFIG_MMR_N_SKT_MASK 0x00000000000003c0UL
-#define UVH_RH_GAM_CONFIG_MMR_MMIOL_CFG_SHFT 12
-#define UVH_RH_GAM_CONFIG_MMR_MMIOL_CFG_MASK 0x0000000000001000UL
+
+#define UV1H_RH_GAM_CONFIG_MMR_M_SKT_SHFT 0
+#define UV1H_RH_GAM_CONFIG_MMR_M_SKT_MASK 0x000000000000003fUL
+#define UV1H_RH_GAM_CONFIG_MMR_N_SKT_SHFT 6
+#define UV1H_RH_GAM_CONFIG_MMR_N_SKT_MASK 0x00000000000003c0UL
+#define UV1H_RH_GAM_CONFIG_MMR_MMIOL_CFG_SHFT 12
+#define UV1H_RH_GAM_CONFIG_MMR_MMIOL_CFG_MASK 0x0000000000001000UL
+
+#define UV2H_RH_GAM_CONFIG_MMR_M_SKT_SHFT 0
+#define UV2H_RH_GAM_CONFIG_MMR_M_SKT_MASK 0x000000000000003fUL
+#define UV2H_RH_GAM_CONFIG_MMR_N_SKT_SHFT 6
+#define UV2H_RH_GAM_CONFIG_MMR_N_SKT_MASK 0x00000000000003c0UL
 
 union uvh_rh_gam_config_mmr_u {
     unsigned long       v;
     struct uvh_rh_gam_config_mmr_s {
         unsigned long   m_skt     :  6;  /* RW */
         unsigned long   n_skt     :  4;  /* RW */
+        unsigned long   rsvd_10_63    : 54;
+    } s;
+    struct uv1h_rh_gam_config_mmr_s {
+        unsigned long   m_skt     :  6;  /* RW */
+        unsigned long   n_skt     :  4;  /* RW */
         unsigned long   rsvd_10_11:  2;  /*    */
         unsigned long   mmiol_cfg :  1;  /* RW */
         unsigned long   rsvd_13_63: 51;  /*    */
-    } s;
+    } s1;
+    struct uv2h_rh_gam_config_mmr_s {
+        unsigned long   m_skt :  6;  /* RW */
+        unsigned long   n_skt :  4;  /* RW */
+        unsigned long   rsvd_10_63: 54;  /*    */
+    } s2;
 };
 
 /* ========================================================================= */
@@ -975,25 +1395,49 @@ union uvh_rh_gam_config_mmr_u {
 
 #define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_SHFT 28
 #define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_MASK 0x00003ffff0000000UL
-#define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_GR4_SHFT 48
-#define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_GR4_MASK 0x0001000000000000UL
-#define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_N_GRU_SHFT 52
-#define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_N_GRU_MASK 0x00f0000000000000UL
-#define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63
-#define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL
+
+#define UV1H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_SHFT 28
+#define UV1H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_MASK 0x00003ffff0000000UL
+#define UV1H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_GR4_SHFT 48
+#define UV1H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_GR4_MASK 0x0001000000000000UL
+#define UV1H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_N_GRU_SHFT 52
+#define UV1H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_N_GRU_MASK 0x00f0000000000000UL
+#define UV1H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63
+#define UV1H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL
+
+#define UV2H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_SHFT 28
+#define UV2H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_MASK 0x00003ffff0000000UL
+#define UV2H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_N_GRU_SHFT 52
+#define UV2H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_N_GRU_MASK 0x00f0000000000000UL
+#define UV2H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63
+#define UV2H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL
 
 union uvh_rh_gam_gru_overlay_config_mmr_u {
     unsigned long       v;
     struct uvh_rh_gam_gru_overlay_config_mmr_s {
         unsigned long   rsvd_0_27: 28;  /*    */
         unsigned long   base   : 18;  /* RW */
+        unsigned long   rsvd_46_62    : 17;
+        unsigned long   enable :  1;  /* RW */
+    } s;
+    struct uv1h_rh_gam_gru_overlay_config_mmr_s {
+        unsigned long   rsvd_0_27: 28;  /*    */
+        unsigned long   base   : 18;  /* RW */
         unsigned long   rsvd_46_47:  2;  /*    */
         unsigned long   gr4    :  1;  /* RW */
         unsigned long   rsvd_49_51:  3;  /*    */
         unsigned long   n_gru  :  4;  /* RW */
         unsigned long   rsvd_56_62:  7;  /*    */
         unsigned long   enable :  1;  /* RW */
-    } s;
+    } s1;
+    struct uv2h_rh_gam_gru_overlay_config_mmr_s {
+        unsigned long   rsvd_0_27: 28;  /*    */
+        unsigned long   base   : 18;  /* RW */
+        unsigned long   rsvd_46_51:  6;  /*    */
+        unsigned long   n_gru  :  4;  /* RW */
+        unsigned long   rsvd_56_62:  7;  /*    */
+        unsigned long   enable :  1;  /* RW */
+    } s2;
 };
 
 /* ========================================================================= */
@@ -1001,25 +1445,42 @@ union uvh_rh_gam_gru_overlay_config_mmr_u {
 /* ========================================================================= */
 #define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR 0x1600030UL
 
-#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_BASE_SHFT 30
-#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_BASE_MASK 0x00003fffc0000000UL
-#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_M_IO_SHFT 46
-#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_M_IO_MASK 0x000fc00000000000UL
-#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_N_IO_SHFT 52
-#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_N_IO_MASK 0x00f0000000000000UL
-#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63
-#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL
+#define UV1H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_BASE_SHFT 30
+#define UV1H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_BASE_MASK 0x00003fffc0000000UL
+#define UV1H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_M_IO_SHFT 46
+#define UV1H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_M_IO_MASK 0x000fc00000000000UL
+#define UV1H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_N_IO_SHFT 52
+#define UV1H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_N_IO_MASK 0x00f0000000000000UL
+#define UV1H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63
+#define UV1H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL
+
+#define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_BASE_SHFT 27
+#define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_BASE_MASK 0x00003ffff8000000UL
+#define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_M_IO_SHFT 46
+#define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_M_IO_MASK 0x000fc00000000000UL
+#define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_N_IO_SHFT 52
+#define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_N_IO_MASK 0x00f0000000000000UL
+#define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63
+#define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL
 
 union uvh_rh_gam_mmioh_overlay_config_mmr_u {
     unsigned long       v;
-    struct uvh_rh_gam_mmioh_overlay_config_mmr_s {
+    struct uv1h_rh_gam_mmioh_overlay_config_mmr_s {
         unsigned long   rsvd_0_29: 30;  /*    */
         unsigned long   base   : 16;  /* RW */
         unsigned long   m_io   :  6;  /* RW */
         unsigned long   n_io   :  4;  /* RW */
         unsigned long   rsvd_56_62:  7;  /*    */
         unsigned long   enable :  1;  /* RW */
-    } s;
+    } s1;
+    struct uv2h_rh_gam_mmioh_overlay_config_mmr_s {
+        unsigned long   rsvd_0_26: 27;  /*    */
+        unsigned long   base   : 19;  /* RW */
+        unsigned long   m_io   :  6;  /* RW */
+        unsigned long   n_io   :  4;  /* RW */
+        unsigned long   rsvd_56_62:  7;  /*    */
+        unsigned long   enable :  1;  /* RW */
+    } s2;
 };
 
 /* ========================================================================= */
@@ -1029,20 +1490,40 @@ union uvh_rh_gam_mmioh_overlay_config_mmr_u {
 
 #define UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_SHFT 26
 #define UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_MASK 0x00003ffffc000000UL
-#define UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_DUAL_HUB_SHFT 46
-#define UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_DUAL_HUB_MASK 0x0000400000000000UL
-#define UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63
-#define UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL
+
+#define UV1H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_SHFT 26
+#define UV1H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_MASK 0x00003ffffc000000UL
+#define UV1H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_DUAL_HUB_SHFT 46
+#define UV1H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_DUAL_HUB_MASK 0x0000400000000000UL
+#define UV1H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63
+#define UV1H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL
+
+#define UV2H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_SHFT 26
+#define UV2H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_MASK 0x00003ffffc000000UL
+#define UV2H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63
+#define UV2H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL
 
 union uvh_rh_gam_mmr_overlay_config_mmr_u {
     unsigned long       v;
     struct uvh_rh_gam_mmr_overlay_config_mmr_s {
         unsigned long   rsvd_0_25: 26;  /*    */
         unsigned long   base     : 20;  /* RW */
+        unsigned long   rsvd_46_62    : 17;
+        unsigned long   enable   :  1;  /* RW */
+    } s;
+    struct uv1h_rh_gam_mmr_overlay_config_mmr_s {
+        unsigned long   rsvd_0_25: 26;  /*    */
+        unsigned long   base     : 20;  /* RW */
         unsigned long   dual_hub :  1;  /* RW */
         unsigned long   rsvd_47_62: 16;  /*    */
         unsigned long   enable   :  1;  /* RW */
-    } s;
+    } s1;
+    struct uv2h_rh_gam_mmr_overlay_config_mmr_s {
+        unsigned long   rsvd_0_25: 26;  /*    */
+        unsigned long   base   : 20;  /* RW */
+        unsigned long   rsvd_46_62: 17;  /*    */
+        unsigned long   enable :  1;  /* RW */
+    } s2;
 };
 
 /* ========================================================================= */
@@ -1103,10 +1584,11 @@ union uvh_rtc1_int_config_u {
 /*                               UVH_SCRATCH5                                */
 /* ========================================================================= */
 #define UVH_SCRATCH5 0x2d0200UL
-#define UVH_SCRATCH5_32 0x00778
+#define UVH_SCRATCH5_32 0x778
 
 #define UVH_SCRATCH5_SCRATCH5_SHFT 0
 #define UVH_SCRATCH5_SCRATCH5_MASK 0xffffffffffffffffUL
+
 union uvh_scratch5_u {
     unsigned long       v;
     struct uvh_scratch5_s {
@@ -1114,4 +1596,154 @@ union uvh_scratch5_u {
     } s;
 };
 
+/* ========================================================================= */
+/*                           UV2H_EVENT_OCCURRED2                            */
+/* ========================================================================= */
+#define UV2H_EVENT_OCCURRED2 0x70100UL
+#define UV2H_EVENT_OCCURRED2_32 0xb68
+
+#define UV2H_EVENT_OCCURRED2_RTC_0_SHFT 0
+#define UV2H_EVENT_OCCURRED2_RTC_0_MASK 0x0000000000000001UL
+#define UV2H_EVENT_OCCURRED2_RTC_1_SHFT 1
+#define UV2H_EVENT_OCCURRED2_RTC_1_MASK 0x0000000000000002UL
+#define UV2H_EVENT_OCCURRED2_RTC_2_SHFT 2
+#define UV2H_EVENT_OCCURRED2_RTC_2_MASK 0x0000000000000004UL
+#define UV2H_EVENT_OCCURRED2_RTC_3_SHFT 3
+#define UV2H_EVENT_OCCURRED2_RTC_3_MASK 0x0000000000000008UL
+#define UV2H_EVENT_OCCURRED2_RTC_4_SHFT 4
+#define UV2H_EVENT_OCCURRED2_RTC_4_MASK 0x0000000000000010UL
+#define UV2H_EVENT_OCCURRED2_RTC_5_SHFT 5
+#define UV2H_EVENT_OCCURRED2_RTC_5_MASK 0x0000000000000020UL
+#define UV2H_EVENT_OCCURRED2_RTC_6_SHFT 6
+#define UV2H_EVENT_OCCURRED2_RTC_6_MASK 0x0000000000000040UL
+#define UV2H_EVENT_OCCURRED2_RTC_7_SHFT 7
+#define UV2H_EVENT_OCCURRED2_RTC_7_MASK 0x0000000000000080UL
+#define UV2H_EVENT_OCCURRED2_RTC_8_SHFT 8
+#define UV2H_EVENT_OCCURRED2_RTC_8_MASK 0x0000000000000100UL
+#define UV2H_EVENT_OCCURRED2_RTC_9_SHFT 9
+#define UV2H_EVENT_OCCURRED2_RTC_9_MASK 0x0000000000000200UL
+#define UV2H_EVENT_OCCURRED2_RTC_10_SHFT 10
+#define UV2H_EVENT_OCCURRED2_RTC_10_MASK 0x0000000000000400UL
+#define UV2H_EVENT_OCCURRED2_RTC_11_SHFT 11
+#define UV2H_EVENT_OCCURRED2_RTC_11_MASK 0x0000000000000800UL
+#define UV2H_EVENT_OCCURRED2_RTC_12_SHFT 12
+#define UV2H_EVENT_OCCURRED2_RTC_12_MASK 0x0000000000001000UL
+#define UV2H_EVENT_OCCURRED2_RTC_13_SHFT 13
+#define UV2H_EVENT_OCCURRED2_RTC_13_MASK 0x0000000000002000UL
+#define UV2H_EVENT_OCCURRED2_RTC_14_SHFT 14
+#define UV2H_EVENT_OCCURRED2_RTC_14_MASK 0x0000000000004000UL
+#define UV2H_EVENT_OCCURRED2_RTC_15_SHFT 15
+#define UV2H_EVENT_OCCURRED2_RTC_15_MASK 0x0000000000008000UL
+#define UV2H_EVENT_OCCURRED2_RTC_16_SHFT 16
+#define UV2H_EVENT_OCCURRED2_RTC_16_MASK 0x0000000000010000UL
+#define UV2H_EVENT_OCCURRED2_RTC_17_SHFT 17
+#define UV2H_EVENT_OCCURRED2_RTC_17_MASK 0x0000000000020000UL
+#define UV2H_EVENT_OCCURRED2_RTC_18_SHFT 18
+#define UV2H_EVENT_OCCURRED2_RTC_18_MASK 0x0000000000040000UL
+#define UV2H_EVENT_OCCURRED2_RTC_19_SHFT 19
+#define UV2H_EVENT_OCCURRED2_RTC_19_MASK 0x0000000000080000UL
+#define UV2H_EVENT_OCCURRED2_RTC_20_SHFT 20
+#define UV2H_EVENT_OCCURRED2_RTC_20_MASK 0x0000000000100000UL
+#define UV2H_EVENT_OCCURRED2_RTC_21_SHFT 21
+#define UV2H_EVENT_OCCURRED2_RTC_21_MASK 0x0000000000200000UL
+#define UV2H_EVENT_OCCURRED2_RTC_22_SHFT 22
+#define UV2H_EVENT_OCCURRED2_RTC_22_MASK 0x0000000000400000UL
+#define UV2H_EVENT_OCCURRED2_RTC_23_SHFT 23
+#define UV2H_EVENT_OCCURRED2_RTC_23_MASK 0x0000000000800000UL
+#define UV2H_EVENT_OCCURRED2_RTC_24_SHFT 24
+#define UV2H_EVENT_OCCURRED2_RTC_24_MASK 0x0000000001000000UL
+#define UV2H_EVENT_OCCURRED2_RTC_25_SHFT 25
+#define UV2H_EVENT_OCCURRED2_RTC_25_MASK 0x0000000002000000UL
+#define UV2H_EVENT_OCCURRED2_RTC_26_SHFT 26
+#define UV2H_EVENT_OCCURRED2_RTC_26_MASK 0x0000000004000000UL
+#define UV2H_EVENT_OCCURRED2_RTC_27_SHFT 27
+#define UV2H_EVENT_OCCURRED2_RTC_27_MASK 0x0000000008000000UL
+#define UV2H_EVENT_OCCURRED2_RTC_28_SHFT 28
+#define UV2H_EVENT_OCCURRED2_RTC_28_MASK 0x0000000010000000UL
+#define UV2H_EVENT_OCCURRED2_RTC_29_SHFT 29
+#define UV2H_EVENT_OCCURRED2_RTC_29_MASK 0x0000000020000000UL
+#define UV2H_EVENT_OCCURRED2_RTC_30_SHFT 30
+#define UV2H_EVENT_OCCURRED2_RTC_30_MASK 0x0000000040000000UL
+#define UV2H_EVENT_OCCURRED2_RTC_31_SHFT 31
+#define UV2H_EVENT_OCCURRED2_RTC_31_MASK 0x0000000080000000UL
+
+union uv2h_event_occurred2_u {
+    unsigned long       v;
+    struct uv2h_event_occurred2_s {
+        unsigned long   rtc_0  :  1;  /* RW */
+        unsigned long   rtc_1  :  1;  /* RW */
+        unsigned long   rtc_2  :  1;  /* RW */
+        unsigned long   rtc_3  :  1;  /* RW */
+        unsigned long   rtc_4  :  1;  /* RW */
+        unsigned long   rtc_5  :  1;  /* RW */
+        unsigned long   rtc_6  :  1;  /* RW */
+        unsigned long   rtc_7  :  1;  /* RW */
+        unsigned long   rtc_8  :  1;  /* RW */
+        unsigned long   rtc_9  :  1;  /* RW */
+        unsigned long   rtc_10 :  1;  /* RW */
+        unsigned long   rtc_11 :  1;  /* RW */
+        unsigned long   rtc_12 :  1;  /* RW */
+        unsigned long   rtc_13 :  1;  /* RW */
+        unsigned long   rtc_14 :  1;  /* RW */
+        unsigned long   rtc_15 :  1;  /* RW */
+        unsigned long   rtc_16 :  1;  /* RW */
+        unsigned long   rtc_17 :  1;  /* RW */
+        unsigned long   rtc_18 :  1;  /* RW */
+        unsigned long   rtc_19 :  1;  /* RW */
+        unsigned long   rtc_20 :  1;  /* RW */
+        unsigned long   rtc_21 :  1;  /* RW */
+        unsigned long   rtc_22 :  1;  /* RW */
+        unsigned long   rtc_23 :  1;  /* RW */
+        unsigned long   rtc_24 :  1;  /* RW */
+        unsigned long   rtc_25 :  1;  /* RW */
+        unsigned long   rtc_26 :  1;  /* RW */
+        unsigned long   rtc_27 :  1;  /* RW */
+        unsigned long   rtc_28 :  1;  /* RW */
+        unsigned long   rtc_29 :  1;  /* RW */
+        unsigned long   rtc_30 :  1;  /* RW */
+        unsigned long   rtc_31 :  1;  /* RW */
+        unsigned long   rsvd_32_63: 32;  /*    */
+    } s1;
+};
+
+/* ========================================================================= */
+/*                        UV2H_EVENT_OCCURRED2_ALIAS                         */
+/* ========================================================================= */
+#define UV2H_EVENT_OCCURRED2_ALIAS 0x70108UL
+#define UV2H_EVENT_OCCURRED2_ALIAS_32 0xb70
+
+/* ========================================================================= */
+/*                    UV2H_LB_BAU_SB_ACTIVATION_STATUS_2                     */
+/* ========================================================================= */
+#define UV2H_LB_BAU_SB_ACTIVATION_STATUS_2 0x320130UL
+#define UV2H_LB_BAU_SB_ACTIVATION_STATUS_2_32 0x9f0
+
+#define UV2H_LB_BAU_SB_ACTIVATION_STATUS_2_AUX_ERROR_SHFT 0
+#define UV2H_LB_BAU_SB_ACTIVATION_STATUS_2_AUX_ERROR_MASK 0xffffffffffffffffUL
+
+union uv2h_lb_bau_sb_activation_status_2_u {
+    unsigned long       v;
+    struct uv2h_lb_bau_sb_activation_status_2_s {
+        unsigned long   aux_error : 64;  /* RW */
+    } s1;
+};
+
+/* ========================================================================= */
+/*                   UV1H_LB_TARGET_PHYSICAL_APIC_ID_MASK                    */
+/* ========================================================================= */
+#define UV1H_LB_TARGET_PHYSICAL_APIC_ID_MASK 0x320130UL
+#define UV1H_LB_TARGET_PHYSICAL_APIC_ID_MASK_32 0x9f0
+
+#define UV1H_LB_TARGET_PHYSICAL_APIC_ID_MASK_BIT_ENABLES_SHFT 0
+#define UV1H_LB_TARGET_PHYSICAL_APIC_ID_MASK_BIT_ENABLES_MASK 0x00000000ffffffffUL
+
+union uv1h_lb_target_physical_apic_id_mask_u {
+    unsigned long       v;
+    struct uv1h_lb_target_physical_apic_id_mask_s {
+        unsigned long   bit_enables : 32;  /* RW */
+        unsigned long   rsvd_32_63  : 32;  /*    */
+    } s1;
+};
+
+
 #endif /* __ASM_UV_MMRS_X86_H__ */
diff --git a/arch/x86/include/asm/vdso.h b/arch/x86/include/asm/vdso.h
index 9064052b73de..bb0522850b74 100644
--- a/arch/x86/include/asm/vdso.h
+++ b/arch/x86/include/asm/vdso.h
@@ -1,20 +1,6 @@
 #ifndef _ASM_X86_VDSO_H
 #define _ASM_X86_VDSO_H
 
-#ifdef CONFIG_X86_64
-extern const char VDSO64_PRELINK[];
-
-/*
- * Given a pointer to the vDSO image, find the pointer to VDSO64_name
- * as that symbol is defined in the vDSO sources or linker script.
- */
-#define VDSO64_SYMBOL(base, name)                                       \
-({                                                                      \
-        extern const char VDSO64_##name[];                              \
-        (void *)(VDSO64_##name - VDSO64_PRELINK + (unsigned long)(base)); \
-})
-#endif
-
 #if defined CONFIG_X86_32 || defined CONFIG_COMPAT
 extern const char VDSO32_PRELINK[];
 
diff --git a/arch/x86/include/asm/vgtod.h b/arch/x86/include/asm/vgtod.h
index 3d61e204826f..646b4c1ca695 100644
--- a/arch/x86/include/asm/vgtod.h
+++ b/arch/x86/include/asm/vgtod.h
@@ -23,8 +23,6 @@ struct vsyscall_gtod_data {
         struct timespec wall_to_monotonic;
         struct timespec wall_time_coarse;
 };
-extern struct vsyscall_gtod_data __vsyscall_gtod_data
-__section_vsyscall_gtod_data;
 extern struct vsyscall_gtod_data vsyscall_gtod_data;
 
 #endif /* _ASM_X86_VGTOD_H */
diff --git a/arch/x86/include/asm/vsyscall.h b/arch/x86/include/asm/vsyscall.h
index d0983d255fbd..d55597351f6a 100644
--- a/arch/x86/include/asm/vsyscall.h
+++ b/arch/x86/include/asm/vsyscall.h
@@ -16,27 +16,19 @@ enum vsyscall_num {
 #ifdef __KERNEL__
 #include <linux/seqlock.h>
 
-#define __section_vgetcpu_mode __attribute__ ((unused, __section__ (".vgetcpu_mode"), aligned(16)))
-#define __section_jiffies __attribute__ ((unused, __section__ (".jiffies"), aligned(16)))
-
 /* Definitions for CONFIG_GENERIC_TIME definitions */
-#define __section_vsyscall_gtod_data __attribute__ \
-        ((unused, __section__ (".vsyscall_gtod_data"),aligned(16)))
-#define __section_vsyscall_clock __attribute__ \
-        ((unused, __section__ (".vsyscall_clock"),aligned(16)))
 #define __vsyscall_fn \
         __attribute__ ((unused, __section__(".vsyscall_fn"))) notrace
 
 #define VGETCPU_RDTSCP  1
 #define VGETCPU_LSL     2
 
-extern int __vgetcpu_mode;
-extern volatile unsigned long __jiffies;
-
 /* kernel space (writeable) */
 extern int vgetcpu_mode;
 extern struct timezone sys_tz;
 
+#include <asm/vvar.h>
+
 extern void map_vsyscall(void);
 
 #endif /* __KERNEL__ */
diff --git a/arch/x86/include/asm/vvar.h b/arch/x86/include/asm/vvar.h
new file mode 100644
index 000000000000..341b3559452b
--- /dev/null
+++ b/arch/x86/include/asm/vvar.h
@@ -0,0 +1,52 @@
+/*
+ * vvar.h: Shared vDSO/kernel variable declarations
+ * Copyright (c) 2011 Andy Lutomirski
+ * Subject to the GNU General Public License, version 2
+ *
+ * A handful of variables are accessible (read-only) from userspace
+ * code in the vsyscall page and the vdso.  They are declared here.
+ * Some other file must define them with DEFINE_VVAR.
+ *
+ * In normal kernel code, they are used like any other variable.
+ * In user code, they are accessed through the VVAR macro.
+ *
+ * Each of these variables lives in the vsyscall page, and each
+ * one needs a unique offset within the little piece of the page
+ * reserved for vvars.  Specify that offset in DECLARE_VVAR.
+ * (There are 896 bytes available.  If you mess up, the linker will
+ * catch it.)
+ */
+
+/* Offset of vars within vsyscall page */
+#define VSYSCALL_VARS_OFFSET (3072 + 128)
+
+#if defined(__VVAR_KERNEL_LDS)
+
+/* The kernel linker script defines its own magic to put vvars in the
+ * right place.
+ */
+#define DECLARE_VVAR(offset, type, name) \
+        EMIT_VVAR(name, VSYSCALL_VARS_OFFSET + offset)
+
+#else
+
+#define DECLARE_VVAR(offset, type, name)                                \
+        static type const * const vvaraddr_ ## name =                   \
+                (void *)(VSYSCALL_START + VSYSCALL_VARS_OFFSET + (offset));
+
+#define DEFINE_VVAR(type, name)                                         \
+        type __vvar_ ## name                                            \
+        __attribute__((section(".vsyscall_var_" #name), aligned(16)))
+
+#define VVAR(name) (*vvaraddr_ ## name)
+
+#endif
+
+/* DECLARE_VVAR(offset, type, name) */
+
+DECLARE_VVAR(0, volatile unsigned long, jiffies)
+DECLARE_VVAR(8, int, vgetcpu_mode)
+DECLARE_VVAR(128, struct vsyscall_gtod_data, vsyscall_gtod_data)
+
+#undef DECLARE_VVAR
+#undef VSYSCALL_VARS_OFFSET
diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h
index 8508bfe52296..d240ea950519 100644
--- a/arch/x86/include/asm/xen/hypercall.h
+++ b/arch/x86/include/asm/xen/hypercall.h
@@ -447,6 +447,13 @@ HYPERVISOR_hvm_op(int op, void *arg)
        return _hypercall2(unsigned long, hvm_op, op, arg);
 }
 
+static inline int
+HYPERVISOR_tmem_op(
+        struct tmem_op *op)
+{
+        return _hypercall1(int, tmem_op, op);
+}
+
 static inline void
 MULTI_fpu_taskswitch(struct multicall_entry *mcl, int set)
 {
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 250806472a7e..90b06d4daee2 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -24,13 +24,17 @@ endif
 nostackp := $(call cc-option, -fno-stack-protector)
 CFLAGS_vsyscall_64.o    := $(PROFILING) -g0 $(nostackp)
 CFLAGS_hpet.o           := $(nostackp)
-CFLAGS_tsc.o            := $(nostackp)
+CFLAGS_vread_tsc_64.o   := $(nostackp)
 CFLAGS_paravirt.o       := $(nostackp)
 GCOV_PROFILE_vsyscall_64.o      := n
 GCOV_PROFILE_hpet.o             := n
 GCOV_PROFILE_tsc.o              := n
+GCOV_PROFILE_vread_tsc_64.o     := n
 GCOV_PROFILE_paravirt.o         := n
 
+# vread_tsc_64 is hot and should be fully optimized:
+CFLAGS_REMOVE_vread_tsc_64.o = -pg -fno-optimize-sibling-calls
+
 obj-y                   := process_$(BITS).o signal.o entry_$(BITS).o
 obj-y                   += traps.o irq.o irq_$(BITS).o dumpstack_$(BITS).o
 obj-y                   += time.o ioport.o ldt.o dumpstack.o
@@ -39,7 +43,7 @@ obj-$(CONFIG_IRQ_WORK)  += irq_work.o
 obj-y                   += probe_roms.o
 obj-$(CONFIG_X86_32)    += sys_i386_32.o i386_ksyms_32.o
 obj-$(CONFIG_X86_64)    += sys_x86_64.o x8664_ksyms_64.o
-obj-$(CONFIG_X86_64)    += syscall_64.o vsyscall_64.o
+obj-$(CONFIG_X86_64)    += syscall_64.o vsyscall_64.o vread_tsc_64.o
 obj-y                   += bootflag.o e820.o
 obj-y                   += pci-dma.o quirks.o topology.o kdebugfs.o
 obj-y                   += alternative.o i8253.o pci-nommu.o hw_breakpoint.o
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index f450b683dfcf..b511a011b7d0 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -91,6 +91,10 @@ static int __init early_get_pnodeid(void)
         m_n_config.v = uv_early_read_mmr(UVH_RH_GAM_CONFIG_MMR);
         uv_min_hub_revision_id = node_id.s.revision;
 
+        if (node_id.s.part_number == UV2_HUB_PART_NUMBER)
+                uv_min_hub_revision_id += UV2_HUB_REVISION_BASE - 1;
+
+        uv_hub_info->hub_revision = uv_min_hub_revision_id;
         pnode = (node_id.s.node_id >> 1) & ((1 << m_n_config.s.n_skt) - 1);
         return pnode;
 }
@@ -112,17 +116,25 @@ static void __init early_get_apic_pnode_shift(void)
  */
 static void __init uv_set_apicid_hibit(void)
 {
-        union uvh_lb_target_physical_apic_id_mask_u apicid_mask;
+        union uv1h_lb_target_physical_apic_id_mask_u apicid_mask;
 
-        apicid_mask.v = uv_early_read_mmr(UVH_LB_TARGET_PHYSICAL_APIC_ID_MASK);
-        uv_apicid_hibits = apicid_mask.s.bit_enables & UV_APICID_HIBIT_MASK;
+        if (is_uv1_hub()) {
+                apicid_mask.v =
+                        uv_early_read_mmr(UV1H_LB_TARGET_PHYSICAL_APIC_ID_MASK);
+                uv_apicid_hibits =
+                        apicid_mask.s1.bit_enables & UV_APICID_HIBIT_MASK;
+        }
 }
 
 static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
 {
-        int pnodeid;
+        int pnodeid, is_uv1, is_uv2;
 
-        if (!strcmp(oem_id, "SGI")) {
+        is_uv1 = !strcmp(oem_id, "SGI");
+        is_uv2 = !strcmp(oem_id, "SGI2");
+        if (is_uv1 || is_uv2) {
+                uv_hub_info->hub_revision =
+                        is_uv1 ? UV1_HUB_REVISION_BASE : UV2_HUB_REVISION_BASE;
                 pnodeid = early_get_pnodeid();
                 early_get_apic_pnode_shift();
                 x86_platform.is_untracked_pat_range =  uv_is_untracked_pat_range;
@@ -484,12 +496,19 @@ static __init void map_mmr_high(int max_pnode)
 static __init void map_mmioh_high(int max_pnode)
 {
         union uvh_rh_gam_mmioh_overlay_config_mmr_u mmioh;
-        int shift = UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_BASE_SHFT;
+        int shift;
 
         mmioh.v = uv_read_local_mmr(UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR);
-        if (mmioh.s.enable)
-                map_high("MMIOH", mmioh.s.base, shift, mmioh.s.m_io,
+        if (is_uv1_hub() && mmioh.s1.enable) {
+                shift = UV1H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_BASE_SHFT;
+                map_high("MMIOH", mmioh.s1.base, shift, mmioh.s1.m_io,
+                        max_pnode, map_uc);
+        }
+        if (is_uv2_hub() && mmioh.s2.enable) {
+                shift = UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_BASE_SHFT;
+                map_high("MMIOH", mmioh.s2.base, shift, mmioh.s2.m_io,
                         max_pnode, map_uc);
+        }
 }
 
 static __init void map_low_mmrs(void)
@@ -736,13 +755,14 @@ void __init uv_system_init(void)
         unsigned long mmr_base, present, paddr;
         unsigned short pnode_mask, pnode_io_mask;
 
+        printk(KERN_INFO "UV: Found %s hub\n", is_uv1_hub() ? "UV1" : "UV2");
         map_low_mmrs();
 
         m_n_config.v = uv_read_local_mmr(UVH_RH_GAM_CONFIG_MMR );
         m_val = m_n_config.s.m_skt;
         n_val = m_n_config.s.n_skt;
         mmioh.v = uv_read_local_mmr(UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR);
-        n_io = mmioh.s.n_io;
+        n_io = is_uv1_hub() ? mmioh.s1.n_io : mmioh.s2.n_io;
         mmr_base =
             uv_read_local_mmr(UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR) &
             ~UV_MMR_ENABLE;
@@ -811,6 +831,8 @@ void __init uv_system_init(void)
                  */
                 uv_cpu_hub_info(cpu)->pnode_mask = pnode_mask;
                 uv_cpu_hub_info(cpu)->apic_pnode_shift = uvh_apicid.s.pnode_shift;
+                uv_cpu_hub_info(cpu)->hub_revision = uv_hub_info->hub_revision;
+
                 pnode = uv_apicid_to_pnode(apicid);
                 blade = boot_pnode_to_blade(pnode);
                 lcpu = uv_blade_info[blade].nr_possible_cpus;
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index 3bfa02235965..965a7666c283 100644
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -361,6 +361,7 @@ struct apm_user {
  * idle percentage above which bios idle calls are done
  */
 #ifdef CONFIG_APM_CPU_IDLE
+#warning deprecated CONFIG_APM_CPU_IDLE will be deleted in 2012
 #define DEFAULT_IDLE_THRESHOLD  95
 #else
 #define DEFAULT_IDLE_THRESHOLD  100
@@ -904,6 +905,7 @@ static void apm_cpu_idle(void)
         unsigned int jiffies_since_last_check = jiffies - last_jiffies;
         unsigned int bucket;
 
+        WARN_ONCE(1, "deprecated apm_cpu_idle will be deleted in 2012");
 recalc:
         if (jiffies_since_last_check > IDLE_CALC_LIMIT) {
                 use_apm_idle = 0;
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 8f5cabb3c5b0..b13ed393dfce 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -612,8 +612,11 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
         }
 #endif
 
-        /* As a rule processors have APIC timer running in deep C states */
-        if (c->x86 > 0xf && !cpu_has_amd_erratum(amd_erratum_400))
+        /*
+         * Family 0x12 and above processors have APIC timer
+         * running in deep C states.
+         */
+        if (c->x86 > 0x11)
                 set_cpu_cap(c, X86_FEATURE_ARAT);
 
         /*
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index c39576cb3018..525514cf33c3 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -19,6 +19,7 @@
 
 static int __init no_halt(char *s)
 {
+        WARN_ONCE(1, "\"no-hlt\" is deprecated, please use \"idle=poll\"\n");
         boot_cpu_data.hlt_works_ok = 0;
         return 1;
 }
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index c8b41623377f..22a073d7fbff 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -477,13 +477,6 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c)
         if (smp_num_siblings <= 1)
                 goto out;
 
-        if (smp_num_siblings > nr_cpu_ids) {
-                pr_warning("CPU: Unsupported number of siblings %d",
-                           smp_num_siblings);
-                smp_num_siblings = 1;
-                return;
-        }
-
         index_msb = get_count_order(smp_num_siblings);
         c->phys_proc_id = apic->phys_pkg_id(c->initial_apicid, index_msb);
 
@@ -909,7 +902,7 @@ static void vgetcpu_set_mode(void)
 void __init identify_boot_cpu(void)
 {
         identify_cpu(&boot_cpu_data);
-        init_c1e_mask();
+        init_amd_e400_c1e_mask();
 #ifdef CONFIG_X86_32
         sysenter_setup();
         enable_sep_cpu();
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index 0ba15a6cc57e..c9a281f272fd 100644
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -123,7 +123,7 @@ static unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr)
 static atomic_t nmi_running = ATOMIC_INIT(0);
 static int mod_code_status;             /* holds return value of text write */
 static void *mod_code_ip;               /* holds the IP to write to */
-static void *mod_code_newcode;          /* holds the text to write to the IP */
+static const void *mod_code_newcode;    /* holds the text to write to the IP */
 
 static unsigned nmi_wait_count;
 static atomic_t nmi_update_count = ATOMIC_INIT(0);
@@ -225,7 +225,7 @@ within(unsigned long addr, unsigned long start, unsigned long end)
 }
 
 static int
-do_ftrace_mod_code(unsigned long ip, void *new_code)
+do_ftrace_mod_code(unsigned long ip, const void *new_code)
 {
         /*
          * On x86_64, kernel text mappings are mapped read-only with
@@ -266,8 +266,8 @@ static const unsigned char *ftrace_nop_replace(void)
 }
 
 static int
-ftrace_modify_code(unsigned long ip, unsigned char *old_code,
-                   unsigned char *new_code)
+ftrace_modify_code(unsigned long ip, unsigned const char *old_code,
+                   unsigned const char *new_code)
 {
         unsigned char replaced[MCOUNT_INSN_SIZE];
 
@@ -301,7 +301,7 @@ ftrace_modify_code(unsigned long ip, unsigned char *old_code,
 int ftrace_make_nop(struct module *mod,
                     struct dyn_ftrace *rec, unsigned long addr)
 {
-        unsigned char *new, *old;
+        unsigned const char *new, *old;
         unsigned long ip = rec->ip;
 
         old = ftrace_call_replace(ip, addr);
@@ -312,7 +312,7 @@ int ftrace_make_nop(struct module *mod,
 
 int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
 {
-        unsigned char *new, *old;
+        unsigned const char *new, *old;
         unsigned long ip = rec->ip;
 
         old = ftrace_nop_replace();
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index 88a90a977f8e..2e4928d45a2d 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -337,7 +337,9 @@ EXPORT_SYMBOL(boot_option_idle_override);
  * Powermanagement idle function, if any..
  */
 void (*pm_idle)(void);
+#if defined(CONFIG_APM_MODULE) && defined(CONFIG_APM_CPU_IDLE)
 EXPORT_SYMBOL(pm_idle);
+#endif
 
 #ifdef CONFIG_X86_32
 /*
@@ -397,7 +399,7 @@ void default_idle(void)
                 cpu_relax();
         }
 }
-#ifdef CONFIG_APM_MODULE
+#if defined(CONFIG_APM_MODULE) && defined(CONFIG_APM_CPU_IDLE)
 EXPORT_SYMBOL(default_idle);
 #endif
 
@@ -535,45 +537,45 @@ int mwait_usable(const struct cpuinfo_x86 *c)
         return (edx & MWAIT_EDX_C1);
 }
 
-bool c1e_detected;
-EXPORT_SYMBOL(c1e_detected);
+bool amd_e400_c1e_detected;
+EXPORT_SYMBOL(amd_e400_c1e_detected);
 
-static cpumask_var_t c1e_mask;
+static cpumask_var_t amd_e400_c1e_mask;
 
-void c1e_remove_cpu(int cpu)
+void amd_e400_remove_cpu(int cpu)
 {
-        if (c1e_mask != NULL)
-                cpumask_clear_cpu(cpu, c1e_mask);
+        if (amd_e400_c1e_mask != NULL)
+                cpumask_clear_cpu(cpu, amd_e400_c1e_mask);
 }
 
 /*
- * C1E aware idle routine. We check for C1E active in the interrupt
+ * AMD Erratum 400 aware idle routine. We check for C1E active in the interrupt
  * pending message MSR. If we detect C1E, then we handle it the same
  * way as C3 power states (local apic timer and TSC stop)
  */
-static void c1e_idle(void)
+static void amd_e400_idle(void)
 {
         if (need_resched())
                 return;
 
-        if (!c1e_detected) {
+        if (!amd_e400_c1e_detected) {
                 u32 lo, hi;
 
                 rdmsr(MSR_K8_INT_PENDING_MSG, lo, hi);
 
                 if (lo & K8_INTP_C1E_ACTIVE_MASK) {
-                        c1e_detected = true;
+                        amd_e400_c1e_detected = true;
                         if (!boot_cpu_has(X86_FEATURE_NONSTOP_TSC))
                                 mark_tsc_unstable("TSC halt in AMD C1E");
                         printk(KERN_INFO "System has AMD C1E enabled\n");
                 }
         }
 
-        if (c1e_detected) {
+        if (amd_e400_c1e_detected) {
                 int cpu = smp_processor_id();
 
-                if (!cpumask_test_cpu(cpu, c1e_mask)) {
-                        cpumask_set_cpu(cpu, c1e_mask);
+                if (!cpumask_test_cpu(cpu, amd_e400_c1e_mask)) {
+                        cpumask_set_cpu(cpu, amd_e400_c1e_mask);
                         /*
                          * Force broadcast so ACPI can not interfere.
                          */
@@ -616,17 +618,17 @@ void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c)
                 pm_idle = mwait_idle;
         } else if (cpu_has_amd_erratum(amd_erratum_400)) {
                 /* E400: APIC timer interrupt does not wake up CPU from C1e */
-                printk(KERN_INFO "using C1E aware idle routine\n");
-                pm_idle = c1e_idle;
+                printk(KERN_INFO "using AMD E400 aware idle routine\n");
+                pm_idle = amd_e400_idle;
         } else
                 pm_idle = default_idle;
 }
 
-void __init init_c1e_mask(void)
+void __init init_amd_e400_c1e_mask(void)
 {
-        /* If we're using c1e_idle, we need to allocate c1e_mask. */
-        if (pm_idle == c1e_idle)
-                zalloc_cpumask_var(&c1e_mask, GFP_KERNEL);
+        /* If we're using amd_e400_idle, we need to allocate amd_e400_c1e_mask. */
+        if (pm_idle == amd_e400_idle)
+                zalloc_cpumask_var(&amd_e400_c1e_mask, GFP_KERNEL);
 }
 
 static int __init idle_setup(char *str)
@@ -640,6 +642,7 @@ static int __init idle_setup(char *str)
                 boot_option_idle_override = IDLE_POLL;
         } else if (!strcmp(str, "mwait")) {
                 boot_option_idle_override = IDLE_FORCE_MWAIT;
+                WARN_ONCE(1, "\"idle=mwait\" will be removed in 2012\n");
         } else if (!strcmp(str, "halt")) {
                 /*
                  * When the boot option of idle=halt is added, halt is
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index a3e5948670c2..afaf38447ef5 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -910,6 +910,13 @@ void __init setup_arch(char **cmdline_p)
         memblock.current_limit = get_max_mapped();
         memblock_x86_fill();
 
+        /*
+         * The EFI specification says that boot service code won't be called
+         * after ExitBootServices(). This is, in fact, a lie.
+         */
+        if (efi_enabled)
+                efi_reserve_boot_services();
+
         /* preallocate 4k for mptable mpc */
         early_reserve_e820_mpc_new();
 
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index a3c430bdfb60..33a0c11797de 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1307,7 +1307,7 @@ void play_dead_common(void)
 {
         idle_task_exit();
         reset_lazy_tlbstate();
-        c1e_remove_cpu(raw_smp_processor_id());
+        amd_e400_remove_cpu(raw_smp_processor_id());
 
         mb();
         /* Ack it */
@@ -1332,7 +1332,7 @@ static inline void mwait_play_dead(void)
         void *mwait_ptr;
         struct cpuinfo_x86 *c = __this_cpu_ptr(&cpu_info);
 
-        if (!this_cpu_has(X86_FEATURE_MWAIT) && mwait_usable(c))
+        if (!(this_cpu_has(X86_FEATURE_MWAIT) && mwait_usable(c)))
                 return;
         if (!this_cpu_has(X86_FEATURE_CLFLSH))
                 return;
diff --git a/arch/x86/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S
index 32cbffb0c494..fbb0a045a1a2 100644
--- a/arch/x86/kernel/syscall_table_32.S
+++ b/arch/x86/kernel/syscall_table_32.S
@@ -345,3 +345,4 @@ ENTRY(sys_call_table)
         .long sys_clock_adjtime
         .long sys_syncfs
         .long sys_sendmmsg              /* 345 */
+        .long sys_setns
diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
index 25a28a245937..00cbb272627f 100644
--- a/arch/x86/kernel/time.c
+++ b/arch/x86/kernel/time.c
@@ -23,7 +23,7 @@
 #include <asm/time.h>
 
 #ifdef CONFIG_X86_64
-volatile unsigned long __jiffies __section_jiffies = INITIAL_JIFFIES;
+DEFINE_VVAR(volatile unsigned long, jiffies) = INITIAL_JIFFIES;
 #endif
 
 unsigned long profile_pc(struct pt_regs *regs)
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 9335bf7dd2e7..6cc6922262af 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -763,25 +763,6 @@ static cycle_t read_tsc(struct clocksource *cs)
                 ret : clocksource_tsc.cycle_last;
 }
 
-#ifdef CONFIG_X86_64
-static cycle_t __vsyscall_fn vread_tsc(void)
-{
-        cycle_t ret;
-
-        /*
-         * Surround the RDTSC by barriers, to make sure it's not
-         * speculated to outside the seqlock critical section and
-         * does not cause time warps:
-         */
-        rdtsc_barrier();
-        ret = (cycle_t)vget_cycles();
-        rdtsc_barrier();
-
-        return ret >= __vsyscall_gtod_data.clock.cycle_last ?
-                ret : __vsyscall_gtod_data.clock.cycle_last;
-}
-#endif
-
 static void resume_tsc(struct clocksource *cs)
 {
         clocksource_tsc.cycle_last = 0;
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 61682f0ac264..89aed99aafce 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -161,6 +161,12 @@ SECTIONS
 
 #define VVIRT_OFFSET (VSYSCALL_ADDR - __vsyscall_0)
 #define VVIRT(x) (ADDR(x) - VVIRT_OFFSET)
+#define EMIT_VVAR(x, offset) .vsyscall_var_ ## x        \
+        ADDR(.vsyscall_0) + offset                      \
+        : AT(VLOAD(.vsyscall_var_ ## x)) {              \
+                *(.vsyscall_var_ ## x)                  \
+        }                                               \
+        x = VVIRT(.vsyscall_var_ ## x);
 
         . = ALIGN(4096);
         __vsyscall_0 = .;
@@ -175,18 +181,6 @@ SECTIONS
                 *(.vsyscall_fn)
         }
 
-        . = ALIGN(L1_CACHE_BYTES);
-        .vsyscall_gtod_data : AT(VLOAD(.vsyscall_gtod_data)) {
-                *(.vsyscall_gtod_data)
-        }
-
-        vsyscall_gtod_data = VVIRT(.vsyscall_gtod_data);
-        .vsyscall_clock : AT(VLOAD(.vsyscall_clock)) {
-                *(.vsyscall_clock)
-        }
-        vsyscall_clock = VVIRT(.vsyscall_clock);
-
-
         .vsyscall_1 ADDR(.vsyscall_0) + 1024: AT(VLOAD(.vsyscall_1)) {
                 *(.vsyscall_1)
         }
@@ -194,21 +188,14 @@ SECTIONS
                 *(.vsyscall_2)
         }
 
-        .vgetcpu_mode : AT(VLOAD(.vgetcpu_mode)) {
-                *(.vgetcpu_mode)
-        }
-        vgetcpu_mode = VVIRT(.vgetcpu_mode);
-
-        . = ALIGN(L1_CACHE_BYTES);
-        .jiffies : AT(VLOAD(.jiffies)) {
-                *(.jiffies)
-        }
-        jiffies = VVIRT(.jiffies);
-
         .vsyscall_3 ADDR(.vsyscall_0) + 3072: AT(VLOAD(.vsyscall_3)) {
                 *(.vsyscall_3)
         }
 
+#define __VVAR_KERNEL_LDS
+#include <asm/vvar.h>
+#undef __VVAR_KERNEL_LDS
+
         . = __vsyscall_0 + PAGE_SIZE;
 
 #undef VSYSCALL_ADDR
@@ -216,6 +203,7 @@ SECTIONS
 #undef VLOAD
 #undef VVIRT_OFFSET
 #undef VVIRT
+#undef EMIT_VVAR
 
 #endif /* CONFIG_X86_64 */
 
diff --git a/arch/x86/kernel/vread_tsc_64.c b/arch/x86/kernel/vread_tsc_64.c
new file mode 100644
index 000000000000..a81aa9e9894c
--- /dev/null
+++ b/arch/x86/kernel/vread_tsc_64.c
@@ -0,0 +1,36 @@
+/* This code runs in userspace. */
+
+#define DISABLE_BRANCH_PROFILING
+#include <asm/vgtod.h>
+
+notrace cycle_t __vsyscall_fn vread_tsc(void)
+{
+        cycle_t ret;
+        u64 last;
+
+        /*
+         * Empirically, a fence (of type that depends on the CPU)
+         * before rdtsc is enough to ensure that rdtsc is ordered
+         * with respect to loads.  The various CPU manuals are unclear
+         * as to whether rdtsc can be reordered with later loads,
+         * but no one has ever seen it happen.
+         */
+        rdtsc_barrier();
+        ret = (cycle_t)vget_cycles();
+
+        last = VVAR(vsyscall_gtod_data).clock.cycle_last;
+
+        if (likely(ret >= last))
+                return ret;
+
+        /*
+         * GCC likes to generate cmov here, but this branch is extremely
+         * predictable (it's just a funciton of time and the likely is
+         * very likely) and there's a data dependence, so force GCC
+         * to generate a branch instead.  I don't barrier() because
+         * we don't actually need a barrier, and if this function
+         * ever gets inlined it will generate worse code.
+         */
+        asm volatile ("");
+        return last;
+}
diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
index dcbb28c4b694..3e682184d76c 100644
--- a/arch/x86/kernel/vsyscall_64.c
+++ b/arch/x86/kernel/vsyscall_64.c
@@ -49,17 +49,10 @@
                 __attribute__ ((unused, __section__(".vsyscall_" #nr))) notrace
 #define __syscall_clobber "r11","cx","memory"
 
-/*
- * vsyscall_gtod_data contains data that is :
- * - readonly from vsyscalls
- * - written by timer interrupt or systcl (/proc/sys/kernel/vsyscall64)
- * Try to keep this structure as small as possible to avoid cache line ping pongs
- */
-int __vgetcpu_mode __section_vgetcpu_mode;
-
-struct vsyscall_gtod_data __vsyscall_gtod_data __section_vsyscall_gtod_data =
+DEFINE_VVAR(int, vgetcpu_mode);
+DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data) =
 {
-        .lock = SEQLOCK_UNLOCKED,
+        .lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock),
         .sysctl_enabled = 1,
 };
 
@@ -97,7 +90,7 @@ void update_vsyscall(struct timespec *wall_time, struct timespec *wtm,
  */
 static __always_inline void do_get_tz(struct timezone * tz)
 {
-        *tz = __vsyscall_gtod_data.sys_tz;
+        *tz = VVAR(vsyscall_gtod_data).sys_tz;
 }
 
 static __always_inline int gettimeofday(struct timeval *tv, struct timezone *tz)
@@ -126,23 +119,24 @@ static __always_inline void do_vgettimeofday(struct timeval * tv)
         unsigned long mult, shift, nsec;
         cycle_t (*vread)(void);
         do {
-                seq = read_seqbegin(&__vsyscall_gtod_data.lock);
+                seq = read_seqbegin(&VVAR(vsyscall_gtod_data).lock);
 
-                vread = __vsyscall_gtod_data.clock.vread;
-                if (unlikely(!__vsyscall_gtod_data.sysctl_enabled || !vread)) {
+                vread = VVAR(vsyscall_gtod_data).clock.vread;
+                if (unlikely(!VVAR(vsyscall_gtod_data).sysctl_enabled ||
+                             !vread)) {
                         gettimeofday(tv,NULL);
                         return;
                 }
 
                 now = vread();
-                base = __vsyscall_gtod_data.clock.cycle_last;
-                mask = __vsyscall_gtod_data.clock.mask;
-                mult = __vsyscall_gtod_data.clock.mult;
-                shift = __vsyscall_gtod_data.clock.shift;
+                base = VVAR(vsyscall_gtod_data).clock.cycle_last;
+                mask = VVAR(vsyscall_gtod_data).clock.mask;
+                mult = VVAR(vsyscall_gtod_data).clock.mult;
+                shift = VVAR(vsyscall_gtod_data).clock.shift;
 
-                tv->tv_sec = __vsyscall_gtod_data.wall_time_sec;
-                nsec = __vsyscall_gtod_data.wall_time_nsec;
-        } while (read_seqretry(&__vsyscall_gtod_data.lock, seq));
+                tv->tv_sec = VVAR(vsyscall_gtod_data).wall_time_sec;
+                nsec = VVAR(vsyscall_gtod_data).wall_time_nsec;
+        } while (read_seqretry(&VVAR(vsyscall_gtod_data).lock, seq));
 
         /* calculate interval: */
         cycle_delta = (now - base) & mask;
@@ -171,15 +165,15 @@ time_t __vsyscall(1) vtime(time_t *t)
 {
         unsigned seq;
         time_t result;
-        if (unlikely(!__vsyscall_gtod_data.sysctl_enabled))
+        if (unlikely(!VVAR(vsyscall_gtod_data).sysctl_enabled))
                 return time_syscall(t);
 
         do {
-                seq = read_seqbegin(&__vsyscall_gtod_data.lock);
+                seq = read_seqbegin(&VVAR(vsyscall_gtod_data).lock);
 
-                result = __vsyscall_gtod_data.wall_time_sec;
+                result = VVAR(vsyscall_gtod_data).wall_time_sec;
 
-        } while (read_seqretry(&__vsyscall_gtod_data.lock, seq));
+        } while (read_seqretry(&VVAR(vsyscall_gtod_data).lock, seq));
 
         if (t)
                 *t = result;
@@ -208,9 +202,9 @@ vgetcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *tcache)
            We do this here because otherwise user space would do it on
            its own in a likely inferior way (no access to jiffies).
            If you don't like it pass NULL. */
-        if (tcache && tcache->blob[0] == (j = __jiffies)) {
+        if (tcache && tcache->blob[0] == (j = VVAR(jiffies))) {
                 p = tcache->blob[1];
-        } else if (__vgetcpu_mode == VGETCPU_RDTSCP) {
+        } else if (VVAR(vgetcpu_mode) == VGETCPU_RDTSCP) {
                 /* Load per CPU data from RDTSCP */
                 native_read_tscp(&p);
         } else {
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
index e191c096ab90..db832fd65ecb 100644
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
@@ -993,6 +993,7 @@ static void lguest_time_irq(unsigned int irq, struct irq_desc *desc)
 static void lguest_time_init(void)
 {
         /* Set up the timer interrupt (0) to go to our simple timer routine */
+        lguest_setup_irq(0);
         irq_set_handler(0, lguest_time_irq);
 
         clocksource_register_hz(&lguest_clock, NSEC_PER_SEC);
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index f7a2a054a3c0..2dbf6bf4c7e5 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -823,16 +823,30 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
         force_sig_info_fault(SIGBUS, code, address, tsk, fault);
 }
 
-static noinline void
+static noinline int
 mm_fault_error(struct pt_regs *regs, unsigned long error_code,
                unsigned long address, unsigned int fault)
 {
+        /*
+         * Pagefault was interrupted by SIGKILL. We have no reason to
+         * continue pagefault.
+         */
+        if (fatal_signal_pending(current)) {
+                if (!(fault & VM_FAULT_RETRY))
+                        up_read(&current->mm->mmap_sem);
+                if (!(error_code & PF_USER))
+                        no_context(regs, error_code, address);
+                return 1;
+        }
+        if (!(fault & VM_FAULT_ERROR))
+                return 0;
+
         if (fault & VM_FAULT_OOM) {
                 /* Kernel mode? Handle exceptions or die: */
                 if (!(error_code & PF_USER)) {
                         up_read(&current->mm->mmap_sem);
                         no_context(regs, error_code, address);
-                        return;
+                        return 1;
                 }
 
                 out_of_memory(regs, error_code, address);
@@ -843,6 +857,7 @@ mm_fault_error(struct pt_regs *regs, unsigned long error_code,
                 else
                         BUG();
         }
+        return 1;
 }
 
 static int spurious_fault_check(unsigned long error_code, pte_t *pte)
@@ -1133,19 +1148,9 @@ good_area:
          */
         fault = handle_mm_fault(mm, vma, address, flags);
 
-        if (unlikely(fault & VM_FAULT_ERROR)) {
-                mm_fault_error(regs, error_code, address, fault);
-                return;
-        }
-
-        /*
-         * Pagefault was interrupted by SIGKILL. We have no reason to
-         * continue pagefault.
-         */
-        if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current)) {
-                if (!(error_code & PF_USER))
-                        no_context(regs, error_code, address);
-                return;
+        if (unlikely(fault & (VM_FAULT_RETRY|VM_FAULT_ERROR))) {
+                if (mm_fault_error(regs, error_code, address, fault))
+                        return;
         }
 
         /*
diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
index c3b8e24f2b16..9fd8a567fe1e 100644
--- a/arch/x86/oprofile/op_model_amd.c
+++ b/arch/x86/oprofile/op_model_amd.c
@@ -316,16 +316,23 @@ static void op_amd_stop_ibs(void)
                 wrmsrl(MSR_AMD64_IBSOPCTL, 0);
 }
 
-static inline int eilvt_is_available(int offset)
+static inline int get_eilvt(int offset)
 {
-        /* check if we may assign a vector */
         return !setup_APIC_eilvt(offset, 0, APIC_EILVT_MSG_NMI, 1);
 }
 
+static inline int put_eilvt(int offset)
+{
+        return !setup_APIC_eilvt(offset, 0, 0, 1);
+}
+
 static inline int ibs_eilvt_valid(void)
 {
         int offset;
         u64 val;
+        int valid = 0;
+
+        preempt_disable();
 
         rdmsrl(MSR_AMD64_IBSCTL, val);
         offset = val & IBSCTL_LVT_OFFSET_MASK;
@@ -333,16 +340,20 @@ static inline int ibs_eilvt_valid(void)
         if (!(val & IBSCTL_LVT_OFFSET_VALID)) {
                 pr_err(FW_BUG "cpu %d, invalid IBS interrupt offset %d (MSR%08X=0x%016llx)\n",
                        smp_processor_id(), offset, MSR_AMD64_IBSCTL, val);
-                return 0;
+                goto out;
         }
 
-        if (!eilvt_is_available(offset)) {
+        if (!get_eilvt(offset)) {
                 pr_err(FW_BUG "cpu %d, IBS interrupt offset %d not available (MSR%08X=0x%016llx)\n",
                        smp_processor_id(), offset, MSR_AMD64_IBSCTL, val);
-                return 0;
+                goto out;
         }
 
-        return 1;
+        valid = 1;
+out:
+        preempt_enable();
+
+        return valid;
 }
 
 static inline int get_ibs_offset(void)
@@ -600,67 +611,69 @@ static int setup_ibs_ctl(int ibs_eilvt_off)
 
 static int force_ibs_eilvt_setup(void)
 {
-        int i;
+        int offset;
         int ret;
 
-        /* find the next free available EILVT entry */
-        for (i = 1; i < 4; i++) {
-                if (!eilvt_is_available(i))
-                        continue;
-                ret = setup_ibs_ctl(i);
-                if (ret)
-                        return ret;
-                pr_err(FW_BUG "using offset %d for IBS interrupts\n", i);
-                return 0;
+        /*
+         * find the next free available EILVT entry, skip offset 0,
+         * pin search to this cpu
+         */
+        preempt_disable();
+        for (offset = 1; offset < APIC_EILVT_NR_MAX; offset++) {
+                if (get_eilvt(offset))
+                        break;
         }
+        preempt_enable();
 
-        printk(KERN_DEBUG "No EILVT entry available\n");
-
-        return -EBUSY;
-}
-
-static int __init_ibs_nmi(void)
-{
-        int ret;
-
-        if (ibs_eilvt_valid())
-                return 0;
+        if (offset == APIC_EILVT_NR_MAX) {
+                printk(KERN_DEBUG "No EILVT entry available\n");
+                return -EBUSY;
+        }
 
-        ret = force_ibs_eilvt_setup();
+        ret = setup_ibs_ctl(offset);
         if (ret)
-                return ret;
+                goto out;
 
-        if (!ibs_eilvt_valid())
-                return -EFAULT;
+        if (!ibs_eilvt_valid()) {
+                ret = -EFAULT;
+                goto out;
+        }
 
+        pr_err(FW_BUG "using offset %d for IBS interrupts\n", offset);
         pr_err(FW_BUG "workaround enabled for IBS LVT offset\n");
 
         return 0;
+out:
+        preempt_disable();
+        put_eilvt(offset);
+        preempt_enable();
+        return ret;
 }
 
 /*
  * check and reserve APIC extended interrupt LVT offset for IBS if
  * available
- *
- * init_ibs() preforms implicitly cpu-local operations, so pin this
- * thread to its current CPU
  */
 
 static void init_ibs(void)
 {
-        preempt_disable();
-
         ibs_caps = get_ibs_caps();
+
         if (!ibs_caps)
+                return;
+
+        if (ibs_eilvt_valid())
                 goto out;
 
-        if (__init_ibs_nmi() < 0)
-                ibs_caps = 0;
-        else
-                printk(KERN_INFO "oprofile: AMD IBS detected (0x%08x)\n", ibs_caps);
+        if (!force_ibs_eilvt_setup())
+                goto out;
+
+        /* Failed to setup ibs */
+        ibs_caps = 0;
+        return;
 
 out:
-        preempt_enable();
+        printk(KERN_INFO "oprofile: AMD IBS detected (0x%08x)\n", ibs_caps);
 }
 
 static int (*create_arch_files)(struct super_block *sb, struct dentry *root);
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index b30aa26a8df2..0d3a4fa34560 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -304,6 +304,40 @@ static void __init print_efi_memmap(void)
 }
 #endif  /*  EFI_DEBUG  */
 
+void __init efi_reserve_boot_services(void)
+{
+        void *p;
+
+        for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
+                efi_memory_desc_t *md = p;
+                unsigned long long start = md->phys_addr;
+                unsigned long long size = md->num_pages << EFI_PAGE_SHIFT;
+
+                if (md->type != EFI_BOOT_SERVICES_CODE &&
+                    md->type != EFI_BOOT_SERVICES_DATA)
+                        continue;
+
+                memblock_x86_reserve_range(start, start + size, "EFI Boot");
+        }
+}
+
+static void __init efi_free_boot_services(void)
+{
+        void *p;
+
+        for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
+                efi_memory_desc_t *md = p;
+                unsigned long long start = md->phys_addr;
+                unsigned long long size = md->num_pages << EFI_PAGE_SHIFT;
+
+                if (md->type != EFI_BOOT_SERVICES_CODE &&
+                    md->type != EFI_BOOT_SERVICES_DATA)
+                        continue;
+
+                free_bootmem_late(start, size);
+        }
+}
+
 void __init efi_init(void)
 {
         efi_config_table_t *config_tables;
@@ -536,7 +570,9 @@ void __init efi_enter_virtual_mode(void)
 
         for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
                 md = p;
-                if (!(md->attribute & EFI_MEMORY_RUNTIME))
+                if (!(md->attribute & EFI_MEMORY_RUNTIME) &&
+                    md->type != EFI_BOOT_SERVICES_CODE &&
+                    md->type != EFI_BOOT_SERVICES_DATA)
                         continue;
 
                 size = md->num_pages << EFI_PAGE_SHIFT;
@@ -593,6 +629,13 @@ void __init efi_enter_virtual_mode(void)
         }
 
         /*
+         * Thankfully, it does seem that no runtime services other than
+         * SetVirtualAddressMap() will touch boot services code, so we can
+         * get rid of it all at this point
+         */
+        efi_free_boot_services();
+
+        /*
          * Now that EFI is in virtual mode, update the function
          * pointers in the runtime service table to the new virtual addresses.
          *
diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
index 2649426a7905..ac3aa54e2654 100644
--- a/arch/x86/platform/efi/efi_64.c
+++ b/arch/x86/platform/efi/efi_64.c
@@ -49,10 +49,11 @@ static void __init early_code_mapping_set_exec(int executable)
         if (!(__supported_pte_mask & _PAGE_NX))
                 return;
 
-        /* Make EFI runtime service code area executable */
+        /* Make EFI service code area executable */
         for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
                 md = p;
-                if (md->type == EFI_RUNTIME_SERVICES_CODE)
+                if (md->type == EFI_RUNTIME_SERVICES_CODE ||
+                    md->type == EFI_BOOT_SERVICES_CODE)
                         efi_set_executable(md, executable);
         }
 }
diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
index c58e0ea39ef5..68e467f69fec 100644
--- a/arch/x86/platform/uv/tlb_uv.c
+++ b/arch/x86/platform/uv/tlb_uv.c
@@ -1,7 +1,7 @@
 /*
  *      SGI UltraViolet TLB flush routines.
  *
- *      (c) 2008-2010 Cliff Wickman <cpw@sgi.com>, SGI.
+ *      (c) 2008-2011 Cliff Wickman <cpw@sgi.com>, SGI.
  *
  *      This code is released under the GNU General Public License version 2 or
  *      later.
@@ -35,6 +35,7 @@ static int timeout_base_ns[] = {
                 5242880,
                 167772160
 };
+
 static int timeout_us;
 static int nobau;
 static int baudisabled;
@@ -42,20 +43,70 @@ static spinlock_t disable_lock;
 static cycles_t congested_cycles;
 
 /* tunables: */
-static int max_bau_concurrent = MAX_BAU_CONCURRENT;
-static int max_bau_concurrent_constant = MAX_BAU_CONCURRENT;
-static int plugged_delay = PLUGGED_DELAY;
-static int plugsb4reset = PLUGSB4RESET;
-static int timeoutsb4reset = TIMEOUTSB4RESET;
-static int ipi_reset_limit = IPI_RESET_LIMIT;
-static int complete_threshold = COMPLETE_THRESHOLD;
-static int congested_response_us = CONGESTED_RESPONSE_US;
-static int congested_reps = CONGESTED_REPS;
-static int congested_period = CONGESTED_PERIOD;
+static int max_concurr          = MAX_BAU_CONCURRENT;
+static int max_concurr_const    = MAX_BAU_CONCURRENT;
+static int plugged_delay        = PLUGGED_DELAY;
+static int plugsb4reset         = PLUGSB4RESET;
+static int timeoutsb4reset      = TIMEOUTSB4RESET;
+static int ipi_reset_limit      = IPI_RESET_LIMIT;
+static int complete_threshold   = COMPLETE_THRESHOLD;
+static int congested_respns_us  = CONGESTED_RESPONSE_US;
+static int congested_reps       = CONGESTED_REPS;
+static int congested_period     = CONGESTED_PERIOD;
+
+static struct tunables tunables[] = {
+        {&max_concurr, MAX_BAU_CONCURRENT}, /* must be [0] */
+        {&plugged_delay, PLUGGED_DELAY},
+        {&plugsb4reset, PLUGSB4RESET},
+        {&timeoutsb4reset, TIMEOUTSB4RESET},
+        {&ipi_reset_limit, IPI_RESET_LIMIT},
+        {&complete_threshold, COMPLETE_THRESHOLD},
+        {&congested_respns_us, CONGESTED_RESPONSE_US},
+        {&congested_reps, CONGESTED_REPS},
+        {&congested_period, CONGESTED_PERIOD}
+};
+
 static struct dentry *tunables_dir;
 static struct dentry *tunables_file;
 
-static int __init setup_nobau(char *arg)
+/* these correspond to the statistics printed by ptc_seq_show() */
+static char *stat_description[] = {
+        "sent:     number of shootdown messages sent",
+        "stime:    time spent sending messages",
+        "numuvhubs: number of hubs targeted with shootdown",
+        "numuvhubs16: number times 16 or more hubs targeted",
+        "numuvhubs8: number times 8 or more hubs targeted",
+        "numuvhubs4: number times 4 or more hubs targeted",
+        "numuvhubs2: number times 2 or more hubs targeted",
+        "numuvhubs1: number times 1 hub targeted",
+        "numcpus:  number of cpus targeted with shootdown",
+        "dto:      number of destination timeouts",
+        "retries:  destination timeout retries sent",
+        "rok:   :  destination timeouts successfully retried",
+        "resetp:   ipi-style resource resets for plugs",
+        "resett:   ipi-style resource resets for timeouts",
+        "giveup:   fall-backs to ipi-style shootdowns",
+        "sto:      number of source timeouts",
+        "bz:       number of stay-busy's",
+        "throt:    number times spun in throttle",
+        "swack:   image of UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE",
+        "recv:     shootdown messages received",
+        "rtime:    time spent processing messages",
+        "all:      shootdown all-tlb messages",
+        "one:      shootdown one-tlb messages",
+        "mult:     interrupts that found multiple messages",
+        "none:     interrupts that found no messages",
+        "retry:    number of retry messages processed",
+        "canc:     number messages canceled by retries",
+        "nocan:    number retries that found nothing to cancel",
+        "reset:    number of ipi-style reset requests processed",
+        "rcan:     number messages canceled by reset requests",
+        "disable:  number times use of the BAU was disabled",
+        "enable:   number times use of the BAU was re-enabled"
+};
+
+static int __init
+setup_nobau(char *arg)
 {
         nobau = 1;
         return 0;
@@ -63,7 +114,7 @@ static int __init setup_nobau(char *arg)
 early_param("nobau", setup_nobau);
 
 /* base pnode in this partition */
-static int uv_partition_base_pnode __read_mostly;
+static int uv_base_pnode __read_mostly;
 /* position of pnode (which is nasid>>1): */
 static int uv_nshift __read_mostly;
 static unsigned long uv_mmask __read_mostly;
@@ -109,60 +160,52 @@ static int __init uvhub_to_first_apicid(int uvhub)
  * clear of the Timeout bit (as well) will free the resource. No reply will
  * be sent (the hardware will only do one reply per message).
  */
-static inline void uv_reply_to_message(struct msg_desc *mdp,
-                                       struct bau_control *bcp)
+static void reply_to_message(struct msg_desc *mdp, struct bau_control *bcp)
 {
         unsigned long dw;
-        struct bau_payload_queue_entry *msg;
+        struct bau_pq_entry *msg;
 
         msg = mdp->msg;
         if (!msg->canceled) {
-                dw = (msg->sw_ack_vector << UV_SW_ACK_NPENDING) |
-                                                msg->sw_ack_vector;
-                uv_write_local_mmr(
-                                UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS, dw);
+                dw = (msg->swack_vec << UV_SW_ACK_NPENDING) | msg->swack_vec;
+                write_mmr_sw_ack(dw);
         }
         msg->replied_to = 1;
-        msg->sw_ack_vector = 0;
+        msg->swack_vec = 0;
 }
 
 /*
  * Process the receipt of a RETRY message
  */
-static inline void uv_bau_process_retry_msg(struct msg_desc *mdp,
-                                            struct bau_control *bcp)
+static void bau_process_retry_msg(struct msg_desc *mdp,
+                                        struct bau_control *bcp)
 {
         int i;
         int cancel_count = 0;
-        int slot2;
         unsigned long msg_res;
         unsigned long mmr = 0;
-        struct bau_payload_queue_entry *msg;
-        struct bau_payload_queue_entry *msg2;
-        struct ptc_stats *stat;
+        struct bau_pq_entry *msg = mdp->msg;
+        struct bau_pq_entry *msg2;
+        struct ptc_stats *stat = bcp->statp;
 
-        msg = mdp->msg;
-        stat = bcp->statp;
         stat->d_retries++;
         /*
          * cancel any message from msg+1 to the retry itself
          */
         for (msg2 = msg+1, i = 0; i < DEST_Q_SIZE; msg2++, i++) {
-                if (msg2 > mdp->va_queue_last)
-                        msg2 = mdp->va_queue_first;
+                if (msg2 > mdp->queue_last)
+                        msg2 = mdp->queue_first;
                 if (msg2 == msg)
                         break;
 
-                /* same conditions for cancellation as uv_do_reset */
+                /* same conditions for cancellation as do_reset */
                 if ((msg2->replied_to == 0) && (msg2->canceled == 0) &&
-                    (msg2->sw_ack_vector) && ((msg2->sw_ack_vector &
-                        msg->sw_ack_vector) == 0) &&
+                    (msg2->swack_vec) && ((msg2->swack_vec &
+                        msg->swack_vec) == 0) &&
                     (msg2->sending_cpu == msg->sending_cpu) &&
                     (msg2->msg_type != MSG_NOOP)) {
-                        slot2 = msg2 - mdp->va_queue_first;
-                        mmr = uv_read_local_mmr
-                                (UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE);
-                        msg_res = msg2->sw_ack_vector;
+                        mmr = read_mmr_sw_ack();
+                        msg_res = msg2->swack_vec;
                         /*
                          * This is a message retry; clear the resources held
                          * by the previous message only if they timed out.
@@ -170,6 +213,7 @@ static inline void uv_bau_process_retry_msg(struct msg_desc *mdp,
                          * situation to report.
                          */
                         if (mmr & (msg_res << UV_SW_ACK_NPENDING)) {
+                                unsigned long mr;
                                 /*
                                  * is the resource timed out?
                                  * make everyone ignore the cancelled message.
@@ -177,10 +221,8 @@ static inline void uv_bau_process_retry_msg(struct msg_desc *mdp,
                                 msg2->canceled = 1;
                                 stat->d_canceled++;
                                 cancel_count++;
-                                uv_write_local_mmr(
-                                    UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS,
-                                        (msg_res << UV_SW_ACK_NPENDING) |
-                                         msg_res);
+                                mr = (msg_res << UV_SW_ACK_NPENDING) | msg_res;
+                                write_mmr_sw_ack(mr);
                         }
                 }
         }
@@ -192,20 +234,19 @@ static inline void uv_bau_process_retry_msg(struct msg_desc *mdp,
  * Do all the things a cpu should do for a TLB shootdown message.
  * Other cpu's may come here at the same time for this message.
  */
-static void uv_bau_process_message(struct msg_desc *mdp,
-                                   struct bau_control *bcp)
+static void bau_process_message(struct msg_desc *mdp,
+                                        struct bau_control *bcp)
 {
-        int msg_ack_count;
         short socket_ack_count = 0;
-        struct ptc_stats *stat;
-        struct bau_payload_queue_entry *msg;
+        short *sp;
+        struct atomic_short *asp;
+        struct ptc_stats *stat = bcp->statp;
+        struct bau_pq_entry *msg = mdp->msg;
         struct bau_control *smaster = bcp->socket_master;
 
         /*
          * This must be a normal message, or retry of a normal message
          */
-        msg = mdp->msg;
-        stat = bcp->statp;
         if (msg->address == TLB_FLUSH_ALL) {
                 local_flush_tlb();
                 stat->d_alltlb++;
@@ -222,30 +263,32 @@ static void uv_bau_process_message(struct msg_desc *mdp,
          * cpu number.
          */
         if (msg->msg_type == MSG_RETRY && bcp == bcp->uvhub_master)
-                uv_bau_process_retry_msg(mdp, bcp);
+                bau_process_retry_msg(mdp, bcp);
 
         /*
-         * This is a sw_ack message, so we have to reply to it.
+         * This is a swack message, so we have to reply to it.
          * Count each responding cpu on the socket. This avoids
          * pinging the count's cache line back and forth between
          * the sockets.
          */
-        socket_ack_count = atomic_add_short_return(1, (struct atomic_short *)
-                        &smaster->socket_acknowledge_count[mdp->msg_slot]);
+        sp = &smaster->socket_acknowledge_count[mdp->msg_slot];
+        asp = (struct atomic_short *)sp;
+        socket_ack_count = atom_asr(1, asp);
         if (socket_ack_count == bcp->cpus_in_socket) {
+                int msg_ack_count;
                 /*
                  * Both sockets dump their completed count total into
                  * the message's count.
                  */
                 smaster->socket_acknowledge_count[mdp->msg_slot] = 0;
-                msg_ack_count = atomic_add_short_return(socket_ack_count,
-                                (struct atomic_short *)&msg->acknowledge_count);
+                asp = (struct atomic_short *)&msg->acknowledge_count;
+                msg_ack_count = atom_asr(socket_ack_count, asp);
 
                 if (msg_ack_count == bcp->cpus_in_uvhub) {
                         /*
                          * All cpus in uvhub saw it; reply
                          */
-                        uv_reply_to_message(mdp, bcp);
+                        reply_to_message(mdp, bcp);
                 }
         }
 
@@ -268,62 +311,51 @@ static int uvhub_to_first_cpu(int uvhub)
  * Last resort when we get a large number of destination timeouts is
  * to clear resources held by a given cpu.
  * Do this with IPI so that all messages in the BAU message queue
- * can be identified by their nonzero sw_ack_vector field.
+ * can be identified by their nonzero swack_vec field.
  *
  * This is entered for a single cpu on the uvhub.
  * The sender want's this uvhub to free a specific message's
- * sw_ack resources.
+ * swack resources.
  */
-static void
-uv_do_reset(void *ptr)
+static void do_reset(void *ptr)
 {
         int i;
-        int slot;
-        int count = 0;
-        unsigned long mmr;
-        unsigned long msg_res;
-        struct bau_control *bcp;
-        struct reset_args *rap;
-        struct bau_payload_queue_entry *msg;
-        struct ptc_stats *stat;
+        struct bau_control *bcp = &per_cpu(bau_control, smp_processor_id());
+        struct reset_args *rap = (struct reset_args *)ptr;
+        struct bau_pq_entry *msg;
+        struct ptc_stats *stat = bcp->statp;
 
-        bcp = &per_cpu(bau_control, smp_processor_id());
-        rap = (struct reset_args *)ptr;
-        stat = bcp->statp;
         stat->d_resets++;
-
         /*
          * We're looking for the given sender, and
-         * will free its sw_ack resource.
+         * will free its swack resource.
          * If all cpu's finally responded after the timeout, its
          * message 'replied_to' was set.
          */
-        for (msg = bcp->va_queue_first, i = 0; i < DEST_Q_SIZE; msg++, i++) {
-                /* uv_do_reset: same conditions for cancellation as
-                   uv_bau_process_retry_msg() */
+        for (msg = bcp->queue_first, i = 0; i < DEST_Q_SIZE; msg++, i++) {
+                unsigned long msg_res;
+                /* do_reset: same conditions for cancellation as
+                   bau_process_retry_msg() */
                 if ((msg->replied_to == 0) &&
                     (msg->canceled == 0) &&
                     (msg->sending_cpu == rap->sender) &&
-                    (msg->sw_ack_vector) &&
+                    (msg->swack_vec) &&
                     (msg->msg_type != MSG_NOOP)) {
+                        unsigned long mmr;
+                        unsigned long mr;
                         /*
                          * make everyone else ignore this message
                          */
                         msg->canceled = 1;
-                        slot = msg - bcp->va_queue_first;
-                        count++;
                         /*
                          * only reset the resource if it is still pending
                          */
-                        mmr = uv_read_local_mmr
-                                        (UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE);
-                        msg_res = msg->sw_ack_vector;
+                        mmr = read_mmr_sw_ack();
+                        msg_res = msg->swack_vec;
+                        mr = (msg_res << UV_SW_ACK_NPENDING) | msg_res;
                         if (mmr & msg_res) {
                                 stat->d_rcanceled++;
-                                uv_write_local_mmr(
-                                    UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS,
-                                        (msg_res << UV_SW_ACK_NPENDING) |
-                                         msg_res);
+                                write_mmr_sw_ack(mr);
                         }
                 }
         }
@@ -334,39 +366,38 @@ uv_do_reset(void *ptr)
  * Use IPI to get all target uvhubs to release resources held by
  * a given sending cpu number.
  */
-static void uv_reset_with_ipi(struct bau_target_uvhubmask *distribution,
-                              int sender)
+static void reset_with_ipi(struct bau_targ_hubmask *distribution, int sender)
 {
         int uvhub;
-        int cpu;
+        int maskbits;
         cpumask_t mask;
         struct reset_args reset_args;
 
         reset_args.sender = sender;
-
         cpus_clear(mask);
         /* find a single cpu for each uvhub in this distribution mask */
-        for (uvhub = 0;
-                    uvhub < sizeof(struct bau_target_uvhubmask) * BITSPERBYTE;
-                    uvhub++) {
+        maskbits = sizeof(struct bau_targ_hubmask) * BITSPERBYTE;
+        for (uvhub = 0; uvhub < maskbits; uvhub++) {
+                int cpu;
                 if (!bau_uvhub_isset(uvhub, distribution))
                         continue;
                 /* find a cpu for this uvhub */
                 cpu = uvhub_to_first_cpu(uvhub);
                 cpu_set(cpu, mask);
         }
-        /* IPI all cpus; Preemption is already disabled */
-        smp_call_function_many(&mask, uv_do_reset, (void *)&reset_args, 1);
+
+        /* IPI all cpus; preemption is already disabled */
+        smp_call_function_many(&mask, do_reset, (void *)&reset_args, 1);
         return;
 }
 
-static inline unsigned long
-cycles_2_us(unsigned long long cyc)
+static inline unsigned long cycles_2_us(unsigned long long cyc)
 {
         unsigned long long ns;
         unsigned long us;
-        ns =  (cyc * per_cpu(cyc2ns, smp_processor_id()))
-                                                >> CYC2NS_SCALE_FACTOR;
+        int cpu = smp_processor_id();
+
+        ns =  (cyc * per_cpu(cyc2ns, cpu)) >> CYC2NS_SCALE_FACTOR;
         us = ns / 1000;
         return us;
 }
@@ -376,56 +407,56 @@ cycles_2_us(unsigned long long cyc)
  * leaves uvhub_quiesce set so that no new broadcasts are started by
  * bau_flush_send_and_wait()
  */
-static inline void
-quiesce_local_uvhub(struct bau_control *hmaster)
+static inline void quiesce_local_uvhub(struct bau_control *hmaster)
 {
-        atomic_add_short_return(1, (struct atomic_short *)
-                 &hmaster->uvhub_quiesce);
+        atom_asr(1, (struct atomic_short *)&hmaster->uvhub_quiesce);
 }
 
 /*
  * mark this quiet-requestor as done
  */
-static inline void
-end_uvhub_quiesce(struct bau_control *hmaster)
+static inline void end_uvhub_quiesce(struct bau_control *hmaster)
 {
-        atomic_add_short_return(-1, (struct atomic_short *)
-                &hmaster->uvhub_quiesce);
+        atom_asr(-1, (struct atomic_short *)&hmaster->uvhub_quiesce);
+}
+
+static unsigned long uv1_read_status(unsigned long mmr_offset, int right_shift)
+{
+        unsigned long descriptor_status;
+
+        descriptor_status = uv_read_local_mmr(mmr_offset);
+        descriptor_status >>= right_shift;
+        descriptor_status &= UV_ACT_STATUS_MASK;
+        return descriptor_status;
 }
 
 /*
  * Wait for completion of a broadcast software ack message
  * return COMPLETE, RETRY(PLUGGED or TIMEOUT) or GIVEUP
  */
-static int uv_wait_completion(struct bau_desc *bau_desc,
-        unsigned long mmr_offset, int right_shift, int this_cpu,
-        struct bau_control *bcp, struct bau_control *smaster, long try)
+static int uv1_wait_completion(struct bau_desc *bau_desc,
+                                unsigned long mmr_offset, int right_shift,
+                                struct bau_control *bcp, long try)
 {
         unsigned long descriptor_status;
-        cycles_t ttime;
+        cycles_t ttm;
         struct ptc_stats *stat = bcp->statp;
-        struct bau_control *hmaster;
-
-        hmaster = bcp->uvhub_master;
 
+        descriptor_status = uv1_read_status(mmr_offset, right_shift);
         /* spin on the status MMR, waiting for it to go idle */
-        while ((descriptor_status = (((unsigned long)
-                uv_read_local_mmr(mmr_offset) >>
-                        right_shift) & UV_ACT_STATUS_MASK)) !=
-                        DESC_STATUS_IDLE) {
+        while ((descriptor_status != DS_IDLE)) {
                 /*
-                 * Our software ack messages may be blocked because there are
-                 * no swack resources available.  As long as none of them
-                 * has timed out hardware will NACK our message and its
-                 * state will stay IDLE.
+                 * Our software ack messages may be blocked because
+                 * there are no swack resources available.  As long
+                 * as none of them has timed out hardware will NACK
+                 * our message and its state will stay IDLE.
                  */
-                if (descriptor_status == DESC_STATUS_SOURCE_TIMEOUT) {
+                if (descriptor_status == DS_SOURCE_TIMEOUT) {
                         stat->s_stimeout++;
                         return FLUSH_GIVEUP;
-                } else if (descriptor_status ==
-                                        DESC_STATUS_DESTINATION_TIMEOUT) {
+                } else if (descriptor_status == DS_DESTINATION_TIMEOUT) {
                         stat->s_dtimeout++;
-                        ttime = get_cycles();
+                        ttm = get_cycles();
 
                         /*
                          * Our retries may be blocked by all destination
@@ -433,8 +464,7 @@ static int uv_wait_completion(struct bau_desc *bau_desc,
                          * pending.  In that case hardware returns the
                          * ERROR that looks like a destination timeout.
                          */
-                        if (cycles_2_us(ttime - bcp->send_message) <
-                                                        timeout_us) {
+                        if (cycles_2_us(ttm - bcp->send_message) < timeout_us) {
                                 bcp->conseccompletes = 0;
                                 return FLUSH_RETRY_PLUGGED;
                         }
@@ -447,80 +477,160 @@ static int uv_wait_completion(struct bau_desc *bau_desc,
                          */
                         cpu_relax();
                 }
+                descriptor_status = uv1_read_status(mmr_offset, right_shift);
         }
         bcp->conseccompletes++;
         return FLUSH_COMPLETE;
 }
 
-static inline cycles_t
-sec_2_cycles(unsigned long sec)
+/*
+ * UV2 has an extra bit of status in the ACTIVATION_STATUS_2 register.
+ */
+static unsigned long uv2_read_status(unsigned long offset, int rshft, int cpu)
 {
-        unsigned long ns;
-        cycles_t cyc;
+        unsigned long descriptor_status;
+        unsigned long descriptor_status2;
 
-        ns = sec * 1000000000;
-        cyc = (ns << CYC2NS_SCALE_FACTOR)/(per_cpu(cyc2ns, smp_processor_id()));
-        return cyc;
+        descriptor_status = ((read_lmmr(offset) >> rshft) & UV_ACT_STATUS_MASK);
+        descriptor_status2 = (read_mmr_uv2_status() >> cpu) & 0x1UL;
+        descriptor_status = (descriptor_status << 1) | descriptor_status2;
+        return descriptor_status;
+}
+
+static int uv2_wait_completion(struct bau_desc *bau_desc,
+                                unsigned long mmr_offset, int right_shift,
+                                struct bau_control *bcp, long try)
+{
+        unsigned long descriptor_stat;
+        cycles_t ttm;
+        int cpu = bcp->uvhub_cpu;
+        struct ptc_stats *stat = bcp->statp;
+
+        descriptor_stat = uv2_read_status(mmr_offset, right_shift, cpu);
+
+        /* spin on the status MMR, waiting for it to go idle */
+        while (descriptor_stat != UV2H_DESC_IDLE) {
+                /*
+                 * Our software ack messages may be blocked because
+                 * there are no swack resources available.  As long
+                 * as none of them has timed out hardware will NACK
+                 * our message and its state will stay IDLE.
+                 */
+                if ((descriptor_stat == UV2H_DESC_SOURCE_TIMEOUT) ||
+                    (descriptor_stat == UV2H_DESC_DEST_STRONG_NACK) ||
+                    (descriptor_stat == UV2H_DESC_DEST_PUT_ERR)) {
+                        stat->s_stimeout++;
+                        return FLUSH_GIVEUP;
+                } else if (descriptor_stat == UV2H_DESC_DEST_TIMEOUT) {
+                        stat->s_dtimeout++;
+                        ttm = get_cycles();
+                        /*
+                         * Our retries may be blocked by all destination
+                         * swack resources being consumed, and a timeout
+                         * pending.  In that case hardware returns the
+                         * ERROR that looks like a destination timeout.
+                         */
+                        if (cycles_2_us(ttm - bcp->send_message) < timeout_us) {
+                                bcp->conseccompletes = 0;
+                                return FLUSH_RETRY_PLUGGED;
+                        }
+                        bcp->conseccompletes = 0;
+                        return FLUSH_RETRY_TIMEOUT;
+                } else {
+                        /*
+                         * descriptor_stat is still BUSY
+                         */
+                        cpu_relax();
+                }
+                descriptor_stat = uv2_read_status(mmr_offset, right_shift, cpu);
+        }
+        bcp->conseccompletes++;
+        return FLUSH_COMPLETE;
 }
 
 /*
- * conditionally add 1 to *v, unless *v is >= u
- * return 0 if we cannot add 1 to *v because it is >= u
- * return 1 if we can add 1 to *v because it is < u
- * the add is atomic
- *
- * This is close to atomic_add_unless(), but this allows the 'u' value
- * to be lowered below the current 'v'.  atomic_add_unless can only stop
- * on equal.
+ * There are 2 status registers; each and array[32] of 2 bits. Set up for
+ * which register to read and position in that register based on cpu in
+ * current hub.
  */
-static inline int atomic_inc_unless_ge(spinlock_t *lock, atomic_t *v, int u)
+static int wait_completion(struct bau_desc *bau_desc,
+                                struct bau_control *bcp, long try)
 {
-        spin_lock(lock);
-        if (atomic_read(v) >= u) {
-                spin_unlock(lock);
-                return 0;
+        int right_shift;
+        unsigned long mmr_offset;
+        int cpu = bcp->uvhub_cpu;
+
+        if (cpu < UV_CPUS_PER_AS) {
+                mmr_offset = UVH_LB_BAU_SB_ACTIVATION_STATUS_0;
+                right_shift = cpu * UV_ACT_STATUS_SIZE;
+        } else {
+                mmr_offset = UVH_LB_BAU_SB_ACTIVATION_STATUS_1;
+                right_shift = ((cpu - UV_CPUS_PER_AS) * UV_ACT_STATUS_SIZE);
         }
-        atomic_inc(v);
-        spin_unlock(lock);
-        return 1;
+
+        if (is_uv1_hub())
+                return uv1_wait_completion(bau_desc, mmr_offset, right_shift,
+                                                                bcp, try);
+        else
+                return uv2_wait_completion(bau_desc, mmr_offset, right_shift,
+                                                                bcp, try);
+}
+
+static inline cycles_t sec_2_cycles(unsigned long sec)
+{
+        unsigned long ns;
+        cycles_t cyc;
+
+        ns = sec * 1000000000;
+        cyc = (ns << CYC2NS_SCALE_FACTOR)/(per_cpu(cyc2ns, smp_processor_id()));
+        return cyc;
 }
 
 /*
- * Our retries are blocked by all destination swack resources being
+ * Our retries are blocked by all destination sw ack resources being
  * in use, and a timeout is pending. In that case hardware immediately
  * returns the ERROR that looks like a destination timeout.
  */
-static void
-destination_plugged(struct bau_desc *bau_desc, struct bau_control *bcp,
+static void destination_plugged(struct bau_desc *bau_desc,
+                        struct bau_control *bcp,
                         struct bau_control *hmaster, struct ptc_stats *stat)
 {
         udelay(bcp->plugged_delay);
         bcp->plugged_tries++;
+
         if (bcp->plugged_tries >= bcp->plugsb4reset) {
                 bcp->plugged_tries = 0;
+
                 quiesce_local_uvhub(hmaster);
+
                 spin_lock(&hmaster->queue_lock);
-                uv_reset_with_ipi(&bau_desc->distribution, bcp->cpu);
+                reset_with_ipi(&bau_desc->distribution, bcp->cpu);
                 spin_unlock(&hmaster->queue_lock);
+
                 end_uvhub_quiesce(hmaster);
+
                 bcp->ipi_attempts++;
                 stat->s_resets_plug++;
         }
 }
 
-static void
-destination_timeout(struct bau_desc *bau_desc, struct bau_control *bcp,
-                        struct bau_control *hmaster, struct ptc_stats *stat)
+static void destination_timeout(struct bau_desc *bau_desc,
+                        struct bau_control *bcp, struct bau_control *hmaster,
+                        struct ptc_stats *stat)
 {
-        hmaster->max_bau_concurrent = 1;
+        hmaster->max_concurr = 1;
         bcp->timeout_tries++;
         if (bcp->timeout_tries >= bcp->timeoutsb4reset) {
                 bcp->timeout_tries = 0;
+
                 quiesce_local_uvhub(hmaster);
+
                 spin_lock(&hmaster->queue_lock);
-                uv_reset_with_ipi(&bau_desc->distribution, bcp->cpu);
+                reset_with_ipi(&bau_desc->distribution, bcp->cpu);
                 spin_unlock(&hmaster->queue_lock);
+
                 end_uvhub_quiesce(hmaster);
+
                 bcp->ipi_attempts++;
                 stat->s_resets_timeout++;
         }
@@ -530,34 +640,104 @@ destination_timeout(struct bau_desc *bau_desc, struct bau_control *bcp,
  * Completions are taking a very long time due to a congested numalink
  * network.
  */
-static void
-disable_for_congestion(struct bau_control *bcp, struct ptc_stats *stat)
+static void disable_for_congestion(struct bau_control *bcp,
+                                        struct ptc_stats *stat)
 {
-        int tcpu;
-        struct bau_control *tbcp;
-
         /* let only one cpu do this disabling */
         spin_lock(&disable_lock);
+
         if (!baudisabled && bcp->period_requests &&
             ((bcp->period_time / bcp->period_requests) > congested_cycles)) {
+                int tcpu;
+                struct bau_control *tbcp;
                 /* it becomes this cpu's job to turn on the use of the
                    BAU again */
                 baudisabled = 1;
                 bcp->set_bau_off = 1;
-                bcp->set_bau_on_time = get_cycles() +
-                        sec_2_cycles(bcp->congested_period);
+                bcp->set_bau_on_time = get_cycles();
+                bcp->set_bau_on_time += sec_2_cycles(bcp->cong_period);
                 stat->s_bau_disabled++;
                 for_each_present_cpu(tcpu) {
                         tbcp = &per_cpu(bau_control, tcpu);
-                                tbcp->baudisabled = 1;
+                        tbcp->baudisabled = 1;
                 }
         }
+
         spin_unlock(&disable_lock);
 }
 
-/**
- * uv_flush_send_and_wait
- *
+static void count_max_concurr(int stat, struct bau_control *bcp,
+                                struct bau_control *hmaster)
+{
+        bcp->plugged_tries = 0;
+        bcp->timeout_tries = 0;
+        if (stat != FLUSH_COMPLETE)
+                return;
+        if (bcp->conseccompletes <= bcp->complete_threshold)
+                return;
+        if (hmaster->max_concurr >= hmaster->max_concurr_const)
+                return;
+        hmaster->max_concurr++;
+}
+
+static void record_send_stats(cycles_t time1, cycles_t time2,
+                struct bau_control *bcp, struct ptc_stats *stat,
+                int completion_status, int try)
+{
+        cycles_t elapsed;
+
+        if (time2 > time1) {
+                elapsed = time2 - time1;
+                stat->s_time += elapsed;
+
+                if ((completion_status == FLUSH_COMPLETE) && (try == 1)) {
+                        bcp->period_requests++;
+                        bcp->period_time += elapsed;
+                        if ((elapsed > congested_cycles) &&
+                            (bcp->period_requests > bcp->cong_reps))
+                                disable_for_congestion(bcp, stat);
+                }
+        } else
+                stat->s_requestor--;
+
+        if (completion_status == FLUSH_COMPLETE && try > 1)
+                stat->s_retriesok++;
+        else if (completion_status == FLUSH_GIVEUP)
+                stat->s_giveup++;
+}
+
+/*
+ * Because of a uv1 hardware bug only a limited number of concurrent
+ * requests can be made.
+ */
+static void uv1_throttle(struct bau_control *hmaster, struct ptc_stats *stat)
+{
+        spinlock_t *lock = &hmaster->uvhub_lock;
+        atomic_t *v;
+
+        v = &hmaster->active_descriptor_count;
+        if (!atomic_inc_unless_ge(lock, v, hmaster->max_concurr)) {
+                stat->s_throttles++;
+                do {
+                        cpu_relax();
+                } while (!atomic_inc_unless_ge(lock, v, hmaster->max_concurr));
+        }
+}
+
+/*
+ * Handle the completion status of a message send.
+ */
+static void handle_cmplt(int completion_status, struct bau_desc *bau_desc,
+                        struct bau_control *bcp, struct bau_control *hmaster,
+                        struct ptc_stats *stat)
+{
+        if (completion_status == FLUSH_RETRY_PLUGGED)
+                destination_plugged(bau_desc, bcp, hmaster, stat);
+        else if (completion_status == FLUSH_RETRY_TIMEOUT)
+                destination_timeout(bau_desc, bcp, hmaster, stat);
+}
+
+/*
  * Send a broadcast and wait for it to complete.
  *
  * The flush_mask contains the cpus the broadcast is to be sent to including
@@ -568,44 +748,23 @@ disable_for_congestion(struct bau_control *bcp, struct ptc_stats *stat)
  * returned to the kernel.
  */
 int uv_flush_send_and_wait(struct bau_desc *bau_desc,
-                           struct cpumask *flush_mask, struct bau_control *bcp)
+                        struct cpumask *flush_mask, struct bau_control *bcp)
 {
-        int right_shift;
-        int completion_status = 0;
         int seq_number = 0;
+        int completion_stat = 0;
         long try = 0;
-        int cpu = bcp->uvhub_cpu;
-        int this_cpu = bcp->cpu;
-        unsigned long mmr_offset;
         unsigned long index;
         cycles_t time1;
         cycles_t time2;
-        cycles_t elapsed;
         struct ptc_stats *stat = bcp->statp;
-        struct bau_control *smaster = bcp->socket_master;
         struct bau_control *hmaster = bcp->uvhub_master;
 
-        if (!atomic_inc_unless_ge(&hmaster->uvhub_lock,
-                        &hmaster->active_descriptor_count,
-                        hmaster->max_bau_concurrent)) {
-                stat->s_throttles++;
-                do {
-                        cpu_relax();
-                } while (!atomic_inc_unless_ge(&hmaster->uvhub_lock,
-                        &hmaster->active_descriptor_count,
-                        hmaster->max_bau_concurrent));
-        }
+        if (is_uv1_hub())
+                uv1_throttle(hmaster, stat);
+
         while (hmaster->uvhub_quiesce)
                 cpu_relax();
 
-        if (cpu < UV_CPUS_PER_ACT_STATUS) {
-                mmr_offset = UVH_LB_BAU_SB_ACTIVATION_STATUS_0;
-                right_shift = cpu * UV_ACT_STATUS_SIZE;
-        } else {
-                mmr_offset = UVH_LB_BAU_SB_ACTIVATION_STATUS_1;
-                right_shift =
-                    ((cpu - UV_CPUS_PER_ACT_STATUS) * UV_ACT_STATUS_SIZE);
-        }
         time1 = get_cycles();
         do {
                 if (try == 0) {
@@ -615,64 +774,134 @@ int uv_flush_send_and_wait(struct bau_desc *bau_desc,
                         bau_desc->header.msg_type = MSG_RETRY;
                         stat->s_retry_messages++;
                 }
+
                 bau_desc->header.sequence = seq_number;
-                index = (1UL << UVH_LB_BAU_SB_ACTIVATION_CONTROL_PUSH_SHFT) |
-                        bcp->uvhub_cpu;
+                index = (1UL << AS_PUSH_SHIFT) | bcp->uvhub_cpu;
                 bcp->send_message = get_cycles();
-                uv_write_local_mmr(UVH_LB_BAU_SB_ACTIVATION_CONTROL, index);
+
+                write_mmr_activation(index);
+
                 try++;
-                completion_status = uv_wait_completion(bau_desc, mmr_offset,
-                        right_shift, this_cpu, bcp, smaster, try);
+                completion_stat = wait_completion(bau_desc, bcp, try);
+
+                handle_cmplt(completion_stat, bau_desc, bcp, hmaster, stat);
 
-                if (completion_status == FLUSH_RETRY_PLUGGED) {
-                        destination_plugged(bau_desc, bcp, hmaster, stat);
-                } else if (completion_status == FLUSH_RETRY_TIMEOUT) {
-                        destination_timeout(bau_desc, bcp, hmaster, stat);
-                }
                 if (bcp->ipi_attempts >= bcp->ipi_reset_limit) {
                         bcp->ipi_attempts = 0;
-                        completion_status = FLUSH_GIVEUP;
+                        completion_stat = FLUSH_GIVEUP;
                         break;
                 }
                 cpu_relax();
-        } while ((completion_status == FLUSH_RETRY_PLUGGED) ||
-                 (completion_status == FLUSH_RETRY_TIMEOUT));
+        } while ((completion_stat == FLUSH_RETRY_PLUGGED) ||
+                 (completion_stat == FLUSH_RETRY_TIMEOUT));
+
         time2 = get_cycles();
-        bcp->plugged_tries = 0;
-        bcp->timeout_tries = 0;
-        if ((completion_status == FLUSH_COMPLETE) &&
-            (bcp->conseccompletes > bcp->complete_threshold) &&
-            (hmaster->max_bau_concurrent <
-                                        hmaster->max_bau_concurrent_constant))
-                        hmaster->max_bau_concurrent++;
+
+        count_max_concurr(completion_stat, bcp, hmaster);
+
         while (hmaster->uvhub_quiesce)
                 cpu_relax();
+
         atomic_dec(&hmaster->active_descriptor_count);
-        if (time2 > time1) {
-                elapsed = time2 - time1;
-                stat->s_time += elapsed;
-                if ((completion_status == FLUSH_COMPLETE) && (try == 1)) {
-                        bcp->period_requests++;
-                        bcp->period_time += elapsed;
-                        if ((elapsed > congested_cycles) &&
-                            (bcp->period_requests > bcp->congested_reps)) {
-                                disable_for_congestion(bcp, stat);
+
+        record_send_stats(time1, time2, bcp, stat, completion_stat, try);
+
+        if (completion_stat == FLUSH_GIVEUP)
+                return 1;
+        return 0;
+}
+
+/*
+ * The BAU is disabled. When the disabled time period has expired, the cpu
+ * that disabled it must re-enable it.
+ * Return 0 if it is re-enabled for all cpus.
+ */
+static int check_enable(struct bau_control *bcp, struct ptc_stats *stat)
+{
+        int tcpu;
+        struct bau_control *tbcp;
+
+        if (bcp->set_bau_off) {
+                if (get_cycles() >= bcp->set_bau_on_time) {
+                        stat->s_bau_reenabled++;
+                        baudisabled = 0;
+                        for_each_present_cpu(tcpu) {
+                                tbcp = &per_cpu(bau_control, tcpu);
+                                tbcp->baudisabled = 0;
+                                tbcp->period_requests = 0;
+                                tbcp->period_time = 0;
                         }
+                        return 0;
                 }
+        }
+        return -1;
+}
+
+static void record_send_statistics(struct ptc_stats *stat, int locals, int hubs,
+                                int remotes, struct bau_desc *bau_desc)
+{
+        stat->s_requestor++;
+        stat->s_ntargcpu += remotes + locals;
+        stat->s_ntargremotes += remotes;
+        stat->s_ntarglocals += locals;
+
+        /* uvhub statistics */
+        hubs = bau_uvhub_weight(&bau_desc->distribution);
+        if (locals) {
+                stat->s_ntarglocaluvhub++;
+                stat->s_ntargremoteuvhub += (hubs - 1);
         } else
-                stat->s_requestor--;
-        if (completion_status == FLUSH_COMPLETE && try > 1)
-                stat->s_retriesok++;
-        else if (completion_status == FLUSH_GIVEUP) {
-                stat->s_giveup++;
-                return 1;
+                stat->s_ntargremoteuvhub += hubs;
+
+        stat->s_ntarguvhub += hubs;
+
+        if (hubs >= 16)
+                stat->s_ntarguvhub16++;
+        else if (hubs >= 8)
+                stat->s_ntarguvhub8++;
+        else if (hubs >= 4)
+                stat->s_ntarguvhub4++;
+        else if (hubs >= 2)
+                stat->s_ntarguvhub2++;
+        else
+                stat->s_ntarguvhub1++;
+}
+
+/*
+ * Translate a cpu mask to the uvhub distribution mask in the BAU
+ * activation descriptor.
+ */
+static int set_distrib_bits(struct cpumask *flush_mask, struct bau_control *bcp,
+                        struct bau_desc *bau_desc, int *localsp, int *remotesp)
+{
+        int cpu;
+        int pnode;
+        int cnt = 0;
+        struct hub_and_pnode *hpp;
+
+        for_each_cpu(cpu, flush_mask) {
+                /*
+                 * The distribution vector is a bit map of pnodes, relative
+                 * to the partition base pnode (and the partition base nasid
+                 * in the header).
+                 * Translate cpu to pnode and hub using a local memory array.
+                 */
+                hpp = &bcp->socket_master->thp[cpu];
+                pnode = hpp->pnode - bcp->partition_base_pnode;
+                bau_uvhub_set(pnode, &bau_desc->distribution);
+                cnt++;
+                if (hpp->uvhub == bcp->uvhub)
+                        (*localsp)++;
+                else
+                        (*remotesp)++;
         }
+        if (!cnt)
+                return 1;
         return 0;
 }
 
-/**
- * uv_flush_tlb_others - globally purge translation cache of a virtual
- * address or all TLB's
+/*
+ * globally purge translation cache of a virtual address or all TLB's
  * @cpumask: mask of all cpu's in which the address is to be removed
  * @mm: mm_struct containing virtual address range
  * @va: virtual address to be removed (or TLB_FLUSH_ALL for all TLB's on cpu)
@@ -696,20 +925,16 @@ int uv_flush_send_and_wait(struct bau_desc *bau_desc,
  * done.  The returned pointer is valid till preemption is re-enabled.
  */
 const struct cpumask *uv_flush_tlb_others(const struct cpumask *cpumask,
-                                          struct mm_struct *mm,
-                                          unsigned long va, unsigned int cpu)
+                                struct mm_struct *mm, unsigned long va,
+                                unsigned int cpu)
 {
         int locals = 0;
         int remotes = 0;
         int hubs = 0;
-        int tcpu;
-        int tpnode;
         struct bau_desc *bau_desc;
         struct cpumask *flush_mask;
         struct ptc_stats *stat;
         struct bau_control *bcp;
-        struct bau_control *tbcp;
-        struct hub_and_pnode *hpp;
 
         /* kernel was booted 'nobau' */
         if (nobau)
@@ -720,20 +945,8 @@ const struct cpumask *uv_flush_tlb_others(const struct cpumask *cpumask,
 
         /* bau was disabled due to slow response */
         if (bcp->baudisabled) {
-                /* the cpu that disabled it must re-enable it */
-                if (bcp->set_bau_off) {
-                        if (get_cycles() >= bcp->set_bau_on_time) {
-                                stat->s_bau_reenabled++;
-                                baudisabled = 0;
-                                for_each_present_cpu(tcpu) {
-                                        tbcp = &per_cpu(bau_control, tcpu);
-                                        tbcp->baudisabled = 0;
-                                        tbcp->period_requests = 0;
-                                        tbcp->period_time = 0;
-                                }
-                        }
-                }
-                return cpumask;
+                if (check_enable(bcp, stat))
+                        return cpumask;
         }
 
         /*
@@ -744,59 +957,20 @@ const struct cpumask *uv_flush_tlb_others(const struct cpumask *cpumask,
         flush_mask = (struct cpumask *)per_cpu(uv_flush_tlb_mask, cpu);
         /* don't actually do a shootdown of the local cpu */
         cpumask_andnot(flush_mask, cpumask, cpumask_of(cpu));
+
         if (cpu_isset(cpu, *cpumask))
                 stat->s_ntargself++;
 
         bau_desc = bcp->descriptor_base;
-        bau_desc += UV_ITEMS_PER_DESCRIPTOR * bcp->uvhub_cpu;
+        bau_desc += ITEMS_PER_DESC * bcp->uvhub_cpu;
         bau_uvhubs_clear(&bau_desc->distribution, UV_DISTRIBUTION_SIZE);
-
-        for_each_cpu(tcpu, flush_mask) {
-                /*
-                 * The distribution vector is a bit map of pnodes, relative
-                 * to the partition base pnode (and the partition base nasid
-                 * in the header).
-                 * Translate cpu to pnode and hub using an array stored
-                 * in local memory.
-                 */
-                hpp = &bcp->socket_master->target_hub_and_pnode[tcpu];
-                tpnode = hpp->pnode - bcp->partition_base_pnode;
-                bau_uvhub_set(tpnode, &bau_desc->distribution);
-                if (hpp->uvhub == bcp->uvhub)
-                        locals++;
-                else
-                        remotes++;
-        }
-        if ((locals + remotes) == 0)
+        if (set_distrib_bits(flush_mask, bcp, bau_desc, &locals, &remotes))
                 return NULL;
-        stat->s_requestor++;
-        stat->s_ntargcpu += remotes + locals;
-        stat->s_ntargremotes += remotes;
-        stat->s_ntarglocals += locals;
-        remotes = bau_uvhub_weight(&bau_desc->distribution);
 
-        /* uvhub statistics */
-        hubs = bau_uvhub_weight(&bau_desc->distribution);
-        if (locals) {
-                stat->s_ntarglocaluvhub++;
-                stat->s_ntargremoteuvhub += (hubs - 1);
-        } else
-                stat->s_ntargremoteuvhub += hubs;
-        stat->s_ntarguvhub += hubs;
-        if (hubs >= 16)
-                stat->s_ntarguvhub16++;
-        else if (hubs >= 8)
-                stat->s_ntarguvhub8++;
-        else if (hubs >= 4)
-                stat->s_ntarguvhub4++;
-        else if (hubs >= 2)
-                stat->s_ntarguvhub2++;
-        else
-                stat->s_ntarguvhub1++;
+        record_send_statistics(stat, locals, hubs, remotes, bau_desc);
 
         bau_desc->payload.address = va;
         bau_desc->payload.sending_cpu = cpu;
-
         /*
          * uv_flush_send_and_wait returns 0 if all cpu's were messaged,
          * or 1 if it gave up and the original cpumask should be returned.
@@ -825,26 +999,31 @@ void uv_bau_message_interrupt(struct pt_regs *regs)
 {
         int count = 0;
         cycles_t time_start;
-        struct bau_payload_queue_entry *msg;
+        struct bau_pq_entry *msg;
         struct bau_control *bcp;
         struct ptc_stats *stat;
         struct msg_desc msgdesc;
 
         time_start = get_cycles();
+
         bcp = &per_cpu(bau_control, smp_processor_id());
         stat = bcp->statp;
-        msgdesc.va_queue_first = bcp->va_queue_first;
-        msgdesc.va_queue_last = bcp->va_queue_last;
+
+        msgdesc.queue_first = bcp->queue_first;
+        msgdesc.queue_last = bcp->queue_last;
+
         msg = bcp->bau_msg_head;
-        while (msg->sw_ack_vector) {
+        while (msg->swack_vec) {
                 count++;
-                msgdesc.msg_slot = msg - msgdesc.va_queue_first;
-                msgdesc.sw_ack_slot = ffs(msg->sw_ack_vector) - 1;
+
+                msgdesc.msg_slot = msg - msgdesc.queue_first;
+                msgdesc.swack_slot = ffs(msg->swack_vec) - 1;
                 msgdesc.msg = msg;
-                uv_bau_process_message(&msgdesc, bcp);
+                bau_process_message(&msgdesc, bcp);
+
                 msg++;
-                if (msg > msgdesc.va_queue_last)
-                        msg = msgdesc.va_queue_first;
+                if (msg > msgdesc.queue_last)
+                        msg = msgdesc.queue_first;
                 bcp->bau_msg_head = msg;
         }
         stat->d_time += (get_cycles() - time_start);
@@ -852,18 +1031,17 @@ void uv_bau_message_interrupt(struct pt_regs *regs)
                 stat->d_nomsg++;
         else if (count > 1)
                 stat->d_multmsg++;
+
         ack_APIC_irq();
 }
 
 /*
- * uv_enable_timeouts
- *
- * Each target uvhub (i.e. a uvhub that has no cpu's) needs to have
+ * Each target uvhub (i.e. a uvhub that has cpu's) needs to have
  * shootdown message timeouts enabled.  The timeout does not cause
  * an interrupt, but causes an error message to be returned to
  * the sender.
  */
-static void __init uv_enable_timeouts(void)
+static void __init enable_timeouts(void)
 {
         int uvhub;
         int nuvhubs;
@@ -877,47 +1055,44 @@ static void __init uv_enable_timeouts(void)
                         continue;
 
                 pnode = uv_blade_to_pnode(uvhub);
-                mmr_image =
-                    uv_read_global_mmr64(pnode, UVH_LB_BAU_MISC_CONTROL);
+                mmr_image = read_mmr_misc_control(pnode);
                 /*
                  * Set the timeout period and then lock it in, in three
                  * steps; captures and locks in the period.
                  *
                  * To program the period, the SOFT_ACK_MODE must be off.
                  */
-                mmr_image &= ~((unsigned long)1 <<
-                    UVH_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_SHFT);
-                uv_write_global_mmr64
-                    (pnode, UVH_LB_BAU_MISC_CONTROL, mmr_image);
+                mmr_image &= ~(1L << SOFTACK_MSHIFT);
+                write_mmr_misc_control(pnode, mmr_image);
                 /*
                  * Set the 4-bit period.
                  */
-                mmr_image &= ~((unsigned long)0xf <<
-                     UVH_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_SHFT);
-                mmr_image |= (UV_INTD_SOFT_ACK_TIMEOUT_PERIOD <<
-                     UVH_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_SHFT);
-                uv_write_global_mmr64
-                    (pnode, UVH_LB_BAU_MISC_CONTROL, mmr_image);
+                mmr_image &= ~((unsigned long)0xf << SOFTACK_PSHIFT);
+                mmr_image |= (SOFTACK_TIMEOUT_PERIOD << SOFTACK_PSHIFT);
+                write_mmr_misc_control(pnode, mmr_image);
                 /*
+                 * UV1:
                  * Subsequent reversals of the timebase bit (3) cause an
                  * immediate timeout of one or all INTD resources as
                  * indicated in bits 2:0 (7 causes all of them to timeout).
                  */
-                mmr_image |= ((unsigned long)1 <<
-                    UVH_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_SHFT);
-                uv_write_global_mmr64
-                    (pnode, UVH_LB_BAU_MISC_CONTROL, mmr_image);
+                mmr_image |= (1L << SOFTACK_MSHIFT);
+                if (is_uv2_hub()) {
+                        mmr_image |= (1L << UV2_LEG_SHFT);
+                        mmr_image |= (1L << UV2_EXT_SHFT);
+                }
+                write_mmr_misc_control(pnode, mmr_image);
         }
 }
 
-static void *uv_ptc_seq_start(struct seq_file *file, loff_t *offset)
+static void *ptc_seq_start(struct seq_file *file, loff_t *offset)
 {
         if (*offset < num_possible_cpus())
                 return offset;
         return NULL;
 }
 
-static void *uv_ptc_seq_next(struct seq_file *file, void *data, loff_t *offset)
+static void *ptc_seq_next(struct seq_file *file, void *data, loff_t *offset)
 {
         (*offset)++;
         if (*offset < num_possible_cpus())
@@ -925,12 +1100,11 @@ static void *uv_ptc_seq_next(struct seq_file *file, void *data, loff_t *offset)
         return NULL;
 }
 
-static void uv_ptc_seq_stop(struct seq_file *file, void *data)
+static void ptc_seq_stop(struct seq_file *file, void *data)
 {
 }
 
-static inline unsigned long long
-microsec_2_cycles(unsigned long microsec)
+static inline unsigned long long usec_2_cycles(unsigned long microsec)
 {
         unsigned long ns;
         unsigned long long cyc;
@@ -941,29 +1115,27 @@ microsec_2_cycles(unsigned long microsec)
 }
 
 /*
- * Display the statistics thru /proc.
+ * Display the statistics thru /proc/sgi_uv/ptc_statistics
  * 'data' points to the cpu number
+ * Note: see the descriptions in stat_description[].
  */
-static int uv_ptc_seq_show(struct seq_file *file, void *data)
+static int ptc_seq_show(struct seq_file *file, void *data)
 {
         struct ptc_stats *stat;
         int cpu;
 
         cpu = *(loff_t *)data;
-
         if (!cpu) {
                 seq_printf(file,
                         "# cpu sent stime self locals remotes ncpus localhub ");
                 seq_printf(file,
                         "remotehub numuvhubs numuvhubs16 numuvhubs8 ");
                 seq_printf(file,
-                        "numuvhubs4 numuvhubs2 numuvhubs1 dto ");
-                seq_printf(file,
-                        "retries rok resetp resett giveup sto bz throt ");
+                        "numuvhubs4 numuvhubs2 numuvhubs1 dto retries rok ");
                 seq_printf(file,
-                        "sw_ack recv rtime all ");
+                        "resetp resett giveup sto bz throt swack recv rtime ");
                 seq_printf(file,
-                        "one mult none retry canc nocan reset rcan ");
+                        "all one mult none retry canc nocan reset rcan ");
                 seq_printf(file,
                         "disable enable\n");
         }
@@ -990,8 +1162,7 @@ static int uv_ptc_seq_show(struct seq_file *file, void *data)
                 /* destination side statistics */
                 seq_printf(file,
                            "%lx %ld %ld %ld %ld %ld %ld %ld %ld %ld %ld %ld ",
-                           uv_read_global_mmr64(uv_cpu_to_pnode(cpu),
-                                        UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE),
+                           read_gmmr_sw_ack(uv_cpu_to_pnode(cpu)),
                            stat->d_requestee, cycles_2_us(stat->d_time),
                            stat->d_alltlb, stat->d_onetlb, stat->d_multmsg,
                            stat->d_nomsg, stat->d_retries, stat->d_canceled,
@@ -1000,7 +1171,6 @@ static int uv_ptc_seq_show(struct seq_file *file, void *data)
                 seq_printf(file, "%ld %ld\n",
                         stat->s_bau_disabled, stat->s_bau_reenabled);
         }
-
         return 0;
 }
 
@@ -1008,18 +1178,18 @@ static int uv_ptc_seq_show(struct seq_file *file, void *data)
  * Display the tunables thru debugfs
  */
 static ssize_t tunables_read(struct file *file, char __user *userbuf,
-                                                size_t count, loff_t *ppos)
+                                size_t count, loff_t *ppos)
 {
         char *buf;
         int ret;
 
         buf = kasprintf(GFP_KERNEL, "%s %s %s\n%d %d %d %d %d %d %d %d %d\n",
-                "max_bau_concurrent plugged_delay plugsb4reset",
+                "max_concur plugged_delay plugsb4reset",
                 "timeoutsb4reset ipi_reset_limit complete_threshold",
                 "congested_response_us congested_reps congested_period",
-                max_bau_concurrent, plugged_delay, plugsb4reset,
+                max_concurr, plugged_delay, plugsb4reset,
                 timeoutsb4reset, ipi_reset_limit, complete_threshold,
-                congested_response_us, congested_reps, congested_period);
+                congested_respns_us, congested_reps, congested_period);
 
         if (!buf)
                 return -ENOMEM;
@@ -1030,13 +1200,16 @@ static ssize_t tunables_read(struct file *file, char __user *userbuf,
 }
 
 /*
- * -1: resetf the statistics
+ * handle a write to /proc/sgi_uv/ptc_statistics
+ * -1: reset the statistics
  *  0: display meaning of the statistics
  */
-static ssize_t uv_ptc_proc_write(struct file *file, const char __user *user,
-                                 size_t count, loff_t *data)
+static ssize_t ptc_proc_write(struct file *file, const char __user *user,
+                                size_t count, loff_t *data)
 {
         int cpu;
+        int i;
+        int elements;
         long input_arg;
         char optstr[64];
         struct ptc_stats *stat;
@@ -1046,79 +1219,18 @@ static ssize_t uv_ptc_proc_write(struct file *file, const char __user *user,
         if (copy_from_user(optstr, user, count))
                 return -EFAULT;
         optstr[count - 1] = '\0';
+
         if (strict_strtol(optstr, 10, &input_arg) < 0) {
                 printk(KERN_DEBUG "%s is invalid\n", optstr);
                 return -EINVAL;
         }
 
         if (input_arg == 0) {
+                elements = sizeof(stat_description)/sizeof(*stat_description);
                 printk(KERN_DEBUG "# cpu:      cpu number\n");
                 printk(KERN_DEBUG "Sender statistics:\n");
-                printk(KERN_DEBUG
-                "sent:     number of shootdown messages sent\n");
-                printk(KERN_DEBUG
-                "stime:    time spent sending messages\n");
-                printk(KERN_DEBUG
-                "numuvhubs: number of hubs targeted with shootdown\n");
-                printk(KERN_DEBUG
-                "numuvhubs16: number times 16 or more hubs targeted\n");
-                printk(KERN_DEBUG
-                "numuvhubs8: number times 8 or more hubs targeted\n");
-                printk(KERN_DEBUG
-                "numuvhubs4: number times 4 or more hubs targeted\n");
-                printk(KERN_DEBUG
-                "numuvhubs2: number times 2 or more hubs targeted\n");
-                printk(KERN_DEBUG
-                "numuvhubs1: number times 1 hub targeted\n");
-                printk(KERN_DEBUG
-                "numcpus:  number of cpus targeted with shootdown\n");
-                printk(KERN_DEBUG
-                "dto:      number of destination timeouts\n");
-                printk(KERN_DEBUG
-                "retries:  destination timeout retries sent\n");
-                printk(KERN_DEBUG
-                "rok:   :  destination timeouts successfully retried\n");
-                printk(KERN_DEBUG
-                "resetp:   ipi-style resource resets for plugs\n");
-                printk(KERN_DEBUG
-                "resett:   ipi-style resource resets for timeouts\n");
-                printk(KERN_DEBUG
-                "giveup:   fall-backs to ipi-style shootdowns\n");
-                printk(KERN_DEBUG
-                "sto:      number of source timeouts\n");
-                printk(KERN_DEBUG
-                "bz:       number of stay-busy's\n");
-                printk(KERN_DEBUG
-                "throt:    number times spun in throttle\n");
-                printk(KERN_DEBUG "Destination side statistics:\n");
-                printk(KERN_DEBUG
-                "sw_ack:   image of UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE\n");
-                printk(KERN_DEBUG
-                "recv:     shootdown messages received\n");
-                printk(KERN_DEBUG
-                "rtime:    time spent processing messages\n");
-                printk(KERN_DEBUG
-                "all:      shootdown all-tlb messages\n");
-                printk(KERN_DEBUG
-                "one:      shootdown one-tlb messages\n");
-                printk(KERN_DEBUG
-                "mult:     interrupts that found multiple messages\n");
-                printk(KERN_DEBUG
-                "none:     interrupts that found no messages\n");
-                printk(KERN_DEBUG
-                "retry:    number of retry messages processed\n");
-                printk(KERN_DEBUG
-                "canc:     number messages canceled by retries\n");
-                printk(KERN_DEBUG
-                "nocan:    number retries that found nothing to cancel\n");
-                printk(KERN_DEBUG
-                "reset:    number of ipi-style reset requests processed\n");
-                printk(KERN_DEBUG
-                "rcan:     number messages canceled by reset requests\n");
-                printk(KERN_DEBUG
-                "disable:  number times use of the BAU was disabled\n");
-                printk(KERN_DEBUG
-                "enable:   number times use of the BAU was re-enabled\n");
+                for (i = 0; i < elements; i++)
+                        printk(KERN_DEBUG "%s\n", stat_description[i]);
         } else if (input_arg == -1) {
                 for_each_present_cpu(cpu) {
                         stat = &per_cpu(ptcstats, cpu);
@@ -1145,27 +1257,18 @@ static int local_atoi(const char *name)
 }
 
 /*
- * set the tunables
- * 0 values reset them to defaults
+ * Parse the values written to /sys/kernel/debug/sgi_uv/bau_tunables.
+ * Zero values reset them to defaults.
  */
-static ssize_t tunables_write(struct file *file, const char __user *user,
-                                 size_t count, loff_t *data)
+static int parse_tunables_write(struct bau_control *bcp, char *instr,
+                                int count)
 {
-        int cpu;
-        int cnt = 0;
-        int val;
         char *p;
         char *q;
-        char instr[64];
-        struct bau_control *bcp;
-
-        if (count == 0 || count > sizeof(instr)-1)
-                return -EINVAL;
-        if (copy_from_user(instr, user, count))
-                return -EFAULT;
+        int cnt = 0;
+        int val;
+        int e = sizeof(tunables) / sizeof(*tunables);
 
-        instr[count] = '\0';
-        /* count the fields */
         p = instr + strspn(instr, WHITESPACE);
         q = p;
         for (; *p; p = q + strspn(q, WHITESPACE)) {
@@ -1174,8 +1277,8 @@ static ssize_t tunables_write(struct file *file, const char __user *user,
                 if (q == p)
                         break;
         }
-        if (cnt != 9) {
-                printk(KERN_INFO "bau tunable error: should be 9 numbers\n");
+        if (cnt != e) {
+                printk(KERN_INFO "bau tunable error: should be %d values\n", e);
                 return -EINVAL;
         }
 
@@ -1187,97 +1290,80 @@ static ssize_t tunables_write(struct file *file, const char __user *user,
                 switch (cnt) {
                 case 0:
                         if (val == 0) {
-                                max_bau_concurrent = MAX_BAU_CONCURRENT;
-                                max_bau_concurrent_constant =
-                                                        MAX_BAU_CONCURRENT;
+                                max_concurr = MAX_BAU_CONCURRENT;
+                                max_concurr_const = MAX_BAU_CONCURRENT;
                                 continue;
                         }
-                        bcp = &per_cpu(bau_control, smp_processor_id());
                         if (val < 1 || val > bcp->cpus_in_uvhub) {
                                 printk(KERN_DEBUG
                                 "Error: BAU max concurrent %d is invalid\n",
                                 val);
                                 return -EINVAL;
                         }
-                        max_bau_concurrent = val;
-                        max_bau_concurrent_constant = val;
-                        continue;
-                case 1:
-                        if (val == 0)
-                                plugged_delay = PLUGGED_DELAY;
-                        else
-                                plugged_delay = val;
-                        continue;
-                case 2:
-                        if (val == 0)
-                                plugsb4reset = PLUGSB4RESET;
-                        else
-                                plugsb4reset = val;
-                        continue;
-                case 3:
-                        if (val == 0)
-                                timeoutsb4reset = TIMEOUTSB4RESET;
-                        else
-                                timeoutsb4reset = val;
-                        continue;
-                case 4:
-                        if (val == 0)
-                                ipi_reset_limit = IPI_RESET_LIMIT;
-                        else
-                                ipi_reset_limit = val;
-                        continue;
-                case 5:
-                        if (val == 0)
-                                complete_threshold = COMPLETE_THRESHOLD;
-                        else
-                                complete_threshold = val;
-                        continue;
-                case 6:
-                        if (val == 0)
-                                congested_response_us = CONGESTED_RESPONSE_US;
-                        else
-                                congested_response_us = val;
-                        continue;
-                case 7:
-                        if (val == 0)
-                                congested_reps = CONGESTED_REPS;
-                        else
-                                congested_reps = val;
+                        max_concurr = val;
+                        max_concurr_const = val;
                         continue;
-                case 8:
+                default:
                         if (val == 0)
-                                congested_period = CONGESTED_PERIOD;
+                                *tunables[cnt].tunp = tunables[cnt].deflt;
                         else
-                                congested_period = val;
+                                *tunables[cnt].tunp = val;
                         continue;
                 }
                 if (q == p)
                         break;
         }
+        return 0;
+}
+
+/*
+ * Handle a write to debugfs. (/sys/kernel/debug/sgi_uv/bau_tunables)
+ */
+static ssize_t tunables_write(struct file *file, const char __user *user,
+                                size_t count, loff_t *data)
+{
+        int cpu;
+        int ret;
+        char instr[100];
+        struct bau_control *bcp;
+
+        if (count == 0 || count > sizeof(instr)-1)
+                return -EINVAL;
+        if (copy_from_user(instr, user, count))
+                return -EFAULT;
+
+        instr[count] = '\0';
+
+        bcp = &per_cpu(bau_control, smp_processor_id());
+
+        ret = parse_tunables_write(bcp, instr, count);
+        if (ret)
+                return ret;
+
         for_each_present_cpu(cpu) {
                 bcp = &per_cpu(bau_control, cpu);
-                bcp->max_bau_concurrent = max_bau_concurrent;
-                bcp->max_bau_concurrent_constant = max_bau_concurrent;
-                bcp->plugged_delay = plugged_delay;
-                bcp->plugsb4reset = plugsb4reset;
-                bcp->timeoutsb4reset = timeoutsb4reset;
-                bcp->ipi_reset_limit = ipi_reset_limit;
-                bcp->complete_threshold = complete_threshold;
-                bcp->congested_response_us = congested_response_us;
-                bcp->congested_reps = congested_reps;
-                bcp->congested_period = congested_period;
+                bcp->max_concurr =              max_concurr;
+                bcp->max_concurr_const =        max_concurr;
+                bcp->plugged_delay =            plugged_delay;
+                bcp->plugsb4reset =             plugsb4reset;
+                bcp->timeoutsb4reset =          timeoutsb4reset;
+                bcp->ipi_reset_limit =          ipi_reset_limit;
+                bcp->complete_threshold =       complete_threshold;
+                bcp->cong_response_us =         congested_respns_us;
+                bcp->cong_reps =                congested_reps;
+                bcp->cong_period =              congested_period;
         }
         return count;
 }
 
 static const struct seq_operations uv_ptc_seq_ops = {
-        .start          = uv_ptc_seq_start,
-        .next           = uv_ptc_seq_next,
-        .stop           = uv_ptc_seq_stop,
-        .show           = uv_ptc_seq_show
+        .start          = ptc_seq_start,
+        .next           = ptc_seq_next,
+        .stop           = ptc_seq_stop,
+        .show           = ptc_seq_show
 };
 
-static int uv_ptc_proc_open(struct inode *inode, struct file *file)
+static int ptc_proc_open(struct inode *inode, struct file *file)
 {
         return seq_open(file, &uv_ptc_seq_ops);
 }
@@ -1288,9 +1374,9 @@ static int tunables_open(struct inode *inode, struct file *file)
 }
 
 static const struct file_operations proc_uv_ptc_operations = {
-        .open           = uv_ptc_proc_open,
+        .open           = ptc_proc_open,
         .read           = seq_read,
-        .write          = uv_ptc_proc_write,
+        .write          = ptc_proc_write,
         .llseek         = seq_lseek,
         .release        = seq_release,
 };
@@ -1324,7 +1410,7 @@ static int __init uv_ptc_init(void)
                 return -EINVAL;
         }
         tunables_file = debugfs_create_file(UV_BAU_TUNABLES_FILE, 0600,
-                        tunables_dir, NULL, &tunables_fops);
+                                        tunables_dir, NULL, &tunables_fops);
         if (!tunables_file) {
                 printk(KERN_ERR "unable to create debugfs file %s\n",
                        UV_BAU_TUNABLES_FILE);
@@ -1336,24 +1422,24 @@ static int __init uv_ptc_init(void)
 /*
  * Initialize the sending side's sending buffers.
  */
-static void
-uv_activation_descriptor_init(int node, int pnode, int base_pnode)
+static void activation_descriptor_init(int node, int pnode, int base_pnode)
 {
         int i;
         int cpu;
         unsigned long pa;
         unsigned long m;
         unsigned long n;
+        size_t dsize;
         struct bau_desc *bau_desc;
         struct bau_desc *bd2;
         struct bau_control *bcp;
 
         /*
-         * each bau_desc is 64 bytes; there are 8 (UV_ITEMS_PER_DESCRIPTOR)
-         * per cpu; and one per cpu on the uvhub (UV_ADP_SIZE)
+         * each bau_desc is 64 bytes; there are 8 (ITEMS_PER_DESC)
+         * per cpu; and one per cpu on the uvhub (ADP_SZ)
          */
-        bau_desc = kmalloc_node(sizeof(struct bau_desc) * UV_ADP_SIZE
-                                * UV_ITEMS_PER_DESCRIPTOR, GFP_KERNEL, node);
+        dsize = sizeof(struct bau_desc) * ADP_SZ * ITEMS_PER_DESC;
+        bau_desc = kmalloc_node(dsize, GFP_KERNEL, node);
         BUG_ON(!bau_desc);
 
         pa = uv_gpa(bau_desc); /* need the real nasid*/
@@ -1361,27 +1447,25 @@ uv_activation_descriptor_init(int node, int pnode, int base_pnode)
         m = pa & uv_mmask;
 
         /* the 14-bit pnode */
-        uv_write_global_mmr64(pnode, UVH_LB_BAU_SB_DESCRIPTOR_BASE,
-                              (n << UV_DESC_BASE_PNODE_SHIFT | m));
+        write_mmr_descriptor_base(pnode, (n << UV_DESC_PSHIFT | m));
         /*
-         * Initializing all 8 (UV_ITEMS_PER_DESCRIPTOR) descriptors for each
+         * Initializing all 8 (ITEMS_PER_DESC) descriptors for each
          * cpu even though we only use the first one; one descriptor can
          * describe a broadcast to 256 uv hubs.
          */
-        for (i = 0, bd2 = bau_desc; i < (UV_ADP_SIZE*UV_ITEMS_PER_DESCRIPTOR);
-                i++, bd2++) {
+        for (i = 0, bd2 = bau_desc; i < (ADP_SZ * ITEMS_PER_DESC); i++, bd2++) {
                 memset(bd2, 0, sizeof(struct bau_desc));
-                bd2->header.sw_ack_flag = 1;
+                bd2->header.swack_flag =        1;
                 /*
                  * The base_dest_nasid set in the message header is the nasid
                  * of the first uvhub in the partition. The bit map will
                  * indicate destination pnode numbers relative to that base.
                  * They may not be consecutive if nasid striding is being used.
                  */
-                bd2->header.base_dest_nasid = UV_PNODE_TO_NASID(base_pnode);
-                bd2->header.dest_subnodeid = UV_LB_SUBNODEID;
-                bd2->header.command = UV_NET_ENDPOINT_INTD;
-                bd2->header.int_both = 1;
+                bd2->header.base_dest_nasid =   UV_PNODE_TO_NASID(base_pnode);
+                bd2->header.dest_subnodeid =    UV_LB_SUBNODEID;
+                bd2->header.command =           UV_NET_ENDPOINT_INTD;
+                bd2->header.int_both =          1;
                 /*
                  * all others need to be set to zero:
                  *   fairness chaining multilevel count replied_to
@@ -1401,57 +1485,55 @@ uv_activation_descriptor_init(int node, int pnode, int base_pnode)
  * - node is first node (kernel memory notion) on the uvhub
  * - pnode is the uvhub's physical identifier
  */
-static void
-uv_payload_queue_init(int node, int pnode)
+static void pq_init(int node, int pnode)
 {
-        int pn;
         int cpu;
+        size_t plsize;
         char *cp;
-        unsigned long pa;
-        struct bau_payload_queue_entry *pqp;
-        struct bau_payload_queue_entry *pqp_malloc;
+        void *vp;
+        unsigned long pn;
+        unsigned long first;
+        unsigned long pn_first;
+        unsigned long last;
+        struct bau_pq_entry *pqp;
         struct bau_control *bcp;
 
-        pqp = kmalloc_node((DEST_Q_SIZE + 1)
-                           * sizeof(struct bau_payload_queue_entry),
-                           GFP_KERNEL, node);
+        plsize = (DEST_Q_SIZE + 1) * sizeof(struct bau_pq_entry);
+        vp = kmalloc_node(plsize, GFP_KERNEL, node);
+        pqp = (struct bau_pq_entry *)vp;
         BUG_ON(!pqp);
-        pqp_malloc = pqp;
 
         cp = (char *)pqp + 31;
-        pqp = (struct bau_payload_queue_entry *)(((unsigned long)cp >> 5) << 5);
+        pqp = (struct bau_pq_entry *)(((unsigned long)cp >> 5) << 5);
 
         for_each_present_cpu(cpu) {
                 if (pnode != uv_cpu_to_pnode(cpu))
                         continue;
                 /* for every cpu on this pnode: */
                 bcp = &per_cpu(bau_control, cpu);
-                bcp->va_queue_first = pqp;
-                bcp->bau_msg_head = pqp;
-                bcp->va_queue_last = pqp + (DEST_Q_SIZE - 1);
+                bcp->queue_first        = pqp;
+                bcp->bau_msg_head       = pqp;
+                bcp->queue_last         = pqp + (DEST_Q_SIZE - 1);
         }
         /*
          * need the pnode of where the memory was really allocated
          */
-        pa = uv_gpa(pqp);
-        pn = pa >> uv_nshift;
-        uv_write_global_mmr64(pnode,
-                              UVH_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST,
-                              ((unsigned long)pn << UV_PAYLOADQ_PNODE_SHIFT) |
-                              uv_physnodeaddr(pqp));
-        uv_write_global_mmr64(pnode, UVH_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL,
-                              uv_physnodeaddr(pqp));
-        uv_write_global_mmr64(pnode, UVH_LB_BAU_INTD_PAYLOAD_QUEUE_LAST,
-                              (unsigned long)
-                              uv_physnodeaddr(pqp + (DEST_Q_SIZE - 1)));
+        pn = uv_gpa(pqp) >> uv_nshift;
+        first = uv_physnodeaddr(pqp);
+        pn_first = ((unsigned long)pn << UV_PAYLOADQ_PNODE_SHIFT) | first;
+        last = uv_physnodeaddr(pqp + (DEST_Q_SIZE - 1));
+        write_mmr_payload_first(pnode, pn_first);
+        write_mmr_payload_tail(pnode, first);
+        write_mmr_payload_last(pnode, last);
+
         /* in effect, all msg_type's are set to MSG_NOOP */
-        memset(pqp, 0, sizeof(struct bau_payload_queue_entry) * DEST_Q_SIZE);
+        memset(pqp, 0, sizeof(struct bau_pq_entry) * DEST_Q_SIZE);
 }
 
 /*
  * Initialization of each UV hub's structures
  */
-static void __init uv_init_uvhub(int uvhub, int vector, int base_pnode)
+static void __init init_uvhub(int uvhub, int vector, int base_pnode)
 {
         int node;
         int pnode;
@@ -1459,24 +1541,24 @@ static void __init uv_init_uvhub(int uvhub, int vector, int base_pnode)
 
         node = uvhub_to_first_node(uvhub);
         pnode = uv_blade_to_pnode(uvhub);
-        uv_activation_descriptor_init(node, pnode, base_pnode);
-        uv_payload_queue_init(node, pnode);
+
+        activation_descriptor_init(node, pnode, base_pnode);
+
+        pq_init(node, pnode);
         /*
          * The below initialization can't be in firmware because the
          * messaging IRQ will be determined by the OS.
          */
         apicid = uvhub_to_first_apicid(uvhub) | uv_apicid_hibits;
-        uv_write_global_mmr64(pnode, UVH_BAU_DATA_CONFIG,
-                                      ((apicid << 32) | vector));
+        write_mmr_data_config(pnode, ((apicid << 32) | vector));
 }
 
 /*
  * We will set BAU_MISC_CONTROL with a timeout period.
  * But the BIOS has set UVH_AGING_PRESCALE_SEL and UVH_TRANSACTION_TIMEOUT.
- * So the destination timeout period has be be calculated from them.
+ * So the destination timeout period has to be calculated from them.
  */
-static int
-calculate_destination_timeout(void)
+static int calculate_destination_timeout(void)
 {
         unsigned long mmr_image;
         int mult1;
@@ -1486,73 +1568,92 @@ calculate_destination_timeout(void)
         int ret;
         unsigned long ts_ns;
 
-        mult1 = UV_INTD_SOFT_ACK_TIMEOUT_PERIOD & BAU_MISC_CONTROL_MULT_MASK;
-        mmr_image = uv_read_local_mmr(UVH_AGING_PRESCALE_SEL);
-        index = (mmr_image >> BAU_URGENCY_7_SHIFT) & BAU_URGENCY_7_MASK;
-        mmr_image = uv_read_local_mmr(UVH_TRANSACTION_TIMEOUT);
-        mult2 = (mmr_image >> BAU_TRANS_SHIFT) & BAU_TRANS_MASK;
-        base = timeout_base_ns[index];
-        ts_ns = base * mult1 * mult2;
-        ret = ts_ns / 1000;
+        if (is_uv1_hub()) {
+                mult1 = SOFTACK_TIMEOUT_PERIOD & BAU_MISC_CONTROL_MULT_MASK;
+                mmr_image = uv_read_local_mmr(UVH_AGING_PRESCALE_SEL);
+                index = (mmr_image >> BAU_URGENCY_7_SHIFT) & BAU_URGENCY_7_MASK;
+                mmr_image = uv_read_local_mmr(UVH_TRANSACTION_TIMEOUT);
+                mult2 = (mmr_image >> BAU_TRANS_SHIFT) & BAU_TRANS_MASK;
+                base = timeout_base_ns[index];
+                ts_ns = base * mult1 * mult2;
+                ret = ts_ns / 1000;
+        } else {
+                /* 4 bits  0/1 for 10/80us, 3 bits of multiplier */
+                mmr_image = uv_read_local_mmr(UVH_AGING_PRESCALE_SEL);
+                mmr_image = (mmr_image & UV_SA_MASK) >> UV_SA_SHFT;
+                if (mmr_image & (1L << UV2_ACK_UNITS_SHFT))
+                        mult1 = 80;
+                else
+                        mult1 = 10;
+                base = mmr_image & UV2_ACK_MASK;
+                ret = mult1 * base;
+        }
         return ret;
 }
 
+static void __init init_per_cpu_tunables(void)
+{
+        int cpu;
+        struct bau_control *bcp;
+
+        for_each_present_cpu(cpu) {
+                bcp = &per_cpu(bau_control, cpu);
+                bcp->baudisabled                = 0;
+                bcp->statp                      = &per_cpu(ptcstats, cpu);
+                /* time interval to catch a hardware stay-busy bug */
+                bcp->timeout_interval           = usec_2_cycles(2*timeout_us);
+                bcp->max_concurr                = max_concurr;
+                bcp->max_concurr_const          = max_concurr;
+                bcp->plugged_delay              = plugged_delay;
+                bcp->plugsb4reset               = plugsb4reset;
+                bcp->timeoutsb4reset            = timeoutsb4reset;
+                bcp->ipi_reset_limit            = ipi_reset_limit;
+                bcp->complete_threshold         = complete_threshold;
+                bcp->cong_response_us           = congested_respns_us;
+                bcp->cong_reps                  = congested_reps;
+                bcp->cong_period                = congested_period;
+        }
+}
+
 /*
- * initialize the bau_control structure for each cpu
+ * Scan all cpus to collect blade and socket summaries.
  */
-static int __init uv_init_per_cpu(int nuvhubs, int base_part_pnode)
+static int __init get_cpu_topology(int base_pnode,
+                                        struct uvhub_desc *uvhub_descs,
+                                        unsigned char *uvhub_mask)
 {
-        int i;
         int cpu;
-        int tcpu;
         int pnode;
         int uvhub;
-        int have_hmaster;
-        short socket = 0;
-        unsigned short socket_mask;
-        unsigned char *uvhub_mask;
+        int socket;
         struct bau_control *bcp;
         struct uvhub_desc *bdp;
         struct socket_desc *sdp;
-        struct bau_control *hmaster = NULL;
-        struct bau_control *smaster = NULL;
-        struct socket_desc {
-                short num_cpus;
-                short cpu_number[MAX_CPUS_PER_SOCKET];
-        };
-        struct uvhub_desc {
-                unsigned short socket_mask;
-                short num_cpus;
-                short uvhub;
-                short pnode;
-                struct socket_desc socket[2];
-        };
-        struct uvhub_desc *uvhub_descs;
-
-        timeout_us = calculate_destination_timeout();
 
-        uvhub_descs = kmalloc(nuvhubs * sizeof(struct uvhub_desc), GFP_KERNEL);
-        memset(uvhub_descs, 0, nuvhubs * sizeof(struct uvhub_desc));
-        uvhub_mask = kzalloc((nuvhubs+7)/8, GFP_KERNEL);
         for_each_present_cpu(cpu) {
                 bcp = &per_cpu(bau_control, cpu);
+
                 memset(bcp, 0, sizeof(struct bau_control));
+
                 pnode = uv_cpu_hub_info(cpu)->pnode;
-                if ((pnode - base_part_pnode) >= UV_DISTRIBUTION_SIZE) {
+                if ((pnode - base_pnode) >= UV_DISTRIBUTION_SIZE) {
                         printk(KERN_EMERG
                                 "cpu %d pnode %d-%d beyond %d; BAU disabled\n",
-                                cpu, pnode, base_part_pnode,
-                                UV_DISTRIBUTION_SIZE);
+                                cpu, pnode, base_pnode, UV_DISTRIBUTION_SIZE);
                         return 1;
                 }
+
                 bcp->osnode = cpu_to_node(cpu);
-                bcp->partition_base_pnode = uv_partition_base_pnode;
+                bcp->partition_base_pnode = base_pnode;
+
                 uvhub = uv_cpu_hub_info(cpu)->numa_blade_id;
                 *(uvhub_mask + (uvhub/8)) |= (1 << (uvhub%8));
                 bdp = &uvhub_descs[uvhub];
+
                 bdp->num_cpus++;
                 bdp->uvhub = uvhub;
                 bdp->pnode = pnode;
+
                 /* kludge: 'assuming' one node per socket, and assuming that
                    disabling a socket just leaves a gap in node numbers */
                 socket = bcp->osnode & 1;
@@ -1561,84 +1662,129 @@ static int __init uv_init_per_cpu(int nuvhubs, int base_part_pnode)
                 sdp->cpu_number[sdp->num_cpus] = cpu;
                 sdp->num_cpus++;
                 if (sdp->num_cpus > MAX_CPUS_PER_SOCKET) {
-                        printk(KERN_EMERG "%d cpus per socket invalid\n", sdp->num_cpus);
+                        printk(KERN_EMERG "%d cpus per socket invalid\n",
+                                sdp->num_cpus);
                         return 1;
                 }
         }
+        return 0;
+}
+
+/*
+ * Each socket is to get a local array of pnodes/hubs.
+ */
+static void make_per_cpu_thp(struct bau_control *smaster)
+{
+        int cpu;
+        size_t hpsz = sizeof(struct hub_and_pnode) * num_possible_cpus();
+
+        smaster->thp = kmalloc_node(hpsz, GFP_KERNEL, smaster->osnode);
+        memset(smaster->thp, 0, hpsz);
+        for_each_present_cpu(cpu) {
+                smaster->thp[cpu].pnode = uv_cpu_hub_info(cpu)->pnode;
+                smaster->thp[cpu].uvhub = uv_cpu_hub_info(cpu)->numa_blade_id;
+        }
+}
+
+/*
+ * Initialize all the per_cpu information for the cpu's on a given socket,
+ * given what has been gathered into the socket_desc struct.
+ * And reports the chosen hub and socket masters back to the caller.
+ */
+static int scan_sock(struct socket_desc *sdp, struct uvhub_desc *bdp,
+                        struct bau_control **smasterp,
+                        struct bau_control **hmasterp)
+{
+        int i;
+        int cpu;
+        struct bau_control *bcp;
+
+        for (i = 0; i < sdp->num_cpus; i++) {
+                cpu = sdp->cpu_number[i];
+                bcp = &per_cpu(bau_control, cpu);
+                bcp->cpu = cpu;
+                if (i == 0) {
+                        *smasterp = bcp;
+                        if (!(*hmasterp))
+                                *hmasterp = bcp;
+                }
+                bcp->cpus_in_uvhub = bdp->num_cpus;
+                bcp->cpus_in_socket = sdp->num_cpus;
+                bcp->socket_master = *smasterp;
+                bcp->uvhub = bdp->uvhub;
+                bcp->uvhub_master = *hmasterp;
+                bcp->uvhub_cpu = uv_cpu_hub_info(cpu)->blade_processor_id;
+                if (bcp->uvhub_cpu >= MAX_CPUS_PER_UVHUB) {
+                        printk(KERN_EMERG "%d cpus per uvhub invalid\n",
+                                bcp->uvhub_cpu);
+                        return 1;
+                }
+        }
+        return 0;
+}
+
+/*
+ * Summarize the blade and socket topology into the per_cpu structures.
+ */
+static int __init summarize_uvhub_sockets(int nuvhubs,
+                        struct uvhub_desc *uvhub_descs,
+                        unsigned char *uvhub_mask)
+{
+        int socket;
+        int uvhub;
+        unsigned short socket_mask;
+
         for (uvhub = 0; uvhub < nuvhubs; uvhub++) {
+                struct uvhub_desc *bdp;
+                struct bau_control *smaster = NULL;
+                struct bau_control *hmaster = NULL;
+
                 if (!(*(uvhub_mask + (uvhub/8)) & (1 << (uvhub%8))))
                         continue;
-                have_hmaster = 0;
+
                 bdp = &uvhub_descs[uvhub];
                 socket_mask = bdp->socket_mask;
                 socket = 0;
                 while (socket_mask) {
-                        if (!(socket_mask & 1))
-                                goto nextsocket;
-                        sdp = &bdp->socket[socket];
-                        for (i = 0; i < sdp->num_cpus; i++) {
-                                cpu = sdp->cpu_number[i];
-                                bcp = &per_cpu(bau_control, cpu);
-                                bcp->cpu = cpu;
-                                if (i == 0) {
-                                        smaster = bcp;
-                                        if (!have_hmaster) {
-                                                have_hmaster++;
-                                                hmaster = bcp;
-                                        }
-                                }
-                                bcp->cpus_in_uvhub = bdp->num_cpus;
-                                bcp->cpus_in_socket = sdp->num_cpus;
-                                bcp->socket_master = smaster;
-                                bcp->uvhub = bdp->uvhub;
-                                bcp->uvhub_master = hmaster;
-                                bcp->uvhub_cpu = uv_cpu_hub_info(cpu)->
-                                                blade_processor_id;
-                                if (bcp->uvhub_cpu >= MAX_CPUS_PER_UVHUB) {
-                                        printk(KERN_EMERG
-                                                "%d cpus per uvhub invalid\n",
-                                                bcp->uvhub_cpu);
+                        struct socket_desc *sdp;
+                        if ((socket_mask & 1)) {
+                                sdp = &bdp->socket[socket];
+                                if (scan_sock(sdp, bdp, &smaster, &hmaster))
                                         return 1;
-                                }
                         }
-nextsocket:
                         socket++;
                         socket_mask = (socket_mask >> 1);
-                        /* each socket gets a local array of pnodes/hubs */
-                        bcp = smaster;
-                        bcp->target_hub_and_pnode = kmalloc_node(
-                                sizeof(struct hub_and_pnode) *
-                                num_possible_cpus(), GFP_KERNEL, bcp->osnode);
-                        memset(bcp->target_hub_and_pnode, 0,
-                                sizeof(struct hub_and_pnode) *
-                                num_possible_cpus());
-                        for_each_present_cpu(tcpu) {
-                                bcp->target_hub_and_pnode[tcpu].pnode =
-                                        uv_cpu_hub_info(tcpu)->pnode;
-                                bcp->target_hub_and_pnode[tcpu].uvhub =
-                                        uv_cpu_hub_info(tcpu)->numa_blade_id;
-                        }
+                        make_per_cpu_thp(smaster);
                 }
         }
+        return 0;
+}
+
+/*
+ * initialize the bau_control structure for each cpu
+ */
+static int __init init_per_cpu(int nuvhubs, int base_part_pnode)
+{
+        unsigned char *uvhub_mask;
+        void *vp;
+        struct uvhub_desc *uvhub_descs;
+
+        timeout_us = calculate_destination_timeout();
+
+        vp = kmalloc(nuvhubs * sizeof(struct uvhub_desc), GFP_KERNEL);
+        uvhub_descs = (struct uvhub_desc *)vp;
+        memset(uvhub_descs, 0, nuvhubs * sizeof(struct uvhub_desc));
+        uvhub_mask = kzalloc((nuvhubs+7)/8, GFP_KERNEL);
+
+        if (get_cpu_topology(base_part_pnode, uvhub_descs, uvhub_mask))
+                return 1;
+
+        if (summarize_uvhub_sockets(nuvhubs, uvhub_descs, uvhub_mask))
+                return 1;
+
         kfree(uvhub_descs);
         kfree(uvhub_mask);
-        for_each_present_cpu(cpu) {
-                bcp = &per_cpu(bau_control, cpu);
-                bcp->baudisabled = 0;
-                bcp->statp = &per_cpu(ptcstats, cpu);
-                /* time interval to catch a hardware stay-busy bug */
-                bcp->timeout_interval = microsec_2_cycles(2*timeout_us);
-                bcp->max_bau_concurrent = max_bau_concurrent;
-                bcp->max_bau_concurrent_constant = max_bau_concurrent;
-                bcp->plugged_delay = plugged_delay;
-                bcp->plugsb4reset = plugsb4reset;
-                bcp->timeoutsb4reset = timeoutsb4reset;
-                bcp->ipi_reset_limit = ipi_reset_limit;
-                bcp->complete_threshold = complete_threshold;
-                bcp->congested_response_us = congested_response_us;
-                bcp->congested_reps = congested_reps;
-                bcp->congested_period = congested_period;
-        }
+        init_per_cpu_tunables();
         return 0;
 }
 
@@ -1651,8 +1797,9 @@ static int __init uv_bau_init(void)
         int pnode;
         int nuvhubs;
         int cur_cpu;
+        int cpus;
         int vector;
-        unsigned long mmr;
+        cpumask_var_t *mask;
 
         if (!is_uv_system())
                 return 0;
@@ -1660,24 +1807,25 @@ static int __init uv_bau_init(void)
         if (nobau)
                 return 0;
 
-        for_each_possible_cpu(cur_cpu)
-                zalloc_cpumask_var_node(&per_cpu(uv_flush_tlb_mask, cur_cpu),
-                                       GFP_KERNEL, cpu_to_node(cur_cpu));
+        for_each_possible_cpu(cur_cpu) {
+                mask = &per_cpu(uv_flush_tlb_mask, cur_cpu);
+                zalloc_cpumask_var_node(mask, GFP_KERNEL, cpu_to_node(cur_cpu));
+        }
 
         uv_nshift = uv_hub_info->m_val;
         uv_mmask = (1UL << uv_hub_info->m_val) - 1;
         nuvhubs = uv_num_possible_blades();
         spin_lock_init(&disable_lock);
-        congested_cycles = microsec_2_cycles(congested_response_us);
+        congested_cycles = usec_2_cycles(congested_respns_us);
 
-        uv_partition_base_pnode = 0x7fffffff;
+        uv_base_pnode = 0x7fffffff;
         for (uvhub = 0; uvhub < nuvhubs; uvhub++) {
-                if (uv_blade_nr_possible_cpus(uvhub) &&
-                        (uv_blade_to_pnode(uvhub) < uv_partition_base_pnode))
-                        uv_partition_base_pnode = uv_blade_to_pnode(uvhub);
+                cpus = uv_blade_nr_possible_cpus(uvhub);
+                if (cpus && (uv_blade_to_pnode(uvhub) < uv_base_pnode))
+                        uv_base_pnode = uv_blade_to_pnode(uvhub);
         }
 
-        if (uv_init_per_cpu(nuvhubs, uv_partition_base_pnode)) {
+        if (init_per_cpu(nuvhubs, uv_base_pnode)) {
                 nobau = 1;
                 return 0;
         }
@@ -1685,21 +1833,21 @@ static int __init uv_bau_init(void)
         vector = UV_BAU_MESSAGE;
         for_each_possible_blade(uvhub)
                 if (uv_blade_nr_possible_cpus(uvhub))
-                        uv_init_uvhub(uvhub, vector, uv_partition_base_pnode);
+                        init_uvhub(uvhub, vector, uv_base_pnode);
 
-        uv_enable_timeouts();
+        enable_timeouts();
         alloc_intr_gate(vector, uv_bau_message_intr1);
 
         for_each_possible_blade(uvhub) {
                 if (uv_blade_nr_possible_cpus(uvhub)) {
+                        unsigned long val;
+                        unsigned long mmr;
                         pnode = uv_blade_to_pnode(uvhub);
                         /* INIT the bau */
-                        uv_write_global_mmr64(pnode,
-                                        UVH_LB_BAU_SB_ACTIVATION_CONTROL,
-                                        ((unsigned long)1 << 63));
+                        val = 1L << 63;
+                        write_gmmr_activation(pnode, val);
                         mmr = 1; /* should be 1 to broadcast to both sockets */
-                        uv_write_global_mmr64(pnode, UVH_BAU_DATA_BROADCAST,
-                                                mmr);
+                        write_mmr_data_broadcast(pnode, mmr);
                 }
         }
 
diff --git a/arch/x86/platform/uv/uv_time.c b/arch/x86/platform/uv/uv_time.c
index 0eb90184515f..9f29a01ee1b3 100644
--- a/arch/x86/platform/uv/uv_time.c
+++ b/arch/x86/platform/uv/uv_time.c
@@ -99,8 +99,12 @@ static void uv_rtc_send_IPI(int cpu)
 /* Check for an RTC interrupt pending */
 static int uv_intr_pending(int pnode)
 {
-        return uv_read_global_mmr64(pnode, UVH_EVENT_OCCURRED0) &
-                UVH_EVENT_OCCURRED0_RTC1_MASK;
+        if (is_uv1_hub())
+                return uv_read_global_mmr64(pnode, UVH_EVENT_OCCURRED0) &
+                        UV1H_EVENT_OCCURRED0_RTC1_MASK;
+        else
+                return uv_read_global_mmr64(pnode, UV2H_EVENT_OCCURRED2) &
+                        UV2H_EVENT_OCCURRED2_RTC_1_MASK;
 }
 
 /* Setup interrupt and return non-zero if early expiration occurred. */
@@ -114,8 +118,12 @@ static int uv_setup_intr(int cpu, u64 expires)
                 UVH_RTC1_INT_CONFIG_M_MASK);
         uv_write_global_mmr64(pnode, UVH_INT_CMPB, -1L);
 
-        uv_write_global_mmr64(pnode, UVH_EVENT_OCCURRED0_ALIAS,
-                UVH_EVENT_OCCURRED0_RTC1_MASK);
+        if (is_uv1_hub())
+                uv_write_global_mmr64(pnode, UVH_EVENT_OCCURRED0_ALIAS,
+                                UV1H_EVENT_OCCURRED0_RTC1_MASK);
+        else
+                uv_write_global_mmr64(pnode, UV2H_EVENT_OCCURRED2_ALIAS,
+                                UV2H_EVENT_OCCURRED2_RTC_1_MASK);
 
         val = (X86_PLATFORM_IPI_VECTOR << UVH_RTC1_INT_CONFIG_VECTOR_SHFT) |
                 ((u64)apicid << UVH_RTC1_INT_CONFIG_APIC_ID_SHFT);
diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
index b6552b189bcd..bef0bc962400 100644
--- a/arch/x86/vdso/Makefile
+++ b/arch/x86/vdso/Makefile
@@ -11,7 +11,7 @@ vdso-install-$(VDSO32-y)	+= $(vdso32-images)
 
 
 # files to link into the vdso
-vobjs-y := vdso-note.o vclock_gettime.o vgetcpu.o vvar.o
+vobjs-y := vdso-note.o vclock_gettime.o vgetcpu.o
 
 # files to link into kernel
 obj-$(VDSO64-y)                 += vma.o vdso.o
@@ -37,11 +37,24 @@ $(obj)/%.so: OBJCOPYFLAGS := -S
 $(obj)/%.so: $(obj)/%.so.dbg FORCE
         $(call if_changed,objcopy)
 
+#
+# Don't omit frame pointers for ease of userspace debugging, but do
+# optimize sibling calls.
+#
 CFL := $(PROFILING) -mcmodel=small -fPIC -O2 -fasynchronous-unwind-tables -m64 \
-       $(filter -g%,$(KBUILD_CFLAGS)) $(call cc-option, -fno-stack-protector)
+       $(filter -g%,$(KBUILD_CFLAGS)) $(call cc-option, -fno-stack-protector) \
+       -fno-omit-frame-pointer -foptimize-sibling-calls
 
 $(vobjs): KBUILD_CFLAGS += $(CFL)
 
+#
+# vDSO code runs in userspace and -pg doesn't help with profiling anyway.
+#
+CFLAGS_REMOVE_vdso-note.o = -pg
+CFLAGS_REMOVE_vclock_gettime.o = -pg
+CFLAGS_REMOVE_vgetcpu.o = -pg
+CFLAGS_REMOVE_vvar.o = -pg
+
 targets += vdso-syms.lds
 obj-$(VDSO64-y)                 += vdso-syms.lds
 
diff --git a/arch/x86/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c
index ee55754cc3c5..a724905fdae7 100644
--- a/arch/x86/vdso/vclock_gettime.c
+++ b/arch/x86/vdso/vclock_gettime.c
@@ -2,7 +2,7 @@
  * Copyright 2006 Andi Kleen, SUSE Labs.
  * Subject to the GNU Public License, v.2
  *
- * Fast user context implementation of clock_gettime and gettimeofday.
+ * Fast user context implementation of clock_gettime, gettimeofday, and time.
  *
  * The code should have no internal unresolved relocations.
  * Check with readelf after changing.
@@ -22,9 +22,8 @@
 #include <asm/hpet.h>
 #include <asm/unistd.h>
 #include <asm/io.h>
-#include "vextern.h"
 
-#define gtod vdso_vsyscall_gtod_data
+#define gtod (&VVAR(vsyscall_gtod_data))
 
 notrace static long vdso_fallback_gettime(long clock, struct timespec *ts)
 {
@@ -56,22 +55,6 @@ notrace static noinline int do_realtime(struct timespec *ts)
         return 0;
 }
 
-/* Copy of the version in kernel/time.c which we cannot directly access */
-notrace static void
-vset_normalized_timespec(struct timespec *ts, long sec, long nsec)
-{
-        while (nsec >= NSEC_PER_SEC) {
-                nsec -= NSEC_PER_SEC;
-                ++sec;
-        }
-        while (nsec < 0) {
-                nsec += NSEC_PER_SEC;
-                --sec;
-        }
-        ts->tv_sec = sec;
-        ts->tv_nsec = nsec;
-}
-
 notrace static noinline int do_monotonic(struct timespec *ts)
 {
         unsigned long seq, ns, secs;
@@ -82,7 +65,17 @@ notrace static noinline int do_monotonic(struct timespec *ts)
                 secs += gtod->wall_to_monotonic.tv_sec;
                 ns += gtod->wall_to_monotonic.tv_nsec;
         } while (unlikely(read_seqretry(&gtod->lock, seq)));
-        vset_normalized_timespec(ts, secs, ns);
+
+        /* wall_time_nsec, vgetns(), and wall_to_monotonic.tv_nsec
+         * are all guaranteed to be nonnegative.
+         */
+        while (ns >= NSEC_PER_SEC) {
+                ns -= NSEC_PER_SEC;
+                ++secs;
+        }
+        ts->tv_sec = secs;
+        ts->tv_nsec = ns;
+
         return 0;
 }
 
@@ -107,7 +100,17 @@ notrace static noinline int do_monotonic_coarse(struct timespec *ts)
                 secs += gtod->wall_to_monotonic.tv_sec;
                 ns += gtod->wall_to_monotonic.tv_nsec;
         } while (unlikely(read_seqretry(&gtod->lock, seq)));
-        vset_normalized_timespec(ts, secs, ns);
+
+        /* wall_time_nsec and wall_to_monotonic.tv_nsec are
+         * guaranteed to be between 0 and NSEC_PER_SEC.
+         */
+        if (ns >= NSEC_PER_SEC) {
+                ns -= NSEC_PER_SEC;
+                ++secs;
+        }
+        ts->tv_sec = secs;
+        ts->tv_nsec = ns;
+
         return 0;
 }
 
@@ -157,3 +160,32 @@ notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz)
 }
 int gettimeofday(struct timeval *, struct timezone *)
         __attribute__((weak, alias("__vdso_gettimeofday")));
+
+/* This will break when the xtime seconds get inaccurate, but that is
+ * unlikely */
+
+static __always_inline long time_syscall(long *t)
+{
+        long secs;
+        asm volatile("syscall"
+                     : "=a" (secs)
+                     : "0" (__NR_time), "D" (t) : "cc", "r11", "cx", "memory");
+        return secs;
+}
+
+notrace time_t __vdso_time(time_t *t)
+{
+        time_t result;
+
+        if (unlikely(!VVAR(vsyscall_gtod_data).sysctl_enabled))
+                return time_syscall(t);
+
+        /* This is atomic on x86_64 so we don't need any locks. */
+        result = ACCESS_ONCE(VVAR(vsyscall_gtod_data).wall_time_sec);
+
+        if (t)
+                *t = result;
+        return result;
+}
+int time(time_t *t)
+        __attribute__((weak, alias("__vdso_time")));
diff --git a/arch/x86/vdso/vdso.lds.S b/arch/x86/vdso/vdso.lds.S
index 4e5dd3b4de7f..b96b2677cad8 100644
--- a/arch/x86/vdso/vdso.lds.S
+++ b/arch/x86/vdso/vdso.lds.S
@@ -23,15 +23,10 @@ VERSION {
                 __vdso_gettimeofday;
                 getcpu;
                 __vdso_getcpu;
+                time;
+                __vdso_time;
         local: *;
         };
 }
 
 VDSO64_PRELINK = VDSO_PRELINK;
-
-/*
- * Define VDSO64_x for each VEXTERN(x), for use via VDSO64_SYMBOL.
- */
-#define VEXTERN(x)      VDSO64_ ## x = vdso_ ## x;
-#include "vextern.h"
-#undef  VEXTERN
diff --git a/arch/x86/vdso/vextern.h b/arch/x86/vdso/vextern.h
deleted file mode 100644
index 1683ba2ae3e8..000000000000
--- a/arch/x86/vdso/vextern.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef VEXTERN
-#include <asm/vsyscall.h>
-#define VEXTERN(x) \
-        extern typeof(x) *vdso_ ## x __attribute__((visibility("hidden")));
-#endif
-
-#define VMAGIC 0xfeedbabeabcdefabUL
-
-/* Any kernel variables used in the vDSO must be exported in the main
-   kernel's vmlinux.lds.S/vsyscall.h/proper __section and
-   put into vextern.h and be referenced as a pointer with vdso prefix.
-   The main kernel later fills in the values.   */
-
-VEXTERN(jiffies)
-VEXTERN(vgetcpu_mode)
-VEXTERN(vsyscall_gtod_data)
diff --git a/arch/x86/vdso/vgetcpu.c b/arch/x86/vdso/vgetcpu.c
index 9fbc6b20026b..5463ad558573 100644
--- a/arch/x86/vdso/vgetcpu.c
+++ b/arch/x86/vdso/vgetcpu.c
@@ -11,14 +11,13 @@
 #include <linux/time.h>
 #include <asm/vsyscall.h>
 #include <asm/vgtod.h>
-#include "vextern.h"
 
 notrace long
 __vdso_getcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *unused)
 {
         unsigned int p;
 
-        if (*vdso_vgetcpu_mode == VGETCPU_RDTSCP) {
+        if (VVAR(vgetcpu_mode) == VGETCPU_RDTSCP) {
                 /* Load per CPU data from RDTSCP */
                 native_read_tscp(&p);
         } else {
diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
index 4b5d26f108bb..7abd2be0f9b9 100644
--- a/arch/x86/vdso/vma.c
+++ b/arch/x86/vdso/vma.c
@@ -15,9 +15,6 @@
 #include <asm/proto.h>
 #include <asm/vdso.h>
 
-#include "vextern.h"            /* Just for VMAGIC.  */
-#undef VEXTERN
-
 unsigned int __read_mostly vdso_enabled = 1;
 
 extern char vdso_start[], vdso_end[];
@@ -26,20 +23,10 @@ extern unsigned short vdso_sync_cpuid;
 static struct page **vdso_pages;
 static unsigned vdso_size;
 
-static inline void *var_ref(void *p, char *name)
-{
-        if (*(void **)p != (void *)VMAGIC) {
-                printk("VDSO: variable %s broken\n", name);
-                vdso_enabled = 0;
-        }
-        return p;
-}
-
 static int __init init_vdso_vars(void)
 {
         int npages = (vdso_end - vdso_start + PAGE_SIZE - 1) / PAGE_SIZE;
         int i;
-        char *vbase;
 
         vdso_size = npages << PAGE_SHIFT;
         vdso_pages = kmalloc(sizeof(struct page *) * npages, GFP_KERNEL);
@@ -54,20 +41,6 @@ static int __init init_vdso_vars(void)
                 copy_page(page_address(p), vdso_start + i*PAGE_SIZE);
         }
 
-        vbase = vmap(vdso_pages, npages, 0, PAGE_KERNEL);
-        if (!vbase)
-                goto oom;
-
-        if (memcmp(vbase, "\177ELF", 4)) {
-                printk("VDSO: I'm broken; not ELF\n");
-                vdso_enabled = 0;
-        }
-
-#define VEXTERN(x) \
-        *(typeof(__ ## x) **) var_ref(VDSO64_SYMBOL(vbase, x), #x) = &__ ## x;
-#include "vextern.h"
-#undef VEXTERN
-        vunmap(vbase);
         return 0;
 
  oom:
diff --git a/arch/x86/vdso/vvar.c b/arch/x86/vdso/vvar.c
deleted file mode 100644
index 1b7e703684f9..000000000000
--- a/arch/x86/vdso/vvar.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Define pointer to external vDSO variables.
-   These are part of the vDSO. The kernel fills in the real addresses
-   at boot time. This is done because when the vdso is linked the
-   kernel isn't yet and we don't know the final addresses. */
-#include <linux/kernel.h>
-#include <linux/time.h>
-#include <asm/vsyscall.h>
-#include <asm/timex.h>
-#include <asm/vgtod.h>
-
-#define VEXTERN(x) typeof (__ ## x) *const vdso_ ## x = (void *)VMAGIC;
-#include "vextern.h"
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index 02d752460371..dc708dcc62f1 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -75,67 +75,12 @@
 #include "mmu.h"
 #include "debugfs.h"
 
-#define MMU_UPDATE_HISTO        30
-
 /*
  * Protects atomic reservation decrease/increase against concurrent increases.
  * Also protects non-atomic updates of current_pages and balloon lists.
  */
 DEFINE_SPINLOCK(xen_reservation_lock);
 
-#ifdef CONFIG_XEN_DEBUG_FS
-
-static struct {
-        u32 pgd_update;
-        u32 pgd_update_pinned;
-        u32 pgd_update_batched;
-
-        u32 pud_update;
-        u32 pud_update_pinned;
-        u32 pud_update_batched;
-
-        u32 pmd_update;
-        u32 pmd_update_pinned;
-        u32 pmd_update_batched;
-
-        u32 pte_update;
-        u32 pte_update_pinned;
-        u32 pte_update_batched;
-
-        u32 mmu_update;
-        u32 mmu_update_extended;
-        u32 mmu_update_histo[MMU_UPDATE_HISTO];
-
-        u32 prot_commit;
-        u32 prot_commit_batched;
-
-        u32 set_pte_at;
-        u32 set_pte_at_batched;
-        u32 set_pte_at_pinned;
-        u32 set_pte_at_current;
-        u32 set_pte_at_kernel;
-} mmu_stats;
-
-static u8 zero_stats;
-
-static inline void check_zero(void)
-{
-        if (unlikely(zero_stats)) {
-                memset(&mmu_stats, 0, sizeof(mmu_stats));
-                zero_stats = 0;
-        }
-}
-
-#define ADD_STATS(elem, val)                    \
-        do { check_zero(); mmu_stats.elem += (val); } while(0)
-
-#else  /* !CONFIG_XEN_DEBUG_FS */
-
-#define ADD_STATS(elem, val)    do { (void)(val); } while(0)
-
-#endif /* CONFIG_XEN_DEBUG_FS */
-
-
 /*
  * Identity map, in addition to plain kernel map.  This needs to be
  * large enough to allocate page table pages to allocate the rest.
@@ -243,11 +188,6 @@ static bool xen_page_pinned(void *ptr)
         return PagePinned(page);
 }
 
-static bool xen_iomap_pte(pte_t pte)
-{
-        return pte_flags(pte) & _PAGE_IOMAP;
-}
-
 void xen_set_domain_pte(pte_t *ptep, pte_t pteval, unsigned domid)
 {
         struct multicall_space mcs;
@@ -257,7 +197,7 @@ void xen_set_domain_pte(pte_t *ptep, pte_t pteval, unsigned domid)
         u = mcs.args;
 
         /* ptep might be kmapped when using 32-bit HIGHPTE */
-        u->ptr = arbitrary_virt_to_machine(ptep).maddr;
+        u->ptr = virt_to_machine(ptep).maddr;
         u->val = pte_val_ma(pteval);
 
         MULTI_mmu_update(mcs.mc, mcs.args, 1, NULL, domid);
@@ -266,11 +206,6 @@ void xen_set_domain_pte(pte_t *ptep, pte_t pteval, unsigned domid)
 }
 EXPORT_SYMBOL_GPL(xen_set_domain_pte);
 
-static void xen_set_iomap_pte(pte_t *ptep, pte_t pteval)
-{
-        xen_set_domain_pte(ptep, pteval, DOMID_IO);
-}
-
 static void xen_extend_mmu_update(const struct mmu_update *update)
 {
         struct multicall_space mcs;
@@ -279,27 +214,17 @@ static void xen_extend_mmu_update(const struct mmu_update *update)
         mcs = xen_mc_extend_args(__HYPERVISOR_mmu_update, sizeof(*u));
 
         if (mcs.mc != NULL) {
-                ADD_STATS(mmu_update_extended, 1);
-                ADD_STATS(mmu_update_histo[mcs.mc->args[1]], -1);
-
                 mcs.mc->args[1]++;
-
-                if (mcs.mc->args[1] < MMU_UPDATE_HISTO)
-                        ADD_STATS(mmu_update_histo[mcs.mc->args[1]], 1);
-                else
-                        ADD_STATS(mmu_update_histo[0], 1);
         } else {
-                ADD_STATS(mmu_update, 1);
                 mcs = __xen_mc_entry(sizeof(*u));
                 MULTI_mmu_update(mcs.mc, mcs.args, 1, NULL, DOMID_SELF);
-                ADD_STATS(mmu_update_histo[1], 1);
         }
 
         u = mcs.args;
         *u = *update;
 }
 
-void xen_set_pmd_hyper(pmd_t *ptr, pmd_t val)
+static void xen_set_pmd_hyper(pmd_t *ptr, pmd_t val)
 {
         struct mmu_update u;
 
@@ -312,17 +237,13 @@ void xen_set_pmd_hyper(pmd_t *ptr, pmd_t val)
         u.val = pmd_val_ma(val);
         xen_extend_mmu_update(&u);
 
-        ADD_STATS(pmd_update_batched, paravirt_get_lazy_mode() == PARAVIRT_LAZY_MMU);
-
         xen_mc_issue(PARAVIRT_LAZY_MMU);
 
         preempt_enable();
 }
 
-void xen_set_pmd(pmd_t *ptr, pmd_t val)
+static void xen_set_pmd(pmd_t *ptr, pmd_t val)
 {
-        ADD_STATS(pmd_update, 1);
-
         /* If page is not pinned, we can just update the entry
            directly */
         if (!xen_page_pinned(ptr)) {
@@ -330,8 +251,6 @@ void xen_set_pmd(pmd_t *ptr, pmd_t val)
                 return;
         }
 
-        ADD_STATS(pmd_update_pinned, 1);
-
         xen_set_pmd_hyper(ptr, val);
 }
 
@@ -344,35 +263,34 @@ void set_pte_mfn(unsigned long vaddr, unsigned long mfn, pgprot_t flags)
         set_pte_vaddr(vaddr, mfn_pte(mfn, flags));
 }
 
-void xen_set_pte_at(struct mm_struct *mm, unsigned long addr,
-                    pte_t *ptep, pte_t pteval)
+static bool xen_batched_set_pte(pte_t *ptep, pte_t pteval)
 {
-        if (xen_iomap_pte(pteval)) {
-                xen_set_iomap_pte(ptep, pteval);
-                goto out;
-        }
+        struct mmu_update u;
 
-        ADD_STATS(set_pte_at, 1);
-//      ADD_STATS(set_pte_at_pinned, xen_page_pinned(ptep));
-        ADD_STATS(set_pte_at_current, mm == current->mm);
-        ADD_STATS(set_pte_at_kernel, mm == &init_mm);
+        if (paravirt_get_lazy_mode() != PARAVIRT_LAZY_MMU)
+                return false;
 
-        if (mm == current->mm || mm == &init_mm) {
-                if (paravirt_get_lazy_mode() == PARAVIRT_LAZY_MMU) {
-                        struct multicall_space mcs;
-                        mcs = xen_mc_entry(0);
+        xen_mc_batch();
 
-                        MULTI_update_va_mapping(mcs.mc, addr, pteval, 0);
-                        ADD_STATS(set_pte_at_batched, 1);
-                        xen_mc_issue(PARAVIRT_LAZY_MMU);
-                        goto out;
-                } else
-                        if (HYPERVISOR_update_va_mapping(addr, pteval, 0) == 0)
-                                goto out;
-        }
-        xen_set_pte(ptep, pteval);
+        u.ptr = virt_to_machine(ptep).maddr | MMU_NORMAL_PT_UPDATE;
+        u.val = pte_val_ma(pteval);
+        xen_extend_mmu_update(&u);
+
+        xen_mc_issue(PARAVIRT_LAZY_MMU);
 
-out:    return;
+        return true;
+}
+
+static void xen_set_pte(pte_t *ptep, pte_t pteval)
+{
+        if (!xen_batched_set_pte(ptep, pteval))
+                native_set_pte(ptep, pteval);
+}
+
+static void xen_set_pte_at(struct mm_struct *mm, unsigned long addr,
+                    pte_t *ptep, pte_t pteval)
+{
+        xen_set_pte(ptep, pteval);
 }
 
 pte_t xen_ptep_modify_prot_start(struct mm_struct *mm,
@@ -389,13 +307,10 @@ void xen_ptep_modify_prot_commit(struct mm_struct *mm, unsigned long addr,
 
         xen_mc_batch();
 
-        u.ptr = arbitrary_virt_to_machine(ptep).maddr | MMU_PT_UPDATE_PRESERVE_AD;
+        u.ptr = virt_to_machine(ptep).maddr | MMU_PT_UPDATE_PRESERVE_AD;
         u.val = pte_val_ma(pte);
         xen_extend_mmu_update(&u);
 
-        ADD_STATS(prot_commit, 1);
-        ADD_STATS(prot_commit_batched, paravirt_get_lazy_mode() == PARAVIRT_LAZY_MMU);
-
         xen_mc_issue(PARAVIRT_LAZY_MMU);
 }
 
@@ -463,7 +378,7 @@ static pteval_t iomap_pte(pteval_t val)
         return val;
 }
 
-pteval_t xen_pte_val(pte_t pte)
+static pteval_t xen_pte_val(pte_t pte)
 {
         pteval_t pteval = pte.pte;
 
@@ -480,7 +395,7 @@ pteval_t xen_pte_val(pte_t pte)
 }
 PV_CALLEE_SAVE_REGS_THUNK(xen_pte_val);
 
-pgdval_t xen_pgd_val(pgd_t pgd)
+static pgdval_t xen_pgd_val(pgd_t pgd)
 {
         return pte_mfn_to_pfn(pgd.pgd);
 }
@@ -511,7 +426,7 @@ void xen_set_pat(u64 pat)
         WARN_ON(pat != 0x0007010600070106ull);
 }
 
-pte_t xen_make_pte(pteval_t pte)
+static pte_t xen_make_pte(pteval_t pte)
 {
         phys_addr_t addr = (pte & PTE_PFN_MASK);
 
@@ -581,20 +496,20 @@ pte_t xen_make_pte_debug(pteval_t pte)
 PV_CALLEE_SAVE_REGS_THUNK(xen_make_pte_debug);
 #endif
 
-pgd_t xen_make_pgd(pgdval_t pgd)
+static pgd_t xen_make_pgd(pgdval_t pgd)
 {
         pgd = pte_pfn_to_mfn(pgd);
         return native_make_pgd(pgd);
 }
 PV_CALLEE_SAVE_REGS_THUNK(xen_make_pgd);
 
-pmdval_t xen_pmd_val(pmd_t pmd)
+static pmdval_t xen_pmd_val(pmd_t pmd)
 {
         return pte_mfn_to_pfn(pmd.pmd);
 }
 PV_CALLEE_SAVE_REGS_THUNK(xen_pmd_val);
 
-void xen_set_pud_hyper(pud_t *ptr, pud_t val)
+static void xen_set_pud_hyper(pud_t *ptr, pud_t val)
 {
         struct mmu_update u;
 
@@ -607,17 +522,13 @@ void xen_set_pud_hyper(pud_t *ptr, pud_t val)
         u.val = pud_val_ma(val);
         xen_extend_mmu_update(&u);
 
-        ADD_STATS(pud_update_batched, paravirt_get_lazy_mode() == PARAVIRT_LAZY_MMU);
-
         xen_mc_issue(PARAVIRT_LAZY_MMU);
 
         preempt_enable();
 }
 
-void xen_set_pud(pud_t *ptr, pud_t val)
+static void xen_set_pud(pud_t *ptr, pud_t val)
 {
-        ADD_STATS(pud_update, 1);
-
         /* If page is not pinned, we can just update the entry
            directly */
         if (!xen_page_pinned(ptr)) {
@@ -625,56 +536,28 @@ void xen_set_pud(pud_t *ptr, pud_t val)
                 return;
         }
 
-        ADD_STATS(pud_update_pinned, 1);
-
         xen_set_pud_hyper(ptr, val);
 }
 
-void xen_set_pte(pte_t *ptep, pte_t pte)
-{
-        if (xen_iomap_pte(pte)) {
-                xen_set_iomap_pte(ptep, pte);
-                return;
-        }
-
-        ADD_STATS(pte_update, 1);
-//      ADD_STATS(pte_update_pinned, xen_page_pinned(ptep));
-        ADD_STATS(pte_update_batched, paravirt_get_lazy_mode() == PARAVIRT_LAZY_MMU);
-
 #ifdef CONFIG_X86_PAE
-        ptep->pte_high = pte.pte_high;
-        smp_wmb();
-        ptep->pte_low = pte.pte_low;
-#else
-        *ptep = pte;
-#endif
-}
-
-#ifdef CONFIG_X86_PAE
-void xen_set_pte_atomic(pte_t *ptep, pte_t pte)
+static void xen_set_pte_atomic(pte_t *ptep, pte_t pte)
 {
-        if (xen_iomap_pte(pte)) {
-                xen_set_iomap_pte(ptep, pte);
-                return;
-        }
-
         set_64bit((u64 *)ptep, native_pte_val(pte));
 }
 
-void xen_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
+static void xen_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
 {
-        ptep->pte_low = 0;
-        smp_wmb();              /* make sure low gets written first */
-        ptep->pte_high = 0;
+        if (!xen_batched_set_pte(ptep, native_make_pte(0)))
+                native_pte_clear(mm, addr, ptep);
 }
 
-void xen_pmd_clear(pmd_t *pmdp)
+static void xen_pmd_clear(pmd_t *pmdp)
 {
         set_pmd(pmdp, __pmd(0));
 }
 #endif  /* CONFIG_X86_PAE */
 
-pmd_t xen_make_pmd(pmdval_t pmd)
+static pmd_t xen_make_pmd(pmdval_t pmd)
 {
         pmd = pte_pfn_to_mfn(pmd);
         return native_make_pmd(pmd);
@@ -682,13 +565,13 @@ pmd_t xen_make_pmd(pmdval_t pmd)
 PV_CALLEE_SAVE_REGS_THUNK(xen_make_pmd);
 
 #if PAGETABLE_LEVELS == 4
-pudval_t xen_pud_val(pud_t pud)
+static pudval_t xen_pud_val(pud_t pud)
 {
         return pte_mfn_to_pfn(pud.pud);
 }
 PV_CALLEE_SAVE_REGS_THUNK(xen_pud_val);
 
-pud_t xen_make_pud(pudval_t pud)
+static pud_t xen_make_pud(pudval_t pud)
 {
         pud = pte_pfn_to_mfn(pud);
 
@@ -696,7 +579,7 @@ pud_t xen_make_pud(pudval_t pud)
 }
 PV_CALLEE_SAVE_REGS_THUNK(xen_make_pud);
 
-pgd_t *xen_get_user_pgd(pgd_t *pgd)
+static pgd_t *xen_get_user_pgd(pgd_t *pgd)
 {
         pgd_t *pgd_page = (pgd_t *)(((unsigned long)pgd) & PAGE_MASK);
         unsigned offset = pgd - pgd_page;
@@ -728,7 +611,7 @@ static void __xen_set_pgd_hyper(pgd_t *ptr, pgd_t val)
  *  2. It is always pinned
  *  3. It has no user pagetable attached to it
  */
-void __init xen_set_pgd_hyper(pgd_t *ptr, pgd_t val)
+static void __init xen_set_pgd_hyper(pgd_t *ptr, pgd_t val)
 {
         preempt_disable();
 
@@ -741,12 +624,10 @@ void __init xen_set_pgd_hyper(pgd_t *ptr, pgd_t val)
         preempt_enable();
 }
 
-void xen_set_pgd(pgd_t *ptr, pgd_t val)
+static void xen_set_pgd(pgd_t *ptr, pgd_t val)
 {
         pgd_t *user_ptr = xen_get_user_pgd(ptr);
 
-        ADD_STATS(pgd_update, 1);
-
         /* If page is not pinned, we can just update the entry
            directly */
         if (!xen_page_pinned(ptr)) {
@@ -758,9 +639,6 @@ void xen_set_pgd(pgd_t *ptr, pgd_t val)
                 return;
         }
 
-        ADD_STATS(pgd_update_pinned, 1);
-        ADD_STATS(pgd_update_batched, paravirt_get_lazy_mode() == PARAVIRT_LAZY_MMU);
-
         /* If it's pinned, then we can at least batch the kernel and
            user updates together. */
         xen_mc_batch();
@@ -1162,14 +1040,14 @@ void xen_mm_unpin_all(void)
         spin_unlock(&pgd_lock);
 }
 
-void xen_activate_mm(struct mm_struct *prev, struct mm_struct *next)
+static void xen_activate_mm(struct mm_struct *prev, struct mm_struct *next)
 {
         spin_lock(&next->page_table_lock);
         xen_pgd_pin(next);
         spin_unlock(&next->page_table_lock);
 }
 
-void xen_dup_mmap(struct mm_struct *oldmm, struct mm_struct *mm)
+static void xen_dup_mmap(struct mm_struct *oldmm, struct mm_struct *mm)
 {
         spin_lock(&mm->page_table_lock);
         xen_pgd_pin(mm);
@@ -1256,7 +1134,7 @@ static void xen_drop_mm_ref(struct mm_struct *mm)
  * pagetable because of lazy tlb flushing.  This means we need need to
  * switch all CPUs off this pagetable before we can unpin it.
  */
-void xen_exit_mmap(struct mm_struct *mm)
+static void xen_exit_mmap(struct mm_struct *mm)
 {
         get_cpu();              /* make sure we don't move around */
         xen_drop_mm_ref(mm);
@@ -2371,7 +2249,7 @@ static int remap_area_mfn_pte_fn(pte_t *ptep, pgtable_t token,
         struct remap_data *rmd = data;
         pte_t pte = pte_mkspecial(pfn_pte(rmd->mfn++, rmd->prot));
 
-        rmd->mmu_update->ptr = arbitrary_virt_to_machine(ptep).maddr;
+        rmd->mmu_update->ptr = virt_to_machine(ptep).maddr;
         rmd->mmu_update->val = pte_val_ma(pte);
         rmd->mmu_update++;
 
@@ -2425,7 +2303,6 @@ out:
 EXPORT_SYMBOL_GPL(xen_remap_domain_mfn_range);
 
 #ifdef CONFIG_XEN_DEBUG_FS
-
 static int p2m_dump_open(struct inode *inode, struct file *filp)
 {
         return single_open(filp, p2m_dump_show, NULL);
@@ -2437,65 +2314,4 @@ static const struct file_operations p2m_dump_fops = {
         .llseek         = seq_lseek,
         .release        = single_release,
 };
-
-static struct dentry *d_mmu_debug;
-
-static int __init xen_mmu_debugfs(void)
-{
-        struct dentry *d_xen = xen_init_debugfs();
-
-        if (d_xen == NULL)
-                return -ENOMEM;
-
-        d_mmu_debug = debugfs_create_dir("mmu", d_xen);
-
-        debugfs_create_u8("zero_stats", 0644, d_mmu_debug, &zero_stats);
-
-        debugfs_create_u32("pgd_update", 0444, d_mmu_debug, &mmu_stats.pgd_update);
-        debugfs_create_u32("pgd_update_pinned", 0444, d_mmu_debug,
-                           &mmu_stats.pgd_update_pinned);
-        debugfs_create_u32("pgd_update_batched", 0444, d_mmu_debug,
-                           &mmu_stats.pgd_update_pinned);
-
-        debugfs_create_u32("pud_update", 0444, d_mmu_debug, &mmu_stats.pud_update);
-        debugfs_create_u32("pud_update_pinned", 0444, d_mmu_debug,
-                           &mmu_stats.pud_update_pinned);
-        debugfs_create_u32("pud_update_batched", 0444, d_mmu_debug,
-                           &mmu_stats.pud_update_pinned);
-
-        debugfs_create_u32("pmd_update", 0444, d_mmu_debug, &mmu_stats.pmd_update);
-        debugfs_create_u32("pmd_update_pinned", 0444, d_mmu_debug,
-                           &mmu_stats.pmd_update_pinned);
-        debugfs_create_u32("pmd_update_batched", 0444, d_mmu_debug,
-                           &mmu_stats.pmd_update_pinned);
-
-        debugfs_create_u32("pte_update", 0444, d_mmu_debug, &mmu_stats.pte_update);
-//      debugfs_create_u32("pte_update_pinned", 0444, d_mmu_debug,
-//                         &mmu_stats.pte_update_pinned);
-        debugfs_create_u32("pte_update_batched", 0444, d_mmu_debug,
-                           &mmu_stats.pte_update_pinned);
-
-        debugfs_create_u32("mmu_update", 0444, d_mmu_debug, &mmu_stats.mmu_update);
-        debugfs_create_u32("mmu_update_extended", 0444, d_mmu_debug,
-                           &mmu_stats.mmu_update_extended);
-        xen_debugfs_create_u32_array("mmu_update_histo", 0444, d_mmu_debug,
-                                     mmu_stats.mmu_update_histo, 20);
-
-        debugfs_create_u32("set_pte_at", 0444, d_mmu_debug, &mmu_stats.set_pte_at);
-        debugfs_create_u32("set_pte_at_batched", 0444, d_mmu_debug,
-                           &mmu_stats.set_pte_at_batched);
-        debugfs_create_u32("set_pte_at_current", 0444, d_mmu_debug,
-                           &mmu_stats.set_pte_at_current);
-        debugfs_create_u32("set_pte_at_kernel", 0444, d_mmu_debug,
-                           &mmu_stats.set_pte_at_kernel);
-
-        debugfs_create_u32("prot_commit", 0444, d_mmu_debug, &mmu_stats.prot_commit);
-        debugfs_create_u32("prot_commit_batched", 0444, d_mmu_debug,
-                           &mmu_stats.prot_commit_batched);
-
-        debugfs_create_file("p2m", 0600, d_mmu_debug, NULL, &p2m_dump_fops);
-        return 0;
-}
-fs_initcall(xen_mmu_debugfs);
-
-#endif  /* CONFIG_XEN_DEBUG_FS */
+#endif /* CONFIG_XEN_DEBUG_FS */
diff --git a/arch/x86/xen/mmu.h b/arch/x86/xen/mmu.h
index 537bb9aab777..73809bb951b4 100644
--- a/arch/x86/xen/mmu.h
+++ b/arch/x86/xen/mmu.h
@@ -15,43 +15,6 @@ bool __set_phys_to_machine(unsigned long pfn, unsigned long mfn);
 
 void set_pte_mfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags);
 
-
-void xen_activate_mm(struct mm_struct *prev, struct mm_struct *next);
-void xen_dup_mmap(struct mm_struct *oldmm, struct mm_struct *mm);
-void xen_exit_mmap(struct mm_struct *mm);
-
-pteval_t xen_pte_val(pte_t);
-pmdval_t xen_pmd_val(pmd_t);
-pgdval_t xen_pgd_val(pgd_t);
-
-pte_t xen_make_pte(pteval_t);
-pmd_t xen_make_pmd(pmdval_t);
-pgd_t xen_make_pgd(pgdval_t);
-
-void xen_set_pte(pte_t *ptep, pte_t pteval);
-void xen_set_pte_at(struct mm_struct *mm, unsigned long addr,
-                    pte_t *ptep, pte_t pteval);
-
-#ifdef CONFIG_X86_PAE
-void xen_set_pte_atomic(pte_t *ptep, pte_t pte);
-void xen_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep);
-void xen_pmd_clear(pmd_t *pmdp);
-#endif  /* CONFIG_X86_PAE */
-
-void xen_set_pmd(pmd_t *pmdp, pmd_t pmdval);
-void xen_set_pud(pud_t *ptr, pud_t val);
-void xen_set_pmd_hyper(pmd_t *pmdp, pmd_t pmdval);
-void xen_set_pud_hyper(pud_t *ptr, pud_t val);
-
-#if PAGETABLE_LEVELS == 4
-pudval_t xen_pud_val(pud_t pud);
-pud_t xen_make_pud(pudval_t pudval);
-void xen_set_pgd(pgd_t *pgdp, pgd_t pgd);
-void xen_set_pgd_hyper(pgd_t *pgdp, pgd_t pgd);
-#endif
-
-pgd_t *xen_get_user_pgd(pgd_t *pgd);
-
 pte_t xen_ptep_modify_prot_start(struct mm_struct *mm, unsigned long addr, pte_t *ptep);
 void  xen_ptep_modify_prot_commit(struct mm_struct *mm, unsigned long addr,
                                   pte_t *ptep, pte_t pte);
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 7c275f5d0df0..5d43c1f8ada8 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -20,12 +20,6 @@ config XTENSA
 config RWSEM_XCHGADD_ALGORITHM
         def_bool y
 
-config GENERIC_FIND_NEXT_BIT
-        def_bool y
-
-config GENERIC_FIND_BIT_LE
-        def_bool y
-
 config GENERIC_HWEIGHT
         def_bool y
 
diff --git a/arch/xtensa/include/asm/unistd.h b/arch/xtensa/include/asm/unistd.h
index 528042c2951e..a6f934f37f1a 100644
--- a/arch/xtensa/include/asm/unistd.h
+++ b/arch/xtensa/include/asm/unistd.h
@@ -683,8 +683,10 @@ __SYSCALL(305, sys_ni_syscall, 0)
 __SYSCALL(306, sys_eventfd, 1)
 #define __NR_recvmmsg                           307
 __SYSCALL(307, sys_recvmmsg, 5)
+#define __NR_setns                              308
+__SYSCALL(308, sys_setns, 2)
 
-#define __NR_syscall_count                      308
+#define __NR_syscall_count                      309
 
 /*
  * sysxtensa syscall handler