diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-09-19 10:33:55 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-10-12 22:15:26 +0200 |
| commit | a7073b8b47651ce2ed27564ed8395eff81120c58 (patch) | |
| tree | 78b355cbeb11f50730d5a065502a3b424183ba58 | |
| parent | [ARM] pxa: remove get_lcdclk_frequency_10khz() (diff) | |
| download | linux-a7073b8b47651ce2ed27564ed8395eff81120c58.tar.xz linux-a7073b8b47651ce2ed27564ed8395eff81120c58.zip | |
[ARM] pxa: mark pxa_set_cken deprecated
Allow the generic clock support code to fiddle with the CKEN register
and mark pxa_set_cken() deprecated.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-pxa/generic.c | 4 | ||||
| -rw-r--r-- | include/asm-arm/arch-pxa/hardware.h | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c index 2f0cc1c4995a..1c5413fc6e74 100644 --- a/arch/arm/mach-pxa/generic.c +++ b/arch/arm/mach-pxa/generic.c @@ -123,7 +123,7 @@ EXPORT_SYMBOL(pxa_gpio_set_value); /* * Routine to safely enable or disable a clock in the CKEN */ -void pxa_set_cken(int clock, int enable) +void __pxa_set_cken(int clock, int enable) { unsigned long flags; local_irq_save(flags); @@ -136,7 +136,7 @@ void pxa_set_cken(int clock, int enable) local_irq_restore(flags); } -EXPORT_SYMBOL(pxa_set_cken); +EXPORT_SYMBOL(__pxa_set_cken); /* * Intel PXA2xx internal register mapping. diff --git a/include/asm-arm/arch-pxa/hardware.h b/include/asm-arm/arch-pxa/hardware.h index 68e7b430ac80..538a34e39e92 100644 --- a/include/asm-arm/arch-pxa/hardware.h +++ b/include/asm-arm/arch-pxa/hardware.h @@ -116,7 +116,11 @@ extern void pxa_gpio_set_value(unsigned gpio, int value); /* * Routine to enable or disable CKEN */ -extern void pxa_set_cken(int clock, int enable); +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 |