diff options
-rw-r--r-- | arch/arm/mach-pxa/generic.c | 18 | ||||
-rw-r--r-- | include/asm-arm/arch-pxa/hardware.h | 9 |
2 files changed, 0 insertions, 27 deletions
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c index c2f102339f57..ca053226fba0 100644 --- a/arch/arm/mach-pxa/generic.c +++ b/arch/arm/mach-pxa/generic.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <asm/mach/map.h> | 26 | #include <asm/mach/map.h> |
27 | 27 | ||
28 | #include <asm/arch/pxa-regs.h> | 28 | #include <asm/arch/pxa-regs.h> |
29 | #include <asm/arch/pxa2xx-regs.h> /* for __pxa_set_cken */ | ||
30 | 29 | ||
31 | #include "generic.h" | 30 | #include "generic.h" |
32 | 31 | ||
@@ -61,23 +60,6 @@ unsigned int get_memclk_frequency_10khz(void) | |||
61 | EXPORT_SYMBOL(get_memclk_frequency_10khz); | 60 | EXPORT_SYMBOL(get_memclk_frequency_10khz); |
62 | 61 | ||
63 | /* | 62 | /* |
64 | * Routine to safely enable or disable a clock in the CKEN | ||
65 | */ | ||
66 | void __pxa_set_cken(int clock, int enable) | ||
67 | { | ||
68 | unsigned long flags; | ||
69 | local_irq_save(flags); | ||
70 | |||
71 | if (enable) | ||
72 | CKEN |= (1 << clock); | ||
73 | else | ||
74 | CKEN &= ~(1 << clock); | ||
75 | |||
76 | local_irq_restore(flags); | ||
77 | } | ||
78 | EXPORT_SYMBOL(__pxa_set_cken); | ||
79 | |||
80 | /* | ||
81 | * Intel PXA2xx internal register mapping. | 63 | * Intel PXA2xx internal register mapping. |
82 | * | 64 | * |
83 | * Note 1: not all PXA2xx variants implement all those addresses. | 65 | * Note 1: not all PXA2xx variants implement all those addresses. |
diff --git a/include/asm-arm/arch-pxa/hardware.h b/include/asm-arm/arch-pxa/hardware.h index e25558faa5a4..d9af6dabc899 100644 --- a/include/asm-arm/arch-pxa/hardware.h +++ b/include/asm-arm/arch-pxa/hardware.h | |||
@@ -192,15 +192,6 @@ extern int pxa_gpio_get_value(unsigned gpio); | |||
192 | extern void pxa_gpio_set_value(unsigned gpio, int value); | 192 | extern void pxa_gpio_set_value(unsigned gpio, int value); |
193 | 193 | ||
194 | /* | 194 | /* |
195 | * Routine to enable or disable CKEN | ||
196 | */ | ||
197 | static inline void __deprecated pxa_set_cken(int clock, int enable) | ||
198 | { | ||
199 | extern void __pxa_set_cken(int clock, int enable); | ||
200 | __pxa_set_cken(clock, enable); | ||
201 | } | ||
202 | |||
203 | /* | ||
204 | * return current memory and LCD clock frequency in units of 10kHz | 195 | * return current memory and LCD clock frequency in units of 10kHz |
205 | */ | 196 | */ |
206 | extern unsigned int get_memclk_frequency_10khz(void); | 197 | extern unsigned int get_memclk_frequency_10khz(void); |