Commit a7073b8b47651ce2ed27564ed8395eff81120c58

Authored by Russell King
Committed by Russell King
1 parent a88a447d44

[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>

Showing 2 changed files with 7 additions and 3 deletions Side-by-side Diff

arch/arm/mach-pxa/generic.c
... ... @@ -123,7 +123,7 @@
123 123 /*
124 124 * Routine to safely enable or disable a clock in the CKEN
125 125 */
126   -void pxa_set_cken(int clock, int enable)
  126 +void __pxa_set_cken(int clock, int enable)
127 127 {
128 128 unsigned long flags;
129 129 local_irq_save(flags);
... ... @@ -136,7 +136,7 @@
136 136 local_irq_restore(flags);
137 137 }
138 138  
139   -EXPORT_SYMBOL(pxa_set_cken);
  139 +EXPORT_SYMBOL(__pxa_set_cken);
140 140  
141 141 /*
142 142 * Intel PXA2xx internal register mapping.
include/asm-arm/arch-pxa/hardware.h
... ... @@ -116,7 +116,11 @@
116 116 /*
117 117 * Routine to enable or disable CKEN
118 118 */
119   -extern void pxa_set_cken(int clock, int enable);
  119 +static inline void __deprecated pxa_set_cken(int clock, int enable)
  120 +{
  121 + extern void __pxa_set_cken(int clock, int enable);
  122 + __pxa_set_cken(clock, enable);
  123 +}
120 124  
121 125 /*
122 126 * return current memory and LCD clock frequency in units of 10kHz