At Thu, 21 Nov 2013 14:04:56 +0000, Mark Brown wrote:
[1 <text/plain; us-ascii (7bit)>] The following changes since commit 3d800c6d75b8c92fa928a0bcaf95cd7ac5fd1ce5:
ASoC: cs42l52: Correct MIC CTL mask (2013-11-15 10:16:53 +0000)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v3.13-5
for you to fetch changes up to 9a5c543dd71952719d40429b6ef252a46c9b2246:
Merge remote-tracking branch 'asoc/fix/wm8962' into asoc-linus (2013-11-20 15:20:38 +0000)
Not sure why the diffstat is still going crazy here... :/
ASoC: Fixes for v3.13
A bunch of device specific fixes, nothing with a general impact here.
Thanks, pulled.
BTW, I'm getting some build errors on soc/omap in my build firm. It's no regression by this pull, so I pushed out now.
It seems that the dependency on CONFIG_GPIOLIB isn't complete, and some codes accessing snd_soc_jack_gpio are built even without CONFIG_GPIOLIB.
I can add a quick fix patch like below, but I guess it's not what you guys want? Other fixes would be just to add "depends on GPIOLIB" in soc/omap/Kconfig, but I vaguely remember of a lengthy thread arguing GPIOLIB dependency mess in the past...
Takashi
--- diff --git a/include/sound/soc.h b/include/sound/soc.h index 1f741cb24f33..a9fe916a554d 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -334,9 +334,7 @@ struct snd_soc_jack_pin; #include <sound/soc-dapm.h> #include <sound/soc-dpcm.h>
-#ifdef CONFIG_GPIOLIB struct snd_soc_jack_gpio; -#endif
typedef int (*hw_write_t)(void *,const char* ,int);
@@ -446,6 +444,16 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count, struct snd_soc_jack_gpio *gpios); void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count, struct snd_soc_jack_gpio *gpios); +#else +static inline int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count, + struct snd_soc_jack_gpio *gpios) +{ + return 0; +} +static inline void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count, + struct snd_soc_jack_gpio *gpios) +{ +} #endif
/* codec register bit access */ @@ -580,7 +588,6 @@ struct snd_soc_jack_zone { * to provide more complex checks (eg, reading an * ADC). */ -#ifdef CONFIG_GPIOLIB struct snd_soc_jack_gpio { unsigned int gpio; const char *name; @@ -594,7 +601,6 @@ struct snd_soc_jack_gpio {
int (*jack_status_check)(void); }; -#endif
struct snd_soc_jack { struct mutex mutex;