lkml.org 
[lkml]   [2012]   [Aug]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/22] ASoC: Ux500: Enable ux500 MSP driver for Device Tree
    Date
    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.

    CC: alsa-devel@alsa-project.org
    Signed-off-by: Lee Jones <lee.jones@linaro.org>
    ---
    sound/soc/ux500/ux500_msp_dai.c | 6 ++++++
    sound/soc/ux500/ux500_msp_i2s.c | 22 +++++++++++++++++++---
    2 files changed, 25 insertions(+), 3 deletions(-)

    diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c
    index 772cb19..0f7dd49 100644
    --- a/sound/soc/ux500/ux500_msp_dai.c
    +++ b/sound/soc/ux500/ux500_msp_dai.c
    @@ -833,10 +833,16 @@ static int __devexit ux500_msp_drv_remove(struct platform_device *pdev)
    return 0;
    }

    +static const struct of_device_id ux500_msp_i2c_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_i2c_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 2cbfc54..5e0bf8c 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>
    @@ -692,16 +693,31 @@ int ux500_msp_i2s_init_msp(struct platform_device *pdev,
    int ret = 0;
    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 (!msp)
    return -ENOMEM;

    + 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;
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2012-08-10 02:41    [W:4.702 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site