Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 15a4033354c68eb75e417ab60771f36212610820

Authored by Russell King
Committed by Russell King
1 parent e259a3aecb

[ARM] pxa: fix naming of memory/lcd/core clock functions 

Rename pxa25x and pxa27x memory/lcd/core clock functions, and
select the correct version at run time.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Showing 4 changed files with 61 additions and 23 deletions Side-by-side Diff

arch/arm/mach-pxa/generic.c
Diff comments   View file @ 15a4033
... ... @@ -43,6 +43,44 @@
43 43 #include "generic.h"
44 44  
45 45 /*
  46 + * Get the clock frequency as reflected by CCCR and the turbo flag.
  47 + * We assume these values have been applied via a fcs.
  48 + * If info is not 0 we also display the current settings.
  49 + */
  50 +unsigned int get_clk_frequency_khz(int info)
  51 +{
  52 + if (cpu_is_pxa21x() || cpu_is_pxa25x())
  53 + return pxa25x_get_clk_frequency_khz(info);
  54 + else
  55 + return pxa27x_get_clk_frequency_khz(info);
  56 +}
  57 +EXPORT_SYMBOL(get_clk_frequency_khz);
  58 +
  59 +/*
  60 + * Return the current memory clock frequency in units of 10kHz
  61 + */
  62 +unsigned int get_memclk_frequency_10khz(void)
  63 +{
  64 + if (cpu_is_pxa21x() || cpu_is_pxa25x())
  65 + return pxa25x_get_memclk_frequency_10khz();
  66 + else
  67 + return pxa27x_get_memclk_frequency_10khz();
  68 +}
  69 +EXPORT_SYMBOL(get_memclk_frequency_10khz);
  70 +
  71 +/*
  72 + * Return the current LCD clock frequency in units of 10kHz
  73 + */
  74 +unsigned int get_lcdclk_frequency_10khz(void)
  75 +{
  76 + if (cpu_is_pxa21x() || cpu_is_pxa25x())
  77 + return pxa25x_get_memclk_frequency_10khz();
  78 + else
  79 + return pxa27x_get_lcdclk_frequency_10khz();
  80 +}
  81 +EXPORT_SYMBOL(get_lcdclk_frequency_10khz);
  82 +
  83 +/*
46 84 * Handy function to set GPIO alternate functions
47 85 */
48 86  
arch/arm/mach-pxa/generic.h
Diff comments   View file @ 15a4033
... ... @@ -25,4 +25,22 @@
25 25 mi->bank[__nr].start = (__start), \
26 26 mi->bank[__nr].size = (__size), \
27 27 mi->bank[__nr].node = (((unsigned)(__start) - PHYS_OFFSET) >> 27)
  28 +
  29 +#ifdef CONFIG_PXA25x
  30 +extern unsigned pxa25x_get_clk_frequency_khz(int);
  31 +extern unsigned pxa25x_get_memclk_frequency_10khz(void);
  32 +#else
  33 +#define pxa25x_get_clk_frequency_khz(x) (0)
  34 +#define pxa25x_get_memclk_frequency_10khz() (0)
  35 +#endif
  36 +
  37 +#ifdef CONFIG_PXA27x
  38 +extern unsigned pxa27x_get_clk_frequency_khz(int);
  39 +extern unsigned pxa27x_get_memclk_frequency_10khz(void);
  40 +extern unsigned pxa27x_get_lcdclk_frequency_10khz(void);
  41 +#else
  42 +#define pxa27x_get_clk_frequency_khz(x) (0)
  43 +#define pxa27x_get_memclk_frequency_10khz() (0)
  44 +#define pxa27x_get_lcdclk_frequency_10khz() (0)
  45 +#endif
arch/arm/mach-pxa/pxa25x.c
Diff comments   View file @ 15a4033
... ... @@ -53,7 +53,7 @@
53 53 * We assume these values have been applied via a fcs.
54 54 * If info is not 0 we also display the current settings.
55 55 */
56   -unsigned int get_clk_frequency_khz(int info)
  56 +unsigned int pxa25x_get_clk_frequency_khz(int info)
57 57 {
58 58 unsigned long cccr, turbo;
59 59 unsigned int l, L, m, M, n2, N;
60 60  
61 61  
... ... @@ -86,27 +86,13 @@
86 86 return (turbo & 1) ? (N/1000) : (M/1000);
87 87 }
88 88  
89   -EXPORT_SYMBOL(get_clk_frequency_khz);
90   -
91 89 /*
92 90 * Return the current memory clock frequency in units of 10kHz
93 91 */
94   -unsigned int get_memclk_frequency_10khz(void)
  92 +unsigned int pxa25x_get_memclk_frequency_10khz(void)
95 93 {
96 94 return L_clk_mult[(CCCR >> 0) & 0x1f] * BASE_CLK / 10000;
97 95 }
98   -
99   -EXPORT_SYMBOL(get_memclk_frequency_10khz);
100   -
101   -/*
102   - * Return the current LCD clock frequency in units of 10kHz
103   - */
104   -unsigned int get_lcdclk_frequency_10khz(void)
105   -{
106   - return get_memclk_frequency_10khz();
107   -}
108   -
109   -EXPORT_SYMBOL(get_lcdclk_frequency_10khz);
110 96  
111 97 #ifdef CONFIG_PM
112 98  
arch/arm/mach-pxa/pxa27x.c
Diff comments   View file @ 15a4033
... ... @@ -36,7 +36,7 @@
36 36 * We assume these values have been applied via a fcs.
37 37 * If info is not 0 we also display the current settings.
38 38 */
39   -unsigned int get_clk_frequency_khz( int info)
  39 +unsigned int pxa27x_get_clk_frequency_khz(int info)
40 40 {
41 41 unsigned long ccsr, clkcfg;
42 42 unsigned int l, L, m, M, n2, N, S;
... ... @@ -79,7 +79,7 @@
79 79 * Return the current mem clock frequency in units of 10kHz as
80 80 * reflected by CCCR[A], B, and L
81 81 */
82   -unsigned int get_memclk_frequency_10khz(void)
  82 +unsigned int pxa27x_get_memclk_frequency_10khz(void)
83 83 {
84 84 unsigned long ccsr, clkcfg;
85 85 unsigned int l, L, m, M;
... ... @@ -104,7 +104,7 @@
104 104 /*
105 105 * Return the current LCD clock frequency in units of 10kHz as
106 106 */
107   -unsigned int get_lcdclk_frequency_10khz(void)
  107 +unsigned int pxa27x_get_lcdclk_frequency_10khz(void)
108 108 {
109 109 unsigned long ccsr;
110 110 unsigned int l, L, k, K;
... ... @@ -119,10 +119,6 @@
119 119  
120 120 return (K / 10000);
121 121 }
122   -
123   -EXPORT_SYMBOL(get_clk_frequency_khz);
124   -EXPORT_SYMBOL(get_memclk_frequency_10khz);
125   -EXPORT_SYMBOL(get_lcdclk_frequency_10khz);
126 122  
127 123 #ifdef CONFIG_PM
128 124