ASoC: Ux500: Enable ux500 MSP driver for Device Tree

Register both parts of the MSP driver from Device Tree so that they
are probed when Device Tree is enabled. Also, as there is platform
data involved, we ensure that there is allocated memory to place the
configuration into and that the correct information is extracted from
the DT binary.

Acked-by: Ola Lilja <ola.o.lilja@stericsson.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c
index 057e28ef770ecbd9582078acb9db8cd7a83f8e4b..45e43b4057b0661b71afe8767806cf72fdf183f5 100644 (file)
--- a/sound/soc/ux500/ux500_msp_dai.c
+++ b/sound/soc/ux500/ux500_msp_dai.c
@@ -830,10 +830,16 @@ static int __devexit ux500_msp_drv_remove(struct platform_device *pdev)
        return 0;
 }
 
+static const struct of_device_id ux500_msp_i2s_match[] = {
+       { .compatible = "stericsson,ux500-msp-i2s", },
+       {},
+};
+
 static struct platform_driver msp_i2s_driver = {
        .driver = {
                .name = "ux500-msp-i2s",
                .owner = THIS_MODULE,
+               .of_match_table = ux500_msp_i2s_match,
        },
        .probe = ux500_msp_drv_probe,
        .remove = ux500_msp_drv_remove,

diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c
index 12d7f567420d45a44530723cc3accc7df42f21cd..e5c79ca425183e47cdf1a255cd1c2ef237dced18 100644 (file)
--- a/sound/soc/ux500/ux500_msp_i2s.c
+++ b/sound/soc/ux500/ux500_msp_i2s.c
@@ -18,6 +18,7 @@
 #include <linux/pinctrl/consumer.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
+#include <linux/of.h>
 
 #include <mach/hardware.h>
 #include <mach/msp.h>
@@ -683,14 +684,29 @@ int ux500_msp_i2s_init_msp(struct platform_device *pdev,
 {
        struct resource *res = NULL;
        struct i2s_controller *i2s_cont;
+       struct device_node *np = pdev->dev.of_node;
        struct ux500_msp *msp;
 
-       dev_dbg(&pdev->dev, "%s: Enter (name: %s, id: %d).\n", __func__,
-               pdev->name, platform_data->id);
-
        *msp_p = devm_kzalloc(&pdev->dev, sizeof(struct ux500_msp), GFP_KERNEL);
        msp = *msp_p;
 
+       if (np) {
+               if (!platform_data) {
+                       platform_data = devm_kzalloc(&pdev->dev,
+                               sizeof(struct msp_i2s_platform_data), GFP_KERNEL);
+                       if (!platform_data)
+                               ret = -ENOMEM;
+               }
+       } else
+               if (!platform_data)
+                       ret = -EINVAL;
+
+       if (ret)
+               goto err_res;
+
+       dev_dbg(&pdev->dev, "%s: Enter (name: %s, id: %d).\n", __func__,
+               pdev->name, platform_data->id);
+
        msp->id = platform_data->id;
        msp->dev = &pdev->dev;
        msp->dma_cfg_rx = platform_data->msp_i2s_dma_rx;