Merge omap-drivers

Conflicts:

	arch/arm/configs/omap_h2_1610_defconfig
	arch/arm/configs/omap_osk_5912_defconfig
	arch/arm/mach-omap1/Makefile
	arch/arm/mach-omap1/board-h2.c
	arch/arm/mach-omap1/board-nokia770.c
	arch/arm/mach-omap2/Makefile
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/plat-omap/Kconfig
	arch/arm/plat-omap/Makefile
	arch/arm/plat-omap/devices.c
	arch/arm/plat-omap/dsp/Kconfig
	arch/arm/plat-omap/dsp/dsp_common.c
	arch/arm/plat-omap/dsp/dsp_common.h
	arch/arm/plat-omap/dsp/omap1_dsp.h
	arch/arm/plat-omap/mailbox.c
	drivers/Makefile
	drivers/cbus/Kconfig
	drivers/cbus/retu-pwrbutton.c
	drivers/cbus/tahvo-usb.c
	drivers/video/omap/hwa742.c
	drivers/video/omap/sossi.c
	include/asm-arm/arch-omap/dsp.h
	include/asm-arm/arch-omap/mailbox.h

diff --cc Makefile
Simple merge

diff --cc arch/arm/mach-omap1/board-nokia770.c
index 8ea0cef8bdb10ff177396daee6b10fed9cca660b,acb233111512da2717192c00164dc2e3e4d1137a..70014f751bc4baa7c70e06f15affa9e84a01d771
--- 1/arch/arm/mach-omap1/board-nokia770.c
--- 2/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@@ -33,9 -33,14 +33,7 @@@
  #include <asm/arch/dsp_common.h>
  #include <asm/arch/aic23.h>
  #include <asm/arch/gpio.h>
 -#include <asm/arch/omapfb.h>
 -#include <asm/arch/hwa742.h>
 -#include <asm/arch/lcd_mipid.h>
 -
 -#include "../plat-omap/dsp/dsp_common.h"
 -
 -#define ADS7846_PENDOWN_GPIO  15
  
