tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

powerpc: Merge maple support code to arch/powerpc/platforms/maple

Signed-off-by: Paul Mackerras <paulus@samba.org>

Paul Mackerras 0cb7b2af d3f67fbb

+22 -10
+1
arch/powerpc/platforms/Makefile
··· 10 10 obj-$(CONFIG_85xx) += 85xx/ 11 11 obj-$(CONFIG_PPC_PSERIES) += pseries/ 12 12 obj-$(CONFIG_PPC_ISERIES) += iseries/ 13 + obj-$(CONFIG_PPC_MAPLE) += maple/
+1
arch/powerpc/platforms/maple/Makefile
··· 1 + obj-y += setup.o pci.o time.o
+12
arch/powerpc/platforms/maple/maple.h
··· 1 + /* 2 + * Declarations for maple-specific code. 3 + * 4 + * Maple is the name of a PPC970 evaluation board. 5 + */ 6 + extern int maple_set_rtc_time(struct rtc_time *tm); 7 + extern void maple_get_rtc_time(struct rtc_time *tm); 8 + extern unsigned long maple_get_boot_time(void); 9 + extern void maple_calibrate_decr(void); 10 + extern void maple_pci_init(void); 11 + extern void maple_pcibios_fixup(void); 12 + extern int maple_pci_get_legacy_ide_irq(struct pci_dev *dev, int channel);
+1 -2
arch/ppc64/kernel/Makefile
··· 55 55 56 56 obj-$(CONFIG_PPC_PMAC) += udbg_scc.o 57 57 58 - obj-$(CONFIG_PPC_MAPLE) += maple_setup.o maple_pci.o maple_time.o \ 59 - udbg_16550.o 58 + obj-$(CONFIG_PPC_MAPLE) += udbg_16550.o 60 59 61 60 ifdef CONFIG_SMP 62 61 obj-$(CONFIG_PPC_PMAC) += smp-tbsync.o
+2
arch/ppc64/kernel/maple_pci.c arch/powerpc/platforms/maple/pci.c
··· 25 25 #include <asm/iommu.h> 26 26 #include <asm/ppc-pci.h> 27 27 28 + #include "maple.h" 29 + 28 30 #ifdef DEBUG 29 31 #define DBG(x...) printk(x) 30 32 #else
+3 -8
arch/ppc64/kernel/maple_setup.c arch/powerpc/platforms/maple/setup.c
··· 1 1 /* 2 - * arch/ppc64/kernel/maple_setup.c 2 + * Maple (970 eval board) setup code 3 3 * 4 4 * (c) Copyright 2004 Benjamin Herrenschmidt (benh@kernel.crashing.org), 5 5 * IBM Corp. ··· 62 62 #include <asm/mpic.h> 63 63 #include <asm/udbg.h> 64 64 65 + #include "maple.h" 66 + 65 67 #ifdef DEBUG 66 68 #define DBG(fmt...) udbg_printf(fmt) 67 69 #else 68 70 #define DBG(fmt...) 69 71 #endif 70 72 71 - extern int maple_set_rtc_time(struct rtc_time *tm); 72 - extern void maple_get_rtc_time(struct rtc_time *tm); 73 - extern unsigned long maple_get_boot_time(void); 74 - extern void maple_calibrate_decr(void); 75 - extern void maple_pci_init(void); 76 - extern void maple_pcibios_fixup(void); 77 - extern int maple_pci_get_legacy_ide_irq(struct pci_dev *dev, int channel); 78 73 extern void generic_find_legacy_serial_ports(u64 *physport, 79 74 unsigned int *default_speed); 80 75
+2
arch/ppc64/kernel/maple_time.c arch/powerpc/platforms/maple/time.c
··· 36 36 #include <asm/machdep.h> 37 37 #include <asm/time.h> 38 38 39 + #include "maple.h" 40 + 39 41 #ifdef DEBUG 40 42 #define DBG(x...) printk(x) 41 43 #else