lkml.org 
[lkml]   [2012]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] devicetree: Add empty of_platform_populate() for !CONFIG_OF_ADDRESS (sparc)
    Date
    Sparc has its own helpers for translating address ranges when the device
    tree is parsed at boot time, and it isn't able to use of_platform_populate().
    However, there are some device drivers that want to use that function on
    other DT enabled platforms (ie. TWL4030). This patch adds an empty
    of_platform_populate() implementation that returns an error when
    CONFIG_OF_ADDRESS is not selected.

    Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
    Cc: Benoit Cousson <b-cousson@ti.com>
    Cc: Samuel Ortiz <sameo@linux.intel.com>
    ---
    drivers/mfd/twl-core.c | 5 ++---
    drivers/of/platform.c | 4 ++--
    include/linux/of_platform.h | 12 ++++++++++--
    3 files changed, 14 insertions(+), 7 deletions(-)

    diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
    index 66f9bff..4970d43 100644
    --- a/drivers/mfd/twl-core.c
    +++ b/drivers/mfd/twl-core.c
    @@ -1305,11 +1305,10 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id)
    twl_i2c_write_u8(TWL4030_MODULE_INTBR, temp, REG_GPPUPDCTR1);
    }

    -#ifdef CONFIG_OF_DEVICE
    + status = -ENODEV;
    if (node)
    status = of_platform_populate(node, NULL, NULL, &client->dev);
    - else
    -#endif
    + if (status)
    status = add_children(pdata, id->driver_data);

    fail:
    diff --git a/drivers/of/platform.c b/drivers/of/platform.c
    index 63b3ec4..20fbebd 100644
    --- a/drivers/of/platform.c
    +++ b/drivers/of/platform.c
    @@ -55,7 +55,7 @@ EXPORT_SYMBOL(of_find_device_by_node);
    #include <asm/dcr.h>
    #endif

    -#if !defined(CONFIG_SPARC)
    +#ifdef CONFIG_OF_ADDRESS
    /*
    * The following routines scan a subtree and registers a device for
    * each applicable node.
    @@ -462,4 +462,4 @@ int of_platform_populate(struct device_node *root,
    of_node_put(root);
    return rc;
    }
    -#endif /* !CONFIG_SPARC */
    +#endif /* CONFIG_OF_ADDRESS */
    diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h
    index 040ce2f..242fa35 100644
    --- a/include/linux/of_platform.h
    +++ b/include/linux/of_platform.h
    @@ -81,7 +81,7 @@ extern struct platform_device *of_device_alloc(struct device_node *np,
    struct device *parent);
    extern struct platform_device *of_find_device_by_node(struct device_node *np);

    -#if !defined(CONFIG_SPARC) /* SPARC has its own device registration method */
    +#ifdef CONFIG_OF_ADDRESS /* device reg helpers depend on OF_ADDRESS */
    /* Platform devices and busses creation */
    extern struct platform_device *of_platform_device_create(struct device_node *np,
    const char *bus_id,
    @@ -94,7 +94,15 @@ extern int of_platform_populate(struct device_node *root,
    const struct of_device_id *matches,
    const struct of_dev_auxdata *lookup,
    struct device *parent);
    -#endif /* !CONFIG_SPARC */
    +#else
    +static inline int of_platform_populate(struct device_node *root,
    + const struct of_device_id *matches,
    + const struct of_dev_auxdata *lookup,
    + struct device *parent)
    +{
    + return -ENODEV;
    +}
    +#endif /* !CONFIG_OF_ADDRESS */

    #endif /* CONFIG_OF_DEVICE */

    --
    1.7.9


    \
     
     \ /
      Last update: 2012-02-24 23:09    [W:0.022 / U:1.848 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site