Merge branch 'v2.6.35-omap-mailbox-for-next' of git://gitorious.org/~doyu/lk/mainline...

Conflicts:
	arch/arm/mach-omap1/devices.c

diff --combined arch/arm/mach-omap2/devices.c
index 162a9be3cbb12bd312a927bfd30ed7620a29607d,44902405fb63370c115290d7a27a3608d14ed3f9..2dbb265bedd4e914c6ceac472dbe9a0b8bddbf0b
--- 1/arch/arm/mach-omap2/devices.c
--- 2/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@@ -25,6 -25,7 +25,6 @@@
  #include <plat/control.h>
  #include <plat/tc.h>
  #include <plat/board.h>
 -#include <plat/mux.h>
  #include <mach/gpio.h>
  #include <plat/mmc.h>
  #include <plat/dma.h>
@@@ -152,10 -153,12 +152,12 @@@ static struct resource omap2_mbox_resou
        {
                .start          = INT_24XX_MAIL_U0_MPU,
                .flags          = IORESOURCE_IRQ,
+               .name           = "dsp",
        },
        {
                .start          = INT_24XX_MAIL_U3_MPU,
                .flags          = IORESOURCE_IRQ,
+               .name           = "iva",
        },
  };
  static int omap2_mbox_resources_sz = ARRAY_SIZE(omap2_mbox_resources);
@@@ -174,6 -177,7 +176,7 @@@ static struct resource omap3_mbox_resou
        {
                .start          = INT_24XX_MAIL_U0_MPU,
                .flags          = IORESOURCE_IRQ,
+               .name           = "dsp",
        },
  };
  static int omap3_mbox_resources_sz = ARRAY_SIZE(omap3_mbox_resources);
@@@ -195,6 -199,7 +198,7 @@@ static struct resource omap4_mbox_resou
        {
                .start          = OMAP44XX_IRQ_MAIL_U0,
                .flags          = IORESOURCE_IRQ,
+               .name           = "mbox",
        },
  };
  static int omap4_mbox_resources_sz = ARRAY_SIZE(omap4_mbox_resources);
@@@ -204,7 -209,7 +208,7 @@@
  #endif
  
  static struct platform_device mbox_device = {
-       .name           = "omap2-mailbox",
+       .name           = "omap-mailbox",
        .id             = -1,
  };
  
