Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	drivers/mtd/onenand/omap2.c

diff --combined Makefile
index ce3666998752a11bdb7e9f9dd6f2ab283e07811c,6c2f51b70454578b8c2210e8069b2e1388d722f8..407210f10cdb81bc76415bb9eed673387f30b09c
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 28
- EXTRAVERSION = -rc7
+ EXTRAVERSION = -rc8
  NAME = Erotic Pickled Herring
  
  # *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.
  #
@@@ -174,8 -171,6 +174,8 @@@ SUBARCH := $(shell uname -m | sed -e s/
                                  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
                                  -e s/sh.*/sh/ )
  
 +SUBARCH := arm
 +
  # Cross compiling and selecting different set of gcc/bin-utils
  # ---------------------------------------------------------------------------
  #
@@@ -196,7 -191,7 +196,7 @@@
  # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
  export KBUILD_BUILDHOST := $(SUBARCH)
  ARCH          ?= $(SUBARCH)
 -CROSS_COMPILE ?=
 +CROSS_COMPILE ?= arm-linux-
  
  # Architecture as present in compile.h
  UTS_MACHINE   := $(ARCH)

diff --combined arch/arm/plat-omap/include/mach/omapfb.h
index 90d63c5fb0edb58b16630e1adb1c5812dee6f28a,7b74d1255e0b93c7531e607a77188a148bda980b..b226bdf45739f6ef5b1f82812dbefbd7c67eda13
--- 1/arch/arm/plat-omap/include/mach/omapfb.h
--- 2/arch/arm/plat-omap/include/mach/omapfb.h
+++ b/arch/arm/plat-omap/include/mach/omapfb.h
@@@ -276,8 -276,8 +276,8 @@@ typedef int (*omapfb_notifier_callback_
                                          void *fbi);
  
  struct omapfb_mem_region {
 -      dma_addr_t      paddr;
 -      void            *vaddr;
 +      u32             paddr;
 +      void __iomem    *vaddr;
        unsigned long   size;
        u8              type;           /* OMAPFB_PLANE_MEM_* */
        unsigned        alloc:1;        /* allocated by the driver */
@@@ -353,8 -353,8 +353,8 @@@ struct omapfb_device 
        u32                     pseudo_palette[17];
  
        struct lcd_panel        *panel;                 /* LCD panel */
-       struct lcd_ctrl         *ctrl;                  /* LCD controller */
-       struct lcd_ctrl         *int_ctrl;              /* internal LCD ctrl */
+       const struct lcd_ctrl   *ctrl;                  /* LCD controller */
+       const struct lcd_ctrl   *int_ctrl;              /* internal LCD ctrl */
        struct lcd_ctrl_extif   *ext_if;                /* LCD ctrl external
                                                           interface */
        struct device           *dev;

diff --combined arch/arm/plat-omap/sram.c
index 070e80e6cd5a9daba999eea4a2b2dc243e6bf211,dcd9d16da2e9f5f0df6e36484e09edaed84139e9..9242fe5b95a49809563dcc749e0c01e37596ca98
--- 1/arch/arm/plat-omap/sram.c
--- 2/arch/arm/plat-omap/sram.c
+++ b/arch/arm/plat-omap/sram.c
@@@ -24,7 -24,6 +24,7 @@@
  
  #include <mach/sram.h>
  #include <mach/board.h>
 +#include <mach/cpu.h>
  
  #include <mach/control.h>
  
@@@ -38,8 -37,8 +38,8 @@@
  #define OMAP1_SRAM_VA         VMALLOC_END
  #define OMAP2_SRAM_PA         0x40200000
  #define OMAP2_SRAM_PUB_PA     0x4020f800
 -#define OMAP2_SRAM_VA         VMALLOC_END
 -#define OMAP2_SRAM_PUB_VA     (VMALLOC_END + 0x800)
 +#define OMAP2_SRAM_VA         0xe3000000
 +#define OMAP2_SRAM_PUB_VA     (OMAP2_SRAM_VA + 0x800)
  #define OMAP3_SRAM_PA           0x40200000
  #define OMAP3_SRAM_VA           0xd7000000
  #define OMAP3_SRAM_PUB_PA       0x40208000
@@@ -88,7 -87,7 +88,7 @@@ static int is_sram_locked(void
        int type = 0;
  
        if (cpu_is_omap242x())
 -              type = system_rev & OMAP2_DEVICETYPE_MASK;
 +              type = omap_rev() & OMAP2_DEVICETYPE_MASK;
  
        if (type == GP_DEVICE) {
                /* RAMFW: R/W access to all initiators for all qualifier sets */
@@@ -256,7 -255,7 +256,7 @@@ void omap_sram_reprogram_clock(u32 dpll
        if (!_omap_sram_reprogram_clock)
                omap_sram_error();
  
-       return _omap_sram_reprogram_clock(dpllctl, ckctl);
+       _omap_sram_reprogram_clock(dpllctl, ckctl);
  }
  
  int __init omap1_sram_init(void)
@@@ -283,8 -282,8 +283,8 @@@ void omap2_sram_ddr_init(u32 *slow_dll_
        if (!_omap2_sram_ddr_init)
                omap_sram_error();
  
-       return _omap2_sram_ddr_init(slow_dll_ctrl, fast_dll_ctrl,
-                                   base_cs, force_unlock);
+       _omap2_sram_ddr_init(slow_dll_ctrl, fast_dll_ctrl,
+                            base_cs, force_unlock);
  }
  
  static void (*_omap2_sram_reprogram_sdrc)(u32 perf_level, u32 dll_val,
@@@ -295,7 -294,7 +295,7 @@@ void omap2_sram_reprogram_sdrc(u32 perf
        if (!_omap2_sram_reprogram_sdrc)
                omap_sram_error();
  
-       return _omap2_sram_reprogram_sdrc(perf_level, dll_val, mem_type);
+       _omap2_sram_reprogram_sdrc(perf_level, dll_val, mem_type);
  }
  
  static u32 (*_omap2_set_prcm)(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass);
@@@ -359,14 -358,14 +359,14 @@@ static u32 (*_omap3_sram_configure_core
                                              u32 m2);
  u32 omap3_configure_core_dpll(u32 sdrc_rfr_ctrl, u32 sdrc_actim_ctrla,
                              u32 sdrc_actim_ctrlb, u32 m2)
 -{
 + {
        if (!_omap3_sram_configure_core_dpll)
                omap_sram_error();
  
        return _omap3_sram_configure_core_dpll(sdrc_rfr_ctrl,
                                               sdrc_actim_ctrla,
                                               sdrc_actim_ctrlb, m2);
 -}
 + }
  
  /* REVISIT: Should this be same as omap34xx_sram_init() after off-idle? */
  void restore_sram_functions(void)
@@@ -378,7 -377,7 +378,7 @@@
                               omap3_sram_configure_core_dpll_sz);
  }
  
 -int __init omap34xx_sram_init(void)
 +int __init omap3_sram_init(void)
  {
        _omap3_sram_configure_core_dpll =
                omap_sram_push(omap3_sram_configure_core_dpll,
@@@ -387,7 -386,7 +387,7 @@@
        return 0;
  }
  #else
 -static inline int omap34xx_sram_init(void)
 +static inline int omap3_sram_init(void)
  {
        return 0;
  }
@@@ -405,7 -404,7 +405,7 @@@ int __init omap_sram_init(void
        else if (cpu_is_omap2430())
                omap243x_sram_init();
        else if (cpu_is_omap34xx())
 -              omap34xx_sram_init();
 +              omap3_sram_init();
  
        return 0;
  }