ARM: pxa: reduce the scope of get_memclk_frequency_10khz()

Up to now, only pxa2xx pcmcia driver is using the API. No other device driver is using this API in PXA3xx or any other PXA silicons. Restrict the scope only on pxa2xx and remove the implementation of pxa3xx. So we can avoid oo much checking on cpuid after more pxa chips supported. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Cc: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

ARM: pxa: reduce the scope of get_memclk_frequency_10khz()
Up to now, only pxa2xx pcmcia driver is using the API. No other device driver is using this API in PXA3xx or any other PXA silicons. Restrict the scope only on pxa2xx and remove the implementation of pxa3xx. So we can avoid oo much checking on cpuid after more pxa chips supported. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Cc: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Haojian Zhuang · Eric Miao
1 parent ecf89b8a91
Showing 3 changed files with 1 additions and 21 deletions Side-by-side Diff
arch/arm/mach-pxa/generic.c
arch/arm/mach-pxa/generic.h
arch/arm/mach-pxa/pxa3xx.c
@@ -79,8 +79,7 @@
 		return pxa25x_get_memclk_frequency_10khz();
 	else if (cpu_is_pxa27x())
 		return pxa27x_get_memclk_frequency_10khz();
-	else
-		return pxa3xx_get_memclk_frequency_10khz();
+	return 0;
 }
 EXPORT_SYMBOL(get_memclk_frequency_10khz);
  
@@ -54,11 +54,9 @@
  
 #ifdef CONFIG_PXA3xx
 extern unsigned pxa3xx_get_clk_frequency_khz(int);
-extern unsigned pxa3xx_get_memclk_frequency_10khz(void);
 extern void pxa3xx_clear_reset_status(unsigned int);
 #else
 #define pxa3xx_get_clk_frequency_khz(x)		(0)
-#define pxa3xx_get_memclk_frequency_10khz()	(0)
 static inline void pxa3xx_clear_reset_status(unsigned int mask) {}
 #endif
  
@@ -98,23 +98,6 @@
 	return CLK / 1000;
 }
  
-/*
- * Return the current static memory controller clock frequency
- * in units of 10kHz
- */
-unsigned int pxa3xx_get_memclk_frequency_10khz(void)
-{
-	unsigned long acsr;
-	unsigned int smcfs, clk = 0;
-
-	acsr = ACSR;
-
-	smcfs = (acsr >> 23) & 0x7;
-	clk = (acsr & ACCR_D0CS) ? RO_CLK : smcfs_mult[smcfs] * BASE_CLK;
-
-	return (clk / 10000);
-}
-
 void pxa3xx_clear_reset_status(unsigned int mask)
 {
 	/* RESET_STATUS_* has a 1:1 mapping with ARSR */
...	...	@@ -79,8 +79,7 @@
79	79	return pxa25x_get_memclk_frequency_10khz();
80	80	else if (cpu_is_pxa27x())
81	81	return pxa27x_get_memclk_frequency_10khz();
82		- else
83		- return pxa3xx_get_memclk_frequency_10khz();
	82	+ return 0;
84	83	}
85	84	EXPORT_SYMBOL(get_memclk_frequency_10khz);
86	85
...	...	@@ -54,11 +54,9 @@
54	54
55	55	#ifdef CONFIG_PXA3xx
56	56	extern unsigned pxa3xx_get_clk_frequency_khz(int);
57		-extern unsigned pxa3xx_get_memclk_frequency_10khz(void);
58	57	extern void pxa3xx_clear_reset_status(unsigned int);
59	58	#else
60	59	#define pxa3xx_get_clk_frequency_khz(x) (0)
61		-#define pxa3xx_get_memclk_frequency_10khz() (0)
62	60	static inline void pxa3xx_clear_reset_status(unsigned int mask) {}
63	61	#endif
64	62
...	...	@@ -98,23 +98,6 @@
98	98	return CLK / 1000;
99	99	}
100	100
101		-/*
102		- * Return the current static memory controller clock frequency
103		- * in units of 10kHz
104		- */
105		-unsigned int pxa3xx_get_memclk_frequency_10khz(void)
106		-{
107		- unsigned long acsr;
108		- unsigned int smcfs, clk = 0;
109		-
110		- acsr = ACSR;
111		-
112		- smcfs = (acsr >> 23) & 0x7;
113		- clk = (acsr & ACCR_D0CS) ? RO_CLK : smcfs_mult[smcfs] * BASE_CLK;
114		-
115		- return (clk / 10000);
116		-}
117		-
118	101	void pxa3xx_clear_reset_status(unsigned int mask)
119	102	{
120	103	/* RESET_STATUS_* has a 1:1 mapping with ARSR */