Merge master.kernel.org:/home/rmk/linux-2.6-arm

author: Linus Torvalds <torvalds@ppc970.osdl.org> 2005-06-24 18:32:01 -0400
committer: Linus Torvalds <torvalds@ppc970.osdl.org> 2005-06-24 18:32:01 -0400
commit: f647a27417d2adc43d8c96d3d6f837422fbc076e (patch)
tree: 3cac5147575ba4cbd63cb8fa226b95e7886e1d7c /include
parent: 75043cb5b386e5a01fd03b88f647dd992de02f97 (diff)
parent: 2966207c7e5945947c4db3a48aa4fa819807c5be (diff)
6 files changed, 100 insertions, 42 deletions
diff --git a/include/asm-arm/arch-ixp2000/gpio.h b/include/asm-arm/arch-ixp2000/gpio.h
index 84634af5cc64..03cbbe1fd9d8 100644
--- a/include/asm-arm/arch-ixp2000/gpio.h
+++ b/include/asm-arm/arch-ixp2000/gpio.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-ixp2000/ixp2000-gpio.h
+ * include/asm-arm/arch-ixp2000/gpio.h
 *
 * Copyright (C) 2002 Intel Corporation.
 *
@@ -16,26 +16,18 @@
 * Use this instead of directly setting the GPIO registers.
 * GPIOs may also be used as GPIOs (e.g. for emulating i2c/smb)
 */
-#ifndef _ASM_ARCH_IXP2000_GPIO_H_
+#ifndef __ASM_ARCH_GPIO_H
-#define _ASM_ARCH_IXP2000_GPIO_H_
+#define __ASM_ARCH_GPIO_H
 #ifndef __ASSEMBLY__
-#define GPIO_OUT                        0x0
-#define GPIO_IN                         0x80
+#define GPIO_IN                         0
+#define GPIO_OUT                        1
 #define IXP2000_GPIO_LOW                0
 #define IXP2000_GPIO_HIGH               1
-#define GPIO_NO_EDGES                   0
+extern void gpio_line_config(int line, int direction);
-#define GPIO_FALLING_EDGE               1
-#define GPIO_RISING_EDGE                2
-#define GPIO_BOTH_EDGES                 3
-#define GPIO_LEVEL_LOW                  4
-#define GPIO_LEVEL_HIGH                 8
-extern void set_GPIO_IRQ_edge(int gpio_nr, int edge);
-extern void set_GPIO_IRQ_level(int gpio_nr, int level);
-extern void gpio_line_config(int line, int style);
 static inline int gpio_line_get(int line)
 {
@@ -45,11 +37,12 @@ static inline int gpio_line_get(int line)
 static inline void gpio_line_set(int line, int value)
 {
        if (value == IXP2000_GPIO_HIGH) {
-                ixp_reg_write(IXP2000_GPIO_POSR, BIT(line));
+                ixp2000_reg_write(IXP2000_GPIO_POSR, 1 << line);
-        } else if (value == IXP2000_GPIO_LOW)
+        } else if (value == IXP2000_GPIO_LOW) {
-                ixp_reg_write(IXP2000_GPIO_POCR, BIT(line));
+                ixp2000_reg_write(IXP2000_GPIO_POCR, 1 << line);
+        }
 }
 #endif /* !__ASSEMBLY__ */
-#endif /* ASM_ARCH_IXP2000_GPIO_H_ */
+#endif /* ASM_ARCH_IXP2000_GPIO_H_ */
diff --git a/include/asm-arm/arch-ixp2000/io.h b/include/asm-arm/arch-ixp2000/io.h
index 083462668e18..5e56b47446e0 100644
--- a/include/asm-arm/arch-ixp2000/io.h
+++ b/include/asm-arm/arch-ixp2000/io.h
@@ -27,8 +27,8 @@
 * since that isn't available on the A? revisions we just keep doing
 * things manually.
 */
