Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0308897 authored by Axel Lin's avatar Axel Lin Committed by Samuel Ortiz
Browse files

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: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 2761a639

drivers/mfd/mc13xxx-spi.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -139,7 +139,9 @@ static int mc13xxx_spi_probe(struct spi_device *spi) 
	mc13xxx->dev = &spi->dev;

	mc13xxx->dev = &spi->dev;

	mutex_init(&mc13xxx->lock);

	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)) {

	if (IS_ERR(mc13xxx->regmap)) {

		ret = PTR_ERR(mc13xxx->regmap);

		ret = PTR_ERR(mc13xxx->regmap);

		dev_err(mc13xxx->dev, "Failed to initialize register map: %d\n",

		dev_err(mc13xxx->dev, "Failed to initialize register map: %d\n",