[ARM] 4151/1: AT91 / AVR32: Move at91_pdc.h to linux/atmel_pdc.h

The Atmel AT91 and AVR32 processor architectures share many of the same peripherals. The PDC (Peripheral Data Controller) registers are also implemented within in a number of the on-chip peripherals (eg, USART, MMC, SPI, SSC, etc). In a attempt not to duplicate the register definitions in each peripheral, or in each architecture, the at91_pdc.h header in asm-arm/arch-at91 and asm-avr32/arch-at32ap has been replaced with linux/atmel_pdc.h. The definitions have also been renamed from AT91_PDC_* to ATMEL_PDC_*, and the drivers updated accordingly. Original patch from Nicolas Ferre. Signed-off-by: Andrew Victor <andrew@sanpeople.com> Acked-by: Haavard Skinnemoen <hskinnemoen@atmel.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
author: Andrew Victor <andrew@sanpeople.com> 2007-02-08 05:31:22 -0500
committer: Russell King <rmk+kernel@arm.linux.org.uk> 2007-02-08 10:13:47 -0500
commit: 93a3ddc201c501146c896d598deb61f3abbe4ab0 (patch)
tree: e7c257729461f9ce8a26c3a5f50bd88a2aa8ee36 /include
parent: da11d02c1da201840b94147d3366a32b41b151e1 (diff)
3 files changed, 36 insertions, 72 deletions
diff --git a/include/asm-arm/arch-at91/at91_pdc.h b/include/asm-arm/arch-at91/at91_pdc.h
deleted file mode 100644
index a54adf52c65d..000000000000
--- a/include/asm-arm/arch-at91/at91_pdc.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * include/asm-arm/arch-at91/at91_pdc.h
- *
- * Copyright (C) 2005 Ivan Kokshaysky
- * Copyright (C) SAN People
- *
- * Peripheral Data Controller (PDC) registers.
- * Based on AT91RM9200 datasheet revision E.
- *
- * 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.
- */
-#ifndef AT91_PDC_H
-#define AT91_PDC_H
-#define AT91_PDC_RPR            0x100   /* Receive Pointer Register */
-#define AT91_PDC_RCR            0x104   /* Receive Counter Register */
-#define AT91_PDC_TPR            0x108   /* Transmit Pointer Register */
-#define AT91_PDC_TCR            0x10c   /* Transmit Counter Register */
-#define AT91_PDC_RNPR           0x110   /* Receive Next Pointer Register */
-#define AT91_PDC_RNCR           0x114   /* Receive Next Counter Register */
-#define AT91_PDC_TNPR           0x118   /* Transmit Next Pointer Register */
-#define AT91_PDC_TNCR           0x11c   /* Transmit Next Counter Register */
-#define AT91_PDC_PTCR           0x120   /* Transfer Control Register */
-#define         AT91_PDC_RXTEN          (1 << 0)        /* Receiver Transfer Enable */
-#define         AT91_PDC_RXTDIS         (1 << 1)        /* Receiver Transfer Disable */
-#define         AT91_PDC_TXTEN          (1 << 8)        /* Transmitter Transfer Enable */
-#define         AT91_PDC_TXTDIS         (1 << 9)        /* Transmitter Transfer Disable */
-#define AT91_PDC_PTSR           0x124   /* Transfer Status Register */
-#endif
diff --git a/include/asm-avr32/arch-at32ap/at91_pdc.h b/include/asm-avr32/arch-at32ap/at91_pdc.h
deleted file mode 100644
index a54adf52c65d..000000000000
--- a/include/asm-avr32/arch-at32ap/at91_pdc.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * include/asm-arm/arch-at91/at91_pdc.h
- *
- * Copyright (C) 2005 Ivan Kokshaysky
- * Copyright (C) SAN People
- *
- * Peripheral Data Controller (PDC) registers.
- * Based on AT91RM9200 datasheet revision E.
- *
- * 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.
- */
-#ifndef AT91_PDC_H
-#define AT91_PDC_H
-#define AT91_PDC_RPR            0x100   /* Receive Pointer Register */
-#define AT91_PDC_RCR            0x104   /* Receive Counter Register */
-#define AT91_PDC_TPR            0x108   /* Transmit Pointer Register */
-#define AT91_PDC_TCR            0x10c   /* Transmit Counter Register */
-#define AT91_PDC_RNPR           0x110   /* Receive Next Pointer Register */
-#define AT91_PDC_RNCR           0x114   /* Receive Next Counter Register */
-#define AT91_PDC_TNPR           0x118   /* Transmit Next Pointer Register */
-#define AT91_PDC_TNCR           0x11c   /* Transmit Next Counter Register */
-#define AT91_PDC_PTCR           0x120   /* Transfer Control Register */
-#define         AT91_PDC_RXTEN          (1 << 0)        /* Receiver Transfer Enable */
-#define         AT91_PDC_RXTDIS         (1 << 1)        /* Receiver Transfer Disable */
-#define         AT91_PDC_TXTEN          (1 << 8)        /* Transmitter Transfer Enable */
-#define         AT91_PDC_TXTDIS         (1 << 9)        /* Transmitter Transfer Disable */
-#define AT91_PDC_PTSR           0x124   /* Transfer Status Register */
-#endif
diff --git a/include/linux/atmel_pdc.h b/include/linux/atmel_pdc.h
new file mode 100644
index 000000000000..5058a31d2ce8
--- /dev/null
+++ b/include/linux/atmel_pdc.h
@@ -0,0 +1,36 @@
+/*
+ * include/linux/atmel_pdc.h
+ *
+ * Copyright (C) 2005 Ivan Kokshaysky
+ * Copyright (C) SAN People
+ *
+ * Peripheral Data Controller (PDC) registers.
+ * Based on AT91RM9200 datasheet revision E.
+ *
+ * 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.
+ */
+#ifndef ATMEL_PDC_H
+#define ATMEL_PDC_H
+#define ATMEL_PDC_RPR           0x100   /* Receive Pointer Register */
+#define ATMEL_PDC_RCR           0x104   /* Receive Counter Register */
+#define ATMEL_PDC_TPR           0x108   /* Transmit Pointer Register */
+#define ATMEL_PDC_TCR           0x10c   /* Transmit Counter Register */
+#define ATMEL_PDC_RNPR          0x110   /* Receive Next Pointer Register */
+#define ATMEL_PDC_RNCR          0x114   /* Receive Next Counter Register */
+#define ATMEL_PDC_TNPR          0x118   /* Transmit Next Pointer Register */
+#define ATMEL_PDC_TNCR          0x11c   /* Transmit Next Counter Register */
+#define ATMEL_PDC_PTCR          0x120   /* Transfer Control Register */
+#define         ATMEL_PDC_RXTEN         (1 << 0)        /* Receiver Transfer Enable */
+#define         ATMEL_PDC_RXTDIS        (1 << 1)        /* Receiver Transfer Disable */
+#define         ATMEL_PDC_TXTEN         (1 << 8)        /* Transmitter Transfer Enable */
+#define         ATMEL_PDC_TXTDIS        (1 << 9)        /* Transmitter Transfer Disable */
+#define ATMEL_PDC_PTSR          0x124   /* Transfer Status Register */
+#endif
author	Andrew Victor <andrew@sanpeople.com>	2007-02-08 05:31:22 -0500
committer	Russell King <rmk+kernel@arm.linux.org.uk>	2007-02-08 10:13:47 -0500
commit	93a3ddc201c501146c896d598deb61f3abbe4ab0 (patch)
tree	e7c257729461f9ce8a26c3a5f50bd88a2aa8ee36 /include
parent	da11d02c1da201840b94147d3366a32b41b151e1 (diff)

