r3907 - branches/src/target/kernel/2.6.24.x/patches

[werner at sita.openmoko.org]

Author: werner
Date: 2008-01-21 22:37:46 +0100 (Mon, 21 Jan 2008)
New Revision: 3907

Modified:
   branches/src/target/kernel/2.6.24.x/patches/gta02-sound.patch
Log:
"Lost OE" patch gta02-sound.patch (by Graeme Gregory)

This one got applied to mainline, but OpenEmbedded had a small fix that 
was still missing.

gta02-sound.patch:
- sound/soc/s3c24xx/neo1973_gta02_wm8753.c (neo1973_gta02_suspend, 
  neo1973_gta02_resume): replace with NULL pointers if CONFIG_PM is not enabled



Modified: branches/src/target/kernel/2.6.24.x/patches/gta02-sound.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta02-sound.patch	2008-01-21 21:28:47 UTC (rev 3906)
+++ branches/src/target/kernel/2.6.24.x/patches/gta02-sound.patch	2008-01-21 21:37:46 UTC (rev 3907)
@@ -1,8 +1,8 @@
-Index: linux-2.6/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
+Index: linux-2.6.24-rc7/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
-@@ -0,0 +1,662 @@
++++ linux-2.6.24-rc7/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
+@@ -0,0 +1,667 @@
 +/*
 + * neo1973_gta02_wm8753.c  --  SoC audio for Neo1973
 + *
@@ -581,6 +581,7 @@
 +},
 +};
 +
++#ifdef CONFIG_PM
 +int neo1973_gta02_suspend(struct platform_device *pdev, pm_message_t state)
 +{
 +	s3c2410_gpio_setpin(GTA02_GPIO_AMP_SHUT, 1);
@@ -595,6 +596,10 @@
 +
 +	return 0;
 +}
++#else
++#define neo1973_gta02_suspend NULL
++#define neo1973_gta02_resume NULL
++#endif
 +
 +static struct snd_soc_machine neo1973_gta02 = {
 +	.name = "neo1973-gta02",
@@ -665,10 +670,10 @@
 +MODULE_DESCRIPTION("ALSA SoC WM8753 Neo1973 GTA02");
 +MODULE_LICENSE("GPL");
 +
-Index: linux-2.6/sound/soc/s3c24xx/Kconfig
+Index: linux-2.6.24-rc7/sound/soc/s3c24xx/Kconfig
 ===================================================================
---- linux-2.6.orig/sound/soc/s3c24xx/Kconfig
-+++ linux-2.6/sound/soc/s3c24xx/Kconfig
+--- linux-2.6.24-rc7.orig/sound/soc/s3c24xx/Kconfig
++++ linux-2.6.24-rc7/sound/soc/s3c24xx/Kconfig
 @@ -25,6 +25,15 @@
  	  Say Y if you want to add support for SoC audio on smdk2440
  	  with the WM8753.
@@ -685,10 +690,10 @@
  config SND_S3C24XX_SOC_SMDK2443_WM9710
  	tristate "SoC AC97 Audio support for SMDK2443 - WM9710"
  	depends on SND_S3C24XX_SOC && MACH_SMDK2443
-Index: linux-2.6/sound/soc/s3c24xx/Makefile
+Index: linux-2.6.24-rc7/sound/soc/s3c24xx/Makefile
 ===================================================================
---- linux-2.6.orig/sound/soc/s3c24xx/Makefile
-+++ linux-2.6/sound/soc/s3c24xx/Makefile
+--- linux-2.6.24-rc7.orig/sound/soc/s3c24xx/Makefile
++++ linux-2.6.24-rc7/sound/soc/s3c24xx/Makefile
 @@ -10,6 +10,9 @@
  # S3C24XX Machine Support
  snd-soc-neo1973-wm8753-objs := neo1973_wm8753.o
@@ -699,10 +704,10 @@
  obj-$(CONFIG_SND_S3C24XX_SOC_SMDK2443_WM9710) += snd-soc-smdk2443-wm9710.o
 +obj-$(CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753) += snd-soc-neo1973-gta02-wm8753.o
 +
-Index: linux-2.6/include/sound/soc-dapm.h
+Index: linux-2.6.24-rc7/include/sound/soc-dapm.h
 ===================================================================
---- linux-2.6.orig/include/sound/soc-dapm.h
-+++ linux-2.6/include/sound/soc-dapm.h
+--- linux-2.6.24-rc7.orig/include/sound/soc-dapm.h
++++ linux-2.6.24-rc7/include/sound/soc-dapm.h
 @@ -206,6 +206,8 @@
  /* dapm audio endpoint control */
  int snd_soc_dapm_set_endpoint(struct snd_soc_codec *codec,
@@ -712,10 +717,10 @@
  int snd_soc_dapm_sync_endpoints(struct snd_soc_codec *codec);
  
  /* dapm widget types */
-Index: linux-2.6/sound/soc/soc-dapm.c
+Index: linux-2.6.24-rc7/sound/soc/soc-dapm.c
 ===================================================================
---- linux-2.6.orig/sound/soc/soc-dapm.c
-+++ linux-2.6/sound/soc/soc-dapm.c
+--- linux-2.6.24-rc7.orig/sound/soc/soc-dapm.c
++++ linux-2.6.24-rc7/sound/soc/soc-dapm.c
 @@ -1305,6 +1305,30 @@
  EXPORT_SYMBOL_GPL(snd_soc_dapm_set_endpoint);