ASoC: da9055: Fix device registration of PMIC and CODEC devices
authorAdam Thomson <Adam.Thomson.Opensource@diasemi.com>
Thu, 6 Feb 2014 18:03:07 +0000 (18:03 +0000)
committerJiri Slaby <jslaby@suse.cz>
Wed, 5 Mar 2014 16:13:43 +0000 (17:13 +0100)
commitf9b501bf0525f95454ca4c7af764e1758ecefedd
tree53234f8733ee11632a73c4f3d37b6b56d6cb7f6e
parentee593d3a91514d37f19251daa9d57edfb27e45e7
ASoC: da9055: Fix device registration of PMIC and CODEC devices

commit 07b0e5b10258b48e5edfb6c8ac156f05510eb775 upstream.

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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/mfd/da9055-i2c.c
sound/soc/codecs/da9055.c