diff --git a/include/asm-arm/arch-at91/at91_pdc.h b/include/asm-arm/arch-at91/at91_pdc.h deleted file mode 100644 index a54adf52c65d..000000000000 --- a/include/asm-arm/arch-at91/at91_pdc.h +++ /dev/null
@@ -1,36 +0,0 @@
1	/*
2	* include/asm-arm/arch-at91/at91_pdc.h
3	*
4	* Copyright (C) 2005 Ivan Kokshaysky
5	* Copyright (C) SAN People
6	*
7	* Peripheral Data Controller (PDC) registers.
8	* Based on AT91RM9200 datasheet revision E.
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 as published by
12	* the Free Software Foundation; either version 2 of the License, or
13	* (at your option) any later version.
14	*/
15
16	#ifndef AT91_PDC_H
17	#define AT91_PDC_H
18
19	#define AT91_PDC_RPR 0x100 /* Receive Pointer Register */
20	#define AT91_PDC_RCR 0x104 /* Receive Counter Register */
21	#define AT91_PDC_TPR 0x108 /* Transmit Pointer Register */
22	#define AT91_PDC_TCR 0x10c /* Transmit Counter Register */
23	#define AT91_PDC_RNPR 0x110 /* Receive Next Pointer Register */
24	#define AT91_PDC_RNCR 0x114 /* Receive Next Counter Register */
25	#define AT91_PDC_TNPR 0x118 /* Transmit Next Pointer Register */
26	#define AT91_PDC_TNCR 0x11c /* Transmit Next Counter Register */
27
28	#define AT91_PDC_PTCR 0x120 /* Transfer Control Register */
29	#define AT91_PDC_RXTEN (1 << 0) /* Receiver Transfer Enable */
30	#define AT91_PDC_RXTDIS (1 << 1) /* Receiver Transfer Disable */
31	#define AT91_PDC_TXTEN (1 << 8) /* Transmitter Transfer Enable */
32	#define AT91_PDC_TXTDIS (1 << 9) /* Transmitter Transfer Disable */
33
34	#define AT91_PDC_PTSR 0x124 /* Transfer Status Register */
35
36	#endif


diff --git a/include/asm-avr32/arch-at32ap/at91_pdc.h b/include/asm-avr32/arch-at32ap/at91_pdc.h deleted file mode 100644 index a54adf52c65d..000000000000 --- a/include/asm-avr32/arch-at32ap/at91_pdc.h +++ /dev/null
@@ -1,36 +0,0 @@
1	/*
2	* include/asm-arm/arch-at91/at91_pdc.h
3	*
4	* Copyright (C) 2005 Ivan Kokshaysky
5	* Copyright (C) SAN People
6	*
7	* Peripheral Data Controller (PDC) registers.
8	* Based on AT91RM9200 datasheet revision E.
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 as published by
12	* the Free Software Foundation; either version 2 of the License, or
13	* (at your option) any later version.
14	*/
15
16	#ifndef AT91_PDC_H
17	#define AT91_PDC_H
18
19	#define AT91_PDC_RPR 0x100 /* Receive Pointer Register */
20	#define AT91_PDC_RCR 0x104 /* Receive Counter Register */
21	#define AT91_PDC_TPR 0x108 /* Transmit Pointer Register */
22	#define AT91_PDC_TCR 0x10c /* Transmit Counter Register */
23	#define AT91_PDC_RNPR 0x110 /* Receive Next Pointer Register */
24	#define AT91_PDC_RNCR 0x114 /* Receive Next Counter Register */
25	#define AT91_PDC_TNPR 0x118 /* Transmit Next Pointer Register */
26	#define AT91_PDC_TNCR 0x11c /* Transmit Next Counter Register */
27
28	#define AT91_PDC_PTCR 0x120 /* Transfer Control Register */
29	#define AT91_PDC_RXTEN (1 << 0) /* Receiver Transfer Enable */
30	#define AT91_PDC_RXTDIS (1 << 1) /* Receiver Transfer Disable */
31	#define AT91_PDC_TXTEN (1 << 8) /* Transmitter Transfer Enable */
32	#define AT91_PDC_TXTDIS (1 << 9) /* Transmitter Transfer Disable */
33
34	#define AT91_PDC_PTSR 0x124 /* Transfer Status Register */
35
36	#endif


diff --git a/include/linux/atmel_pdc.h b/include/linux/atmel_pdc.h new file mode 100644 index 000000000000..5058a31d2ce8 --- /dev/null +++ b/include/linux/atmel_pdc.h
@@ -0,0 +1,36 @@
		1	/*
		2	* include/linux/atmel_pdc.h
		3	*
		4	* Copyright (C) 2005 Ivan Kokshaysky
		5	* Copyright (C) SAN People
		6	*
		7	* Peripheral Data Controller (PDC) registers.
		8	* Based on AT91RM9200 datasheet revision E.
		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 as published by
		12	* the Free Software Foundation; either version 2 of the License, or
		13	* (at your option) any later version.
		14	*/
		15
		16	#ifndef ATMEL_PDC_H
		17	#define ATMEL_PDC_H
		18
		19	#define ATMEL_PDC_RPR 0x100 /* Receive Pointer Register */
		20	#define ATMEL_PDC_RCR 0x104 /* Receive Counter Register */
		21	#define ATMEL_PDC_TPR 0x108 /* Transmit Pointer Register */
		22	#define ATMEL_PDC_TCR 0x10c /* Transmit Counter Register */
		23	#define ATMEL_PDC_RNPR 0x110 /* Receive Next Pointer Register */
		24	#define ATMEL_PDC_RNCR 0x114 /* Receive Next Counter Register */
		25	#define ATMEL_PDC_TNPR 0x118 /* Transmit Next Pointer Register */
		26	#define ATMEL_PDC_TNCR 0x11c /* Transmit Next Counter Register */
		27
		28	#define ATMEL_PDC_PTCR 0x120 /* Transfer Control Register */
		29	#define ATMEL_PDC_RXTEN (1 << 0) /* Receiver Transfer Enable */
		30	#define ATMEL_PDC_RXTDIS (1 << 1) /* Receiver Transfer Disable */
		31	#define ATMEL_PDC_TXTEN (1 << 8) /* Transmitter Transfer Enable */
		32	#define ATMEL_PDC_TXTDIS (1 << 9) /* Transmitter Transfer Disable */
		33
		34	#define ATMEL_PDC_PTSR 0x124 /* Transfer Status Register */
		35
		36	#endif