Skip to contentSkip to conversation

powerpc: consolidate mpc83xx platform files

PATCH In review Kim Phillips 2 participants 2 messages Dec 19, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc: consolidate mpc83xx platform files

Eliminate platforms/83xx code redundancy. Common mpc83xx code cleaned up and merged into setup.c. Each board maintains its own machine definition and corresponding probe fn in its own file. Kconfig modified to allow for multiple board selection in a single kernel image.

The loops_per_jiffy assignment is removed since udelay now uses the timebase.

---
exactly the same as last time, minus the publish_devices call (see next patch) also, rtc code removal is pending ds1374 support in rtc_class (832xMDS has ds1374)

 arch/powerpc/platforms/83xx/Kconfig       |    6 -
 arch/powerpc/platforms/83xx/Makefile      |    2 +-
 arch/powerpc/platforms/83xx/mpc832x_mds.c |  176 +----------------------------
 arch/powerpc/platforms/83xx/mpc832x_mds.h |   19 ---
 arch/powerpc/platforms/83xx/mpc834x_itx.c |   92 +++------------
 arch/powerpc/platforms/83xx/mpc834x_itx.h |   23 ----
 arch/powerpc/platforms/83xx/mpc834x_sys.c |  111 +++---------------
 arch/powerpc/platforms/83xx/mpc834x_sys.h |   23 ----
 arch/powerpc/platforms/83xx/mpc8360e_pb.c |  175 +----------------------------
 arch/powerpc/platforms/83xx/mpc83xx.h     |    2 +
 arch/powerpc/platforms/83xx/setup.c       |  167 +++++++++++++++++++++++++++
 11 files changed, 210 insertions(+), 586 deletions(-)
arch/powerpc/platforms/83xx/Kconfig +0 -6
index edcd5b8..c236dff 100644
@@ -1,10 +1,6 @@
 menu "Platform support"
 	depends on PPC_83xx
 
-choice
-	prompt "Machine Type"
-	default MPC834x_SYS
-
 config MPC832x_MDS
 	bool "Freescale MPC832x MDS"
 	select DEFAULT_UIMAGE
@@ -39,8 +35,6 @@ config MPC8360E_PB
 	help
 	  This option enables support for the MPC836x EMDS Processor Board.
 
-endchoice
-
 config PPC_MPC832x
 	bool
 	select PPC_UDBG_16550
arch/powerpc/platforms/83xx/Makefile +1 -1
index f1aa7e2..07db146 100644
@@ -1,7 +1,7 @@
 #
 # Makefile for the PowerPC 83xx linux kernel.
 #
-obj-y				:= misc.o
+obj-y				:= setup.o misc.o
 obj-$(CONFIG_PCI)		+= pci.o
 obj-$(CONFIG_MPC834x_SYS)	+= mpc834x_sys.o
 obj-$(CONFIG_MPC834x_ITX)	+= mpc834x_itx.o
arch/powerpc/platforms/83xx/mpc832x_mds.c +3 -173

202 lines not on this page · raw message

arch/powerpc/platforms/83xx/mpc832x_mds.h deleted +0 -19
deleted file mode 100644
index a495889..0000000
@@ -1,19 +0,0 @@
-/*
- * Copyright (C) Freescale Semicondutor, Inc. 2006. All rights reserved.
- *
- * Description:
- * MPC832x MDS board specific header.
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- */
-
-#ifndef __MACH_MPC832x_MDS_H__
-#define __MACH_MPC832x_MDS_H__
-
-extern u8 *get_bcsr(void);
-
-#endif				/* __MACH_MPC832x_MDS_H__ */
arch/powerpc/platforms/83xx/mpc834x_itx.c +17 -75

121 lines not on this page · raw message

arch/powerpc/platforms/83xx/mpc834x_itx.h deleted +0 -23
deleted file mode 100644
index 174ca4e..0000000
@@ -1,23 +0,0 @@
-/*
- * arch/powerpc/platforms/83xx/mpc834x_itx.h
- *
- * MPC834X ITX common board definitions
- *
- * Maintainer: Kumar Gala <[email protected]>
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- */
-
-#ifndef __MACH_MPC83XX_ITX_H__
-#define __MACH_MPC83XX_ITX_H__
-
-#define PIRQA	MPC83xx_IRQ_EXT4
-#define PIRQB	MPC83xx_IRQ_EXT5
-#define PIRQC	MPC83xx_IRQ_EXT6
-#define PIRQD	MPC83xx_IRQ_EXT7
-
-#endif				/* __MACH_MPC83XX_ITX_H__ */
arch/powerpc/platforms/83xx/mpc834x_sys.c +17 -94

139 lines not on this page · raw message

arch/powerpc/platforms/83xx/mpc834x_sys.h deleted +0 -23
deleted file mode 100644
index 7d5bbef..0000000
@@ -1,23 +0,0 @@
-/*
- * arch/powerpc/platforms/83xx/mpc834x_sys.h
- *
- * MPC834X SYS common board definitions
- *
- * Maintainer: Kumar Gala <[email protected]>
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- */
-
-#ifndef __MACH_MPC83XX_SYS_H__
-#define __MACH_MPC83XX_SYS_H__
-
-#define PIRQA	MPC83xx_IRQ_EXT4
-#define PIRQB	MPC83xx_IRQ_EXT5
-#define PIRQC	MPC83xx_IRQ_EXT6
-#define PIRQD	MPC83xx_IRQ_EXT7
-
-#endif				/* __MACH_MPC83XX_SYS_H__ */
arch/powerpc/platforms/83xx/mpc8360e_pb.c +3 -172

199 lines not on this page · raw message

arch/powerpc/platforms/83xx/mpc83xx.h +2 -0
index 01cae10..7419db4 100644
@@ -13,5 +13,7 @@ extern int add_bridge(struct device_node
 extern int mpc83xx_exclude_device(u_char bus, u_char devfn);
 extern void mpc83xx_restart(char *cmd);
 extern long mpc83xx_time_init(void);
+extern void __init mpc83xx_setup_arch(void);
+extern void __init mpc83xx_init_IRQ(void);
 
 #endif				/* __MPC83XX_H__ */
arch/powerpc/platforms/83xx/setup.c new file +167 -0

167 lines not on this page · raw message

Signature · 1 line
1.4.4
#1 lore raw
Quoted 5 lines · Kim Phillips
arch/powerpc/platforms/83xx/setup.c new file +0 -0
new file mode 100644
index 0000000..6177581

<snip>

arch/powerpc/platforms/83xx/setup.c line 66

Quoted 8 lines
arch/powerpc/platforms/83xx/setup.c new file +8 -0
+
+static u8 __iomem *bcsr_regs = NULL;
+
+u8 *get_bcsr(void)
+{
+	return bcsr_regs;
+}
+

Sorry for rehashing this, but BCSR is a Freescale-only thing. While I realize it's something you guys put on all of your evaluation boards, I doubt anybody else does. It's a tiny amount of code, but does it belong in the common file?

regards,
Ben