mfd: motorola-cpcap: Add audio-codec support

Add support for the audio-codec node by converting from
devm_of_platform_populate() to devm_mfd_add_devices().

Tested-by: Pavel Machek <pavel@ucw.cz>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

1 files changed, 50 insertions, 1 deletions

diff --git a/drivers/mfd/motorola-cpcap.c b/drivers/mfd/motorola-cpcap.c
index 5276911caaec..20d9692640e1 100644
--- a/drivers/mfd/motorola-cpcap.c
+++ b/drivers/mfd/motorola-cpcap.c
@@ -18,6 +18,7 @@
 #include <linux/regmap.h>
 #include <linux/sysfs.h>
 
+#include <linux/mfd/core.h>
 #include <linux/mfd/motorola-cpcap.h>
 #include <linux/spi/spi.h>
 
@@ -216,6 +217,53 @@ static const struct regmap_config cpcap_regmap_config = {
         .val_format_endian = REGMAP_ENDIAN_LITTLE,
 };
 
+static const struct mfd_cell cpcap_mfd_devices[] = {
+        {
+                .name          = "cpcap_adc",
+                .of_compatible = "motorola,mapphone-cpcap-adc",
+        }, {
+                .name          = "cpcap_battery",
+                .of_compatible = "motorola,cpcap-battery",
+        }, {
+                .name          = "cpcap-charger",
+                .of_compatible = "motorola,mapphone-cpcap-charger",
+        }, {
+                .name          = "cpcap-regulator",
+                .of_compatible = "motorola,mapphone-cpcap-regulator",
+        }, {
+                .name          = "cpcap-rtc",
+                .of_compatible = "motorola,cpcap-rtc",
+        }, {
+                .name          = "cpcap-pwrbutton",
+                .of_compatible = "motorola,cpcap-pwrbutton",
+        }, {
+                .name          = "cpcap-usb-phy",
+                .of_compatible = "motorola,mapphone-cpcap-usb-phy",
+        }, {
+                .name          = "cpcap-led",
+                .id            = 0,
+                .of_compatible = "motorola,cpcap-led-red",
+        }, {
+                .name          = "cpcap-led",
+                .id            = 1,
+                .of_compatible = "motorola,cpcap-led-green",
+        }, {
+                .name          = "cpcap-led",
+                .id            = 2,
+                .of_compatible = "motorola,cpcap-led-blue",
+        }, {
+                .name          = "cpcap-led",
+                .id            = 3,
+                .of_compatible = "motorola,cpcap-led-adl",
+        }, {
+                .name          = "cpcap-led",
+                .id            = 4,
+                .of_compatible = "motorola,cpcap-led-cp",
+        }, {
+                .name          = "cpcap-codec",
+        }
+};
+
 static int cpcap_probe(struct spi_device *spi)
 {
         const struct of_device_id *match;
@@ -260,7 +308,8 @@ static int cpcap_probe(struct spi_device *spi)
         if (ret)
                 return ret;
 
-        return devm_of_platform_populate(&cpcap->spi->dev);
+        return devm_mfd_add_devices(&spi->dev, 0, cpcap_mfd_devices,
+                                    ARRAY_SIZE(cpcap_mfd_devices), NULL, 0, NULL);
 }
 
 static struct spi_driver cpcap_driver = {