Skip to contentSkip to conversation

pxa: rename pxa930 to pxa9xx

PATCH New Haojian Zhuang 1 participant 1 message Mar 12, 2010

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

PATCH 1/1 pxa: rename pxa930 to pxa9xx

Since lots of components are similar among pxa930, pxa935 and pxa950. Rename pxa930 to pxa9xx for compatible reason.

---
 arch/arm/mach-pxa/Makefile              |    4 +-
 arch/arm/mach-pxa/include/mach/pxa930.h |    8 --
 arch/arm/mach-pxa/include/mach/pxa9xx.h |    8 ++
 arch/arm/mach-pxa/pxa930.c              |  206 -------------------------------
 arch/arm/mach-pxa/pxa9xx.c              |  206 +++++++++++++++++++++++++++++++
 arch/arm/mach-pxa/saar.c                |    2 +-
 arch/arm/mach-pxa/tavorevb.c            |    2 +-
 7 files changed, 219 insertions(+), 217 deletions(-)
 delete mode 100644 arch/arm/mach-pxa/include/mach/pxa930.h
 create mode 100644 arch/arm/mach-pxa/include/mach/pxa9xx.h
 delete mode 100644 arch/arm/mach-pxa/pxa930.c
 create mode 100644 arch/arm/mach-pxa/pxa9xx.c
arch/arm/mach-pxa/Makefile +3 -1
index 86bc87b..af932b1 100644
@@ -22,7 +22,9 @@ obj-$(CONFIG_PXA27x)		+= mfp-pxa2xx.o pxa2xx.o pxa27x.o
 obj-$(CONFIG_PXA3xx)		+= mfp-pxa3xx.o pxa3xx.o smemc.o
 obj-$(CONFIG_CPU_PXA300)	+= pxa300.o
 obj-$(CONFIG_CPU_PXA320)	+= pxa320.o
-obj-$(CONFIG_CPU_PXA930)	+= pxa930.o
+obj-$(CONFIG_CPU_PXA930)	+= pxa9xx.o
+obj-$(CONFIG_CPU_PXA935)	+= pxa9xx.o
+obj-$(CONFIG_CPU_PXA950)	+= pxa9xx.o
 
 # NOTE: keep the order of boards in accordance to their order in Kconfig
 
(quoted diff) +0 -0

b/arch/arm/mach-pxa/include/mach/pxa930.h
deleted file mode 100644
index 7851ec5..0000000

arch/arm/mach-pxa/include/mach/pxa930.h deleted +0 -8
@@ -1,8 +0,0 @@
-#ifndef __MACH_PXA930_H
-#define __MACH_PXA930_H
-
-#include <mach/hardware.h>
-#include <mach/pxa3xx-regs.h>
-#include <mach/mfp-pxa9xx.h>
-
-#endif /* __MACH_PXA930_H */
(quoted diff) +0 -0

b/arch/arm/mach-pxa/include/mach/pxa9xx.h
new file mode 100644
index 0000000..c97fdc3

arch/arm/mach-pxa/include/mach/pxa9xx.h new file +8 -0
@@ -0,0 +1,8 @@
+#ifndef __MACH_PXA9XX_H
+#define __MACH_PXA9XX_H
+
+#include <mach/hardware.h>
+#include <mach/pxa3xx-regs.h>
+#include <mach/mfp-pxa9xx.h>
+
+#endif /* __MACH_PXA9XX_H */
arch/arm/mach-pxa/pxa930.c deleted +0 -206

206 lines not on this page · raw message

arch/arm/mach-pxa/pxa9xx.c new file +206 -0

206 lines not on this page · raw message

arch/arm/mach-pxa/saar.c +1 -1
index 115b6f2..f2793db 100644
@@ -30,7 +30,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
 
-#include <mach/pxa930.h>
+#include <mach/pxa9xx.h>
 #include <plat/i2c.h>
 #include <mach/pxafb.h>
 
arch/arm/mach-pxa/tavorevb.c +1 -1
index f02dcb5..37190f5 100644
@@ -23,7 +23,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
-#include <mach/pxa930.h>
+#include <mach/pxa9xx.h>
 #include <mach/pxafb.h>
 #include <mach/pxa27x_keypad.h>
 
Signature · 1 line
1.5.6.5