diff options
author | Lee Jones <lee.jones@linaro.org> | 2012-07-26 17:07:26 +0100 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2012-09-20 09:10:57 +0200 |
commit | 49731c23bee88fd76af8cd57b915547b2175a26a (patch) | |
tree | 6a9bd7720279652be34ba3481cbdb2779de3adaa /sound/soc/ux500/ux500_msp_i2s.c | |
parent | 0af541ce47ee4e80393dda12109a1efaf757fdcd (diff) | |
download | linux-stable-49731c23bee88fd76af8cd57b915547b2175a26a.tar.gz linux-stable-49731c23bee88fd76af8cd57b915547b2175a26a.tar.bz2 linux-stable-49731c23bee88fd76af8cd57b915547b2175a26a.zip |
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>
Diffstat (limited to 'sound/soc/ux500/ux500_msp_i2s.c')
-rw-r--r-- | sound/soc/ux500/ux500_msp_i2s.c | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c index 12d7f567420d..e5c79ca42518 100644 --- 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; |