mfd: arizona: Integrate wm8997 into Arizona mfd

The wm8997 is a compact, high-performance audio hub CODEC with SLIMbus
interfacing, for smartphones, tablets and other portable audio devices
based on the Arizona platform.

This patch integrates the wm8997 into the Arizona mfd.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

1 files changed, 27 insertions, 0 deletions

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 74b4481754fd..89a115301a0c 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -554,6 +554,7 @@ static int arizona_of_get_core_pdata(struct arizona *arizona)
 const struct of_device_id arizona_of_match[] = {
         { .compatible = "wlf,wm5102", .data = (void *)WM5102 },
         { .compatible = "wlf,wm5110", .data = (void *)WM5110 },
+        { .compatible = "wlf,wm8997", .data = (void *)WM8997 },
         {},
 };
 EXPORT_SYMBOL_GPL(arizona_of_match);
@@ -586,6 +587,15 @@ static struct mfd_cell wm5110_devs[] = {
         { .name = "wm5110-codec" },
 };
 
+static struct mfd_cell wm8997_devs[] = {
+        { .name = "arizona-micsupp" },
+        { .name = "arizona-extcon" },
+        { .name = "arizona-gpio" },
+        { .name = "arizona-haptics" },
+        { .name = "arizona-pwm" },
+        { .name = "wm8997-codec" },
+};
+
 int arizona_dev_init(struct arizona *arizona)
 {
         struct device *dev = arizona->dev;
@@ -608,6 +618,7 @@ int arizona_dev_init(struct arizona *arizona)
         switch (arizona->type) {
         case WM5102:
         case WM5110:
+        case WM8997:
                 for (i = 0; i < ARRAY_SIZE(wm5102_core_supplies); i++)
                         arizona->core_supplies[i].supply
                                 = wm5102_core_supplies[i];
@@ -683,6 +694,7 @@ int arizona_dev_init(struct arizona *arizona)
         switch (reg) {
         case 0x5102:
         case 0x5110:
+        case 0x8997:
                 break;
         default:
                 dev_err(arizona->dev, "Unknown device ID: %x\n", reg);
@@ -768,6 +780,17 @@ int arizona_dev_init(struct arizona *arizona)
                 apply_patch = wm5110_patch;
                 break;
 #endif
+#ifdef CONFIG_MFD_WM8997
+        case 0x8997:
+                type_name = "WM8997";
+                if (arizona->type != WM8997) {
+                        dev_err(arizona->dev, "WM8997 registered as %d\n",
+                                arizona->type);
+                        arizona->type = WM8997;
+                }
+                apply_patch = wm8997_patch;
+                break;
+#endif
         default:
                 dev_err(arizona->dev, "Unknown device ID %x\n", reg);
                 goto err_reset;
@@ -934,6 +957,10 @@ int arizona_dev_init(struct arizona *arizona)
                 ret = mfd_add_devices(arizona->dev, -1, wm5110_devs,
                                       ARRAY_SIZE(wm5110_devs), NULL, 0, NULL);
                 break;
+        case WM8997:
+                ret = mfd_add_devices(arizona->dev, -1, wm8997_devs,
+                                      ARRAY_SIZE(wm8997_devs), NULL, 0, NULL);
+                break;
         }
 
         if (ret != 0) {