Current code init regmap with &da9052_regmap_config for both da9052-spi and da9052-i2c drivers. da9052-spi sets the read_flag_mask. The same setting may be applied for da9052-i2c if da9052-spi driver is loaded first because they actually use the same regmap_config setting. Fix this issue by using a local variable for regmap_config in da9052-spi driver, so the settings in spi driver won't impact the settings in i2c driver. Also makes da9052_regmap_config const to avoid similar issue. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
		
			
				
	
	
		
			111 lines
		
	
	
	
		
			2.4 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			111 lines
		
	
	
	
		
			2.4 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * SPI access for Dialog DA9052 PMICs.
 | 
						|
 *
 | 
						|
 * Copyright(c) 2011 Dialog Semiconductor Ltd.
 | 
						|
 *
 | 
						|
 * Author: David Dajun Chen <dchen@diasemi.com>
 | 
						|
 *
 | 
						|
 * This program is free software; you can redistribute it and/or modify
 | 
						|
 * it under the terms of the GNU General Public License as published by
 | 
						|
 * the Free Software Foundation; either version 2 of the License, or
 | 
						|
 * (at your option) any later version.
 | 
						|
 *
 | 
						|
 */
 | 
						|
 | 
						|
#include <linux/device.h>
 | 
						|
#include <linux/module.h>
 | 
						|
#include <linux/input.h>
 | 
						|
#include <linux/mfd/core.h>
 | 
						|
#include <linux/spi/spi.h>
 | 
						|
#include <linux/err.h>
 | 
						|
 | 
						|
#include <linux/mfd/da9052/da9052.h>
 | 
						|
 | 
						|
static int da9052_spi_probe(struct spi_device *spi)
 | 
						|
{
 | 
						|
	struct regmap_config config;
 | 
						|
	int ret;
 | 
						|
	const struct spi_device_id *id = spi_get_device_id(spi);
 | 
						|
	struct da9052 *da9052;
 | 
						|
 | 
						|
	da9052 = devm_kzalloc(&spi->dev, sizeof(struct da9052), GFP_KERNEL);
 | 
						|
	if (!da9052)
 | 
						|
		return -ENOMEM;
 | 
						|
 | 
						|
	spi->mode = SPI_MODE_0 | SPI_CPOL;
 | 
						|
	spi->bits_per_word = 8;
 | 
						|
	spi_setup(spi);
 | 
						|
 | 
						|
	da9052->dev = &spi->dev;
 | 
						|
	da9052->chip_irq = spi->irq;
 | 
						|
 | 
						|
	spi_set_drvdata(spi, da9052);
 | 
						|
 | 
						|
	config = da9052_regmap_config;
 | 
						|
	config.read_flag_mask = 1;
 | 
						|
 | 
						|
	da9052->regmap = devm_regmap_init_spi(spi, &config);
 | 
						|
	if (IS_ERR(da9052->regmap)) {
 | 
						|
		ret = PTR_ERR(da9052->regmap);
 | 
						|
		dev_err(&spi->dev, "Failed to allocate register map: %d\n",
 | 
						|
			ret);
 | 
						|
		return ret;
 | 
						|
	}
 | 
						|
 | 
						|
	ret = da9052_device_init(da9052, id->driver_data);
 | 
						|
	if (ret != 0)
 | 
						|
		return ret;
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static int da9052_spi_remove(struct spi_device *spi)
 | 
						|
{
 | 
						|
	struct da9052 *da9052 = spi_get_drvdata(spi);
 | 
						|
 | 
						|
	da9052_device_exit(da9052);
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static struct spi_device_id da9052_spi_id[] = {
 | 
						|
	{"da9052", DA9052},
 | 
						|
	{"da9053-aa", DA9053_AA},
 | 
						|
	{"da9053-ba", DA9053_BA},
 | 
						|
	{"da9053-bb", DA9053_BB},
 | 
						|
	{"da9053-bc", DA9053_BC},
 | 
						|
	{}
 | 
						|
};
 | 
						|
 | 
						|
static struct spi_driver da9052_spi_driver = {
 | 
						|
	.probe = da9052_spi_probe,
 | 
						|
	.remove = da9052_spi_remove,
 | 
						|
	.id_table = da9052_spi_id,
 | 
						|
	.driver = {
 | 
						|
		.name = "da9052",
 | 
						|
		.owner = THIS_MODULE,
 | 
						|
	},
 | 
						|
};
 | 
						|
 | 
						|
static int __init da9052_spi_init(void)
 | 
						|
{
 | 
						|
	int ret;
 | 
						|
 | 
						|
	ret = spi_register_driver(&da9052_spi_driver);
 | 
						|
	if (ret != 0) {
 | 
						|
		pr_err("Failed to register DA9052 SPI driver, %d\n", ret);
 | 
						|
		return ret;
 | 
						|
	}
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
subsys_initcall(da9052_spi_init);
 | 
						|
 | 
						|
static void __exit da9052_spi_exit(void)
 | 
						|
{
 | 
						|
	spi_unregister_driver(&da9052_spi_driver);
 | 
						|
}
 | 
						|
module_exit(da9052_spi_exit);
 | 
						|
 | 
						|
MODULE_AUTHOR("David Dajun Chen <dchen@diasemi.com>");
 | 
						|
MODULE_DESCRIPTION("SPI driver for Dialog DA9052 PMIC");
 | 
						|
MODULE_LICENSE("GPL");
 |