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>
86 lines
2.1 KiB
C
86 lines
2.1 KiB
C
/* SPDX-License-Identifier: GPL-2.0
|
|
*
|
|
* Copyright 2011-2019 NW Digital Radio
|
|
*
|
|
* Author: Annaliese McDermond <nh6z@nh6z.net>
|
|
*
|
|
* Based on sound/soc/codecs/wm8974 and TI driver for kernel 2.6.27.
|
|
*
|
|
*/
|
|
|
|
#include <linux/i2c.h>
|
|
#include <linux/module.h>
|
|
#include <linux/of.h>
|
|
#include <linux/regmap.h>
|
|
#include <sound/soc.h>
|
|
|
|
#include "tlv320aic32x4.h"
|
|
|
|
static const struct of_device_id aic32x4_of_id[];
|
|
static const struct i2c_device_id aic32x4_i2c_id[];
|
|
|
|
static int aic32x4_i2c_probe(struct i2c_client *i2c)
|
|
{
|
|
struct regmap *regmap;
|
|
struct regmap_config config;
|
|
|
|
config = aic32x4_regmap_config;
|
|
config.reg_bits = 8;
|
|
config.val_bits = 8;
|
|
|
|
regmap = devm_regmap_init_i2c(i2c, &config);
|
|
|
|
if (i2c->dev.of_node) {
|
|
const struct of_device_id *oid;
|
|
|
|
oid = of_match_node(aic32x4_of_id, i2c->dev.of_node);
|
|
dev_set_drvdata(&i2c->dev, (void *)oid->data);
|
|
} else {
|
|
const struct i2c_device_id *id;
|
|
|
|
id = i2c_match_id(aic32x4_i2c_id, i2c);
|
|
dev_set_drvdata(&i2c->dev, (void *)id->driver_data);
|
|
}
|
|
|
|
return aic32x4_probe(&i2c->dev, regmap);
|
|
}
|
|
|
|
static int aic32x4_i2c_remove(struct i2c_client *i2c)
|
|
{
|
|
aic32x4_remove(&i2c->dev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct i2c_device_id aic32x4_i2c_id[] = {
|
|
{ "tlv320aic32x4", (kernel_ulong_t)AIC32X4_TYPE_AIC32X4 },
|
|
{ "tlv320aic32x6", (kernel_ulong_t)AIC32X4_TYPE_AIC32X6 },
|
|
{ "tas2505", (kernel_ulong_t)AIC32X4_TYPE_TAS2505 },
|
|
{ /* sentinel */ }
|
|
};
|
|
MODULE_DEVICE_TABLE(i2c, aic32x4_i2c_id);
|
|
|
|
static const struct of_device_id aic32x4_of_id[] = {
|
|
{ .compatible = "ti,tlv320aic32x4", .data = (void *)AIC32X4_TYPE_AIC32X4 },
|
|
{ .compatible = "ti,tlv320aic32x6", .data = (void *)AIC32X4_TYPE_AIC32X6 },
|
|
{ .compatible = "ti,tas2505", .data = (void *)AIC32X4_TYPE_TAS2505 },
|
|
{ /* senitel */ }
|
|
};
|
|
MODULE_DEVICE_TABLE(of, aic32x4_of_id);
|
|
|
|
static struct i2c_driver aic32x4_i2c_driver = {
|
|
.driver = {
|
|
.name = "tlv320aic32x4",
|
|
.of_match_table = aic32x4_of_id,
|
|
},
|
|
.probe_new = aic32x4_i2c_probe,
|
|
.remove = aic32x4_i2c_remove,
|
|
.id_table = aic32x4_i2c_id,
|
|
};
|
|
|
|
module_i2c_driver(aic32x4_i2c_driver);
|
|
|
|
MODULE_DESCRIPTION("ASoC TLV320AIC32x4 codec driver I2C");
|
|
MODULE_AUTHOR("Annaliese McDermond <nh6z@nh6z.net>");
|
|
MODULE_LICENSE("GPL");
|