[RFC][PATCH 2/2] add mpc83xx.h to powerpc include proper

[RFC][PATCH 2/2] add mpc83xx.h to powerpc include proper

[Kim Phillips]

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 <scottwood@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>

---
 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(-)

diff --git a/arch/powerpc/platforms/83xx/mpc834x_itx.h b/arch/powerpc/platforms/83xx/mpc834x_itx.h
index 174ca4e..88932d2 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_itx.h
+++ b/arch/powerpc/platforms/83xx/mpc834x_itx.h
@@ -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__ */
diff --git a/arch/powerpc/platforms/83xx/mpc834x_sys.h b/arch/powerpc/platforms/83xx/mpc834x_sys.h
index fedecb7..8ec5f2f 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_sys.h
+++ b/arch/powerpc/platforms/83xx/mpc834x_sys.h
@@ -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__ */
diff --git a/include/asm-powerpc/mpc83xx.h b/include/asm-powerpc/mpc83xx.h
new file mode 100644
index 0000000..5773cba
--- /dev/null
+++ b/include/asm-powerpc/mpc83xx.h
@@ -0,0 +1,30 @@
+/*
+ * include/asm-powerpc/mpc83xx.h
+ *
+ * MPC83xx definitions
+ *
+ * Maintainer: Kumar Gala <galak@kernel.crashing.org>
+ *
+ * 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__ */
-- 
1.4.2.1

Re: [RFC][PATCH 2/2] add mpc83xx.h to powerpc include proper

[Kumar Gala]

On Sep 28, 2006, at 4:02 PM, Kim Phillips wrote:

> add mpc83xx.h to 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


> Signed-off-by: Scott Wood <scottwood@freescale.com>
> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
>
> ---
>  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(-)
>
> diff --git a/arch/powerpc/platforms/83xx/mpc834x_itx.h b/arch/ 
> powerpc/platforms/83xx/mpc834x_itx.h
> index 174ca4e..88932d2 100644
> --- a/arch/powerpc/platforms/83xx/mpc834x_itx.h
> +++ b/arch/powerpc/platforms/83xx/mpc834x_itx.h
> @@ -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__ */
> diff --git a/arch/powerpc/platforms/83xx/mpc834x_sys.h b/arch/ 
> powerpc/platforms/83xx/mpc834x_sys.h
> index fedecb7..8ec5f2f 100644
> --- a/arch/powerpc/platforms/83xx/mpc834x_sys.h
> +++ b/arch/powerpc/platforms/83xx/mpc834x_sys.h
> @@ -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__ */
> diff --git a/include/asm-powerpc/mpc83xx.h b/include/asm-powerpc/ 
> mpc83xx.h
> new file mode 100644
> index 0000000..5773cba
> --- /dev/null
> +++ b/include/asm-powerpc/mpc83xx.h
> @@ -0,0 +1,30 @@
> +/*
> + * include/asm-powerpc/mpc83xx.h
> + *
> + * MPC83xx definitions
> + *
> + * Maintainer: Kumar Gala <galak@kernel.crashing.org>
> + *
> + * 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__ */
> -- 
> 1.4.2.1