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

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

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 9323b1e..cbf1dd9 100644 (file)
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -845,19 +845,6 @@ static int arizona_of_get_core_pdata(struct arizona *arizona)
 
        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
 static inline int arizona_of_get_core_pdata(struct arizona *arizona)
 {

diff --git a/drivers/mfd/arizona-i2c.c b/drivers/mfd/arizona-i2c.c
index 5e83b73..3ed810e 100644 (file)
--- a/drivers/mfd/arizona-i2c.c
+++ b/drivers/mfd/arizona-i2c.c
@@ -104,11 +104,23 @@ static const struct i2c_device_id 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 = {
        .driver = {
                .name   = "arizona",
                .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,
        .remove         = arizona_i2c_remove,

diff --git a/drivers/mfd/arizona-spi.c b/drivers/mfd/arizona-spi.c
index aa1d6f9..9fe06dd 100644 (file)
--- a/drivers/mfd/arizona-spi.c
+++ b/drivers/mfd/arizona-spi.c
@@ -225,11 +225,22 @@ static const struct spi_device_id 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 = {
        .driver = {
                .name   = "arizona",
                .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),
        },
        .probe          = arizona_spi_probe,

diff --git a/drivers/mfd/arizona.h b/drivers/mfd/arizona.h
index 801cbbc..66d6092 100644 (file)
--- a/drivers/mfd/arizona.h
+++ b/drivers/mfd/arizona.h
@@ -28,8 +28,6 @@ extern const struct regmap_config wm8998_i2c_regmap;
 
 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_irq;