mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 00:40:03 +00:00
![Hans de Goede](/assets/img/avatar_default.png)
Replace the custom arizona_of_get_type() function with the generic device_get_match_data() helper. Besides being a nice cleanup this also makes it easier to add support for binding to ACPI enumerated devices. While at it also fix a possible NULL pointer deref of the id argument to the probe functions (this could happen on e.g. manual driver binding through sysfs). Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
123 lines
2.8 KiB
C
123 lines
2.8 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Arizona-i2c.c -- Arizona I2C bus interface
|
|
*
|
|
* Copyright 2012 Wolfson Microelectronics plc
|
|
*
|
|
* Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
|
|
*/
|
|
|
|
#include <linux/err.h>
|
|
#include <linux/i2c.h>
|
|
#include <linux/module.h>
|
|
#include <linux/pm_runtime.h>
|
|
#include <linux/regmap.h>
|
|
#include <linux/regulator/consumer.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/of.h>
|
|
|
|
#include <linux/mfd/arizona/core.h>
|
|
|
|
#include "arizona.h"
|
|
|
|
static int arizona_i2c_probe(struct i2c_client *i2c,
|
|
const struct i2c_device_id *id)
|
|
{
|
|
const void *match_data;
|
|
struct arizona *arizona;
|
|
const struct regmap_config *regmap_config = NULL;
|
|
unsigned long type = 0;
|
|
int ret;
|
|
|
|
match_data = device_get_match_data(&i2c->dev);
|
|
if (match_data)
|
|
type = (unsigned long)match_data;
|
|
else if (id)
|
|
type = id->driver_data;
|
|
|
|
switch (type) {
|
|
case WM5102:
|
|
if (IS_ENABLED(CONFIG_MFD_WM5102))
|
|
regmap_config = &wm5102_i2c_regmap;
|
|
break;
|
|
case WM5110:
|
|
case WM8280:
|
|
if (IS_ENABLED(CONFIG_MFD_WM5110))
|
|
regmap_config = &wm5110_i2c_regmap;
|
|
break;
|
|
case WM8997:
|
|
if (IS_ENABLED(CONFIG_MFD_WM8997))
|
|
regmap_config = &wm8997_i2c_regmap;
|
|
break;
|
|
case WM8998:
|
|
case WM1814:
|
|
if (IS_ENABLED(CONFIG_MFD_WM8998))
|
|
regmap_config = &wm8998_i2c_regmap;
|
|
break;
|
|
default:
|
|
dev_err(&i2c->dev, "Unknown device type %ld\n", type);
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (!regmap_config) {
|
|
dev_err(&i2c->dev,
|
|
"No kernel support for device type %ld\n", type);
|
|
return -EINVAL;
|
|
}
|
|
|
|
arizona = devm_kzalloc(&i2c->dev, sizeof(*arizona), GFP_KERNEL);
|
|
if (arizona == NULL)
|
|
return -ENOMEM;
|
|
|
|
arizona->regmap = devm_regmap_init_i2c(i2c, regmap_config);
|
|
if (IS_ERR(arizona->regmap)) {
|
|
ret = PTR_ERR(arizona->regmap);
|
|
dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
|
|
ret);
|
|
return ret;
|
|
}
|
|
|
|
arizona->type = type;
|
|
arizona->dev = &i2c->dev;
|
|
arizona->irq = i2c->irq;
|
|
|
|
return arizona_dev_init(arizona);
|
|
}
|
|
|
|
static int arizona_i2c_remove(struct i2c_client *i2c)
|
|
{
|
|
struct arizona *arizona = dev_get_drvdata(&i2c->dev);
|
|
|
|
arizona_dev_exit(arizona);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct i2c_device_id arizona_i2c_id[] = {
|
|
{ "wm5102", WM5102 },
|
|
{ "wm5110", WM5110 },
|
|
{ "wm8280", WM8280 },
|
|
{ "wm8997", WM8997 },
|
|
{ "wm8998", WM8998 },
|
|
{ "wm1814", WM1814 },
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(i2c, arizona_i2c_id);
|
|
|
|
static struct i2c_driver arizona_i2c_driver = {
|
|
.driver = {
|
|
.name = "arizona",
|
|
.pm = &arizona_pm_ops,
|
|
.of_match_table = of_match_ptr(arizona_of_match),
|
|
},
|
|
.probe = arizona_i2c_probe,
|
|
.remove = arizona_i2c_remove,
|
|
.id_table = arizona_i2c_id,
|
|
};
|
|
|
|
module_i2c_driver(arizona_i2c_driver);
|
|
|
|
MODULE_SOFTDEP("pre: arizona_ldo1");
|
|
MODULE_DESCRIPTION("Arizona I2C bus interface");
|
|
MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
|
|
MODULE_LICENSE("GPL");
|