recipes/linux/linux-omap-psp-2.6.32/omap3-touchbook/0005-ARM-OMAP-Hack-beagle-asoc-driver-to-support-touchboo.patch

   1 From 3937249a21d70f55b5f8a5d2a94e28bac588c09f Mon Sep 17 00:00:00 2001
   2 From: Gregoire Gentil <gregoire@gentil.com>
   3 Date: Fri, 12 Mar 2010 11:47:59 +0100
   4 Subject: [PATCH 05/14] ARM: OMAP: Hack beagle asoc driver to support touchbook, tweak touchbook KConfig
   5
   6 ---
   7  arch/arm/mach-omap2/Kconfig  |    1 +
   8  sound/soc/omap/Kconfig       |    8 ++++++++
   9  sound/soc/omap/Makefile      |    2 ++
  10  sound/soc/omap/omap3beagle.c |    4 ++--
  11  4 files changed, 13 insertions(+), 2 deletions(-)
  12
  13 diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
  14 index b72ae06..6f2bf4e 100644
  15 --- a/arch/arm/mach-omap2/Kconfig
  16 +++ b/arch/arm/mach-omap2/Kconfig
  17 @@ -113,6 +113,7 @@ config MACH_OMAP3_PANDORA
  18  config MACH_OMAP3_TOUCHBOOK
  19         bool "OMAP3 Touch Book"
  20         depends on ARCH_OMAP3 && ARCH_OMAP34XX
  21 +       select OMAP_PACKAGE_CBB
  22         select BACKLIGHT_CLASS_DEVICE
  23
  24  config MACH_OMAP_3430SDP
  25 diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
  26 index 61952aa..a7c06ab 100644
  27 --- a/sound/soc/omap/Kconfig
  28 +++ b/sound/soc/omap/Kconfig
  29 @@ -101,6 +101,14 @@ config SND_OMAP_SOC_OMAP3_BEAGLE
  30         help
  31           Say Y if you want to add support for SoC audio on the Beagleboard.
  32
  33 +config SND_OMAP_SOC_OMAP3_TOUCHBOOK
  34 +       tristate "SoC Audio support for OMAP3 Touch Book"
  35 +       depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP3_TOUCHBOOK
  36 +       select SND_OMAP_SOC_MCBSP
  37 +       select SND_SOC_TWL4030
  38 +       help
  39 +         Say Y if you want to add support for SoC audio on the Touch Book.
  40 +
  41  config SND_OMAP_SOC_ZOOM2
  42         tristate "SoC Audio support for Zoom2"
  43         depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP_ZOOM2
  44 diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile
  45 index 19283e5..9c972d6 100644
  46 --- a/sound/soc/omap/Makefile
  47 +++ b/sound/soc/omap/Makefile
  48 @@ -16,6 +16,7 @@ snd-soc-am3517evm-objs := am3517evm.o
  49  snd-soc-sdp3430-objs := sdp3430.o
  50  snd-soc-omap3pandora-objs := omap3pandora.o
  51  snd-soc-omap3beagle-objs := omap3beagle.o
  52 +snd-soc-omap3touchbook-objs := omap3beagle.o
  53  snd-soc-zoom2-objs := zoom2.o
  54  snd-soc-igep0020-objs := igep0020.o
  55
  56 @@ -29,5 +30,6 @@ obj-$(CONFIG_SND_OMAP_SOC_AM3517EVM) += snd-soc-am3517evm.o
  57  obj-$(CONFIG_SND_OMAP_SOC_SDP3430) += snd-soc-sdp3430.o
  58  obj-$(CONFIG_SND_OMAP_SOC_OMAP3_PANDORA) += snd-soc-omap3pandora.o
  59  obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o
  60 +obj-$(CONFIG_SND_OMAP_SOC_OMAP3_TOUCHBOOK) += snd-soc-omap3beagle.o
  61  obj-$(CONFIG_SND_OMAP_SOC_ZOOM2) += snd-soc-zoom2.o
  62  obj-$(CONFIG_SND_OMAP_SOC_IGEP0020) += snd-soc-igep0020.o
  63 diff --git a/sound/soc/omap/omap3beagle.c b/sound/soc/omap/omap3beagle.c
  64 index d88ad5c..248b789 100644
  65 --- a/sound/soc/omap/omap3beagle.c
  66 +++ b/sound/soc/omap/omap3beagle.c
  67 @@ -116,13 +116,13 @@ static struct platform_device *omap3beagle_snd_device;
  68  static int __init omap3beagle_soc_init(void)
  69  {
  70         int ret;
  71 -
  72 +/*
  73         if (!machine_is_omap3_beagle()) {
  74                 pr_debug("Not OMAP3 Beagle!\n");
  75                 return -ENODEV;
  76         }
  77         pr_info("OMAP3 Beagle SoC init\n");
  78 -
  79 +*/
  80         omap3beagle_snd_device = platform_device_alloc("soc-audio", -1);
  81         if (!omap3beagle_snd_device) {
  82                 printk(KERN_ERR "Platform device allocation failed\n");
  83 --
  84 1.6.6.1
  85