[PATCH] powerpc: Make Virtex-II Pro support generic for all Virtex devices

The PPC405 hard core is used in both the Virtex-II Pro and Virtex 4 FX
FPGAs.  This patch cleans up the Virtex naming convention to reflect more
than just the Virtex-II Pro.

Rename files virtex-ii_pro.[ch] to virtex.[ch]
Rename config value VIRTEX_II_PRO to XILINX_VIRTEX

Signed-off-by: Grant C. Likely <grant.likely@secretlab.ca>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/ppc/platforms/4xx/Kconfig b/arch/ppc/platforms/4xx/Kconfig
index d8837911bbc6a473d90ae22d3c1c04f38dc90e3c..203abab32cc32864c53b64e516e3dca74a02d4d2 100644 (file)
--- a/arch/ppc/platforms/4xx/Kconfig
+++ b/arch/ppc/platforms/4xx/Kconfig
@@ -208,11 +208,16 @@ config 405GPR
        depends on SYCAMORE
        default y
 
-config VIRTEX_II_PRO
+config XILINX_VIRTEX_II_PRO
        bool
        depends on XILINX_ML300
        default y
 
+config XILINX_VIRTEX
+       bool
+       depends on XILINX_VIRTEX_II_PRO
+       default y
+
 config STB03xxx
        bool
        depends on REDWOOD_5 || REDWOOD_6

diff --git a/arch/ppc/platforms/4xx/Makefile b/arch/ppc/platforms/4xx/Makefile
index c9bb6117095477144a43f26487a338536e0f683a..be4163c8afe71506814ed5a545cc8aba6a24019b 100644 (file)
--- a/arch/ppc/platforms/4xx/Makefile
+++ b/arch/ppc/platforms/4xx/Makefile
@@ -26,4 +26,4 @@ obj-$(CONFIG_440SP)           += ibm440sp.o
 obj-$(CONFIG_440SPE)           += ppc440spe.o
 obj-$(CONFIG_405EP)            += ibm405ep.o
 obj-$(CONFIG_405GPR)           += ibm405gpr.o
-obj-$(CONFIG_VIRTEX_II_PRO)    += virtex-ii_pro.o
+obj-$(CONFIG_XILINX_VIRTEX)    += virtex.o

diff --git a/arch/ppc/platforms/4xx/virtex-ii_pro.c b/arch/ppc/platforms/4xx/virtex.c
similarity index 95%
rename from arch/ppc/platforms/4xx/virtex-ii_pro.c
rename to arch/ppc/platforms/4xx/virtex.c
index 097cc9d5aca09ce5b51e9a022d88f49ee42275ed..bbb12c0c0b2c42b5fa8c64fcaa8a18f83abc3209 100644 (file)
--- a/arch/ppc/platforms/4xx/virtex-ii_pro.c
+++ b/arch/ppc/platforms/4xx/virtex.c
@@ -1,5 +1,5 @@
 /*
- * arch/ppc/platforms/4xx/virtex-ii_pro.c
+ * arch/ppc/platforms/4xx/virtex.c
  *
  * Author: MontaVista Software, Inc.
  *         source@mvista.com
@@ -12,7 +12,7 @@
 #include <linux/config.h>
 #include <linux/init.h>
 #include <asm/ocp.h>
-#include "virtex-ii_pro.h"
+#include <platforms/4xx/virtex.h>
 
 /* Have OCP take care of the serial ports. */
 struct ocp_def core_ocp[] = {

diff --git a/arch/ppc/platforms/4xx/virtex-ii_pro.h b/arch/ppc/platforms/4xx/virtex.h
similarity index 94%
rename from arch/ppc/platforms/4xx/virtex-ii_pro.h
rename to arch/ppc/platforms/4xx/virtex.h
index 026130c8e72a9c9d80f5b0a16fb73109518f9fee..049c767d33e7a682d70657527e187d9e7521be06 100644 (file)
--- a/arch/ppc/platforms/4xx/virtex-ii_pro.h
+++ b/arch/ppc/platforms/4xx/virtex.h
@@ -1,5 +1,5 @@
 /*
- * arch/ppc/platforms/4xx/virtex-ii_pro.h
+ * arch/ppc/platforms/4xx/virtex.h
  *
  * Include file that defines the Xilinx Virtex-II Pro processor
  *
@@ -12,8 +12,8 @@
  */
 
 #ifdef __KERNEL__
-#ifndef __ASM_VIRTEXIIPRO_H__
-#define __ASM_VIRTEXIIPRO_H__
+#ifndef __ASM_VIRTEX_H__
+#define __ASM_VIRTEX_H__
 
 #include <linux/config.h>
 #include <platforms/4xx/xparameters/xparameters.h>
@@ -95,5 +95,5 @@
 
 #include <asm/ibm405.h>
 
-#endif                         /* __ASM_VIRTEXIIPRO_H__ */
+#endif                         /* __ASM_VIRTEX_H__ */
 #endif                         /* __KERNEL__ */

diff --git a/arch/ppc/platforms/4xx/xilinx_ml300.c b/arch/ppc/platforms/4xx/xilinx_ml300.c
index 0b1b77d986bfd6b94d26f11a822179963281fe85..b0de0a2f131de428e291a9c250b68ff0d828e0bb 100644 (file)
--- a/arch/ppc/platforms/4xx/xilinx_ml300.c
+++ b/arch/ppc/platforms/4xx/xilinx_ml300.c
@@ -22,7 +22,7 @@
 #include <asm/machdep.h>
 #include <asm/ocp.h>
 
-#include <platforms/4xx/virtex-ii_pro.h>       /* for NR_SER_PORTS */
+#include <platforms/4xx/virtex.h>      /* for NR_SER_PORTS */
 
 /*
  * As an overview of how the following functions (platform_init,

diff --git a/arch/ppc/platforms/4xx/xilinx_ml300.h b/arch/ppc/platforms/4xx/xilinx_ml300.h
index f8c5884123364239b72fc4543e1e5e797f01ee17..899398143623bb5dbb6add9d172cc08e4d81998d 100644 (file)
--- a/arch/ppc/platforms/4xx/xilinx_ml300.h
+++ b/arch/ppc/platforms/4xx/xilinx_ml300.h
@@ -16,7 +16,7 @@
 #define __ASM_XILINX_ML300_H__
 
 /* ML300 has a Xilinx Virtex-II Pro processor */
-#include <platforms/4xx/virtex-ii_pro.h>
+#include <platforms/4xx/virtex.h>
 
 #ifndef __ASSEMBLY__
 

diff --git a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile
index 159dcd92a6d129ff8f4514a34c0331f4e6a356f7..6234ee57b31c8548afc46e7ee178ada72aad0f91 100644 (file)
--- a/arch/ppc/syslib/Makefile
+++ b/arch/ppc/syslib/Makefile
@@ -17,7 +17,7 @@ obj-$(CONFIG_440GX)           += ibm440gx_common.o
 obj-$(CONFIG_440SP)            += ibm440gx_common.o ibm440sp_common.o
 obj-$(CONFIG_440SPE)           += ibm440gx_common.o ibm440sp_common.o ppc440spe_pcie.o
 ifeq ($(CONFIG_4xx),y)
-ifeq ($(CONFIG_VIRTEX_II_PRO),y)
+ifeq ($(CONFIG_XILINX_VIRTEX),y)
 obj-$(CONFIG_40x)              += xilinx_pic.o
 else
 ifeq ($(CONFIG_403),y)