Browse Source

[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>
Russell King 17 years ago
parent
commit
a7073b8b47
2 changed files with 7 additions and 3 deletions
  1. 2 2
      arch/arm/mach-pxa/generic.c
  2. 5 1
      include/asm-arm/arch-pxa/hardware.h

+ 2 - 2
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
  * 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;
 	unsigned long flags;
 	local_irq_save(flags);
 	local_irq_save(flags);
@@ -136,7 +136,7 @@ void pxa_set_cken(int clock, int enable)
 	local_irq_restore(flags);
 	local_irq_restore(flags);
 }
 }
 
 
-EXPORT_SYMBOL(pxa_set_cken);
+EXPORT_SYMBOL(__pxa_set_cken);
 
 
 /*
 /*
  * Intel PXA2xx internal register mapping.
  * Intel PXA2xx internal register mapping.

+ 5 - 1
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
  * 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
  * return current memory and LCD clock frequency in units of 10kHz