leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/85xx: clean up for mpc8568_mds name

Browse Source 
Keep an unique machine def for the MPC8568 MDS board to handle some
subtle differences between the future MDS board. Also set the bcsrs in
setup_arch() only for mpc8568_mds because other mds has different bcsr
settings.

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Haiying Wang 2009-04-29 14:14:33 -04:00 committed by Kumar Gala
parent 1e76dff22c
commit ea5130dcb4
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/powerpc/platforms/85xx/mpc85xx_mds.c
View File

@ -206,6 +206,7 @@ static void __init mpc85xx_mds_setup_arch(void)
} }
if (bcsr_regs) { if (bcsr_regs) {
if (machine_is(mpc8568_mds)) {
#define BCSR_UCC1_GETH_EN (0x1 << 7) #define BCSR_UCC1_GETH_EN (0x1 << 7)
#define BCSR_UCC2_GETH_EN (0x1 << 7) #define BCSR_UCC2_GETH_EN (0x1 << 7)
#define BCSR_UCC1_MODE_MSK (0x3 << 4) #define BCSR_UCC1_MODE_MSK (0x3 << 4)
@ -222,7 +223,7 @@ static void __init mpc85xx_mds_setup_arch(void)
/* Turn UCC1 & UCC2 on */ /* Turn UCC1 & UCC2 on */
setbits8(&bcsr_regs[8], BCSR_UCC1_GETH_EN); setbits8(&bcsr_regs[8], BCSR_UCC1_GETH_EN);
setbits8(&bcsr_regs[9], BCSR_UCC2_GETH_EN); setbits8(&bcsr_regs[9], BCSR_UCC2_GETH_EN);
}
iounmap(bcsr_regs); iounmap(bcsr_regs);
} }
#endif /* CONFIG_QUICC_ENGINE */ #endif /* CONFIG_QUICC_ENGINE */
@ -257,7 +258,7 @@ static int __init board_fixups(void)
return 0; return 0;
} }
machine_arch_initcall(mpc85xx_mds, board_fixups); machine_arch_initcall(mpc8568_mds, board_fixups);
static struct of_device_id mpc85xx_ids[] = { static struct of_device_id mpc85xx_ids[] = {
{ .type = "soc", }, { .type = "soc", },
@ -276,7 +277,7 @@ static int __init mpc85xx_publish_devices(void)
return 0; return 0;
} }
machine_device_initcall(mpc85xx_mds, mpc85xx_publish_devices); machine_device_initcall(mpc8568_mds, mpc85xx_publish_devices);
static void __init mpc85xx_mds_pic_init(void) static void __init mpc85xx_mds_pic_init(void)
{ {
@ -321,8 +322,8 @@ static int __init mpc85xx_mds_probe(void)
return of_flat_dt_is_compatible(root, "MPC85xxMDS"); return of_flat_dt_is_compatible(root, "MPC85xxMDS");
} }
define_machine(mpc85xx_mds) { define_machine(mpc8568_mds) {
.name = "MPC85xx MDS", .name = "MPC8568 MDS",
.probe = mpc85xx_mds_probe, .probe = mpc85xx_mds_probe,
.setup_arch = mpc85xx_mds_setup_arch, .setup_arch = mpc85xx_mds_setup_arch,
.init_IRQ = mpc85xx_mds_pic_init, .init_IRQ = mpc85xx_mds_pic_init,