[ARM] 3816/1: iop3xx: rename config symbols

Rename CONFIG_ARCH_IOP321 to CONFIG_ARCH_IOP32X and
CONFIG_ARCH_IOP331 to CONFIG_ARCH_IOP33X.
Signed-off-by: NLennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

arch/arm/boot/compressed/head.S

@@ -42,7 +42,7 @@
 		add	\rb, \rb, #0x00010000	@ Ser1
 #endif
 		.endm
-#elif defined(CONFIG_ARCH_IOP331)
+#elif defined(CONFIG_ARCH_IOP33X)
 		.macro loadsp, rb
                 mov   	\rb, #0xff000000
                 orr     \rb, \rb, #0x00ff0000

arch/arm/configs/ep80219_defconfig

@@ -93,8 +93,8 @@ CONFIG_ARCH_IQ31244=y
 # CONFIG_ARCH_IQ80331 is not set
 # CONFIG_MACH_IQ80332 is not set
 CONFIG_ARCH_EP80219=y
-CONFIG_ARCH_IOP321=y
-# CONFIG_ARCH_IOP331 is not set
+CONFIG_ARCH_IOP32X=y
+# CONFIG_ARCH_IOP33X is not set
 
 #
 # IOP3xx Chipset Features

arch/arm/configs/iq31244_defconfig

@@ -94,8 +94,8 @@ CONFIG_ARCH_IQ31244=y
 # CONFIG_ARCH_IQ80331 is not set
 # CONFIG_MACH_IQ80332 is not set
 # CONFIG_ARCH_EP80219 is not set
-CONFIG_ARCH_IOP321=y
-# CONFIG_ARCH_IOP331 is not set
+CONFIG_ARCH_IOP32X=y
+# CONFIG_ARCH_IOP33X is not set
 
 #
 # IOP3xx Chipset Features

arch/arm/configs/iq80321_defconfig

@@ -93,8 +93,8 @@ CONFIG_ARCH_IQ80321=y
 # CONFIG_ARCH_IQ80331 is not set
 # CONFIG_MACH_IQ80332 is not set
 # CONFIG_ARCH_EP80219 is not set
-CONFIG_ARCH_IOP321=y
-# CONFIG_ARCH_IOP331 is not set
+CONFIG_ARCH_IOP32X=y
+# CONFIG_ARCH_IOP33X is not set
 
 #
 # IOP3xx Chipset Features

arch/arm/configs/iq80331_defconfig

@@ -93,7 +93,7 @@ CONFIG_ARCH_IOP3XX=y
 CONFIG_ARCH_IQ80331=y
 # CONFIG_MACH_IQ80332 is not set
 # CONFIG_ARCH_EP80219 is not set
-CONFIG_ARCH_IOP331=y
+CONFIG_ARCH_IOP33X=y
 
 #
 # IOP3xx Chipset Features

arch/arm/configs/iq80332_defconfig

@@ -93,7 +93,7 @@ CONFIG_ARCH_IOP3XX=y
 # CONFIG_ARCH_IQ80331 is not set
 CONFIG_MACH_IQ80332=y
 # CONFIG_ARCH_EP80219 is not set
-CONFIG_ARCH_IOP331=y
+CONFIG_ARCH_IOP33X=y
 
 #
 # IOP3xx Chipset Features

arch/arm/mach-iop3xx/Kconfig

@@ -6,48 +6,48 @@ comment "IOP3xx Platform Types"
 
 config ARCH_IQ80321
 	bool "Enable support for IQ80321"
-	select ARCH_IOP321
+	select ARCH_IOP32X
 	help
 	  Say Y here if you want to run your kernel on the Intel IQ80321
 	  evaluation kit for the IOP321 chipset.
 
 config ARCH_IQ31244
 	bool "Enable support for IQ31244"
-	select ARCH_IOP321
+	select ARCH_IOP32X
 	help
 	  Say Y here if you want to run your kernel on the Intel IQ31244
 	  evaluation kit for the IOP321 chipset.
 
 config ARCH_IQ80331
 	bool "Enable support for IQ80331"
-	select ARCH_IOP331
+	select ARCH_IOP33X
 	help
 	  Say Y here if you want to run your kernel on the Intel IQ80331
 	  evaluation kit for the IOP331 chipset.
 
 config MACH_IQ80332
 	bool "Enable support for IQ80332"
-	select ARCH_IOP331
+	select ARCH_IOP33X
 	help
 	  Say Y here if you want to run your kernel on the Intel IQ80332
 	  evaluation kit for the IOP332 chipset.
 
 config ARCH_EP80219
 	bool "Enable support for EP80219"
-	select ARCH_IOP321
+	select ARCH_IOP32X
 	select ARCH_IQ31244
 	help
 	  Say Y here if you want to run your kernel on the Intel EP80219
 	  evaluation kit for the Intel 80219 chipset (a IOP321 variant).
 
 # Which IOP variant are we running?
