[SPARC64]: Use in-kernel PROM tree for EBUS and ISA.
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -199,7 +199,7 @@ static int __init sparcspkr_init(void)
|
||||
|
||||
for_each_ebus(ebus) {
|
||||
for_each_ebusdev(edev, ebus) {
|
||||
if (!strcmp(edev->prom_name, "beep")) {
|
||||
if (!strcmp(edev->prom_node->name, "beep")) {
|
||||
beep_name = "Sparc EBUS Speaker";
|
||||
beep_event = ebus_spkr_event;
|
||||
beep_iobase = edev->resource[0].start;
|
||||
@@ -213,7 +213,7 @@ static int __init sparcspkr_init(void)
|
||||
/* A hack, the beep device's base lives in
|
||||
* the DMA isa node.
|
||||
*/
|
||||
if (!strcmp(isa_dev->prom_name, "dma")) {
|
||||
if (!strcmp(isa_dev->prom_node->name, "dma")) {
|
||||
beep_name = "Sparc ISA Speaker";
|
||||
beep_event = isa_spkr_event,
|
||||
beep_iobase = isa_dev->resource.start;
|
||||
|
||||
@@ -74,7 +74,7 @@ static int __init i8042_platform_init(void)
|
||||
|
||||
for_each_ebus(ebus) {
|
||||
for_each_ebusdev(edev, ebus) {
|
||||
if (!strcmp(edev->prom_name, "8042"))
|
||||
if (!strcmp(edev->prom_node->name, "8042"))
|
||||
goto edev_found;
|
||||
}
|
||||
}
|
||||
@@ -82,14 +82,14 @@ static int __init i8042_platform_init(void)
|
||||
|
||||
edev_found:
|
||||
for_each_edevchild(edev, child) {
|
||||
if (!strcmp(child->prom_name, OBP_PS2KBD_NAME1) ||
|
||||
!strcmp(child->prom_name, OBP_PS2KBD_NAME2)) {
|
||||
if (!strcmp(child->prom_node->name, OBP_PS2KBD_NAME1) ||
|
||||
!strcmp(child->prom_node->name, OBP_PS2KBD_NAME2)) {
|
||||
i8042_kbd_irq = child->irqs[0];
|
||||
kbd_iobase =
|
||||
ioremap(child->resource[0].start, 8);
|
||||
}
|
||||
if (!strcmp(child->prom_name, OBP_PS2MS_NAME1) ||
|
||||
!strcmp(child->prom_name, OBP_PS2MS_NAME2))
|
||||
if (!strcmp(child->prom_node->name, OBP_PS2MS_NAME1) ||
|
||||
!strcmp(child->prom_node->name, OBP_PS2MS_NAME2))
|
||||
i8042_aux_irq = child->irqs[0];
|
||||
}
|
||||
if (i8042_kbd_irq == -1 ||
|
||||
|
||||
Reference in New Issue
Block a user