Merge mainline v2.6.27-rc2 tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-pxa / hardware.h

diff --git a/include/asm-arm/arch-pxa/hardware.h b/include/asm-arm/arch-pxa/hardware.h
index e25558faa5a480f7b2c2fa78d444244e071e9ae6..979a45695d7d43c83681314c0b9021c55f84a410 100644 (file)
--- a/include/asm-arm/arch-pxa/hardware.h
+++ b/include/asm-arm/arch-pxa/hardware.h
@@ -69,6 +69,12 @@
                _id == 0x212;                           \
        })
 
+#define __cpu_is_pxa255(id)                             \
+       ({                                              \
+               unsigned int _id = (id) >> 4 & 0xfff;   \
+               _id == 0x2d0;                           \
+        })
+
 #define __cpu_is_pxa25x(id)                            \
        ({                                              \
                unsigned int _id = (id) >> 4 & 0xfff;   \
@@ -76,6 +82,7 @@
        })
 #else
 #define __cpu_is_pxa21x(id)    (0)
+#define __cpu_is_pxa255(id)    (0)
 #define __cpu_is_pxa25x(id)    (0)
 #endif
 
@@ -119,11 +126,26 @@
 #define __cpu_is_pxa320(id)    (0)
 #endif
 
+#ifdef CONFIG_CPU_PXA930
+#define __cpu_is_pxa930(id)                            \
+       ({                                              \
+               unsigned int _id = (id) >> 4 & 0xfff;   \
+               _id == 0x683;           \
+        })
+#else
+#define __cpu_is_pxa930(id)    (0)
+#endif
+
 #define cpu_is_pxa21x()                                        \
        ({                                              \
                __cpu_is_pxa21x(read_cpuid_id());       \
        })
 
+#define cpu_is_pxa255()                                 \
+       ({                                              \
+               __cpu_is_pxa255(read_cpuid_id());       \
+       })
+
 #define cpu_is_pxa25x()                                        \
        ({                                              \
                __cpu_is_pxa25x(read_cpuid_id());       \
@@ -149,6 +171,12 @@
                __cpu_is_pxa320(read_cpuid_id());       \
         })
 
+#define cpu_is_pxa930()                                        \
+       ({                                              \
+               unsigned int id = read_cpuid(CPUID_ID); \
+               __cpu_is_pxa930(id);                    \
+        })
+
 /*
  * CPUID Core Generation Bit
  * <= 0x2 for pxa21x/pxa25x/pxa26x/pxa27x
@@ -192,18 +220,14 @@ extern int pxa_gpio_get_value(unsigned gpio);
 extern void pxa_gpio_set_value(unsigned gpio, int value);
 
 /*
- * Routine to enable or disable CKEN
+ * return current memory and LCD clock frequency in units of 10kHz
  */
-static inline void __deprecated pxa_set_cken(int clock, int enable)
-{
-       extern void __pxa_set_cken(int clock, int enable);
-       __pxa_set_cken(clock, enable);
-}
+extern unsigned int get_memclk_frequency_10khz(void);
 
 /*
- * return current memory and LCD clock frequency in units of 10kHz
+ * register GPIO as reset generator
  */
-extern unsigned int get_memclk_frequency_10khz(void);
+extern int init_gpio_reset(int gpio);
 
 #endif