mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-21 18:11:39 +00:00
988e6870c8
As part of the ongoing i2c transition to the simple probe
("probe_new"), this patch uses i2c_match_id to retrieve the
driver_data for the probed device. The id parameter is thus no longer
necessary and the simple probe can be used instead.
In the context of an i2c probe, i2c_match_id with the module id table
and the probed client never returns null, so removing the null check
on the i2c_device_id pointer is safe.
The i2c id tables are moved up before the probe function, as
suggested by Wolfram Sang, except where the existing code already had
a declaration for the of_device_id table.
Signed-off-by: Stephen Kitt <steve@sk2.org>
Link: https://lore.kernel.org/r/20220415160613.148882-7-steve@sk2.org
Signed-off-by: Mark Brown <broonie@kernel.org>
75 lines
1.8 KiB
C
75 lines
1.8 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only
|
|
*
|
|
* ALSA SoC TLV320AIC3x codec driver I2C interface
|
|
*
|
|
* Author: Arun KS, <arunks@mistralsolutions.com>
|
|
* Copyright: (C) 2008 Mistral Solutions Pvt Ltd.,
|
|
*
|
|
* Based on sound/soc/codecs/wm8731.c by Richard Purdie
|
|
*
|
|
*/
|
|
|
|
#include <linux/i2c.h>
|
|
#include <linux/module.h>
|
|
#include <linux/of.h>
|
|
#include <linux/regmap.h>
|
|
#include <sound/soc.h>
|
|
|
|
#include "tlv320aic3x.h"
|
|
|
|
static const struct i2c_device_id aic3x_i2c_id[] = {
|
|
{ "tlv320aic3x", AIC3X_MODEL_3X },
|
|
{ "tlv320aic33", AIC3X_MODEL_33 },
|
|
{ "tlv320aic3007", AIC3X_MODEL_3007 },
|
|
{ "tlv320aic3104", AIC3X_MODEL_3104 },
|
|
{ "tlv320aic3106", AIC3X_MODEL_3106 },
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(i2c, aic3x_i2c_id);
|
|
|
|
static int aic3x_i2c_probe(struct i2c_client *i2c)
|
|
{
|
|
struct regmap *regmap;
|
|
struct regmap_config config;
|
|
const struct i2c_device_id *id = i2c_match_id(aic3x_i2c_id, i2c);
|
|
|
|
config = aic3x_regmap;
|
|
config.reg_bits = 8;
|
|
config.val_bits = 8;
|
|
|
|
regmap = devm_regmap_init_i2c(i2c, &config);
|
|
return aic3x_probe(&i2c->dev, regmap, id->driver_data);
|
|
}
|
|
|
|
static int aic3x_i2c_remove(struct i2c_client *i2c)
|
|
{
|
|
aic3x_remove(&i2c->dev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct of_device_id aic3x_of_id[] = {
|
|
{ .compatible = "ti,tlv320aic3x", },
|
|
{ .compatible = "ti,tlv320aic33" },
|
|
{ .compatible = "ti,tlv320aic3007" },
|
|
{ .compatible = "ti,tlv320aic3104" },
|
|
{ .compatible = "ti,tlv320aic3106" },
|
|
{},
|
|
};
|
|
MODULE_DEVICE_TABLE(of, aic3x_of_id);
|
|
|
|
static struct i2c_driver aic3x_i2c_driver = {
|
|
.driver = {
|
|
.name = "tlv320aic3x",
|
|
.of_match_table = aic3x_of_id,
|
|
},
|
|
.probe_new = aic3x_i2c_probe,
|
|
.remove = aic3x_i2c_remove,
|
|
.id_table = aic3x_i2c_id,
|
|
};
|
|
|
|
module_i2c_driver(aic3x_i2c_driver);
|
|
|
|
MODULE_DESCRIPTION("ASoC TLV320AIC3x codec driver I2C");
|
|
MODULE_AUTHOR("Arun KS <arunks@mistralsolutions.com>");
|
|
MODULE_LICENSE("GPL");
|