-#define alignb(addr)            (void __iomem *)((unsigned long)addr ^ 3)
+#define alignb(addr)            (void __iomem *)((unsigned long)(addr) ^ 3)
-#define alignw(addr)            (void __iomem *)((unsigned long)addr ^ 2)
+#define alignw(addr)            (void __iomem *)((unsigned long)(addr) ^ 2)
 #define outb(v,p)               __raw_writeb((v),alignb(___io(p)))
 #define outw(v,p)               __raw_writew((v),alignw(___io(p)))
@@ -48,6 +48,78 @@
 #define insw(p,d,l)             __raw_readsw(alignw(___io(p)),d,l)
 #define insl(p,d,l)             __raw_readsl(___io(p),d,l)
+#define __is_io_address(p)      ((((unsigned long)(p)) & ~(IXP2000_PCI_IO_SIZE - 1)) == IXP2000_PCI_IO_VIRT_BASE)
+#define ioread8(p)                                              \
+        ({                                                      \
+                unsigned int __v;                               \
+                                                                \
+                if (__is_io_address(p)) {                       \
+                        __v = __raw_readb(alignb(p));           \
+                } else {                                        \
+                        __v = __raw_readb(p);                   \
+                }                                               \
+                                                                \
+                __v;                                            \
+        })                                                      \
+#define ioread16(p)                                             \
+        ({                                                      \
+                unsigned int __v;                               \
+                                                                \
+                if (__is_io_address(p)) {                       \
+                        __v = __raw_readw(alignw(p));           \
+                } else {                                        \
+                        __v = le16_to_cpu(__raw_readw(p));      \
+                }                                               \
+                                                                \
+                __v;                                            \
+        })
+#define ioread32(p)                                             \
+        ({                                                      \
+                unsigned int __v;                               \
+                                                                \
+                if (__is_io_address(p)) {                       \
+                        __v = __raw_readl(p);                   \
+                } else {                                        \
+                        __v = le32_to_cpu(__raw_readl(p));      \
+                }                                               \
+                                                                \
+                 __v;                                           \
+        })
+#define iowrite8(v,p)                                           \
+        ({                                                      \
+                if (__is_io_address(p)) {                       \
+                        __raw_writeb((v), alignb(p));           \
+                } else {                                        \
+                        __raw_writeb((v), p);                   \
+                }                                               \
+        })
+#define iowrite16(v,p)                                          \
+        ({                                                      \
+                if (__is_io_address(p)) {                       \
+                        __raw_writew((v), alignw(p));           \
+                } else {                                        \
+                        __raw_writew(cpu_to_le16(v), p);        \
+                }                                               \
+        })
+#define iowrite32(v,p)                                          \
+        ({                                                      \
+                if (__is_io_address(p)) {                       \
+                        __raw_writel((v), p);                   \
+                } else {                                        \
+                        __raw_writel(cpu_to_le32(v), p);        \
+                }                                               \
+        })
+#define ioport_map(port, nr)    ___io(port)
+#define ioport_unmap(addr)
 #ifdef CONFIG_ARCH_IXDP2X01
 /*
diff --git a/include/asm-arm/arch-ixp2000/platform.h b/include/asm-arm/arch-ixp2000/platform.h
index 901bba6d02b4..52ded516ea5c 100644
--- a/include/asm-arm/arch-ixp2000/platform.h
+++ b/include/asm-arm/arch-ixp2000/platform.h
@@ -138,30 +138,10 @@ struct ixp2000_flash_data {
        unsigned long (*bank_setup)(unsigned long);
 };
-/*
- * GPIO helper functions
- */
-#define GPIO_IN         0
-#define GPIO_OUT        1
-extern void gpio_line_config(int line, int style);
-static inline int gpio_line_get(int line)
-{
-        return (((*IXP2000_GPIO_PLR) >> line) & 1);
-}
-static inline void gpio_line_set(int line, int value)
-{
-        if (value) 
-                ixp2000_reg_write(IXP2000_GPIO_POSR, (1 << line));
-        else 
-                ixp2000_reg_write(IXP2000_GPIO_POCR, (1 << line));
-}
 struct ixp2000_i2c_pins {
        unsigned long sda_pin;
        unsigned long scl_pin;
 };
 #endif /*  !__ASSEMBLY__ */
diff --git a/include/asm-arm/arch-ixp4xx/debug-macro.S b/include/asm-arm/arch-ixp4xx/debug-macro.S
index 4499ae8e4b44..45a6c6cc29d5 100644
--- a/include/asm-arm/arch-ixp4xx/debug-macro.S
+++ b/include/asm-arm/arch-ixp4xx/debug-macro.S
@@ -14,6 +14,7 @@
                mrc     p15, 0, \rx, c1, c0
                tst     \rx, #1                 @ MMU enabled?
                moveq   \rx, #0xc8000000
+                orrne   \rx, \rx, #0x00b00000
                movne   \rx, #0xff000000
                add     \rx,\rx,#3              @ Uart regs are at off set of 3 if
                                                @ byte writes used - Big Endian.
diff --git a/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h b/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
index 8eeb1db6309d..004696a95bdb 100644
--- a/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
+++ b/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
@@ -69,6 +69,16 @@
 #define IXP4XX_PERIPHERAL_BASE_VIRT     (0xFFBF2000)
 #define IXP4XX_PERIPHERAL_REGION_SIZE   (0x0000C000)
+/*
+ * Debug UART
+ *
+ * This is basically a remap of UART1 into a region that is section
+ * aligned so that it * can be used with the low-level debug code.
+ */
+#define IXP4XX_DEBUG_UART_BASE_PHYS     (0xC8000000)
+#define IXP4XX_DEBUG_UART_BASE_VIRT     (0xffb00000)
+#define IXP4XX_DEBUG_UART_REGION_SIZE   (0x00001000)
 #define IXP4XX_EXP_CS0_OFFSET   0x00
 #define IXP4XX_EXP_CS1_OFFSET   0x04
 #define IXP4XX_EXP_CS2_OFFSET   0x08
diff --git a/include/asm-arm/io.h b/include/asm-arm/io.h
index 08a46302d265..cc4b5f5dbfcf 100644
--- a/include/asm-arm/io.h
+++ b/include/asm-arm/io.h
@@ -275,6 +275,7 @@ extern void __iounmap(void __iomem *addr);
 /*
 * io{read,write}{8,16,32} macros
 */
+#ifndef ioread8
 #define ioread8(p)      ({ unsigned int __v = __raw_readb(p); __v; })
 #define ioread16(p)     ({ unsigned int __v = le16_to_cpu(__raw_readw(p)); __v; })
 #define ioread32(p)     ({ unsigned int __v = le32_to_cpu(__raw_readl(p)); __v; })
@@ -293,6 +294,7 @@ extern void __iounmap(void __iomem *addr);
 extern void __iomem *ioport_map(unsigned long port, unsigned int nr);
 extern void ioport_unmap(void __iomem *addr);
+#endif
 struct pci_dev;
author	Linus Torvalds <torvalds@ppc970.osdl.org>	2005-06-24 18:32:01 -0400
committer	Linus Torvalds <torvalds@ppc970.osdl.org>	2005-06-24 18:32:01 -0400
commit	f647a27417d2adc43d8c96d3d6f837422fbc076e (patch)
tree	3cac5147575ba4cbd63cb8fa226b95e7886e1d7c /include
parent	75043cb5b386e5a01fd03b88f647dd992de02f97 (diff)
parent	2966207c7e5945947c4db3a48aa4fa819807c5be (diff)

diff --git a/include/asm-arm/arch-ixp2000/gpio.h b/include/asm-arm/arch-ixp2000/gpio.h index 84634af5cc64..03cbbe1fd9d8 100644 --- a/include/asm-arm/arch-ixp2000/gpio.h +++ b/include/asm-arm/arch-ixp2000/gpio.h
@@ -1,5 +1,5 @@
1	/*	1	/*
2	* include/asm-arm/arch-ixp2000/ixp2000-gpio.h	2	* include/asm-arm/arch-ixp2000/gpio.h
3	*	3	*
4	* Copyright (C) 2002 Intel Corporation.	4	* Copyright (C) 2002 Intel Corporation.
5	*	5	*
@@ -16,26 +16,18 @@
16	* Use this instead of directly setting the GPIO registers.	16	* Use this instead of directly setting the GPIO registers.
17	* GPIOs may also be used as GPIOs (e.g. for emulating i2c/smb)	17	* GPIOs may also be used as GPIOs (e.g. for emulating i2c/smb)
18	*/	18	*/
19	#ifndef _ASM_ARCH_IXP2000_GPIO_H_	19	#ifndef __ASM_ARCH_GPIO_H
20	#define _ASM_ARCH_IXP2000_GPIO_H_	20	#define __ASM_ARCH_GPIO_H
21		21
22	#ifndef __ASSEMBLY__	22	#ifndef __ASSEMBLY__
23	#define GPIO_OUT 0x0	23
24	#define GPIO_IN 0x80	24	#define GPIO_IN 0
		25	#define GPIO_OUT 1
