target/linux/omap24xx/patches-2.6.36/750-n810-sound-fixes.patch

   1 ---
   2  arch/arm/mach-omap2/board-n8x0.c |   14 ++++++++++++++
   3  sound/soc/omap/n810.c            |   10 ----------
   4  2 files changed, 14 insertions(+), 10 deletions(-)
   5
   6 --- linux-2.6.36-rc7.orig/arch/arm/mach-omap2/board-n8x0.c
   7 +++ linux-2.6.36-rc7/arch/arm/mach-omap2/board-n8x0.c
   8 @@ -906,6 +906,20 @@ static void __init n8x0_gpio_switches_in
   9                                     ARRAY_SIZE(n8x0_gpio_switches));
  10  }
  11
  12 +static struct i2c_board_info n810_tlc320aic3x_i2c_dev[] = {
  13 +       { I2C_BOARD_INFO("tlv320aic3x", 0x1b), }
  14 +};
  15 +
  16 +static int __init n810_tlv320aic3x_register(void)
  17 +{
  18 +       if (machine_is_nokia_n810() || machine_is_nokia_n810_wimax()) {
  19 +               i2c_register_board_info(1, n810_tlc320aic3x_i2c_dev,
  20 +                                       ARRAY_SIZE(n810_tlc320aic3x_i2c_dev));
  21 +       }
  22 +       return 0;
  23 +}
  24 +arch_initcall(n810_tlv320aic3x_register);
  25 +
  26  static void __init n8x0_init_machine(void)
  27  {
  28         omap2420_mux_init(board_mux, OMAP_PACKAGE_ZAC);
  29 --- linux-2.6.36-rc7.orig/sound/soc/omap/n810.c
  30 +++ linux-2.6.36-rc7/sound/soc/omap/n810.c
  31 @@ -22,7 +22,6 @@
  32   */
  33
  34  #include <linux/clk.h>
  35 -#include <linux/i2c.h>
  36  #include <linux/platform_device.h>
  37  #include <sound/core.h>
  38  #include <sound/pcm.h>
  39 @@ -336,13 +335,6 @@ static struct snd_soc_device n810_snd_de
  40
  41  static struct platform_device *n810_snd_device;
  42
  43 -/* temporary i2c device creation until this can be moved into the machine
  44 - * support file.
  45 -*/
  46 -static struct i2c_board_info i2c_device[] = {
  47 -       { I2C_BOARD_INFO("tlv320aic3x", 0x1b), }
  48 -};
  49 -
  50  static int __init n810_soc_init(void)
  51  {
  52         int err;
  53 @@ -351,8 +343,6 @@ static int __init n810_soc_init(void)
  54         if (!(machine_is_nokia_n810() || machine_is_nokia_n810_wimax()))
  55                 return -ENODEV;
  56
  57 -       i2c_register_board_info(1, i2c_device, ARRAY_SIZE(i2c_device));
  58 -
  59         n810_snd_device = platform_device_alloc("soc-audio", -1);
  60         if (!n810_snd_device)
  61                 return -ENOMEM;