add mpc83xx.h to powerpc include proper
Subsystems (2)
RFC PATCH 2/2 add mpc83xx.h to powerpc include proper
add mpc83xx.h to powerpc include proper, rm defines in board header files replaced by the dt. This completes 83xx transition to ARCH=powerpc.
Signed-off-by Scott Wood <[email protected]>
Signed-off-by Kim Phillips <[email protected]>
--- arch/powerpc/platforms/83xx/mpc834x_itx.h | 5 ----- arch/powerpc/platforms/83xx/mpc834x_sys.h | 7 +------ include/asm-powerpc/mpc83xx.h | 30 +++++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 11 deletions(-)
arch/powerpc/platforms/83xx/mpc834x_itx.h +0 -5
@@ -15,9 +15,4 @@#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.h +1 -6
@@ -1,5 +1,5 @@/* -* arch/powerppc/platforms/83xx/mpc834x_sys.h +* arch/powerpc/platforms/83xx/mpc834x_sys.h * * MPC834X SYS common board definitions *
@@ -15,9 +15,4 @@#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__ */
include/asm-powerpc/mpc83xx.h new file +30 -0
@@ -0,0 +1,30 @@ +/* +* include/asm-powerpc/mpc83xx.h +* +* MPC83xx definitions +* +* Maintainer: Kumar Gala <[email protected]> +* +* Copyright 2005 Freescale Semiconductor, Inc +* +* 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. +*/ + +#ifdef __KERNEL__ +#ifndef __ASM_MPC83xx_H__ +#define __ASM_MPC83xx_H__ + +#include <asm/mmu.h> + +#ifdef CONFIG_83xx + +#ifdef CONFIG_MPC834x_SYS +#include <platforms/83xx/mpc834x_sys.h> +#endif + +#endif /* CONFIG_83xx */ +#endif /* __ASM_MPC83xx_H__ */ +#endif /* __KERNEL__ */
Signature · 1 line
1.4.2.1
Quoted 1 line · Kim Phillips
add
mpc83xx.hto powerpc include proper, rm defines in board header files replaced by the dt. This completes 83xx transition to ARCH=powerpc.
Can we get ride of mpc83xx.h. I don't believe its needed and if it is we need to work on removing it before I'm ok with this change.
- k
Quoted 86 lines
Signed-off-by Scott Wood <[email protected]>Signed-off-by Kim Phillips <[email protected]>--- arch/powerpc/platforms/83xx/mpc834x_itx.h | 5 ----- arch/powerpc/platforms/83xx/mpc834x_sys.h | 7 +------ include/asm-powerpc/mpc83xx.h | 30 ++++++++++++++++++ +++++++++++ 3 files changed, 31 insertions(+), 11 deletions(-)arch/powerpc/platforms/83xx/mpc834x_itx.h +0
-5@@ -15,9 +15,4 @@#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.h +1
-6@@ -1,5 +1,5 @@/* -* arch/powerppc/platforms/83xx/mpc834x_sys.h +* arch/powerpc/platforms/83xx/mpc834x_sys.h * * MPC834X SYS common board definitions * @@ -15,9 +15,4 @@#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__ */ include/asm-powerpc/mpc83xx.h new file +10
-0@@ -0,0 +1,30 @@ +/* +* include/asm-powerpc/mpc83xx.h +* +* MPC83xx definitions +* +* Maintainer: Kumar Gala <[email protected]> +* +* Copyright 2005 Freescale Semiconductor, Inc +* +* 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.
+ */include/asm-powerpc/mpc83xx.h new file +16
-0+ +#ifdef __KERNEL__ +#ifndef __ASM_MPC83xx_H__ +#define __ASM_MPC83xx_H__ + +#include <asm/mmu.h> + +#ifdef CONFIG_83xx + +#ifdef CONFIG_MPC834x_SYS +#include <platforms/83xx/mpc834x_sys.h> +#endif + +#endif /* CONFIG_83xx */ +#endif /* __ASM_MPC83xx_H__ */ +#endif /* __KERNEL__ */ Signature · 1 line
1.4.2.1