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

* 'for-linus' of git://gitorious.org/linux-omap-dss2/linux: (49 commits)
  OMAP: DSS2: Taal: Fix TE when resuming
  OMAP: DSS2: Taal: Fix ESD check
  OMAP: DSS2: OMAPFB: Constify some function parameters
  OMAP: DSS2: OMAPFB: install omapfb.h
  OMAP: DSS2: DSI: add error prints
  OMAP: DSS2: TPO-TD03MTEA1: fix function names
  OMAP: DSS2: DSI: add dsi_vc_dcs_read_2() helper
  OMAP: DSS2: OMAPFB: Remove FB_OMAP2_FORCE_AUTO_UPDATE
  OMAP: DSS2: DSI: remove external TE support
  OMAP: DSS2: move timing functions
  OMAP: DSS2: move set/get_wss()
  OMAP: DSS2: move enable/disable/suspend/resume
  OMAP: DSS2: move update() and sync()
  OMAP: DSS2: move set/get_update_mode()
  OMAP: DSS2: move enable/get_te()
  OMAP: DSS2: move get_recommended_bpp()
  OMAP: DSS2: move get_resolution()
  OMAP: DSS2: move enable/disable_channel to overlay manager
  OMAP: DSS2: move wait_vsync()
  OMAP: DSS2: move get/set_rotate()
  ...

diff --combined arch/arm/mach-omap2/board-3430sdp.c
index f312b151375368fac4a0ed641e0d6fa30262d7fe,964c390c2f39d62203d516ce58c2f1ea7bfb3af1..a101029ceb6f55e86feecbf9e9cc126d466ad0b3
--- 1/arch/arm/mach-omap2/board-3430sdp.c
--- 2/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@@ -41,12 -41,9 +41,12 @@@
  #include <plat/control.h>
  #include <plat/gpmc-smc91x.h>
  
 +#include <mach/board-sdp.h>
 +
  #include "mux.h"
  #include "sdram-qimonda-hyb18m512160af-6.h"
 -#include "mmc-twl4030.h"
 +#include "hsmmc.h"
 +#include "pm.h"
  
  #define CONFIG_DISABLE_HFCLK 1
  
@@@ -58,24 -55,6 +58,24 @@@
  
  #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 int board_keymap[] = {
        KEY(0, 0, KEY_LEFT),
        KEY(0, 1, KEY_RIGHT),