25		26
26	#define IXP2000_GPIO_LOW 0	27	#define IXP2000_GPIO_LOW 0
27	#define IXP2000_GPIO_HIGH 1	28	#define IXP2000_GPIO_HIGH 1
28		29
29	#define GPIO_NO_EDGES 0	30	extern void gpio_line_config(int line, int direction);
30	#define GPIO_FALLING_EDGE 1
31	#define GPIO_RISING_EDGE 2
32	#define GPIO_BOTH_EDGES 3
33	#define GPIO_LEVEL_LOW 4
34	#define GPIO_LEVEL_HIGH 8
35
36	extern void set_GPIO_IRQ_edge(int gpio_nr, int edge);
37	extern void set_GPIO_IRQ_level(int gpio_nr, int level);
38	extern void gpio_line_config(int line, int style);
39		31
40	static inline int gpio_line_get(int line)	32	static inline int gpio_line_get(int line)
41	{	33	{
@@ -45,11 +37,12 @@ static inline int gpio_line_get(int line)
45	static inline void gpio_line_set(int line, int value)	37	static inline void gpio_line_set(int line, int value)
46	{	38	{
47	if (value == IXP2000_GPIO_HIGH) {	39	if (value == IXP2000_GPIO_HIGH) {
48	ixp_reg_write(IXP2000_GPIO_POSR, BIT(line));	40	ixp2000_reg_write(IXP2000_GPIO_POSR, 1 << line);
49	} else if (value == IXP2000_GPIO_LOW)	41	} else if (value == IXP2000_GPIO_LOW) {
50	ixp_reg_write(IXP2000_GPIO_POCR, BIT(line));	42	ixp2000_reg_write(IXP2000_GPIO_POCR, 1 << line);
		43	}
51	}	44	}
52		45
53	#endif /* !__ASSEMBLY__ */	46	#endif /* !__ASSEMBLY__ */
54	#endif /* ASM_ARCH_IXP2000_GPIO_H_ */
55		47
		48	#endif /* ASM_ARCH_IXP2000_GPIO_H_ */


diff --git a/include/asm-arm/arch-ixp2000/io.h b/include/asm-arm/arch-ixp2000/io.h index 083462668e18..5e56b47446e0 100644 --- a/include/asm-arm/arch-ixp2000/io.h +++ b/include/asm-arm/arch-ixp2000/io.h
@@ -27,8 +27,8 @@
27	* since that isn't available on the A? revisions we just keep doing	27	* since that isn't available on the A? revisions we just keep doing
28	* things manually.	28	* things manually.
29	*/	29	*/
30	#define alignb(addr) (void __iomem *)((unsigned long)addr ^ 3)	30	#define alignb(addr) (void __iomem *)((unsigned long)(addr) ^ 3)
31	#define alignw(addr) (void __iomem *)((unsigned long)addr ^ 2)	31	#define alignw(addr) (void __iomem *)((unsigned long)(addr) ^ 2)
32		32
33	#define outb(v,p) __raw_writeb((v),alignb(___io(p)))	33	#define outb(v,p) __raw_writeb((v),alignb(___io(p)))
34	#define outw(v,p) __raw_writew((v),alignw(___io(p)))	34	#define outw(v,p) __raw_writew((v),alignw(___io(p)))
@@ -48,6 +48,78 @@
48	#define insw(p,d,l) __raw_readsw(alignw(___io(p)),d,l)	48	#define insw(p,d,l) __raw_readsw(alignw(___io(p)),d,l)
49	#define insl(p,d,l) __raw_readsl(___io(p),d,l)	49	#define insl(p,d,l) __raw_readsl(___io(p),d,l)
50		50
		51	#define __is_io_address(p) ((((unsigned long)(p)) & ~(IXP2000_PCI_IO_SIZE - 1)) == IXP2000_PCI_IO_VIRT_BASE)
		52
		53	#define ioread8(p) \
		54	({ \
		55	unsigned int __v; \
		56	\
		57	if (__is_io_address(p)) { \
		58	__v = __raw_readb(alignb(p)); \
		59	} else { \
		60	__v = __raw_readb(p); \
		61	} \
		62	\
		63	__v; \
		64	}) \
		65
		66	#define ioread16(p) \
		67	({ \
		68	unsigned int __v; \
		69	\
		70	if (__is_io_address(p)) { \
		71	__v = __raw_readw(alignw(p)); \
		72	} else { \
		73	__v = le16_to_cpu(__raw_readw(p)); \
		74	} \
		75	\
		76	__v; \
		77	})
		78
		79	#define ioread32(p) \
		80	({ \
		81	unsigned int __v; \
		82	\
		83	if (__is_io_address(p)) { \
		84	__v = __raw_readl(p); \
		85	} else { \
		86	__v = le32_to_cpu(__raw_readl(p)); \
		87	} \
		88	\
		89	__v; \
		90	})
		91
		92	#define iowrite8(v,p) \
		93	({ \
		94	if (__is_io_address(p)) { \
		95	__raw_writeb((v), alignb(p)); \
		96	} else { \
		97	__raw_writeb((v), p); \
		98	} \
		99	})
		100
		101	#define iowrite16(v,p) \
		102	({ \
		103	if (__is_io_address(p)) { \
		104	__raw_writew((v), alignw(p)); \
		105	} else { \
		106	__raw_writew(cpu_to_le16(v), p); \
		107	} \
		108	})
		109
		110	#define iowrite32(v,p) \
		111	({ \
		112	if (__is_io_address(p)) { \
		113	__raw_writel((v), p); \
		114	} else { \
		115	__raw_writel(cpu_to_le32(v), p); \
		116	} \
		117	})
		118
		119	#define ioport_map(port, nr) ___io(port)
		120
		121	#define ioport_unmap(addr)
		122
51		123
52	#ifdef CONFIG_ARCH_IXDP2X01	124	#ifdef CONFIG_ARCH_IXDP2X01
53	/*	125	/*


diff --git a/include/asm-arm/arch-ixp2000/platform.h b/include/asm-arm/arch-ixp2000/platform.h index 901bba6d02b4..52ded516ea5c 100644 --- a/include/asm-arm/arch-ixp2000/platform.h +++ b/include/asm-arm/arch-ixp2000/platform.h
@@ -138,30 +138,10 @@ struct ixp2000_flash_data {
138	unsigned long (*bank_setup)(unsigned long);	138	unsigned long (*bank_setup)(unsigned long);
139	};	139	};
140		140
141	/*
142	* GPIO helper functions
143	*/
144	#define GPIO_IN 0
145	#define GPIO_OUT 1
146
147	extern void gpio_line_config(int line, int style);
148
149	static inline int gpio_line_get(int line)
150	{
151	return (((*IXP2000_GPIO_PLR) >> line) & 1);
152	}
153
154	static inline void gpio_line_set(int line, int value)
155	{
156	if (value)
157	ixp2000_reg_write(IXP2000_GPIO_POSR, (1 << line));
158	else
159	ixp2000_reg_write(IXP2000_GPIO_POCR, (1 << line));
160	}
161
162	struct ixp2000_i2c_pins {	141	struct ixp2000_i2c_pins {
163	unsigned long sda_pin;	142	unsigned long sda_pin;
164	unsigned long scl_pin;	143	unsigned long scl_pin;
165	};	144	};
166		145
		146
167	#endif /* !__ASSEMBLY__ */	147	#endif /* !__ASSEMBLY__ */


diff --git a/include/asm-arm/arch-ixp4xx/debug-macro.S b/include/asm-arm/arch-ixp4xx/debug-macro.S index 4499ae8e4b44..45a6c6cc29d5 100644 --- a/include/asm-arm/arch-ixp4xx/debug-macro.S +++ b/include/asm-arm/arch-ixp4xx/debug-macro.S
@@ -14,6 +14,7 @@
14	mrc p15, 0, \rx, c1, c0	14	mrc p15, 0, \rx, c1, c0
15	tst \rx, #1 @ MMU enabled?	15	tst \rx, #1 @ MMU enabled?
16	moveq \rx, #0xc8000000	16	moveq \rx, #0xc8000000
		17	orrne \rx, \rx, #0x00b00000
17	movne \rx, #0xff000000	18	movne \rx, #0xff000000
18	add \rx,\rx,#3 @ Uart regs are at off set of 3 if	19	add \rx,\rx,#3 @ Uart regs are at off set of 3 if
19	@ byte writes used - Big Endian.	20	@ byte writes used - Big Endian.


diff --git a/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h b/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h index 8eeb1db6309d..004696a95bdb 100644 --- a/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h +++ b/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
@@ -69,6 +69,16 @@
69	#define IXP4XX_PERIPHERAL_BASE_VIRT (0xFFBF2000)	69	#define IXP4XX_PERIPHERAL_BASE_VIRT (0xFFBF2000)
70	#define IXP4XX_PERIPHERAL_REGION_SIZE (0x0000C000)	70	#define IXP4XX_PERIPHERAL_REGION_SIZE (0x0000C000)
71		71
		72	/*
		73	* Debug UART
		74	*
		75	* This is basically a remap of UART1 into a region that is section
		76	* aligned so that it * can be used with the low-level debug code.
		77	*/
		78	#define IXP4XX_DEBUG_UART_BASE_PHYS (0xC8000000)
		79	#define IXP4XX_DEBUG_UART_BASE_VIRT (0xffb00000)
		80	#define IXP4XX_DEBUG_UART_REGION_SIZE (0x00001000)
		81
72	#define IXP4XX_EXP_CS0_OFFSET 0x00	82	#define IXP4XX_EXP_CS0_OFFSET 0x00
73	#define IXP4XX_EXP_CS1_OFFSET 0x04	83	#define IXP4XX_EXP_CS1_OFFSET 0x04
74	#define IXP4XX_EXP_CS2_OFFSET 0x08	84	#define IXP4XX_EXP_CS2_OFFSET 0x08


diff --git a/include/asm-arm/io.h b/include/asm-arm/io.h index 08a46302d265..cc4b5f5dbfcf 100644 --- a/include/asm-arm/io.h +++ b/include/asm-arm/io.h
@@ -275,6 +275,7 @@ extern void __iounmap(void __iomem *addr);
275	/*	275	/*
276	* io{read,write}{8,16,32} macros	276	* io{read,write}{8,16,32} macros
277	*/	277	*/
		278	#ifndef ioread8
278	#define ioread8(p) ({ unsigned int __v = __raw_readb(p); __v; })	279	#define ioread8(p) ({ unsigned int __v = __raw_readb(p); __v; })
279	#define ioread16(p) ({ unsigned int __v = le16_to_cpu(__raw_readw(p)); __v; })	280	#define ioread16(p) ({ unsigned int __v = le16_to_cpu(__raw_readw(p)); __v; })
280	#define ioread32(p) ({ unsigned int __v = le32_to_cpu(__raw_readl(p)); __v; })	281	#define ioread32(p) ({ unsigned int __v = le32_to_cpu(__raw_readl(p)); __v; })
@@ -293,6 +294,7 @@ extern void __iounmap(void __iomem *addr);
293		294
294	extern void __iomem *ioport_map(unsigned long port, unsigned int nr);	295	extern void __iomem *ioport_map(unsigned long port, unsigned int nr);
295	extern void ioport_unmap(void __iomem *addr);	296	extern void ioport_unmap(void __iomem *addr);
		297	#endif
296		298
297	struct pci_dev;	299	struct pci_dev;
298		300