Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 292555
b: refs/heads/master
c: 6886780
h: refs/heads/master
i:
  292553: d2fb66e
  292551: b82323f
v: v3
  • Loading branch information
Zhicheng Fan authored and Kumar Gala committed Mar 16, 2012
1 parent a986096 commit ab1ef17
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 465aceb832fb54b342a098143dbdc1e1ae250416
refs/heads/master: 6886780abf8e3e059da822ed7066c449726e2f0c
22 changes: 22 additions & 0 deletions trunk/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ machine_device_initcall(p2020_rdb, mpc85xx_common_publish_devices);
machine_device_initcall(p2020_rdb_pc, mpc85xx_common_publish_devices);
machine_device_initcall(p1020_rdb, mpc85xx_common_publish_devices);
machine_device_initcall(p1021_rdb_pc, mpc85xx_common_publish_devices);
machine_device_initcall(p1025_rdb, mpc85xx_common_publish_devices);

/*
* Called very early, device-tree isn't unflattened
Expand Down Expand Up @@ -131,6 +132,13 @@ static int __init p2020_rdb_pc_probe(void)
return 0;
}

static int __init p1025_rdb_probe(void)
{
unsigned long root = of_get_flat_dt_root();

return of_flat_dt_is_compatible(root, "fsl,P1025RDB");
}

define_machine(p2020_rdb) {
.name = "P2020 RDB",
.probe = p2020_rdb_probe,
Expand Down Expand Up @@ -186,3 +194,17 @@ define_machine(p2020_rdb_pc) {
.calibrate_decr = generic_calibrate_decr,
.progress = udbg_progress,
};

define_machine(p1025_rdb) {
.name = "P1025 RDB",
.probe = p1025_rdb_probe,
.setup_arch = mpc85xx_rdb_setup_arch,
.init_IRQ = mpc85xx_rdb_pic_init,
#ifdef CONFIG_PCI
.pcibios_fixup_bus = fsl_pcibios_fixup_bus,
#endif
.get_irq = mpic_get_irq,
.restart = fsl_rstcr_restart,
.calibrate_decr = generic_calibrate_decr,
.progress = udbg_progress,
};

0 comments on commit ab1ef17

Please sign in to comment.