]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 7 Mar 2014 06:06:18 +0000 (22:06 -0800)
commita0d6c7a1291ec99db200f7c74b1d000f2f1b5198
tree81fc3ba077e99ea35811a65ffaefb65aaa05ea34
parent92cb6f3c5533832aa70a7dc9326ef21270169583
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/mfd/da9055-i2c.c
sound/soc/codecs/da9055.c