aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2007-05-12 11:12:12 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-05-12 11:12:12 -0400
commit158304ef09a28c7f2dd37d78f536a4e09ba084a1 (patch)
tree2e6d808fef46d70268e547ccfc5926a865e3d2ea /include
parent641e79129a56a4c50be1aed0fa713f440b46a440 (diff)
parent25f4a81ef51b7c279786f5b81fe6d89510f46d99 (diff)
Merge branch 'fixes' into devel
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/arch-at91/hardware.h17
-rw-r--r--include/asm-arm/arch-at91/io.h18
-rw-r--r--include/asm-arm/arch-at91/irqs.h1
-rw-r--r--include/asm-arm/arch-at91/uncompress.h2
-rw-r--r--include/asm-arm/arch-iop13xx/io.h2
-rw-r--r--include/asm-arm/arch-iop32x/io.h2
-rw-r--r--include/asm-arm/arch-iop33x/io.h2
-rw-r--r--include/asm-arm/arch-omap/mux.h31
8 files changed, 53 insertions, 22 deletions
diff --git a/include/asm-arm/arch-at91/hardware.h b/include/asm-arm/arch-at91/hardware.h
index 0e51ad224eaa..46835e945aea 100644
--- a/include/asm-arm/arch-at91/hardware.h
+++ b/include/asm-arm/arch-at91/hardware.h
@@ -71,22 +71,5 @@
71/* Clocks */ 71/* Clocks */
72#define AT91_SLOW_CLOCK 32768 /* slow clock */ 72#define AT91_SLOW_CLOCK 32768 /* slow clock */
73 73
74#ifndef __ASSEMBLY__
75#include <asm/io.h>
76
77static inline unsigned int at91_sys_read(unsigned int reg_offset)
78{
79 void __iomem *addr = (void __iomem *)AT91_VA_BASE_SYS;
80
81 return __raw_readl(addr + reg_offset);
82}
83
84static inline void at91_sys_write(unsigned int reg_offset, unsigned long value)
85{
86 void __iomem *addr = (void __iomem *)AT91_VA_BASE_SYS;
87
88 __raw_writel(value, addr + reg_offset);
89}
90#endif
91 74
92#endif 75#endif
diff --git a/include/asm-arm/arch-at91/io.h b/include/asm-arm/arch-at91/io.h
index 401f327ec047..80073fd36b8e 100644
--- a/include/asm-arm/arch-at91/io.h
+++ b/include/asm-arm/arch-at91/io.h
@@ -29,4 +29,22 @@
29#define __mem_pci(a) (a) 29#define __mem_pci(a) (a)
30 30
31 31
32#ifndef __ASSEMBLY__
33
34static inline unsigned int at91_sys_read(unsigned int reg_offset)
35{
36 void __iomem *addr = (void __iomem *)AT91_VA_BASE_SYS;
37
38 return __raw_readl(addr + reg_offset);
39}
40
41static inline void at91_sys_write(unsigned int reg_offset, unsigned long value)
42{
43 void __iomem *addr = (void __iomem *)AT91_VA_BASE_SYS;
44
45 __raw_writel(value, addr + reg_offset);
46}
47
48#endif
49
32#endif 50#endif
diff --git a/include/asm-arm/arch-at91/irqs.h b/include/asm-arm/arch-at91/irqs.h
index 1ffa3bb9a9c1..1127a3b5e928 100644
--- a/include/asm-arm/arch-at91/irqs.h
+++ b/include/asm-arm/arch-at91/irqs.h
@@ -21,6 +21,7 @@
21#ifndef __ASM_ARCH_IRQS_H 21#ifndef __ASM_ARCH_IRQS_H
22#define __ASM_ARCH_IRQS_H 22#define __ASM_ARCH_IRQS_H
23 23
24#include <asm/io.h>
24#include <asm/arch/at91_aic.h> 25#include <asm/arch/at91_aic.h>
25 26
26#define NR_AIC_IRQS 32 27#define NR_AIC_IRQS 32
diff --git a/include/asm-arm/arch-at91/uncompress.h b/include/asm-arm/arch-at91/uncompress.h
index a193d28304b6..30ac587b3b41 100644
--- a/include/asm-arm/arch-at91/uncompress.h
+++ b/include/asm-arm/arch-at91/uncompress.h
@@ -21,7 +21,7 @@
21#ifndef __ASM_ARCH_UNCOMPRESS_H 21#ifndef __ASM_ARCH_UNCOMPRESS_H
22#define __ASM_ARCH_UNCOMPRESS_H 22#define __ASM_ARCH_UNCOMPRESS_H
23 23
24#include <asm/hardware.h> 24#include <asm/io.h>
25#include <asm/arch/at91_dbgu.h> 25#include <asm/arch/at91_dbgu.h>
26 26
27/* 27/*
diff --git a/include/asm-arm/arch-iop13xx/io.h b/include/asm-arm/arch-iop13xx/io.h
index 7dfff4ad82b3..a6e0f9e6ddcf 100644
--- a/include/asm-arm/arch-iop13xx/io.h
+++ b/include/asm-arm/arch-iop13xx/io.h
@@ -27,7 +27,7 @@
27 27
28extern void __iomem * __iop13xx_io(unsigned long io_addr); 28extern void __iomem * __iop13xx_io(unsigned long io_addr);
29extern void __iomem *__iop13xx_ioremap(unsigned long cookie, size_t size, 29extern void __iomem *__iop13xx_ioremap(unsigned long cookie, size_t size,
30 unsigned long flags); 30 unsigned int mtype);
31extern void __iop13xx_iounmap(void __iomem *addr); 31extern void __iop13xx_iounmap(void __iomem *addr);
32 32
33extern u32 iop13xx_atue_mem_base; 33extern u32 iop13xx_atue_mem_base;
diff --git a/include/asm-arm/arch-iop32x/io.h b/include/asm-arm/arch-iop32x/io.h
index 994f16af5057..958af751a484 100644
--- a/include/asm-arm/arch-iop32x/io.h
+++ b/include/asm-arm/arch-iop32x/io.h
@@ -14,7 +14,7 @@
14#include <asm/hardware.h> 14#include <asm/hardware.h>
15 15
16extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size, 16extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size,
17 unsigned long flags); 17 unsigned int mtype);
18extern void __iop3xx_iounmap(void __iomem *addr); 18extern void __iop3xx_iounmap(void __iomem *addr);
19 19
20#define IO_SPACE_LIMIT 0xffffffff 20#define IO_SPACE_LIMIT 0xffffffff
diff --git a/include/asm-arm/arch-iop33x/io.h b/include/asm-arm/arch-iop33x/io.h
index 993f7589b29f..fec9c53e2b10 100644
--- a/include/asm-arm/arch-iop33x/io.h
+++ b/include/asm-arm/arch-iop33x/io.h
@@ -14,7 +14,7 @@
14#include <asm/hardware.h> 14#include <asm/hardware.h>
15 15
16extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size, 16extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size,
17 unsigned long flags); 17 unsigned int mtype);
18extern void __iop3xx_iounmap(void __iomem *addr); 18extern void __iop3xx_iounmap(void __iomem *addr);
19 19
20#define IO_SPACE_LIMIT 0xffffffff 20#define IO_SPACE_LIMIT 0xffffffff
diff --git a/include/asm-arm/arch-omap/mux.h b/include/asm-arm/arch-omap/mux.h
index 828cc5c114e1..f1ec2edd4040 100644
--- a/include/asm-arm/arch-omap/mux.h
+++ b/include/asm-arm/arch-omap/mux.h
@@ -421,7 +421,9 @@ enum omap24xx_index {
421 /* 24xx clock */ 421 /* 24xx clock */
422 W14_24XX_SYS_CLKOUT, 422 W14_24XX_SYS_CLKOUT,
423 423
424 /* 24xx GPMC wait pin monitoring */ 424 /* 24xx GPMC chipselects, wait pin monitoring */
425 E2_GPMC_NCS2,
426 L2_GPMC_NCS7,
425 L3_GPMC_WAIT0, 427 L3_GPMC_WAIT0,
426 N7_GPMC_WAIT1, 428 N7_GPMC_WAIT1,
427 M1_GPMC_WAIT2, 429 M1_GPMC_WAIT2,
@@ -435,6 +437,7 @@ enum omap24xx_index {
435 437
436 /* 24xx GPIO */ 438 /* 24xx GPIO */
437 M21_242X_GPIO11, 439 M21_242X_GPIO11,
440 P21_242X_GPIO12,
438 AA10_242X_GPIO13, 441 AA10_242X_GPIO13,
439 AA6_242X_GPIO14, 442 AA6_242X_GPIO14,
440 AA4_242X_GPIO15, 443 AA4_242X_GPIO15,
@@ -444,7 +447,9 @@ enum omap24xx_index {
444 Y20_24XX_GPIO60, 447 Y20_24XX_GPIO60,
445 W4__24XX_GPIO74, 448 W4__24XX_GPIO74,
446 M15_24XX_GPIO92, 449 M15_24XX_GPIO92,
450 J15_24XX_GPIO99,
447 V14_24XX_GPIO117, 451 V14_24XX_GPIO117,
452 P14_24XX_GPIO125,
448 453
449 /* 242x DBG GPIO */ 454 /* 242x DBG GPIO */
450 V4_242X_GPIO49, 455 V4_242X_GPIO49,
@@ -486,6 +491,30 @@ enum omap24xx_index {
486 G18_24XX_MMC_CMD_DIR, 491 G18_24XX_MMC_CMD_DIR,
487 H15_24XX_MMC_CLKI, 492 H15_24XX_MMC_CLKI,
488 493
494 /* Full speed USB */
495 J20_24XX_USB0_PUEN,
496 J19_24XX_USB0_VP,
497 K20_24XX_USB0_VM,
498 J18_24XX_USB0_RCV,
499 K19_24XX_USB0_TXEN,
500 J14_24XX_USB0_SE0,
501 K18_24XX_USB0_DAT,
502
503 N14_24XX_USB1_SE0,
504 W12_24XX_USB1_SE0,
505 P15_24XX_USB1_DAT,
506 R13_24XX_USB1_DAT,
507 W20_24XX_USB1_TXEN,
508 P13_24XX_USB1_TXEN,
509 V19_24XX_USB1_RCV,
510 V12_24XX_USB1_RCV,
511
512 AA10_24XX_USB2_SE0,
513 Y11_24XX_USB2_DAT,
514 AA12_24XX_USB2_TXEN,
515 AA6_24XX_USB2_RCV,
516 AA4_24XX_USB2_TLLSE0,
517
489 /* Keypad GPIO*/ 518 /* Keypad GPIO*/
490 T19_24XX_KBR0, 519 T19_24XX_KBR0,
491 R19_24XX_KBR1, 520 R19_24XX_KBR1,