of/device: populate platform_device (of_device) resource table on allocation

When allocating a platform_device to represent an OF node, also allocate
space for the resource table and populate it with IRQ and reg property
information.  This change is in preparation for merging the
of_platform_bus_type with the platform_bus_type so that existing
platform_driver code can retrieve base addresses and IRQs data.

Background: a previous commit removed struct of_device and made it a
#define alias for platform_device.

Signed-off-by: Grant Likely <[email protected]>
CC: Michal Simek <[email protected]>
CC: Grant Likely <[email protected]>
CC: Benjamin Herrenschmidt <[email protected]>
CC: Stephen Rothwell <[email protected]>
CC: [email protected]
CC: [email protected]
CC: [email protected]
This commit is contained in:
Grant Likely 2010-06-08 07:48:15 -06:00
commit ac80a51e2c

View file

@ -475,10 +475,35 @@ struct of_device *of_device_alloc(struct device_node *np,
struct device *parent)
{
struct of_device *dev;
int rc, i, num_reg = 0, num_irq = 0;
struct resource *res, temp_res;
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
/* First count how many resources are needed */
while (of_address_to_resource(np, num_reg, &temp_res) == 0)
num_reg++;
while (of_irq_to_resource(np, num_irq, &temp_res) != NO_IRQ)
num_irq++;
/* Allocate memory for both the struct device and the resource table */
dev = kzalloc(sizeof(*dev) + (sizeof(*res) * (num_reg + num_irq)),
GFP_KERNEL);
if (!dev)
return NULL;
res = (struct resource *) &dev[1];
/* Populate the resource table */
if (num_irq || num_reg) {
dev->num_resources = num_reg + num_irq;
dev->resource = res;
for (i = 0; i < num_reg; i++, res++) {
rc = of_address_to_resource(np, i, res);
WARN_ON(rc);
}
for (i = 0; i < num_irq; i++, res++) {
rc = of_irq_to_resource(np, i, res);
WARN_ON(rc == NO_IRQ);
}
}
dev->dev.of_node = of_node_get(np);
dev->dev.dma_mask = &dev->archdata.dma_mask;