Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (28 commits)
  ARM: OMAP: Fix GCC-reported compile time bug
  ARM: OMAP: restore CONFIG_GENERIC_TIME
  ARM: OMAP: partial LED fixes
  ARM: OMAP: add SoSSI clock (call propagate_rate for childrens)
  ARM: OMAP: FB sync with N800 tree (support for dynamic SRAM allocations)
  ARM: OMAP: Sync framebuffer headers with N800 tree
  ARM: OMAP: Mostly cosmetic to sync up with linux-omap tree
  ARM: OMAP: Fix gpmc header
  ARM: OMAP: Add mailbox support for IVA
  [ARM] armv7: add Makefile and Kconfig entries
  [ARM] armv7: add support for asid-tagged VIVT I-cache
  [ARM] armv7: add dedicated ARMv7 barrier instructions
  [ARM] armv7: Add ARMv7 cacheid macros
  [ARM] armv7: add support for ARMv7 cores.
  [ARM] Fix ARM branch relocation range
  [ARM] 4363/1: AT91: Remove legacy PIO definitions
  [ARM] 4361/1: AT91: Build error
  ARM: OMAP: Sync core code with linux-omap
  ARM: OMAP: Sync headers with linux-omap
  ARM: OMAP: h4 must have blinky leds!!
  ...

diff --combined arch/arm/mach-omap1/Kconfig
index c7e229b00f6e24d05ce830f35b5a05197b3f0d22,ab1b17d35bd32322a416937bd10caff4f9114fa1..856c681ebbbcf9c3e9e64060bd52a1e690316e51
--- 1/arch/arm/mach-omap1/Kconfig
--- 2/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@@ -22,6 -22,7 +22,7 @@@ comment "OMAP Board Type
  config MACH_OMAP_INNOVATOR
        bool "TI Innovator"
        depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX)
+       select OMAP_MCBSP
        help
            TI OMAP 1510 or 1610 Innovator board support. Say Y here if you
            have such a board.
@@@ -29,6 -30,7 +30,7 @@@
  config MACH_OMAP_H2
        bool "TI H2 Support"
        depends on ARCH_OMAP1 && ARCH_OMAP16XX
+       select OMAP_MCBSP
        help
          TI OMAP 1610/1611B H2 board support. Say Y here if you have such
          a board.
@@@ -36,6 -38,7 +38,7 @@@
  config MACH_OMAP_H3
        bool "TI H3 Support"
        depends on ARCH_OMAP1 && ARCH_OMAP16XX
+       select GPIOEXPANDER_OMAP
        help
          TI OMAP 1710 H3 board support. Say Y here if you have such
          a board.
@@@ -43,7 -46,7 +46,7 @@@
  config MACH_OMAP_OSK
        bool "TI OSK Support"
        depends on ARCH_OMAP1 && ARCH_OMAP16XX
-       select TPS65010
+       select OMAP_MCBSP
        help
          TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here
            if you have such a board.
@@@ -84,7 -87,7 +87,7 @@@ config MACH_OMAP_PALMT
            Support for the Palm Tungsten E PDA. Currently only the LCD panel
            is supported. To boot the kernel, you'll need a PalmOS compatible
            bootloader; check out http://palmtelinux.sourceforge.net for more
 -          informations.
 +          information.
            Say Y here if you have such a PDA, say NO otherwise.
  
  config MACH_NOKIA770

diff --combined include/asm-arm/arch-omap/board.h
index 4fd717e626a240e8e7abf0969c0396f9acf7169e,2075f556bfe4f709d0212b05cf07475d669ea15e..031672c563777667b6f9f37baadea56137b74b43
--- 1/include/asm-arm/arch-omap/board.h
--- 2/include/asm-arm/arch-omap/board.h
+++ b/include/asm-arm/arch-omap/board.h
@@@ -4,7 -4,7 +4,7 @@@
   *  Information structures for board-specific data
   *
   *  Copyright (C) 2004        Nokia Corporation
 - *  Written by Juha Yrjölä <juha.yrjola@nokia.com>
 + *  Written by Juha Yrjölä <juha.yrjola@nokia.com>
   */
  
  #ifndef _OMAP_BOARD_H
@@@ -12,6 -12,8 +12,8 @@@
  
  #include <linux/types.h>
  
+ #include <asm/arch/gpio-switch.h>
+ 
  /* Different peripheral ids */
  #define OMAP_TAG_CLOCK                0x4f01
  #define OMAP_TAG_MMC          0x4f02
@@@ -99,26 -101,31 +101,31 @@@ struct omap_usb_config 
  struct omap_lcd_config {
        char panel_name[16];
        char ctrl_name[16];
+       s16  nreset_gpio;
+       u8   data_lines;
+ };
+ 
+ struct device;
+ struct fb_info;
+ struct omap_backlight_config {
+       int default_intensity;
+       int (*set_power)(struct device *dev, int state);
+       int (*check_fb)(struct fb_info *fb);
  };
  
  struct omap_fbmem_config {
-       u32 fb_sram_start;
-       u32 fb_sram_size;
-       u32 fb_sdram_start;
-       u32 fb_sdram_size;
+       u32 start;
+       u32 size;
  };
  
- /* Cover:
-  *      high -> closed
-  *      low  -> open
-  * Connection:
-  *      high -> connected
-  *      low  -> disconnected
-  */
- #define OMAP_GPIO_SWITCH_TYPE_COVER           0x0000
- #define OMAP_GPIO_SWITCH_TYPE_CONNECTION      0x0001
- #define OMAP_GPIO_SWITCH_FLAG_INVERTED                0x0001
- #define OMAP_GPIO_SWITCH_FLAG_OUTPUT          0x0002
+ struct omap_pwm_led_platform_data {
+       const char *name;
+       int intensity_timer;
+       int blink_timer;
+       void (*set_power)(struct omap_pwm_led_platform_data *self, int on_off);
+ };
+ 
+ /* See include/asm-arm/arch-omap/gpio-switch.h for definitions */
  struct omap_gpio_switch_config {
        char name[12];
        u16 gpio;

diff --combined include/asm-arm/system.h
index f2da3b6e3a837e89369625fd6c6cd4f113e9212b,41dd49151dae149be79ab614c3c3c40bbf450d9c..6f8e6a69dc5f4334391dc03ff6ef53b3d1bd032a
--- 1/include/asm-arm/system.h
--- 2/include/asm-arm/system.h
+++ b/include/asm-arm/system.h
@@@ -14,6 -14,7 +14,7 @@@
  #define CPU_ARCH_ARMv5TE      6
  #define CPU_ARCH_ARMv5TEJ     7
  #define CPU_ARCH_ARMv6                8
+ #define CPU_ARCH_ARMv7                9
  
  /*
   * CR1 bits (CP#15 CR1)
@@@ -93,7 -94,7 +94,7 @@@ void die(const char *msg, struct pt_reg
                __attribute__((noreturn));
  
  struct siginfo;
 -void notify_die(const char *str, struct pt_regs *regs, struct siginfo *info,
 +void arm_notify_die(const char *str, struct pt_regs *regs, struct siginfo *info,
                unsigned long err, unsigned long trap);
  
  void hook_fault_code(int nr, int (*fn)(unsigned long, unsigned int,
@@@ -103,6 -104,8 +104,6 @@@
  #define xchg(ptr,x) \
        ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
  
 -#define tas(ptr) (xchg((ptr),1))
 -
  extern asmlinkage void __backtrace(void);
  extern asmlinkage void c_backtrace(unsigned long fp, int pmode);
  
@@@ -155,7 -158,11 +156,11 @@@ extern unsigned int user_debug
  #define vectors_high()        (0)
  #endif
  
- #if defined(CONFIG_CPU_XSC3) || __LINUX_ARM_ARCH__ >= 6
+ #if __LINUX_ARM_ARCH__ >= 7
+ #define isb() __asm__ __volatile__ ("isb" : : : "memory")
+ #define dsb() __asm__ __volatile__ ("dsb" : : : "memory")
+ #define dmb() __asm__ __volatile__ ("dmb" : : : "memory")
+ #elif defined(CONFIG_CPU_XSC3) || __LINUX_ARM_ARCH__ == 6
  #define isb() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c5, 4" \
                                    : : "r" (0) : "memory")
  #define dsb() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 4" \