Adam Thomson 07b0e5b102 ASoC: da9055: Fix device registration of PMIC and CODEC devices ... Currently the I2C device Ids conflict for the MFD and CODEC so cannot be both instantiated on one platform. This patch updates the Ids and names to make them unique from each other. It should be noted that the I2C addresses for both PMIC and CODEC are modifiable so instantiation of the two are kept as separate devices, rather than instantiating the CODEC from the MFD code. Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> Acked-by: Mark Brown <broonie@linaro.org> Signed-off-by: Mark Brown <broonie@linaro.org> Cc: stable@vger.kernel.org		2014-02-10 13:43:52 +00:00
..
aoa	sound fixes for 3.13-rc1	2013-11-16 12:50:53 -08:00
arm	ALSA: AACI: Convert to modern PM ops	2013-12-03 17:43:42 +01:00
atmel	Merge branch 'for-linus' into for-next	2013-12-16 15:53:52 +01:00
core	ALSA: Refactor slot assignment code	2014-01-23 11:45:24 +01:00
drivers	ALSA: pcsp: Fix the order of input device unregistration	2013-11-14 15:50:10 +01:00
firewire	ALSA: dice: fix array limits in dice_proc_read()	2013-11-29 10:23:04 +01:00
i2c	ALSA: ak4114: Fix wrong register array size	2013-10-29 16:42:36 +01:00
isa	ALSA: isa: not allocating enough space	2013-11-13 09:28:31 +01:00
mips	ALSA: mips/ad1843: Use WARN_ON() instead of BUG_ON()	2013-11-06 08:35:16 +01:00
oss	sound: oss: remove last sleep_on users	2014-01-14 16:12:07 +01:00
parisc	ALSA: Remove the rest of *_set_drvdata(NULL) calls	2013-05-29 12:50:59 +02:00
pci	ALSA: hda/hdmi - allow PIN_OUT to be dynamically enabled	2014-01-31 17:57:02 +01:00
pcmcia
ppc	Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2013-11-18 15:50:07 -08:00
sh	ALSA: sh_dac_audio: Remove redundant platform_set_drvdata()	2013-05-23 14:36:45 +02:00
soc	ASoC: da9055: Fix device registration of PMIC and CODEC devices	2014-02-10 13:43:52 +00:00
sparc	ALSA: sparc: fix missing unlock on error in snd_cs4231_playback_prepare()	2013-11-11 16:23:16 +01:00
spi	ALSA: at73c213: clk_round_rate() can return a zero upon error	2013-12-10 21:19:47 +01:00
synth
usb	ALSA: snd-usb: re-order some quirk entries	2014-01-14 14:40:08 +01:00
ac97_bus.c
Kconfig
last.c
Makefile
sound_core.c	consolidate the reassignments of ->f_op in ->open() instances	2013-10-24 23:34:53 -04:00
sound_firmware.c	sound_firmware: don't bother with filp_close()	2013-04-09 15:16:32 -04:00