@@@ -326,7 -305,6 +326,7 @@@ static void __init omap_3430sdp_init_ir
  {
        omap_board_config = sdp3430_config;
        omap_board_config_size = ARRAY_SIZE(sdp3430_config);
 +      omap3_pm_init_cpuidle(omap3_cpuidle_params_table);
        omap2_init_common_hw(hyb18m512160af6_sdrc_params, NULL);
        omap_init_irq();
        omap_gpio_init();
@@@ -348,7 -326,7 +348,7 @@@ static struct twl4030_bci_platform_dat
        .tblsize                = ARRAY_SIZE(sdp3430_batt_table),
  };
  
 -static struct twl4030_hsmmc_info mmc[] = {
 +static struct omap2_hsmmc_info mmc[] = {
        {
                .mmc            = 1,
                /* 8 bits (default) requires S6.3 == ON,
@@@ -385,7 -363,7 +385,7 @@@ static int sdp3430_twl_gpio_setup(struc
         */
        mmc[0].gpio_cd = gpio + 0;
        mmc[1].gpio_cd = gpio + 1;
 -      twl4030_mmc_init(mmc);
 +      omap2_hsmmc_init(mmc);
  
        /* link regulators to MMC adapters ... we "know" the
         * regulators will be set up only *after* we return.
@@@ -541,10 -519,6 +541,6 @@@ static struct regulator_init_data sdp34
  
  /* VPLL2 for digital video outputs */
  static struct regulator_consumer_supply sdp3430_vpll2_supplies[] = {
-       {
-               .supply         = "vdvi",
-               .dev            = &sdp3430_lcd_device.dev,
-       },
        {
                .supply         = "vdds_dsi",
                .dev            = &sdp3430_dss_device.dev,
@@@ -672,120 -646,6 +668,120 @@@ static struct omap_board_mux board_mux[
  #define board_mux     NULL
  #endif
  
 +static struct mtd_partition sdp_nor_partitions[] = {
 +      /* bootloader (U-Boot, etc) in first sector */
 +      {
 +              .name           = "Bootloader-NOR",
 +              .offset         = 0,
 +              .size           = SZ_256K,
 +              .mask_flags     = MTD_WRITEABLE, /* force read-only */
 +      },
 +      /* bootloader params in the next sector */
 +      {
 +              .name           = "Params-NOR",
 +              .offset         = MTDPART_OFS_APPEND,
 +              .size           = SZ_256K,
 +              .mask_flags     = 0,
 +      },
 +      /* kernel */
 +      {
 +              .name           = "Kernel-NOR",
 +              .offset         = MTDPART_OFS_APPEND,
 +              .size           = SZ_2M,
 +              .mask_flags     = 0
 +      },
 +      /* file system */
 +      {
 +              .name           = "Filesystem-NOR",
 +              .offset         = MTDPART_OFS_APPEND,
 +              .size           = MTDPART_SIZ_FULL,
 +              .mask_flags     = 0
 +      }
 +};
 +
 +static struct mtd_partition sdp_onenand_partitions[] = {
 +      {
 +              .name           = "X-Loader-OneNAND",
 +              .offset         = 0,
 +              .size           = 4 * (64 * 2048),
 +              .mask_flags     = MTD_WRITEABLE  /* force read-only */
 +      },
 +      {
 +              .name           = "U-Boot-OneNAND",
 +              .offset         = MTDPART_OFS_APPEND,
 +              .size           = 2 * (64 * 2048),
 +              .mask_flags     = MTD_WRITEABLE  /* force read-only */
 +      },
 +      {
 +              .name           = "U-Boot Environment-OneNAND",
 +              .offset         = MTDPART_OFS_APPEND,
 +              .size           = 1 * (64 * 2048),
 +      },
 +      {
 +              .name           = "Kernel-OneNAND",
 +              .offset         = MTDPART_OFS_APPEND,
 +              .size           = 16 * (64 * 2048),
 +      },
 +      {
 +              .name           = "File System-OneNAND",
 +              .offset         = MTDPART_OFS_APPEND,
 +              .size           = MTDPART_SIZ_FULL,
 +      },
 +};
 +
 +static struct mtd_partition sdp_nand_partitions[] = {
 +      /* All the partition sizes are listed in terms of NAND block size */
 +      {
 +              .name           = "X-Loader-NAND",
 +              .offset         = 0,
 +              .size           = 4 * (64 * 2048),
 +              .mask_flags     = MTD_WRITEABLE,        /* force read-only */
 +      },
 +      {
 +              .name           = "U-Boot-NAND",
 +              .offset         = MTDPART_OFS_APPEND,   /* Offset = 0x80000 */
 +              .size           = 10 * (64 * 2048),
 +              .mask_flags     = MTD_WRITEABLE,        /* force read-only */
 +      },
 +      {
 +              .name           = "Boot Env-NAND",
 +
 +              .offset         = MTDPART_OFS_APPEND,   /* Offset = 0x1c0000 */
 +              .size           = 6 * (64 * 2048),
 +      },
 +      {
 +              .name           = "Kernel-NAND",
 +              .offset         = MTDPART_OFS_APPEND,   /* Offset = 0x280000 */
 +              .size           = 40 * (64 * 2048),
 +      },
 +      {
 +              .name           = "File System - NAND",
 +              .size           = MTDPART_SIZ_FULL,
 +              .offset         = MTDPART_OFS_APPEND,   /* Offset = 0x780000 */
 +      },
 +};
 +
 +static struct flash_partitions sdp_flash_partitions[] = {
 +      {
 +              .parts = sdp_nor_partitions,
 +              .nr_parts = ARRAY_SIZE(sdp_nor_partitions),
 +      },
 +      {
 +              .parts = sdp_onenand_partitions,
 +              .nr_parts = ARRAY_SIZE(sdp_onenand_partitions),
 +      },
 +      {
 +              .parts = sdp_nand_partitions,
 +              .nr_parts = ARRAY_SIZE(sdp_nand_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)
  {
        omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
@@@ -800,9 -660,8 +796,9 @@@
                                ARRAY_SIZE(sdp3430_spi_board_info));
        ads7846_dev_init();
        omap_serial_init();
 -      usb_musb_init();
 +      usb_musb_init(&musb_board_data);
        board_smc91x_init();
 +      sdp_flash_init(sdp_flash_partitions);
        sdp3430_display_init();
        enable_board_wakeup_source();
        usb_ehci_init(&ehci_pdata);
@@@ -811,7 -670,7 +807,7 @@@
  static void __init omap_3430sdp_map_io(void)
  {
        omap2_set_globals_343x();
 -      omap2_map_common_io();
 +      omap34xx_map_common_io();
  }
  
  MACHINE_START(OMAP_3430SDP, "OMAP3430 3430SDP board")

diff --combined include/linux/Kbuild
index 5b0d997f23efc802bad818d0a9b673c63b55c3ec,aa80d7a2dee786c23420817a2dfab98725f91de0..e2ea0b2159cd23c1a29662fe98907c9370883048
--- 1/include/linux/Kbuild
--- 2/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@@ -43,7 -43,6 +43,7 @@@ header-y += blkpg.
  header-y += bpqether.h
  header-y += bsg.h
  header-y += can.h
 +header-y += cciss_defs.h
  header-y += cdk.h
  header-y += chio.h
  header-y += coda_psdev.h
@@@ -126,6 -125,7 +126,7 @@@ header-y += nfs2.
  header-y += nfs4_mount.h
  header-y += nfs_mount.h
  header-y += nl80211.h
+ header-y += omapfb.h
  header-y += param.h
  header-y += pci_regs.h
  header-y += perf_event.h
@@@ -363,7 -363,6 +364,7 @@@ unifdef-y += uio.
  unifdef-y += unistd.h
  unifdef-y += usbdevice_fs.h
  unifdef-y += utsname.h
 +unifdef-y += vhost.h
  unifdef-y += videodev2.h
  unifdef-y += videodev.h
  unifdef-y += virtio_config.h