* [PATCH 1/1] amba: add oftree probe support
@ 2013-02-12 11:09 Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 0 replies; 4+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-02-12 11:09 UTC (permalink / raw)
To: barebox
move ARM_AMBA Kconfig to drivers/amba/Kconfig
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
v3:
only probe amba device when amba is enable
Best Regards,
J.
arch/arm/Kconfig | 3 ---
drivers/Kconfig | 1 +
drivers/amba/Kconfig | 2 ++
drivers/amba/bus.c | 1 +
drivers/of/base.c | 61 +++++++++++++++++++++++++++++++++++++++++++-------
5 files changed, 57 insertions(+), 11 deletions(-)
create mode 100644 drivers/amba/Kconfig
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2ff544e..f002910 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -7,9 +7,6 @@ config ARM
select HAVE_IMAGE_COMPRESSION
default y
-config ARM_AMBA
- bool
-
config ARM_LINUX
bool
default y
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 988ec9e..dac22de 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -1,5 +1,6 @@
menu "Drivers"
+source "drivers/amba/Kconfig"
source "drivers/serial/Kconfig"
source "drivers/net/Kconfig"
source "drivers/spi/Kconfig"
diff --git a/drivers/amba/Kconfig b/drivers/amba/Kconfig
new file mode 100644
index 0000000..d1cba6a
--- /dev/null
+++ b/drivers/amba/Kconfig
@@ -0,0 +1,2 @@
+config ARM_AMBA
+ bool
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..1f32bfb 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_platform_device(struct device_node *node)
+{
+ struct device_d *dev;
+ char *name, *at;
dev = xzalloc(sizeof(*dev));
@@ -679,6 +706,24 @@ static struct device_d *add_of_device(struct device_node *node)
return dev;
}
+
+static struct device_d *add_of_device(struct device_node *node)
+{
+ const struct property *cp;
+
+ if (of_node_disabled(node))
+ return NULL;
+
+ cp = of_get_property(node, "compatible", NULL);
+ if (!cp)
+ return NULL;
+
+ if (IS_ENABLED(CONFIG_ARM_AMBA) &&
+ of_device_is_compatible(node, "arm,primecell") == 1)
+ return add_of_amba_device(node);
+ else
+ return add_of_platform_device(node);
+}
EXPORT_SYMBOL(add_of_device);
u64 dt_mem_next_cell(int s, const __be32 **cellp)
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] amba: add oftree probe support
2013-02-11 20:17 ` Sascha Hauer
@ 2013-02-11 21:44 ` Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 0 replies; 4+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-02-11 21:44 UTC (permalink / raw)
To: Sascha Hauer; +Cc: barebox
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@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 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] amba: add oftree probe support
2013-02-11 19:09 Jean-Christophe PLAGNIOL-VILLARD
@ 2013-02-11 20:17 ` Sascha Hauer
2013-02-11 21:44 ` Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 1 reply; 4+ messages in thread
From: Sascha Hauer @ 2013-02-11 20:17 UTC (permalink / raw)
To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox
On Mon, Feb 11, 2013 at 08:09:25PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote:
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@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.
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 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/1] amba: add oftree probe support
@ 2013-02-11 19:09 Jean-Christophe PLAGNIOL-VILLARD
2013-02-11 20:17 ` Sascha Hauer
0 siblings, 1 reply; 4+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-02-11 19:09 UTC (permalink / raw)
To: barebox
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@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)
+{
+ struct device_d *dev;
+ char *name, *at;
dev = xzalloc(sizeof(*dev));
@@ -679,6 +706,23 @@ static struct device_d *add_of_device(struct device_node *node)
return dev;
}
+
+static struct device_d *add_of_device(struct device_node *node)
+{
+ const struct property *cp;
+
+ if (of_node_disabled(node))
+ return NULL;
+
+ cp = of_get_property(node, "compatible", NULL);
+ if (!cp)
+ return NULL;
+
+ if (of_device_is_compatible(node, "arm,primecell") == 1)
+ return add_of_amba_device(node);
+ else
+ return add_of_platfrom_device(node);
+}
EXPORT_SYMBOL(add_of_device);
u64 dt_mem_next_cell(int s, const __be32 **cellp)
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-02-12 11:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-12 11:09 [PATCH 1/1] amba: add oftree probe support Jean-Christophe PLAGNIOL-VILLARD
-- strict thread matches above, loose matches on Subject: below --
2013-02-11 19:09 Jean-Christophe PLAGNIOL-VILLARD
2013-02-11 20:17 ` Sascha Hauer
2013-02-11 21:44 ` Jean-Christophe PLAGNIOL-VILLARD
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox