1 files changed, 0 insertions, 86 deletions
diff --git a/include/asm-arm/arch-iop32x/iop321.h b/include/asm-arm/arch-iop32x/iop321.h
deleted file mode 100644
index 1757222a4cad..000000000000
--- a/include/asm-arm/arch-iop32x/iop321.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * linux/include/asm/arch-iop32x/iop321.h
- *
- * Intel IOP321 Chip definitions
- *
- * Author: Rory Bolt <rorybolt@pacbell.net>
- * Copyright (C) 2002 Rory Bolt
- * Copyright (C) 2004 Intel Corp.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef _IOP321_HW_H_
-#define _IOP321_HW_H_
-/*
- * This is needed for mixed drivers that need to work on all
- * IOP3xx variants but behave slightly differently on each.
- */
-#ifndef __ASSEMBLY__
-#define iop_is_321()            1
-#endif
-/*
- * IOP321 chipset registers
- */
-#define IOP321_VIRT_MEM_BASE 0xfeffe000  /* chip virtual mem address*/
-#define IOP321_PHYS_MEM_BASE 0xffffe000  /* chip physical memory address */
-#define IOP321_REG_ADDR(reg) (IOP321_VIRT_MEM_BASE | (reg))
-/* Reserved 0x00000000 through 0x000000FF */
-/* Address Translation Unit 0x00000100 through 0x000001FF */
-/* Messaging Unit 0x00000300 through 0x000003FF */
-/* DMA Controller 0x00000400 through 0x000004FF */
-/* Memory controller 0x00000500 through 0x0005FF */
-/* Peripheral bus interface unit 0x00000680 through 0x0006FF */
-/* Peripheral performance monitoring unit 0x00000700 through 0x00077F */
-/* Internal arbitration unit 0x00000780 through 0x0007BF */
-#define IOP321_IACR     (volatile u32 *)IOP321_REG_ADDR(0x00000780)
-#define IOP321_MTTR1    (volatile u32 *)IOP321_REG_ADDR(0x00000784)
-#define IOP321_MTTR2    (volatile u32 *)IOP321_REG_ADDR(0x00000788)
-/* General Purpose I/O Registers */
-#define IOP321_GPOE       (volatile u32 *)IOP321_REG_ADDR(0x000007C4)
-#define IOP321_GPID       (volatile u32 *)IOP321_REG_ADDR(0x000007C8)
-#define IOP321_GPOD       (volatile u32 *)IOP321_REG_ADDR(0x000007CC)
-/* Interrupt Controller */
-#define IOP321_INTCTL     (volatile u32 *)IOP321_REG_ADDR(0x000007D0)
-#define IOP321_INTSTR     (volatile u32 *)IOP321_REG_ADDR(0x000007D4)
-#define IOP321_IINTSRC    (volatile u32 *)IOP321_REG_ADDR(0x000007D8)
-#define IOP321_FINTSRC    (volatile u32 *)IOP321_REG_ADDR(0x000007DC)
-/* Application accelerator unit 0x00000800 - 0x000008FF */
-/* SSP serial port unit 0x00001600 - 0x0000167F */
-/* I2C bus interface unit 0x00001680 - 0x000016FF */
-/* for I2C bit defs see drivers/i2c/i2c-iop3xx.h */
-/*
- * Peripherals that are shared between the iop32x and iop33x but
- * located at different addresses.
- */
-#define IOP3XX_GPIO_REG(reg)   (IOP3XX_PERIPHERAL_VIRT_BASE + 0x07c0 + (reg))
-#define IOP3XX_TIMER_REG(reg)  (IOP3XX_PERIPHERAL_VIRT_BASE + 0x07e0 + (reg))
-#include <asm/hardware/iop3xx.h>
-#ifndef __ASSEMBLY__
-extern void iop321_init_irq(void);
-extern void iop321_time_init(void);
-#endif
-#endif // _IOP321_HW_H_

diff --git a/include/asm-arm/arch-iop32x/iop321.h b/include/asm-arm/arch-iop32x/iop321.h deleted file mode 100644 index 1757222a4cad..000000000000 --- a/include/asm-arm/arch-iop32x/iop321.h +++ /dev/null
@@ -1,86 +0,0 @@
1	/*
2	* linux/include/asm/arch-iop32x/iop321.h
3	*
4	* Intel IOP321 Chip definitions
5	*
6	* Author: Rory Bolt <rorybolt@pacbell.net>
7	* Copyright (C) 2002 Rory Bolt
8	* Copyright (C) 2004 Intel Corp.
9	*
10	* This program is free software; you can redistribute it and/or modify
11	* it under the terms of the GNU General Public License version 2 as
12	* published by the Free Software Foundation.
13	*/
14
15	#ifndef _IOP321_HW_H_
16	#define _IOP321_HW_H_
17
18
19	/*
20	* This is needed for mixed drivers that need to work on all
21	* IOP3xx variants but behave slightly differently on each.
22	*/
23	#ifndef __ASSEMBLY__
24	#define iop_is_321() 1
25	#endif
26
27	/*
28	* IOP321 chipset registers
29	*/
30	#define IOP321_VIRT_MEM_BASE 0xfeffe000 /* chip virtual mem address*/
31	#define IOP321_PHYS_MEM_BASE 0xffffe000 /* chip physical memory address */
32	#define IOP321_REG_ADDR(reg) (IOP321_VIRT_MEM_BASE \| (reg))
33
34	/* Reserved 0x00000000 through 0x000000FF */
35
36	/* Address Translation Unit 0x00000100 through 0x000001FF */
37
38	/* Messaging Unit 0x00000300 through 0x000003FF */
39
40	/* DMA Controller 0x00000400 through 0x000004FF */
41
42	/* Memory controller 0x00000500 through 0x0005FF */
43
44	/* Peripheral bus interface unit 0x00000680 through 0x0006FF */
45
46	/* Peripheral performance monitoring unit 0x00000700 through 0x00077F */
47
48	/* Internal arbitration unit 0x00000780 through 0x0007BF */
49	#define IOP321_IACR (volatile u32 *)IOP321_REG_ADDR(0x00000780)
50	#define IOP321_MTTR1 (volatile u32 *)IOP321_REG_ADDR(0x00000784)
51	#define IOP321_MTTR2 (volatile u32 *)IOP321_REG_ADDR(0x00000788)
52
53	/* General Purpose I/O Registers */
54	#define IOP321_GPOE (volatile u32 *)IOP321_REG_ADDR(0x000007C4)
55	#define IOP321_GPID (volatile u32 *)IOP321_REG_ADDR(0x000007C8)
56	#define IOP321_GPOD (volatile u32 *)IOP321_REG_ADDR(0x000007CC)
57
58	/* Interrupt Controller */
59	#define IOP321_INTCTL (volatile u32 *)IOP321_REG_ADDR(0x000007D0)
60	#define IOP321_INTSTR (volatile u32 *)IOP321_REG_ADDR(0x000007D4)
61	#define IOP321_IINTSRC (volatile u32 *)IOP321_REG_ADDR(0x000007D8)
62	#define IOP321_FINTSRC (volatile u32 *)IOP321_REG_ADDR(0x000007DC)
63
64	/* Application accelerator unit 0x00000800 - 0x000008FF */
65
66	/* SSP serial port unit 0x00001600 - 0x0000167F */
67	/* I2C bus interface unit 0x00001680 - 0x000016FF */
68
69	/* for I2C bit defs see drivers/i2c/i2c-iop3xx.h */
70
71	/*
72	* Peripherals that are shared between the iop32x and iop33x but
73	* located at different addresses.
74	*/
75	#define IOP3XX_GPIO_REG(reg) (IOP3XX_PERIPHERAL_VIRT_BASE + 0x07c0 + (reg))
76	#define IOP3XX_TIMER_REG(reg) (IOP3XX_PERIPHERAL_VIRT_BASE + 0x07e0 + (reg))
77
78	#include <asm/hardware/iop3xx.h>
79
80
81	#ifndef __ASSEMBLY__
82	extern void iop321_init_irq(void);
83	extern void iop321_time_init(void);
84	#endif
85
86	#endif // _IOP321_HW_H_