Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 17:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mfd: arizona: Split of_match table into I2C and SPI versions

Browse Source 
The Arizona driver has both some devices which only have an I2C
interface and some which only have a SPI interface. Currently both of
these share an of_match table, but this means inapproriate compatibles
are available for each interface. Tidy this up by creating a table for
each interface listing only the appropriate compatibles.

Reported-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20210928163035.23960-1-ckeepax@opensource.cirrus.com
This commit is contained in:
Charles Keepax 2021-09-28 17:30:35 +01:00 committed by Lee Jones
parent 239f2bb141
commit 3f65555c41
4 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/mfd/arizona-core.c
View File

@ -845,19 +845,6 @@ static int arizona_of_get_core_pdata(struct arizona *arizona)
return 0; return 0;
} }
const struct of_device_id arizona_of_match[] = {
{ .compatible = "wlf,wm5102", .data = (void *)WM5102 },
{ .compatible = "wlf,wm5110", .data = (void *)WM5110 },
{ .compatible = "wlf,wm8280", .data = (void *)WM8280 },
{ .compatible = "wlf,wm8997", .data = (void *)WM8997 },
{ .compatible = "wlf,wm8998", .data = (void *)WM8998 },
{ .compatible = "wlf,wm1814", .data = (void *)WM1814 },
{ .compatible = "wlf,wm1831", .data = (void *)WM1831 },
{ .compatible = "cirrus,cs47l24", .data = (void *)CS47L24 },
{},
};
EXPORT_SYMBOL_GPL(arizona_of_match);
#else #else
static inline int arizona_of_get_core_pdata(struct arizona *arizona) static inline int arizona_of_get_core_pdata(struct arizona *arizona)
{ {

14
drivers/mfd/arizona-i2c.c
View File

@ -104,11 +104,23 @@ static const struct i2c_device_id arizona_i2c_id[] = {
}; };
MODULE_DEVICE_TABLE(i2c, arizona_i2c_id); MODULE_DEVICE_TABLE(i2c, arizona_i2c_id);
#ifdef CONFIG_OF
const struct of_device_id arizona_i2c_of_match[] = {
{ .compatible = "wlf,wm5102", .data = (void *)WM5102 },
{ .compatible = "wlf,wm5110", .data = (void *)WM5110 },
{ .compatible = "wlf,wm8280", .data = (void *)WM8280 },
{ .compatible = "wlf,wm8997", .data = (void *)WM8997 },
{ .compatible = "wlf,wm8998", .data = (void *)WM8998 },
{ .compatible = "wlf,wm1814", .data = (void *)WM1814 },
{},
};
#endif
static struct i2c_driver arizona_i2c_driver = { static struct i2c_driver arizona_i2c_driver = {
.driver = { .driver = {
.name = "arizona", .name = "arizona",
.pm = &arizona_pm_ops, .pm = &arizona_pm_ops,
.of_match_table = of_match_ptr(arizona_of_match), .of_match_table = of_match_ptr(arizona_i2c_of_match),
}, },
.probe = arizona_i2c_probe, .probe = arizona_i2c_probe,
.remove = arizona_i2c_remove, .remove = arizona_i2c_remove,

13
drivers/mfd/arizona-spi.c
View File

@ -225,11 +225,22 @@ static const struct spi_device_id arizona_spi_ids[] = {
}; };
MODULE_DEVICE_TABLE(spi, arizona_spi_ids); MODULE_DEVICE_TABLE(spi, arizona_spi_ids);
#ifdef CONFIG_OF
const struct of_device_id arizona_spi_of_match[] = {
{ .compatible = "wlf,wm5102", .data = (void *)WM5102 },
{ .compatible = "wlf,wm5110", .data = (void *)WM5110 },
{ .compatible = "wlf,wm8280", .data = (void *)WM8280 },
{ .compatible = "wlf,wm1831", .data = (void *)WM1831 },
{ .compatible = "cirrus,cs47l24", .data = (void *)CS47L24 },
{},
};
#endif
static struct spi_driver arizona_spi_driver = { static struct spi_driver arizona_spi_driver = {
.driver = { .driver = {
.name = "arizona", .name = "arizona",
.pm = &arizona_pm_ops, .pm = &arizona_pm_ops,
.of_match_table = of_match_ptr(arizona_of_match), .of_match_table = of_match_ptr(arizona_spi_of_match),
.acpi_match_table = ACPI_PTR(arizona_acpi_match), .acpi_match_table = ACPI_PTR(arizona_acpi_match),
}, },
.probe = arizona_spi_probe, .probe = arizona_spi_probe,

2
drivers/mfd/arizona.h
View File

@ -28,8 +28,6 @@ extern const struct regmap_config wm8998_i2c_regmap;
extern const struct dev_pm_ops arizona_pm_ops; extern const struct dev_pm_ops arizona_pm_ops;
extern const struct of_device_id arizona_of_match[];
extern const struct regmap_irq_chip wm5102_aod; extern const struct regmap_irq_chip wm5102_aod;
extern const struct regmap_irq_chip wm5102_irq; extern const struct regmap_irq_chip wm5102_irq;