-config ARCH_IOP321
+config ARCH_IOP32X
 	bool
 	help
 	  The IQ80321 uses the IOP321 variant.
 	  The IQ31244 and EP80219 uses the IOP321 variant.
 
-config ARCH_IOP331
+config ARCH_IOP33X
 	bool
 	default ARCH_IQ80331
 	help
@@ -57,7 +57,7 @@ comment "IOP3xx Chipset Features"
 
 config IOP331_STEPD
 	bool "Chip stepping D of the IOP80331 processor or IOP80333"
-	depends on (ARCH_IOP331)
+	depends on ARCH_IOP33X
 	help
 	  Say Y here if you have StepD of the IOP80331 or IOP8033
 	  based platforms.

arch/arm/mach-iop3xx/Makefile

@@ -10,9 +10,9 @@ obj-m			:=
 obj-n			:=
 obj-			:=
 
-obj-$(CONFIG_ARCH_IOP321)  += iop321-setup.o iop321-irq.o iop321-pci.o iop321-time.o
+obj-$(CONFIG_ARCH_IOP32X)  += iop321-setup.o iop321-irq.o iop321-pci.o iop321-time.o
 
-obj-$(CONFIG_ARCH_IOP331)  += iop331-setup.o iop331-irq.o iop331-pci.o iop331-time.o
+obj-$(CONFIG_ARCH_IOP33X)  += iop331-setup.o iop331-irq.o iop331-pci.o iop331-time.o
 
 obj-$(CONFIG_ARCH_IQ80321) += iq80321-mm.o iq80321-pci.o
 

arch/arm/mach-iop3xx/Makefile.boot

    zreladdr-y	:= 0xa0008000
 params_phys-y	:= 0xa0000100
 initrd_phys-y	:= 0xa0800000
-ifeq ($(CONFIG_ARCH_IOP331),y)
+ifeq ($(CONFIG_ARCH_IOP33X),y)
    zreladdr-y	:= 0x00008000
 params_phys-y	:= 0x00000100
 initrd_phys-y	:= 0x00800000

arch/arm/mach-iop3xx/iop331-setup.c

@@ -177,7 +177,7 @@ void __init iop331_map_io(void)
 	iotable_init(iop331_std_desc, ARRAY_SIZE(iop331_std_desc));
 }
 
-#ifdef CONFIG_ARCH_IOP331
+#ifdef CONFIG_ARCH_IOP33X
 extern void iop331_init_irq(void);
 extern struct sys_timer iop331_timer;
 #endif

arch/arm/oprofile/op_model_xscale.c

@@ -36,10 +36,10 @@
 #ifdef CONFIG_ARCH_IOP310
 #define XSCALE_PMU_IRQ  IRQ_XS80200_PMU
 #endif
-#ifdef CONFIG_ARCH_IOP321
+#ifdef CONFIG_ARCH_IOP32X
 #define XSCALE_PMU_IRQ  IRQ_IOP321_CORE_PMU
 #endif
-#ifdef CONFIG_ARCH_IOP331
+#ifdef CONFIG_ARCH_IOP33X
 #define XSCALE_PMU_IRQ  IRQ_IOP331_CORE_PMU
 #endif
 #ifdef CONFIG_ARCH_PXA

drivers/i2c/busses/i2c-iop3xx.c

@@ -82,9 +82,9 @@ iop3xx_i2c_enable(struct i2c_algo_iop3xx_data *iop3xx_adap)
 
 	/* 
 	 * Every time unit enable is asserted, GPOD needs to be cleared
-	 * on IOP321 to avoid data corruption on the bus.
+	 * on IOP32X to avoid data corruption on the bus.
 	 */
-#ifdef CONFIG_ARCH_IOP321
+#ifdef CONFIG_ARCH_IOP32X
 #define IOP321_GPOD_I2C0    0x00c0  /* clear these bits to enable ch0 */
 #define IOP321_GPOD_I2C1    0x0030  /* clear these bits to enable ch1 */
 

include/asm-arm/arch-iop3xx/debug-macro.S

@@ -15,7 +15,7 @@
 		mov	\rx, #0xfe000000	@ physical
 #if defined(CONFIG_ARCH_IQ80321) || defined(CONFIG_ARCH_IQ31244)
 		orr	\rx, \rx, #0x00800000	@ location of the UART
-#elif defined(CONFIG_ARCH_IOP331)
+#elif defined(CONFIG_ARCH_IOP33X)
 		mrc	p15, 0, \rx, c1, c0
 		tst	\rx, #1			@ MMU enabled?
 		moveq	\rx, #0x000fe000	@ Physical Base

include/asm-arm/arch-iop3xx/entry-macro.S

@@ -9,7 +9,7 @@
  */
 #include <asm/arch/irqs.h>
 
-#if defined(CONFIG_ARCH_IOP321)
+#if defined(CONFIG_ARCH_IOP32X)
 		.macro  disable_fiq
 		.endm
 
@@ -28,7 +28,7 @@
 1001:
 		.endm
 
-#elif defined(CONFIG_ARCH_IOP331)
+#elif defined(CONFIG_ARCH_IOP33X)
 		.macro  disable_fiq
 		.endm
 

include/asm-arm/arch-iop3xx/iop321.h

@@ -21,7 +21,7 @@
  * IOP3xx variants but behave slightly differently on each.
  */
 #ifndef __ASSEMBLY__
-#ifdef	CONFIG_ARCH_IOP321
+#ifdef	CONFIG_ARCH_IOP32X
 #define iop_is_321() (((processor_id & 0xfffff5e0) == 0x69052420))
 #else
 #define	iop_is_321()	0

include/asm-arm/arch-iop3xx/iop331.h

@@ -20,7 +20,7 @@
  * IOP3xx variants but behave slightly differently on each.
  */
 #ifndef __ASSEMBLY__
-#ifdef	CONFIG_ARCH_IOP331
+#ifdef	CONFIG_ARCH_IOP33X
 /*#define	iop_is_331()	((processor_id & 0xffffffb0) == 0x69054090) */
 #define	iop_is_331()	((processor_id & 0xffffff30) == 0x69054010)
 #else
@@ -257,7 +257,7 @@
 #define IOP331_TU_TISR    (volatile u32 *)IOP331_REG_ADDR(0x000007E8)
 #define IOP331_TU_WDTCR   (volatile u32 *)IOP331_REG_ADDR(0x000007EC)
 
-#if defined(CONFIG_ARCH_IOP331)
+#if defined(CONFIG_ARCH_IOP33X)
 #define	IOP331_TICK_RATE	266000000	/* 266 MHz IB clock */
 #endif
 

include/asm-arm/arch-iop3xx/irqs.h

@@ -12,10 +12,10 @@
 /*
  * Chipset-specific bits
  */
-#ifdef CONFIG_ARCH_IOP321
+#ifdef CONFIG_ARCH_IOP32X
 #include "iop321-irqs.h"
 #endif
 
-#ifdef CONFIG_ARCH_IOP331
+#ifdef CONFIG_ARCH_IOP33X
 #include "iop331-irqs.h"
 #endif

include/asm-arm/arch-iop3xx/memory.h

@@ -10,7 +10,7 @@
 /*
  * Physical DRAM offset.
  */
-#ifndef CONFIG_ARCH_IOP331
+#ifndef CONFIG_ARCH_IOP33X
 #define PHYS_OFFSET	UL(0xa0000000)
 #else
 #define PHYS_OFFSET	UL(0x00000000)
@@ -23,12 +23,12 @@
  * bus_to_virt: Used to convert an address for DMA operations
  *		to an address that the kernel can use.
  */
-#if defined(CONFIG_ARCH_IOP321)
+#if defined(CONFIG_ARCH_IOP32X)
 
 #define __virt_to_bus(x)	(((__virt_to_phys(x)) & ~(*IOP321_IATVR2)) | ((*IOP321_IABAR2) & 0xfffffff0))
 #define __bus_to_virt(x)    (__phys_to_virt(((x) & ~(*IOP321_IALR2)) | ( *IOP321_IATVR2)))
 
-#elif defined(CONFIG_ARCH_IOP331)
+#elif defined(CONFIG_ARCH_IOP33X)
 
 #define __virt_to_bus(x)	(((__virt_to_phys(x)) & ~(*IOP331_IATVR2)) | ((*IOP331_IABAR2) & 0xfffffff0))
 #define __bus_to_virt(x)    (__phys_to_virt(((x) & ~(*IOP331_IALR2)) | ( *IOP331_IATVR2)))

include/asm-arm/arch-iop3xx/system.h

@@ -16,11 +16,11 @@ static inline void arch_idle(void)
 
 static inline void arch_reset(char mode)
 {
-#ifdef CONFIG_ARCH_IOP321
+#ifdef CONFIG_ARCH_IOP32X
     *IOP321_PCSR = 0x30;
 #endif
 
-#ifdef CONFIG_ARCH_IOP331
+#ifdef CONFIG_ARCH_IOP33X
     *IOP331_PCSR = 0x30;
 #endif
 

include/asm-arm/arch-iop3xx/uncompress.h

@@ -6,9 +6,9 @@
 #include <linux/serial_reg.h>
 #include <asm/hardware.h>
 
-#ifdef CONFIG_ARCH_IOP321
+#ifdef CONFIG_ARCH_IOP32X
 #define UTYPE unsigned char *
-#elif defined(CONFIG_ARCH_IOP331)
+#elif defined(CONFIG_ARCH_IOP33X)
 #define UTYPE u32 *
 #else
 #error "Missing IOP3xx arch type def"