Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cb7b2af authored by Paul Mackerras's avatar Paul Mackerras
Browse files

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



Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent d3f67fbb

arch/powerpc/platforms/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -10,3 +10,4 @@ obj-$(CONFIG_4xx) += 4xx/ 
obj-$(CONFIG_85xx)		+= 85xx/

obj-$(CONFIG_PPC_PSERIES)	+= pseries/

obj-$(CONFIG_PPC_ISERIES)	+= iseries/

obj-$(CONFIG_PPC_MAPLE)		+= maple/

arch/powerpc/platforms/maple/Makefile

0 → 100644
+1 −0
Original line number Diff line number Diff line 
obj-y	+= setup.o pci.o time.o

arch/powerpc/platforms/maple/maple.h

0 → 100644
+12 −0
Original line number Diff line number Diff line 
/*

 * Declarations for maple-specific code.

 *

 * Maple is the name of a PPC970 evaluation board.

 */

extern int maple_set_rtc_time(struct rtc_time *tm);

extern void maple_get_rtc_time(struct rtc_time *tm);

extern unsigned long maple_get_boot_time(void);

extern void maple_calibrate_decr(void);

extern void maple_pci_init(void);

extern void maple_pcibios_fixup(void);

extern int maple_pci_get_legacy_ide_irq(struct pci_dev *dev, int channel);

arch/ppc64/kernel/maple_pci.c→arch/powerpc/platforms/maple/pci.c

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 
#include <asm/iommu.h>

#include <asm/ppc-pci.h>



#include "maple.h"



#ifdef DEBUG

#define DBG(x...) printk(x)

#else

arch/ppc64/kernel/maple_setup.c→arch/powerpc/platforms/maple/setup.c

+3 −8
Original line number Diff line number Diff line 
/*

 *  arch/ppc64/kernel/maple_setup.c

 *  Maple (970 eval board) setup code

 *

 *  (c) Copyright 2004 Benjamin Herrenschmidt (benh@kernel.crashing.org),

 *                     IBM Corp.
@@ -62,19 +62,14 @@ 
#include <asm/mpic.h>

#include <asm/udbg.h>



#include "maple.h"



#ifdef DEBUG

#define DBG(fmt...) udbg_printf(fmt)

#else

#define DBG(fmt...)

#endif



extern int maple_set_rtc_time(struct rtc_time *tm);

extern void maple_get_rtc_time(struct rtc_time *tm);

extern unsigned long maple_get_boot_time(void);

extern void maple_calibrate_decr(void);

extern void maple_pci_init(void);

extern void maple_pcibios_fixup(void);

extern int maple_pci_get_legacy_ide_irq(struct pci_dev *dev, int channel);

extern void generic_find_legacy_serial_ports(u64 *physport,

		unsigned int *default_speed);