Merge git://git.infradead.org/battery-2.6

[pandora-kernel.git] / arch / powerpc / boot / io.h

diff --git a/arch/powerpc/boot/io.h b/arch/powerpc/boot/io.h
index 32974ed..ccaedae 100644 (file)
--- a/arch/powerpc/boot/io.h
+++ b/arch/powerpc/boot/io.h
@@ -1,5 +1,8 @@
 #ifndef _IO_H
 #define __IO_H
+
+#include "types.h"
+
 /*
  * Low-level I/O routines.
  *
@@ -20,6 +23,37 @@ static inline void out_8(volatile unsigned char *addr, int val)
                             : "=m" (*addr) : "r" (val));
 }
 
+static inline unsigned in_le16(const volatile u16 *addr)
+{
+       unsigned ret;
+
+       __asm__ __volatile__("lhbrx %0,0,%1; twi 0,%0,0; isync"
+                            : "=r" (ret) : "r" (addr), "m" (*addr));
+
+       return ret;
+}
+
+static inline unsigned in_be16(const volatile u16 *addr)
+{
+       unsigned ret;
+
+       __asm__ __volatile__("lhz%U1%X1 %0,%1; twi 0,%0,0; isync"
+                            : "=r" (ret) : "m" (*addr));
+       return ret;
+}
+
+static inline void out_le16(volatile u16 *addr, int val)
+{
+       __asm__ __volatile__("sthbrx %1,0,%2; sync" : "=m" (*addr)
+                            : "r" (val), "r" (addr));
+}
+
+static inline void out_be16(volatile u16 *addr, int val)
+{
+       __asm__ __volatile__("sth%U0%X0 %1,%0; sync"
+                            : "=m" (*addr) : "r" (val));
+}
+
 static inline unsigned in_le32(const volatile unsigned *addr)
 {
        unsigned ret;
@@ -50,4 +84,19 @@ static inline void out_be32(volatile unsigned *addr, int val)
                             : "=m" (*addr) : "r" (val));
 }
 
+static inline void sync(void)
+{
+       asm volatile("sync" : : : "memory");
+}
+
+static inline void eieio(void)
+{
+       asm volatile("eieio" : : : "memory");
+}
+
+static inline void barrier(void)
+{
+       asm volatile("" : : : "memory");
+}
+
 #endif /* _IO_H */