Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux

* 'for-linus' of git://gitorious.org/linux-omap-dss2/linux:
  OMAP: DSS2: don't power off a panel twice
  OMAP: DSS2: OMAPFB: Allow usage of def_vrfb only for omap2,3
  OMAP: DSS2: OMAPFB: make VRFB depends on OMAP2,3
  OMAP: DSS2: OMAPFB: Allow FB_OMAP2 to build without VRFB
  arm/omap: simplify conditional
  OMAP: DSS2: DSI: Remove extra iounmap in error path
  OMAP: DSS2: Use dss_features framework on DSS2 code
  OMAP: DSS2: Introduce dss_features files
  video/omap: remove mux.h include
  ARM: omap/fb: move get_fbmem_region() to .init.text
  ARM: omap/fb: move omapfb_reserve_sram to .init.text
  ARM: omap/fb: move omap_init_fb to .init.text
  OMAP: DSS2: OMAPFB: swap front and back porches for both hsync and vsync
  OMAP: DSS2: make filter coefficient tables human readable
  OMAP: DSS2: Add SPI dependency to Kconfig of ACX565AKM panel

diff --combined arch/arm/plat-omap/fb.c
index bb78c15,f2a1483..c9e5d72
--- 1/arch/arm/plat-omap/fb.c
--- 2/arch/arm/plat-omap/fb.c
+++ b/arch/arm/plat-omap/fb.c
@@@ -36,8 -36,6 +36,8 @@@
  #include <plat/board.h>
  #include <plat/sram.h>
  
 +#include "fb.h"
 +
  #if defined(CONFIG_FB_OMAP) || defined(CONFIG_FB_OMAP_MODULE)
  
  static struct omapfb_platform_data omapfb_config;
@@@ -96,7 -94,7 +96,7 @@@ static int fbmem_region_reserved(unsign
   * Get the region_idx`th region from board config/ATAG and convert it to
   * our internal format.
   */
- static int get_fbmem_region(int region_idx, struct omapfb_mem_region *rg)
+ static int __init get_fbmem_region(int region_idx, struct omapfb_mem_region *rg)
  {
        const struct omap_fbmem_config  *conf;
        u32                             paddr;
@@@ -128,7 -126,7 +128,7 @@@ static int set_fbmem_region_type(struc
         * type = 0 && paddr = 0, a default don't care case maps to
         * the SDRAM type.
         */
-       if (rg->type || (!rg->type && !rg->paddr))
+       if (rg->type || !rg->paddr)
                return 0;
        if (ranges_overlap(rg->paddr, rg->size, mem_start, mem_size)) {
                rg->type = mem_type;
@@@ -175,7 -173,11 +175,7 @@@ static int check_fbmem_region(int regio
  
  static int valid_sdram(unsigned long addr, unsigned long size)
  {
 -      struct memblock_property res;
 -
 -      res.base = addr;
 -      res.size = size;
 -      return !memblock_find(&res) && res.base == addr && res.size == size;
 +      return memblock_is_region_memory(addr, size);
  }
  
  static int reserve_sdram(unsigned long addr, unsigned long size)
@@@ -260,7 -262,7 +260,7 @@@ void __init omapfb_reserve_sdram_memblo
   * this point, since the driver built as a module would have problem with
   * freeing / reallocating the regions.
   */
- unsigned long omapfb_reserve_sram(unsigned long sram_pstart,
+ unsigned long __init omapfb_reserve_sram(unsigned long sram_pstart,
                                  unsigned long sram_vstart,
                                  unsigned long sram_size,
                                  unsigned long pstart_avail,
@@@ -334,7 -336,7 +334,7 @@@ void omapfb_set_ctrl_platform_data(voi
        omapfb_config.ctrl_platform_data = data;
  }
  
- static inline int omap_init_fb(void)
+ static int __init omap_init_fb(void)
  {
        const struct omap_lcd_config *conf;
  
@@@ -379,7 -381,7 +379,7 @@@ void omapfb_set_platform_data(struct om
        omapfb_config = *data;
  }
  
- static inline int omap_init_fb(void)
+ static int __init omap_init_fb(void)
  {
        return platform_device_register(&omap_fb_device);
  }
@@@ -390,7 -392,7 +390,7 @@@ void omapfb_reserve_sdram_memblock(void
  {
  }
  
- unsigned long omapfb_reserve_sram(unsigned long sram_pstart,
+ unsigned long __init omapfb_reserve_sram(unsigned long sram_pstart,
                                  unsigned long sram_vstart,
                                  unsigned long sram_size,
                                  unsigned long start_avail,
@@@ -409,7 -411,7 +409,7 @@@ void omapfb_reserve_sdram_memblock(void
  {
  }
  
- unsigned long omapfb_reserve_sram(unsigned long sram_pstart,
+ unsigned long __init omapfb_reserve_sram(unsigned long sram_pstart,
                                  unsigned long sram_vstart,
                                  unsigned long sram_size,
                                  unsigned long start_avail,