Merge omap-drivers

Conflicts:

	arch/arm/configs/omap_h2_1610_defconfig
	arch/arm/configs/omap_osk_5912_defconfig
	arch/arm/mach-omap1/board-h2.c
	arch/arm/mach-omap2/Kconfig
	arch/arm/mach-omap2/Makefile
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/board-n800-dsp.c
	arch/arm/mach-omap2/board-n800-usb.c
	arch/arm/plat-omap/Kconfig
	arch/arm/plat-omap/Makefile
	arch/arm/plat-omap/devices.c
	drivers/Makefile
	drivers/i2c/chips/gpio_expander_omap.c
	drivers/i2c/chips/menelaus.c
	drivers/i2c/chips/tlv320aic23.c
	drivers/mtd/onenand/omap2.c
	drivers/video/omap/omapfb_main.c
	include/asm-arm/arch-omap/dsp.h
	include/asm-arm/hardware/tsc2101.h
	net/ipv4/netfilter/ipt_IDLETIMER.c

diff --combined Makefile
index c8e8a31e1eca8731fea6d4831c9616197e021808,234bae68cb98ec1eb6d6ef7d4d5b5a1e912cb7bf..8921dddb0140ae7b42a76db2bdc89dd4200becde
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 21
- EXTRAVERSION = -rc5
+ EXTRAVERSION = -rc7
  NAME = Nocturnal Monster Puppy
  
  # *DOCUMENTATION*
@@@ -16,9 -16,6 +16,9 @@@
  # o  print "Entering directory ...";
  MAKEFLAGS += -rR --no-print-directory
  
 +# Add custom flags here to avoid conflict with updates
 +EXTRAVERSION := $(EXTRAVERSION)-omap1
 +
  # We are using a recursive build, so we need to do a little thinking
  # to get the ordering right.
  #
@@@ -166,8 -163,6 +166,8 @@@ SUBARCH := $(shell uname -m | sed -e s/
                                  -e s/s390x/s390/ -e s/parisc64/parisc/ \
                                  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ )
  
 +SUBARCH := arm
 +
  # Cross compiling and selecting different set of gcc/bin-utils
  # ---------------------------------------------------------------------------
  #
@@@ -188,7 -183,7 +188,7 @@@
  # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
  
  ARCH          ?= $(SUBARCH)
 -CROSS_COMPILE ?=
 +CROSS_COMPILE ?= arm-linux-
  
  # Architecture as present in compile.h
  UTS_MACHINE := $(ARCH)

diff --combined arch/arm/mach-omap2/io.c
index 871fde3f02b7197edbfa7087d91a65f92bba7bb6,2769171147bcfbe1edb51ad51d60742ba2548fb0..5fa7fc2be030b2ef50c2c78d0dcf391f66a926bd
--- 1/arch/arm/mach-omap2/io.c
--- 2/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@@ -42,12 -42,6 +42,50 @@@ static struct map_desc omap2_io_desc[] 
                .length         = L3_24XX_SIZE,
                .type           = MT_DEVICE
        },
-               .virtual        = L4_24XX_VIRT,
-               .pfn            = __phys_to_pfn(L4_24XX_PHYS),
-               .length         = L4_24XX_SIZE,
++#ifdef CONFIG_ARCH_OMAP2430
++      {
++              .virtual        = L4_WK_243X_VIRT,
++              .pfn            = __phys_to_pfn(L4_WK_243X_PHYS),
++              .length         = L4_WK_243X_SIZE,
++              .type           = MT_DEVICE
++      },
++      {
++              .virtual        = OMAP243X_GPMC_VIRT,
++              .pfn            = __phys_to_pfn(OMAP243X_GPMC_PHYS),
++              .length         = OMAP243X_GPMC_SIZE,
++              .type           = MT_DEVICE
++      },
++      {
++              .virtual        = OMAP243X_SDRC_VIRT,
++              .pfn            = __phys_to_pfn(OMAP243X_SDRC_PHYS),
++              .length         = OMAP243X_SDRC_SIZE,
++              .type           = MT_DEVICE
++      },
++      {
++              .virtual        = OMAP243X_SMS_VIRT,
++              .pfn            = __phys_to_pfn(OMAP243X_SMS_PHYS),
++              .length         = OMAP243X_SMS_SIZE,
++              .type           = MT_DEVICE
++      },
++#endif
++      {
++              .virtual        = DSP_MEM_24XX_VIRT,
++              .pfn            = __phys_to_pfn(DSP_MEM_24XX_PHYS),
++              .length         = DSP_MEM_24XX_SIZE,
++              .type           = MT_DEVICE
++      },
++      {
++              .virtual        = DSP_IPI_24XX_VIRT,
++              .pfn            = __phys_to_pfn(DSP_IPI_24XX_PHYS),
++              .length         = DSP_IPI_24XX_SIZE,
++              .type           = MT_DEVICE
++      },
 +      {
++              .virtual        = DSP_MMU_24XX_VIRT,
++              .pfn            = __phys_to_pfn(DSP_MMU_24XX_PHYS),
++              .length         = DSP_MMU_24XX_SIZE,
 +              .type           = MT_DEVICE
 +      },
  #ifdef CONFIG_ARCH_OMAP2430
        {
                .virtual        = L4_WK_243X_VIRT,