diff options
author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2008-06-11 19:04:17 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2008-07-16 18:57:42 -0400 |
commit | 52ddd1cdc923802b224b15ba75000c6c5668227f (patch) | |
tree | caaa3e7faa4bf01b1bd7aaa56f2e86e4a1593b1e /arch/powerpc/platforms/85xx | |
parent | 00c5372d37a78990c1530184a9c792ee60a30067 (diff) |
powerpc/85xx/86xx: some refactoring for fsl_uli1575 code
- Get rid of uses_fsl_uli_m1575, it does not scale for all cases.
Instead, let's explicitly use machine_is() for each fixup.
- Factor out MPC8610HPCD quirks to fsl_uli1575, and protect them with
machine_is(). One step closer to multiplatform kernels.
- Actually use fsl_uli1575 on MPC8610HPCD, so RTC quirk will be applied.
- RTC quirk applies to all boards though, so no machine_is() checks.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/85xx')
-rw-r--r-- | arch/powerpc/platforms/85xx/mpc85xx_ds.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c index 25f41cd2d33a..00c535806647 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c | |||
@@ -115,7 +115,6 @@ void __init mpc85xx_ds_pic_init(void) | |||
115 | 115 | ||
116 | #ifdef CONFIG_PCI | 116 | #ifdef CONFIG_PCI |
117 | static int primary_phb_addr; | 117 | static int primary_phb_addr; |
118 | extern int uses_fsl_uli_m1575; | ||
119 | extern int uli_exclude_device(struct pci_controller *hose, | 118 | extern int uli_exclude_device(struct pci_controller *hose, |
120 | u_char bus, u_char devfn); | 119 | u_char bus, u_char devfn); |
121 | 120 | ||
@@ -161,7 +160,6 @@ static void __init mpc85xx_ds_setup_arch(void) | |||
161 | } | 160 | } |
162 | } | 161 | } |
163 | 162 | ||
164 | uses_fsl_uli_m1575 = 1; | ||
165 | ppc_md.pci_exclude_device = mpc85xx_exclude_device; | 163 | ppc_md.pci_exclude_device = mpc85xx_exclude_device; |
166 | #endif | 164 | #endif |
167 | 165 | ||