@@@ -229,7 -234,64 +233,7 @@@ static inline void omap_init_mbox(void
  static inline void omap_init_mbox(void) { }
  #endif /* CONFIG_OMAP_MBOX_FWK */
  
 -#if defined(CONFIG_OMAP_STI)
 -
 -#if defined(CONFIG_ARCH_OMAP2)
 -
 -#define OMAP2_STI_BASE                0x48068000
 -#define OMAP2_STI_CHANNEL_BASE        0x54000000
 -#define OMAP2_STI_IRQ         4
 -
 -static struct resource sti_resources[] = {
 -      {
 -              .start          = OMAP2_STI_BASE,
 -              .end            = OMAP2_STI_BASE + 0x7ff,
 -              .flags          = IORESOURCE_MEM,
 -      },
 -      {
 -              .start          = OMAP2_STI_CHANNEL_BASE,
 -              .end            = OMAP2_STI_CHANNEL_BASE + SZ_64K - 1,
 -              .flags          = IORESOURCE_MEM,
 -      },
 -      {
 -              .start          = OMAP2_STI_IRQ,
 -              .flags          = IORESOURCE_IRQ,
 -      }
 -};
 -#elif defined(CONFIG_ARCH_OMAP3)
 -
 -#define OMAP3_SDTI_BASE               0x54500000
 -#define OMAP3_SDTI_CHANNEL_BASE       0x54600000
 -
 -static struct resource sti_resources[] = {
 -      {
 -              .start          = OMAP3_SDTI_BASE,
 -              .end            = OMAP3_SDTI_BASE + 0xFFF,
 -              .flags          = IORESOURCE_MEM,
 -      },
 -      {
 -              .start          = OMAP3_SDTI_CHANNEL_BASE,
 -              .end            = OMAP3_SDTI_CHANNEL_BASE + SZ_1M - 1,
 -              .flags          = IORESOURCE_MEM,
 -      }
 -};
 -
 -#endif
 -
 -static struct platform_device sti_device = {
 -      .name           = "sti",
 -      .id             = -1,
 -      .num_resources  = ARRAY_SIZE(sti_resources),
 -      .resource       = sti_resources,
 -};
 -
 -static inline void omap_init_sti(void)
 -{
 -      platform_device_register(&sti_device);
 -}
 -#else
  static inline void omap_init_sti(void) {}
 -#endif
  
  #if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE)
  
@@@ -614,19 -676,19 +618,19 @@@ static inline void omap2_mmc_mux(struc
                                        OMAP_PIN_INPUT_PULLUP);
  
        if (cpu_is_omap2420() && controller_nr == 0) {
 -              omap_cfg_reg(H18_24XX_MMC_CMD);
 -              omap_cfg_reg(H15_24XX_MMC_CLKI);
 -              omap_cfg_reg(G19_24XX_MMC_CLKO);
 -              omap_cfg_reg(F20_24XX_MMC_DAT0);
 -              omap_cfg_reg(F19_24XX_MMC_DAT_DIR0);
 -              omap_cfg_reg(G18_24XX_MMC_CMD_DIR);
 +              omap_mux_init_signal("sdmmc_cmd", 0);
 +              omap_mux_init_signal("sdmmc_clki", 0);
 +              omap_mux_init_signal("sdmmc_clko", 0);
 +              omap_mux_init_signal("sdmmc_dat0", 0);
 +              omap_mux_init_signal("sdmmc_dat_dir0", 0);
 +              omap_mux_init_signal("sdmmc_cmd_dir", 0);
                if (mmc_controller->slots[0].wires == 4) {
 -                      omap_cfg_reg(H14_24XX_MMC_DAT1);
 -                      omap_cfg_reg(E19_24XX_MMC_DAT2);
 -                      omap_cfg_reg(D19_24XX_MMC_DAT3);
 -                      omap_cfg_reg(E20_24XX_MMC_DAT_DIR1);
 -                      omap_cfg_reg(F18_24XX_MMC_DAT_DIR2);
 -                      omap_cfg_reg(E18_24XX_MMC_DAT_DIR3);
 +                      omap_mux_init_signal("sdmmc_dat1", 0);
 +                      omap_mux_init_signal("sdmmc_dat2", 0);
 +                      omap_mux_init_signal("sdmmc_dat3", 0);
 +                      omap_mux_init_signal("sdmmc_dat_dir1", 0);
 +                      omap_mux_init_signal("sdmmc_dat_dir2", 0);
 +                      omap_mux_init_signal("sdmmc_dat_dir3", 0);
                }
  
                /*

diff --combined arch/arm/plat-omap/Kconfig
index e2ed952df23dabed046e514033702235328514a3,111d39a47ad17be21b8a30209f4b54f8169c43b5..e39a417a368dc92ad6776a68ef6fefc22a046b76
--- 1/arch/arm/plat-omap/Kconfig
--- 2/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@@ -1,6 -1,6 +1,6 @@@
  if ARCH_OMAP
  
 -menu "TI OMAP Implementations"
 +menu "TI OMAP Common Features"
  
  config ARCH_OMAP_OTG
        bool
@@@ -21,6 -21,24 +21,6 @@@ config ARCH_OMAP2PLU
        help
          "Systems based on omap24xx, omap34xx or omap44xx"
  
 -config ARCH_OMAP2
 -      bool "TI OMAP2"
 -      depends on ARCH_OMAP2PLUS
 -      select CPU_V6
 -
 -config ARCH_OMAP3
 -      bool "TI OMAP3"
 -      depends on ARCH_OMAP2PLUS
 -      select CPU_V7
 -      select USB_ARCH_HAS_EHCI
 -      select ARM_L1_CACHE_SHIFT_6
 -
 -config ARCH_OMAP4
 -      bool "TI OMAP4"
 -      depends on ARCH_OMAP2PLUS
 -      select CPU_V7
 -      select ARM_GIC
 -
  endchoice
  
  comment "OMAP Feature Selections"
@@@ -33,7 -51,7 +33,7 @@@ config OMAP_DEBUG_DEVICE
  config OMAP_DEBUG_LEDS
        bool
        depends on OMAP_DEBUG_DEVICES
 -      default y if LEDS || LEDS_OMAP_DEBUG
 +      default y if LEDS
  
  config OMAP_RESET_CLOCKS
        bool "Reset unused clocks during boot"
@@@ -88,6 -106,15 +88,15 @@@ config OMAP_MBOX_FW
          Say Y here if you want to use OMAP Mailbox framework support for
          DSP, IVA1.0 and IVA2 in OMAP1/2/3.
  
+ config OMAP_MBOX_KFIFO_SIZE
+       int "Mailbox kfifo default buffer size (bytes)"
+       depends on OMAP_MBOX_FWK
+       default 256
+       help
+         Specify the default size of mailbox's kfifo buffers (bytes).
+         This can also be changed at runtime (via the mbox_kfifo_size
+         module parameter).
+ 
  config OMAP_IOMMU
        tristate
  
@@@ -102,7 -129,7 +111,7 @@@ config OMAP_IOMMU_DEBU
  
  choice
        prompt "System timer"
 -      default OMAP_MPU_TIMER
 +      default OMAP_32K_TIMER if !ARCH_OMAP15XX
  
  config OMAP_MPU_TIMER
        bool "Use mpu timer"