Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 292571
b: refs/heads/master
c: 7e6af14
h: refs/heads/master
i:
  292569: 179d9f5
  292567: 0344217
v: v3
  • Loading branch information
Zhicheng Fan authored and Kumar Gala committed Mar 16, 2012
1 parent d7b29d0 commit a9c2b82
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1a244b8318b5f67f9065362767409117609edc9a
refs/heads/master: 7e6af144781a3ae9dff142f44dc26e585cb41b82
24 changes: 23 additions & 1 deletion trunk/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* MPC85xx RDB Board Setup
*
* Copyright 2009 Freescale Semiconductor Inc.
* Copyright 2009,2012 Freescale Semiconductor Inc.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
Expand Down 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_mbg_pc, mpc85xx_common_publish_devices);
machine_device_initcall(p1020_rdb, mpc85xx_common_publish_devices);
machine_device_initcall(p1020_rdb_pc, mpc85xx_common_publish_devices);
machine_device_initcall(p1020_utm_pc, mpc85xx_common_publish_devices);
machine_device_initcall(p1021_rdb_pc, mpc85xx_common_publish_devices);
machine_device_initcall(p1025_rdb, mpc85xx_common_publish_devices);
Expand All @@ -116,6 +117,13 @@ static int __init p1020_rdb_probe(void)
return 0;
}

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

return of_flat_dt_is_compatible(root, "fsl,P1020RDB-PC");
}

static int __init p1021_rdb_pc_probe(void)
{
unsigned long root = of_get_flat_dt_root();
Expand Down Expand Up @@ -252,3 +260,17 @@ define_machine(p1020_utm_pc) {
.calibrate_decr = generic_calibrate_decr,
.progress = udbg_progress,
};

define_machine(p1020_rdb_pc) {
.name = "P1020RDB-PC",
.probe = p1020_rdb_pc_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 a9c2b82

Please sign in to comment.