Commit b1a4c9a1 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Kalle Valo

bcma: make OF code more generic (not platform_device specific)

OF allows not only specifying platform devices but also describing
devices on standard buses like PCI or USB. This change will allow
reading info from DT for bcma buses hosted on PCI cards.
Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 6715208d
...@@ -136,17 +136,17 @@ static bool bcma_is_core_needed_early(u16 core_id) ...@@ -136,17 +136,17 @@ static bool bcma_is_core_needed_early(u16 core_id)
return false; return false;
} }
static struct device_node *bcma_of_find_child_device(struct platform_device *parent, static struct device_node *bcma_of_find_child_device(struct device *parent,
struct bcma_device *core) struct bcma_device *core)
{ {
struct device_node *node; struct device_node *node;
u64 size; u64 size;
const __be32 *reg; const __be32 *reg;
if (!parent || !parent->dev.of_node) if (!parent->of_node)
return NULL; return NULL;
for_each_child_of_node(parent->dev.of_node, node) { for_each_child_of_node(parent->of_node, node) {
reg = of_get_address(node, 0, &size, NULL); reg = of_get_address(node, 0, &size, NULL);
if (!reg) if (!reg)
continue; continue;
...@@ -156,7 +156,7 @@ static struct device_node *bcma_of_find_child_device(struct platform_device *par ...@@ -156,7 +156,7 @@ static struct device_node *bcma_of_find_child_device(struct platform_device *par
return NULL; return NULL;
} }
static int bcma_of_irq_parse(struct platform_device *parent, static int bcma_of_irq_parse(struct device *parent,
struct bcma_device *core, struct bcma_device *core,
struct of_phandle_args *out_irq, int num) struct of_phandle_args *out_irq, int num)
{ {
...@@ -169,7 +169,7 @@ static int bcma_of_irq_parse(struct platform_device *parent, ...@@ -169,7 +169,7 @@ static int bcma_of_irq_parse(struct platform_device *parent,
return rc; return rc;
} }
out_irq->np = parent->dev.of_node; out_irq->np = parent->of_node;
out_irq->args_count = 1; out_irq->args_count = 1;
out_irq->args[0] = num; out_irq->args[0] = num;
...@@ -177,13 +177,13 @@ static int bcma_of_irq_parse(struct platform_device *parent, ...@@ -177,13 +177,13 @@ static int bcma_of_irq_parse(struct platform_device *parent,
return of_irq_parse_raw(laddr, out_irq); return of_irq_parse_raw(laddr, out_irq);
} }
static unsigned int bcma_of_get_irq(struct platform_device *parent, static unsigned int bcma_of_get_irq(struct device *parent,
struct bcma_device *core, int num) struct bcma_device *core, int num)
{ {
struct of_phandle_args out_irq; struct of_phandle_args out_irq;
int ret; int ret;
if (!IS_ENABLED(CONFIG_OF_IRQ) || !parent || !parent->dev.of_node) if (!IS_ENABLED(CONFIG_OF_IRQ) || !parent->of_node)
return 0; return 0;
ret = bcma_of_irq_parse(parent, core, &out_irq, num); ret = bcma_of_irq_parse(parent, core, &out_irq, num);
...@@ -196,7 +196,7 @@ static unsigned int bcma_of_get_irq(struct platform_device *parent, ...@@ -196,7 +196,7 @@ static unsigned int bcma_of_get_irq(struct platform_device *parent,
return irq_create_of_mapping(&out_irq); return irq_create_of_mapping(&out_irq);
} }
static void bcma_of_fill_device(struct platform_device *parent, static void bcma_of_fill_device(struct device *parent,
struct bcma_device *core) struct bcma_device *core)
{ {
struct device_node *node; struct device_node *node;
...@@ -227,7 +227,7 @@ unsigned int bcma_core_irq(struct bcma_device *core, int num) ...@@ -227,7 +227,7 @@ unsigned int bcma_core_irq(struct bcma_device *core, int num)
return mips_irq <= 4 ? mips_irq + 2 : 0; return mips_irq <= 4 ? mips_irq + 2 : 0;
} }
if (bus->host_pdev) if (bus->host_pdev)
return bcma_of_get_irq(bus->host_pdev, core, num); return bcma_of_get_irq(&bus->host_pdev->dev, core, num);
return 0; return 0;
case BCMA_HOSTTYPE_SDIO: case BCMA_HOSTTYPE_SDIO:
return 0; return 0;
...@@ -253,7 +253,8 @@ void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core) ...@@ -253,7 +253,8 @@ void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core)
if (IS_ENABLED(CONFIG_OF) && bus->host_pdev) { if (IS_ENABLED(CONFIG_OF) && bus->host_pdev) {
core->dma_dev = &bus->host_pdev->dev; core->dma_dev = &bus->host_pdev->dev;
core->dev.parent = &bus->host_pdev->dev; core->dev.parent = &bus->host_pdev->dev;
bcma_of_fill_device(bus->host_pdev, core); if (core->dev.parent)
bcma_of_fill_device(core->dev.parent, core);
} else { } else {
core->dev.dma_mask = &core->dev.coherent_dma_mask; core->dev.dma_mask = &core->dev.coherent_dma_mask;
core->dma_dev = &core->dev; core->dma_dev = &core->dev;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment