summaryrefslogtreecommitdiff
path: root/drivers/mfd/mc13xxx-spi.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-07-02 12:03:00 +0400
committerSamuel Ortiz <sameo@linux.intel.com>2012-07-09 02:16:13 +0400
commite03088972f6e38e90077eaf09acf7b8a327a2da2 (patch)
tree04a8f0d84bdfd9c787bc1a28add9ccb4f3291da4 /drivers/mfd/mc13xxx-spi.c
parent2761a63945164ef111062828858a80225222ecd7 (diff)
downloadlinux-e03088972f6e38e90077eaf09acf7b8a327a2da2.tar.xz
mfd: Fix mc13xxx-spi merge conflict
This patch fixes conflict between commit 8ae3559 "mfd: mc13xxx workaround SPI hardware bug on i.Mx" and commit 10c7a5d "mfd: Use devm_* APIs for mc13xxx". commit 8ae3559 changes regmap_init_spi to regmap_init. So now we need to use devm_regmap_init rather than devm_regmap_init_spi. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/mc13xxx-spi.c')
-rw-r--r--drivers/mfd/mc13xxx-spi.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mfd/mc13xxx-spi.c b/drivers/mfd/mc13xxx-spi.c
index 234207f7a831..35636261da6c 100644
--- a/drivers/mfd/mc13xxx-spi.c
+++ b/drivers/mfd/mc13xxx-spi.c
@@ -139,7 +139,9 @@ static int mc13xxx_spi_probe(struct spi_device *spi)
mc13xxx->dev = &spi->dev;
mutex_init(&mc13xxx->lock);
- mc13xxx->regmap = devm_regmap_init_spi(spi, &mc13xxx_regmap_spi_config);
+ mc13xxx->regmap = devm_regmap_init(&spi->dev, &regmap_mc13xxx_bus,
+ &spi->dev,
+ &mc13xxx_regmap_spi_config);
if (IS_ERR(mc13xxx->regmap)) {
ret = PTR_ERR(mc13xxx->regmap);
dev_err(mc13xxx->dev, "Failed to initialize register map: %d\n",