Merge cbus

Conflicts:
	arch/arm/mach-omap2/board-n8x0.c

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-omap1/board-nokia770.c
index 51a4539aecf54ba1a7046227a695d2014610ce30,fb3ecb9201eb6a291c388645dfc30574143938de..d739dd15146d2fa3b72845f99638a5df2557e815
--- 1/arch/arm/mach-omap1/board-nokia770.c
--- 2/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@@ -241,8 -270,141 +269,9 @@@ static inline void nokia770_mmc_init(vo
  }
  #endif
  
 -#if   defined(CONFIG_OMAP_DSP)
 -/*
 - * audio power control
 - */
 -#define       HEADPHONE_GPIO          14
 -#define       AMPLIFIER_CTRL_GPIO     58
 -
 -static struct clk *dspxor_ck;
 -static DEFINE_MUTEX(audio_pwr_lock);
 -/*
 - * audio_pwr_state
 - * +--+-------------------------+---------------------------------------+
 - * |-1|down                   |power-up request -> 0                  |
 - * +--+-------------------------+---------------------------------------+
 - * | 0|up                     |power-down(1) request -> 1             |
 - * |  |                               |power-down(2) request -> (ignore)      |
 - * +--+-------------------------+---------------------------------------+
 - * | 1|up,                    |power-up request -> 0                  |
 - * |  |received down(1) request       |power-down(2) request -> -1            |
 - * +--+-------------------------+---------------------------------------+
 - */
 -static int audio_pwr_state = -1;
 -
 -static inline void aic23_power_up(void)
 -{
 -}
 -static inline void aic23_power_down(void)
 -{
 -}
 -
 -/*
 - * audio_pwr_up / down should be called under audio_pwr_lock
 - */
 -static void nokia770_audio_pwr_up(void)
 -{
 -      clk_enable(dspxor_ck);
 -
 -      /* Turn on codec */
 -      aic23_power_up();
 -
 -      if (gpio_get_value(HEADPHONE_GPIO))
 -              /* HP not connected, turn on amplifier */
 -              gpio_set_value(AMPLIFIER_CTRL_GPIO, 1);
 -      else
 -              /* HP connected, do not turn on amplifier */
 -              printk("HP connected\n");
 -}
 -
 -static void codec_delayed_power_down(struct work_struct *work)
 -{
 -      mutex_lock(&audio_pwr_lock);
 -      if (audio_pwr_state == -1)
 -              aic23_power_down();
 -      clk_disable(dspxor_ck);
 -      mutex_unlock(&audio_pwr_lock);
 -}
 -
 -static DECLARE_DELAYED_WORK(codec_power_down_work, codec_delayed_power_down);
 -
 -static void nokia770_audio_pwr_down(void)
 -{
 -      /* Turn off amplifier */
 -      gpio_set_value(AMPLIFIER_CTRL_GPIO, 0);
 -
 -      /* Turn off codec: schedule delayed work */
 -      schedule_delayed_work(&codec_power_down_work, HZ / 20); /* 50ms */
 -}
 -
 -static int
 -nokia770_audio_pwr_up_request(struct dsp_kfunc_device *kdev, int stage)
 -{
 -      mutex_lock(&audio_pwr_lock);
 -      if (audio_pwr_state == -1)
 -              nokia770_audio_pwr_up();
 -      /* force audio_pwr_state = 0, even if it was 1. */
 -      audio_pwr_state = 0;
 -      mutex_unlock(&audio_pwr_lock);
 -      return 0;
 -}
 -
 -static int
 -nokia770_audio_pwr_down_request(struct dsp_kfunc_device *kdev, int stage)
 -{
 -      mutex_lock(&audio_pwr_lock);
 -      switch (stage) {
 -      case 1:
 -              if (audio_pwr_state == 0)
 -                      audio_pwr_state = 1;
 -              break;
 -      case 2:
 -              if (audio_pwr_state == 1) {
 -                      nokia770_audio_pwr_down();
 -                      audio_pwr_state = -1;
 -              }
 -              break;
 -      }
 -      mutex_unlock(&audio_pwr_lock);
 -      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;
 -}
 -#else
 -#define omap_dsp_init()               do {} while (0)
 -#endif        /* CONFIG_OMAP_DSP */
 -
  static void __init omap_nokia770_init(void)
  {
+       nokia770_cbus_init();
        platform_add_devices(nokia770_devices, ARRAY_SIZE(nokia770_devices));
        spi_register_board_info(nokia770_spi_board_info,
                                ARRAY_SIZE(nokia770_spi_board_info));

diff --cc arch/arm/mach-omap2/board-n8x0.c
index a3e2b49aa39f001046c0994b09c64aa14cd10581,131ce3c221b28a9947f9bd272d5957cb73746cdb..67a9c2a8c7c7b593e1038364c5d4e56e89001e33
--- 1/arch/arm/mach-omap2/board-n8x0.c
--- 2/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@@ -32,9 -33,8 +33,10 @@@
  #include <plat/onenand.h>
  #include <plat/mmc.h>
  #include <plat/serial.h>
+ #include <plat/cbus.h>
  
 +#include "mux.h"
 +
  static int slot1_cover_open;
  static int slot2_cover_open;
  static struct device *mmc_device;
@@@ -651,17 -678,10 +680,19 @@@ static void __init n8x0_init_irq(void
        omap_gpio_init();
  }
  
 +#ifdef CONFIG_OMAP_MUX
 +static struct omap_board_mux board_mux[] __initdata = {
 +      { .reg_offset = OMAP_MUX_TERMINATOR },
 +};
 +#else
 +#define board_mux     NULL
 +#endif
 +
  static void __init n8x0_init_machine(void)
  {
 +      omap2420_mux_init(board_mux, OMAP_PACKAGE_ZAC);
+       n8x0_cbus_init();
+ 
        /* FIXME: add n810 spi devices */
        spi_register_board_info(n800_spi_board_info,
                                ARRAY_SIZE(n800_spi_board_info));

diff --cc drivers/Makefile
Simple merge