- #include "../plat-omap/dsp/dsp_common.h"
- 
  static void __init omap_nokia770_init_irq(void)
  {
        /* On Nokia 770, the SleepX signal is masked with an
@@@ -93,9 -98,44 +91,9 @@@ static struct platform_device nokia770_
  };
  
  static struct platform_device *nokia770_devices[] __initdata = {
--      &nokia770_kp_device,
 -};
 -
 -static void mipid_shutdown(struct mipid_platform_data *pdata)
 -{
 -      if (pdata->nreset_gpio != -1) {
 -              printk(KERN_INFO "shutdown LCD\n");
 -              omap_set_gpio_dataout(pdata->nreset_gpio, 0);
 -              msleep(120);
 -      }
 -}
 -
 -static struct mipid_platform_data nokia770_mipid_platform_data = {
 -      .shutdown = mipid_shutdown,
++        &nokia770_kp_device,
  };
  
 -static void mipid_dev_init(void)
 -{
 -      const struct omap_lcd_config *conf;
 -
 -      conf = omap_get_config(OMAP_TAG_LCD, struct omap_lcd_config);
 -      if (conf != NULL) {
 -              nokia770_mipid_platform_data.nreset_gpio = conf->nreset_gpio;
 -              nokia770_mipid_platform_data.data_lines = conf->data_lines;
 -      }
 -}
 -
 -static void ads7846_dev_init(void)
 -{
 -      if (omap_request_gpio(ADS7846_PENDOWN_GPIO) < 0)
 -              printk(KERN_ERR "can't get ads7846 pen down GPIO\n");
 -}
 -
 -static int ads7846_get_pendown_state(void)
 -{
 -      return !omap_get_gpio_datain(ADS7846_PENDOWN_GPIO);
 -}
 -
  static struct ads7846_platform_data nokia770_ads7846_platform_data __initdata = {
        .x_max          = 0x0fff,
        .y_max          = 0x0fff,
@@@ -107,7 -149,7 +105,7 @@@
  
  static struct spi_board_info nokia770_spi_board_info[] __initdata = {
        [0] = {
--              .modalias       = "lcd_mipid",
++              .modalias               = "lcd_mipid",
                .bus_num        = 2,
                .chip_select    = 3,
                .max_speed_hz   = 12000000,
@@@ -155,7 -239,7 +153,6 @@@ static struct omap_board_config_kernel 
        { OMAP_TAG_MMC,         &nokia770_mmc_config },
  };
  
--#if   defined(CONFIG_OMAP_DSP)
  /*
   * audio power control
   */
@@@ -186,7 -270,7 +183,7 @@@ static void nokia770_audio_pwr_up(void
        clk_enable(dspxor_ck);
  
        /* Turn on codec */
--      aic23_power_up();
++      tlv320aic23_power_up();
  
        if (omap_get_gpio_datain(HEADPHONE_GPIO))
                /* HP not connected, turn on amplifier */
@@@ -200,7 -284,7 +197,7 @@@ static void codec_delayed_power_down(st
  {
        down(&audio_pwr_sem);
        if (audio_pwr_state == -1)
--              aic23_power_down();
++              tlv320aic23_power_down();
        clk_disable(dspxor_ck);
        up(&audio_pwr_sem);
  }
@@@ -216,8 -300,8 +213,7 @@@ static void nokia770_audio_pwr_down(voi
        schedule_delayed_work(&codec_power_down_work, HZ / 20); /* 50ms */
  }
  
--static int
--nokia770_audio_pwr_up_request(struct dsp_kfunc_device *kdev, int stage)
++void nokia770_audio_pwr_up_request(int stage)
  {
        down(&audio_pwr_sem);
        if (audio_pwr_state == -1)
@@@ -225,11 -309,11 +221,9 @@@
        /* force audio_pwr_state = 0, even if it was 1. */
        audio_pwr_state = 0;
        up(&audio_pwr_sem);
--      return 0;
  }
  
--static int
--nokia770_audio_pwr_down_request(struct dsp_kfunc_device *kdev, int stage)
++void nokia770_audio_pwr_down_request(int stage)
  {
        down(&audio_pwr_sem);
        switch (stage) {
@@@ -245,38 -329,38 +239,7 @@@
                break;
        }
        up(&audio_pwr_sem);
--      return 0;
--}
--
--static struct dsp_kfunc_device nokia770_audio_device = {
--      .name    = "audio",
--      .type    = DSP_KFUNC_DEV_TYPE_AUDIO,
--      .enable  = nokia770_audio_pwr_up_request,
--      .disable = nokia770_audio_pwr_down_request,
--};
--
--static __init int omap_dsp_init(void)
--{
--      int ret;
--
--      dspxor_ck = clk_get(0, "dspxor_ck");
--      if (IS_ERR(dspxor_ck)) {
--              printk(KERN_ERR "couldn't acquire dspxor_ck\n");
--              return PTR_ERR(dspxor_ck);
--      }
--
--      ret = dsp_kfunc_device_register(&nokia770_audio_device);
--      if (ret) {
--              printk(KERN_ERR
--                     "KFUNC device registration faild: %s\n",
--                     nokia770_audio_device.name);
--              goto out;
--      }
--      return 0;
-- out:
--      return ret;
  }
--#endif        /* CONFIG_OMAP_DSP */
  
  static void __init omap_nokia770_init(void)
  {
@@@ -287,8 -371,12 +250,10 @@@
                                ARRAY_SIZE(nokia770_spi_board_info));
        omap_board_config = nokia770_config;
        omap_board_config_size = ARRAY_SIZE(nokia770_config);
 -      omap_gpio_init();
        omap_serial_init();
--      omap_dsp_init();
 -      hwa742_dev_init();
 -      ads7846_dev_init();
 -      mipid_dev_init();
++      omap_dsp_audio_pwr_up_request = nokia770_audio_pwr_up_request;
++      omap_dsp_audio_pwr_down_request = nokia770_audio_pwr_down_request;
++      dspxor_ck = clk_get(0, "dspxor_ck");
  }
  
  static void __init omap_nokia770_map_io(void)

diff --cc drivers/char/Kconfig
Simple merge

diff --cc drivers/input/keyboard/Kconfig
Simple merge