[PATCH 1/1] amba: add oftree probe support
Jean-Christophe PLAGNIOL-VILLARD
plagnioj at jcrosoft.com
Mon Feb 11 16:44:49 EST 2013
On 21:17 Mon 11 Feb , Sascha Hauer wrote:
> On Mon, Feb 11, 2013 at 08:09:25PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
> > ---
> > drivers/amba/bus.c | 1 +
> > drivers/of/base.c | 60 +++++++++++++++++++++++++++++++++++++++++++++-------
> > 2 files changed, 53 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
> > index d1ab53c..dcb52bf 100644
> > --- a/drivers/amba/bus.c
> > +++ b/drivers/amba/bus.c
> > @@ -212,6 +212,7 @@ struct amba_device *amba_device_alloc(const char *name, int id, resource_size_t
> > dev->res.start = base;
> > dev->res.end = base + size - 1;
> > dev->res.flags = IORESOURCE_MEM;
> > + dev->dev.resource = &dev->res;
> >
> > return dev;
> > }
> > diff --git a/drivers/of/base.c b/drivers/of/base.c
> > index eaaeaf4..c2737ec 100644
> > --- a/drivers/of/base.c
> > +++ b/drivers/of/base.c
> > @@ -26,6 +26,7 @@
> > #include <memory.h>
> > #include <sizes.h>
> > #include <linux/ctype.h>
> > +#include <linux/amba/bus.h>
> >
> > /**
> > * struct alias_prop - Alias property in 'aliases' node
> > @@ -641,18 +642,44 @@ void of_delete_property(struct property *pp)
> > free(pp);
> > }
> >
> > -static struct device_d *add_of_device(struct device_node *node)
> > +static struct device_d *add_of_amba_device(struct device_node *node)
> > {
> > - struct device_d *dev;
> > + struct amba_device *dev;
> > char *name, *at;
> > - const struct property *cp;
> >
> > - if (of_node_disabled(node))
> > - return NULL;
> > + dev = xzalloc(sizeof(*dev));
> >
> > - cp = of_get_property(node, "compatible", NULL);
> > - if (!cp)
> > - return NULL;
> > + name = xstrdup(node->name);
> > + at = strchr(name, '@');
> > + if (at) {
> > + *at = 0;
> > + snprintf(dev->dev.name, MAX_DRIVER_NAME, "%s.%s", at + 1, name);
> > + } else {
> > + strncpy(dev->dev.name, node->name, MAX_DRIVER_NAME);
> > + }
> > +
> > + dev->dev.id = DEVICE_ID_SINGLE;
> > + memcpy(&dev->res, &node->resource[0], sizeof(struct resource));
> > + dev->dev.resource = node->resource;
> > + dev->dev.num_resources = 1;
> > + dev->dev.device_node = node;
> > + node->device = &dev->dev;
> > +
> > + of_property_read_u32(node, "arm,primecell-periphid", &dev->periphid);
> > +
> > + debug("register device 0x%08x\n", node->resource[0].start);
> > +
> > + amba_device_add(dev);
> > +
> > + free(name);
> > +
> > + return &dev->dev;
> > +}
> > +
> > +static struct device_d *add_of_platfrom_device(struct device_node *node)
>
> Lets not reintroduce platfroms, use platforms.
:)
Best Regards,
J.
>
> Sascha
>
>
> --
> Pengutronix e.K. | |
> Industrial Linux Solutions | http://www.pengutronix.de/ |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
More information about the barebox
mailing list