Merge branch 'pxa-tosa' into pxa
[linux-2.6.git] / include / asm-arm / arch-pxa / hardware.h
index 5547ec7..09868de 100644 (file)
                _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
 
                __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());       \
@@ -192,15 +204,6 @@ extern int pxa_gpio_get_value(unsigned gpio);
 extern void pxa_gpio_set_value(unsigned gpio, int value);
 
 /*
- * Routine to enable or disable CKEN
- */
-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);
-}
-
-/*
  * return current memory and LCD clock frequency in units of 10kHz
  */
 extern unsigned int get_memclk_frequency_10khz(void);