lkml.org 
[lkml]   [2011]   [May]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5] uio/pdrv_genirq: Add OF support
    Date
    Adding OF binding to genirq.
    Version string is setup to the "devicetree".

    Compatible string is not setup for now but you can add your
    custom compatible string to uio_of_genirq_match structure.

    For example with "vendor,device" compatible string:
    static const struct of_device_id __devinitconst uio_of_genirq_match[] = {
    { .compatible = "vendor,device", },
    { /* empty for now */ },
    };

    Signed-off-by: Michal Simek <monstr@monstr.eu>
    CC: Hans J. Koch <hjk@hansjkoch.de>
    CC: Arnd Bergmann <arnd@arndb.de>
    CC: John Williams <john.williams@petalogix.com>
    CC: Grant Likely <grant.likely@secretlab.ca>
    CC: Wolfram Sang <w.sang@pengutronix.de>

    ---
    v5: Free uioinfo in genirq_remove
    Use pdev->dev.of_node for OF detection

    v4: Remove dev_info messages
    Check irq against -ENXIO for no irq

    v3: Fix irq binding
    Use "devicetree" as version string

    v2: Remove additional resource binding
    Setup correct version string
    Clear compatible string
    ---
    drivers/uio/uio_pdrv_genirq.c | 44 +++++++++++++++++++++++++++++++++++++++++
    1 files changed, 44 insertions(+), 0 deletions(-)

    diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
    index 7174d51..24bb395 100644
    --- a/drivers/uio/uio_pdrv_genirq.c
    +++ b/drivers/uio/uio_pdrv_genirq.c
    @@ -23,6 +23,10 @@
    #include <linux/pm_runtime.h>
    #include <linux/slab.h>

    +#include <linux/of.h>
    +#include <linux/of_platform.h>
    +#include <linux/of_address.h>
    +
    #define DRIVER_NAME "uio_pdrv_genirq"

    struct uio_pdrv_genirq_platdata {
    @@ -97,6 +101,27 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev)
    int ret = -EINVAL;
    int i;

    + if (!uioinfo) {
    + int irq;
    +
    + /* alloc uioinfo for one device */
    + uioinfo = kzalloc(sizeof(*uioinfo), GFP_KERNEL);
    + if (!uioinfo) {
    + ret = -ENOMEM;
    + dev_err(&pdev->dev, "unable to kmalloc\n");
    + goto bad2;
    + }
    + uioinfo->name = pdev->dev.of_node->name;
    + uioinfo->version = "devicetree";
    +
    + /* Multiple IRQs are not supported */
    + irq = platform_get_irq(pdev, 0);
    + if (irq == -ENXIO)
    + uioinfo->irq = UIO_IRQ_NONE;
    + else
    + uioinfo->irq = irq;
    + }
    +
    if (!uioinfo || !uioinfo->name || !uioinfo->version) {
    dev_err(&pdev->dev, "missing platform_data\n");
    goto bad0;
    @@ -180,6 +205,10 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev)
    kfree(priv);
    pm_runtime_disable(&pdev->dev);
    bad0:
    + /* kfree uioinfo for OF */
    + if (pdev->dev.of_node)
    + kfree(uioinfo);
    + bad2:
    return ret;
    }

    @@ -189,6 +218,11 @@ static int uio_pdrv_genirq_remove(struct platform_device *pdev)

    uio_unregister_device(priv->uioinfo);
    pm_runtime_disable(&pdev->dev);
    +
    + /* kfree uioinfo for OF */
    + if (pdev->dev.of_node)
    + kfree(priv->uioinfo);
    +
    kfree(priv);
    return 0;
    }
    @@ -215,6 +249,15 @@ static const struct dev_pm_ops uio_pdrv_genirq_dev_pm_ops = {
    .runtime_resume = uio_pdrv_genirq_runtime_nop,
    };

    +#ifdef CONFIG_OF
    +static const struct of_device_id __devinitconst uio_of_genirq_match[] = {
    + { /* empty for now */ },
    +};
    +MODULE_DEVICE_TABLE(of, uio_of_genirq_match);
    +#else
    +# define uio_of_genirq_match NULL
    +#endif
    +
    static struct platform_driver uio_pdrv_genirq = {
    .probe = uio_pdrv_genirq_probe,
    .remove = uio_pdrv_genirq_remove,
    @@ -222,6 +265,7 @@ static struct platform_driver uio_pdrv_genirq = {
    .name = DRIVER_NAME,
    .owner = THIS_MODULE,
    .pm = &uio_pdrv_genirq_dev_pm_ops,
    + .of_match_table = uio_of_genirq_match,
    },
    };

    --
    1.5.5.6


    \
     
     \ /
      Last update: 2011-05-05 08:43    [W:0.023 / U:0.644 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site