summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorAdam Thomson <Adam.Thomson.Opensource@diasemi.com>2014-02-06 19:03:07 +0100
committerMark Brown <broonie@linaro.org>2014-02-10 14:43:52 +0100
commit07b0e5b10258b48e5edfb6c8ac156f05510eb775 (patch)
tree685255287a3f5ba246fef109693be55411760f2f /drivers/nfc
parentLinus 3.14-rc1 (diff)
downloadlinux-07b0e5b10258b48e5edfb6c8ac156f05510eb775.tar.xz
linux-07b0e5b10258b48e5edfb6c8ac156f05510eb775.zip
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
Diffstat (limited to 'drivers/nfc')
0 files changed, 0 insertions, 0 deletions