Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[deliverable/linux.git] / include / asm-powerpc / io.h

diff --git a/include/asm-powerpc/io.h b/include/asm-powerpc/io.h
index 75df3bce9ccbebfa1d74b0f94a220352d50697fc..350c9bdb31dccc7007c1f0bfa7bc72d569b55754 100644 (file)
--- a/include/asm-powerpc/io.h
+++ b/include/asm-powerpc/io.h
@@ -11,7 +11,12 @@
 
 /* Check of existence of legacy devices */
 extern int check_legacy_ioport(unsigned long base_port);
-#define PNPBIOS_BASE   0xf000  /* only relevant for PReP */
+#define I8042_DATA_REG 0x60
+#define FDC_BASE       0x3f0
+/* only relevant for PReP */
+#define _PIDXR         0x279
+#define _PNPWRP                0xa79
+#define PNPBIOS_BASE   0xf000
 
 #include <linux/compiler.h>
 #include <asm/page.h>
@@ -302,7 +307,7 @@ static inline void __raw_writeq(unsigned long v, volatile void __iomem *addr)
 #ifdef CONFIG_PPC32
 
 #define __do_in_asm(name, op)                          \
-extern __inline__ unsigned int name(unsigned int port) \
+static inline unsigned int name(unsigned int port)     \
 {                                                      \
        unsigned int x;                                 \
        __asm__ __volatile__(                           \
@@ -329,7 +334,7 @@ extern __inline__ unsigned int name(unsigned int port)      \
 }
 
 #define __do_out_asm(name, op)                         \
-extern __inline__ void name(unsigned int val, unsigned int port) \
+static inline void name(unsigned int val, unsigned int port) \
 {                                                      \
        __asm__ __volatile__(                           \
                "sync\n"                                \
@@ -732,6 +737,12 @@ static inline void * bus_to_virt(unsigned long address)
 
 #endif /* CONFIG_PPC32 */
 
+/* access ports */
+#define setbits32(_addr, _v) out_be32((_addr), in_be32(_addr) |  (_v))
+#define clrbits32(_addr, _v) out_be32((_addr), in_be32(_addr) & ~(_v))
+
+#define setbits16(_addr, _v) out_be16((_addr), in_be16(_addr) |  (_v))
+#define clrbits16(_addr, _v) out_be16((_addr), in_be16(_addr) & ~(_v))
 
 #endif /* __KERNEL__ */