diff options
Diffstat (limited to 'arch/ppc/syslib')
-rw-r--r-- | arch/ppc/syslib/Makefile | 1 | ||||
-rw-r--r-- | arch/ppc/syslib/ppc85xx_setup.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile index 96acf85800d4..6e7ecbc59aac 100644 --- a/arch/ppc/syslib/Makefile +++ b/arch/ppc/syslib/Makefile | |||
@@ -107,6 +107,7 @@ obj-$(CONFIG_83xx) += ipic.o ppc83xx_setup.o ppc_sys.o \ | |||
107 | ifeq ($(CONFIG_83xx),y) | 107 | ifeq ($(CONFIG_83xx),y) |
108 | obj-$(CONFIG_PCI) += indirect_pci.o pci_auto.o | 108 | obj-$(CONFIG_PCI) += indirect_pci.o pci_auto.o |
109 | endif | 109 | endif |
110 | obj-$(CONFIG_MPC8548_CDS) += todc_time.o | ||
110 | obj-$(CONFIG_MPC8555_CDS) += todc_time.o | 111 | obj-$(CONFIG_MPC8555_CDS) += todc_time.o |
111 | obj-$(CONFIG_PPC_MPC52xx) += mpc52xx_setup.o mpc52xx_pic.o \ | 112 | obj-$(CONFIG_PPC_MPC52xx) += mpc52xx_setup.o mpc52xx_pic.o \ |
112 | mpc52xx_sys.o mpc52xx_devices.o ppc_sys.o | 113 | mpc52xx_sys.o mpc52xx_devices.o ppc_sys.o |
diff --git a/arch/ppc/syslib/ppc85xx_setup.c b/arch/ppc/syslib/ppc85xx_setup.c index f3277f469e78..455473f589d1 100644 --- a/arch/ppc/syslib/ppc85xx_setup.c +++ b/arch/ppc/syslib/ppc85xx_setup.c | |||
@@ -133,7 +133,7 @@ mpc85xx_halt(void) | |||
133 | 133 | ||
134 | #ifdef CONFIG_PCI | 134 | #ifdef CONFIG_PCI |
135 | 135 | ||
136 | #if defined(CONFIG_MPC8555_CDS) | 136 | #if defined(CONFIG_MPC8555_CDS) || defined(CONFIG_MPC8548_CDS) |
137 | extern void mpc85xx_cds_enable_via(struct pci_controller *hose); | 137 | extern void mpc85xx_cds_enable_via(struct pci_controller *hose); |
138 | extern void mpc85xx_cds_fixup_via(struct pci_controller *hose); | 138 | extern void mpc85xx_cds_fixup_via(struct pci_controller *hose); |
139 | #endif | 139 | #endif |
@@ -308,14 +308,14 @@ mpc85xx_setup_hose(void) | |||
308 | 308 | ||
309 | ppc_md.pci_exclude_device = mpc85xx_exclude_device; | 309 | ppc_md.pci_exclude_device = mpc85xx_exclude_device; |
310 | 310 | ||
311 | #if defined(CONFIG_MPC8555_CDS) | 311 | #if defined(CONFIG_MPC8555_CDS) || defined(CONFIG_MPC8548_CDS) |
312 | /* Pre pciauto_bus_scan VIA init */ | 312 | /* Pre pciauto_bus_scan VIA init */ |
313 | mpc85xx_cds_enable_via(hose_a); | 313 | mpc85xx_cds_enable_via(hose_a); |
314 | #endif | 314 | #endif |
315 | 315 | ||
316 | hose_a->last_busno = pciauto_bus_scan(hose_a, hose_a->first_busno); | 316 | hose_a->last_busno = pciauto_bus_scan(hose_a, hose_a->first_busno); |
317 | 317 | ||
318 | #if defined(CONFIG_MPC8555_CDS) | 318 | #if defined(CONFIG_MPC8555_CDS) || defined(CONFIG_MPC8548_CDS) |
319 | /* Post pciauto_bus_scan VIA fixup */ | 319 | /* Post pciauto_bus_scan VIA fixup */ |
320 | mpc85xx_cds_fixup_via(hose_a); | 320 | mpc85xx_cds_fixup_via(hose_a); |
321 | #endif | 321 | #endif |