8a95bc8dfe
Commit 46d026ac ("powerpc/85xx: consolidate of_platform_bus_probe calls")
replaced platform-specific of_device_id tables with a single function
that probes the most of the busses in 85xx device trees. If a specific
platform needed additional busses probed, then it could call
of_platform_bus_probe() again. Typically, the additional platform-specific
busses are children of existing busses that have already been probed.
of_platform_bus_probe() does not handle those child busses automatically.
Unfortunately, this doesn't actually work. The second (platform-specific)
call to of_platform_bus_probe() never finds any of the busses it's asked
to find.
To remedy this, the platform-specific of_device_id tables are eliminated,
and their entries are merged into mpc85xx_common_ids[], so that all busses
are probed at once.
Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
72 lines
1.7 KiB
C
72 lines
1.7 KiB
C
/*
|
|
* Routines common to most mpc85xx-based boards.
|
|
*
|
|
* This is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
#include <linux/of_platform.h>
|
|
|
|
#include <sysdev/cpm2_pic.h>
|
|
|
|
#include "mpc85xx.h"
|
|
|
|
static struct of_device_id __initdata mpc85xx_common_ids[] = {
|
|
{ .type = "soc", },
|
|
{ .compatible = "soc", },
|
|
{ .compatible = "simple-bus", },
|
|
{ .name = "cpm", },
|
|
{ .name = "localbus", },
|
|
{ .compatible = "gianfar", },
|
|
{ .compatible = "fsl,qe", },
|
|
{ .compatible = "fsl,cpm2", },
|
|
{ .compatible = "fsl,srio", },
|
|
/* So that the DMA channel nodes can be probed individually: */
|
|
{ .compatible = "fsl,eloplus-dma", },
|
|
/* For the PMC driver */
|
|
{ .compatible = "fsl,mpc8548-guts", },
|
|
/* Probably unnecessary? */
|
|
{ .compatible = "gpio-leds", },
|
|
{},
|
|
};
|
|
|
|
int __init mpc85xx_common_publish_devices(void)
|
|
{
|
|
return of_platform_bus_probe(NULL, mpc85xx_common_ids, NULL);
|
|
}
|
|
#ifdef CONFIG_CPM2
|
|
static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
|
|
{
|
|
struct irq_chip *chip = irq_desc_get_chip(desc);
|
|
int cascade_irq;
|
|
|
|
while ((cascade_irq = cpm2_get_irq()) >= 0)
|
|
generic_handle_irq(cascade_irq);
|
|
|
|
chip->irq_eoi(&desc->irq_data);
|
|
}
|
|
|
|
|
|
void __init mpc85xx_cpm2_pic_init(void)
|
|
{
|
|
struct device_node *np;
|
|
int irq;
|
|
|
|
/* Setup CPM2 PIC */
|
|
np = of_find_compatible_node(NULL, NULL, "fsl,cpm2-pic");
|
|
if (np == NULL) {
|
|
printk(KERN_ERR "PIC init: can not find fsl,cpm2-pic node\n");
|
|
return;
|
|
}
|
|
irq = irq_of_parse_and_map(np, 0);
|
|
if (irq == NO_IRQ) {
|
|
of_node_put(np);
|
|
printk(KERN_ERR "PIC init: got no IRQ for cpm cascade\n");
|
|
return;
|
|
}
|
|
|
|
cpm2_pic_init(np);
|
|
of_node_put(np);
|
|
irq_set_chained_handler(irq, cpm2_cascade);
|
|
}
|
|
#endif
|