mfd: Add device tree bindings for Arizona class devices

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

4 files changed, 97 insertions, 4 deletions

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 549db0ad7257..d8d30c0a488d 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -16,6 +16,9 @@
 #include <linux/interrupt.h>
 #include <linux/mfd/core.h>
 #include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/of_gpio.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
@@ -462,6 +465,70 @@ const struct dev_pm_ops arizona_pm_ops = {
 };
 EXPORT_SYMBOL_GPL(arizona_pm_ops);
 
+#ifdef CONFIG_OF
+int arizona_of_get_type(struct device *dev)
+{
+        const struct of_device_id *id = of_match_device(arizona_of_match, dev);
+
+        if (id)
+                return (int)id->data;
+        else
+                return 0;
+}
+EXPORT_SYMBOL_GPL(arizona_of_get_type);
+
+static int arizona_of_get_core_pdata(struct arizona *arizona)
+{
+        int ret, i;
+
+        arizona->pdata.reset = of_get_named_gpio(arizona->dev->of_node,
+                                                 "wlf,reset", 0);
+        if (arizona->pdata.reset < 0)
+                arizona->pdata.reset = 0;
+
+        arizona->pdata.ldoena = of_get_named_gpio(arizona->dev->of_node,
+                                                  "wlf,ldoena", 0);
+        if (arizona->pdata.ldoena < 0)
+                arizona->pdata.ldoena = 0;
+
+        ret = of_property_read_u32_array(arizona->dev->of_node,
+                                         "wlf,gpio-defaults",
+                                         arizona->pdata.gpio_defaults,
+                                         ARRAY_SIZE(arizona->pdata.gpio_defaults));
+        if (ret >= 0) {
+                /*
+                 * All values are literal except out of range values
+                 * which are chip default, translate into platform
+                 * data which uses 0 as chip default and out of range
+                 * as zero.
+                 */
+                for (i = 0; i < ARRAY_SIZE(arizona->pdata.gpio_defaults); i++) {
+                        if (arizona->pdata.gpio_defaults[i] > 0xffff)
+                                arizona->pdata.gpio_defaults[i] = 0;
+                        if (arizona->pdata.gpio_defaults[i] == 0)
+                                arizona->pdata.gpio_defaults[i] = 0x10000;
+                }
+        } else {
+                dev_err(arizona->dev, "Failed to parse GPIO defaults: %d\n",
+                        ret);
+        }
+
+        return 0;
+}
+
+const struct of_device_id arizona_of_match[] = {
+        { .compatible = "wlf,wm5102", .data = (void *)WM5102 },
+        { .compatible = "wlf,wm5110", .data = (void *)WM5110 },
+        {},
+};
+EXPORT_SYMBOL_GPL(arizona_of_match);
+#else
+static inline int arizona_of_get_core_pdata(struct arizona *arizona)
+{
+        return 0;
+}
+#endif
+
 static struct mfd_cell early_devs[] = {
         { .name = "arizona-ldo1" },
 };
@@ -495,6 +562,8 @@ int arizona_dev_init(struct arizona *arizona)
         dev_set_drvdata(arizona->dev, arizona);
         mutex_init(&arizona->clk_lock);
 
+        arizona_of_get_core_pdata(arizona);
+
         if (dev_get_platdata(arizona->dev))
                 memcpy(&arizona->pdata, dev_get_platdata(arizona->dev),
                        sizeof(arizona->pdata));
diff --git a/drivers/mfd/arizona-i2c.c b/drivers/mfd/arizona-i2c.c
index 44a1bb969841..deb267ebf84e 100644
--- a/drivers/mfd/arizona-i2c.c
+++ b/drivers/mfd/arizona-i2c.c
@@ -27,9 +27,14 @@ static int arizona_i2c_probe(struct i2c_client *i2c,
 {
         struct arizona *arizona;
         const struct regmap_config *regmap_config;
-        int ret;
+        int ret, type;
 
-        switch (id->driver_data) {
+        if (i2c->dev.of_node)
+                type = arizona_of_get_type(&i2c->dev);
+        else
+                type = id->driver_data;
+
+        switch (type) {
 #ifdef CONFIG_MFD_WM5102
         case WM5102:
                 regmap_config = &wm5102_i2c_regmap;
@@ -84,6 +89,7 @@ static struct i2c_driver arizona_i2c_driver = {
                 .name   = "arizona",
                 .owner  = THIS_MODULE,
                 .pm     = &arizona_pm_ops,
+                .of_match_table = of_match_ptr(arizona_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 b57e642d2b4a..47be7b35b5c5 100644
--- a/drivers/mfd/arizona-spi.c
+++ b/drivers/mfd/arizona-spi.c
@@ -27,9 +27,14 @@ static int arizona_spi_probe(struct spi_device *spi)
         const struct spi_device_id *id = spi_get_device_id(spi);
         struct arizona *arizona;
         const struct regmap_config *regmap_config;
-        int ret;
+        int ret, type;
 
-        switch (id->driver_data) {
+        if (spi->dev.of_node)
+                type = arizona_of_get_type(&spi->dev);
+        else
+                type = id->driver_data;
+
+        switch (type) {
 #ifdef CONFIG_MFD_WM5102
         case WM5102:
                 regmap_config = &wm5102_spi_regmap;
@@ -84,6 +89,7 @@ static struct spi_driver arizona_spi_driver = {
                 .name   = "arizona",
                 .owner  = THIS_MODULE,
                 .pm     = &arizona_pm_ops,
+                .of_match_table = of_match_ptr(arizona_of_match),
         },
         .probe          = arizona_spi_probe,
         .remove         = arizona_spi_remove,
diff --git a/drivers/mfd/arizona.h b/drivers/mfd/arizona.h
index 9798ae5da67b..db55d9854a55 100644
--- a/drivers/mfd/arizona.h
+++ b/drivers/mfd/arizona.h
@@ -13,6 +13,7 @@
 #ifndef _WM5102_H
 #define _WM5102_H
 
+#include <linux/of.h>
 #include <linux/regmap.h>
 #include <linux/pm.h>
 
@@ -26,6 +27,8 @@ extern const struct regmap_config wm5110_spi_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;
 
@@ -37,4 +40,13 @@ int arizona_dev_exit(struct arizona *arizona);
 int arizona_irq_init(struct arizona *arizona);
 int arizona_irq_exit(struct arizona *arizona);
 
+#ifdef CONFIG_OF
+int arizona_of_get_type(struct device *dev);
+#else
+static inline int arizona_of_get_type(struct device *dev)
+{
+        return 0;
+}
+#endif
+
 #endif