Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'v3.2-samsung-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung
* 'v3.2-samsung-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Remove duplicated SROMC static memory mapping
ARM: SAMSUNG: Fix build error when selecting CPU_FREQ_S3C24XX_DEBUGFS on S3C2440
+15
-15
-5
arch/arm/mach-exynos/cpu.c
-5
arch/arm/mach-exynos/cpu.c
···
111
111
.length = SZ_4K,
112
112
.type = MT_DEVICE,
113
113
}, {
114
-
.virtual = (unsigned long)S5P_VA_SROMC,
115
-
.pfn = __phys_to_pfn(EXYNOS4_PA_SROMC),
116
-
.length = SZ_4K,
117
-
.type = MT_DEVICE,
118
-
}, {
119
114
.virtual = (unsigned long)S3C_VA_USB_HSPHY,
120
115
.pfn = __phys_to_pfn(EXYNOS4_PA_HSPHY),
121
116
.length = SZ_4K,
+15
-10
arch/arm/plat-samsung/include/plat/cpu-freq-core.h
+15
-10
arch/arm/plat-samsung/include/plat/cpu-freq-core.h
···
202
202
extern struct s3c_cpufreq_config *s3c_cpufreq_getconfig(void);
203
203
extern struct s3c_iotimings *s3c_cpufreq_getiotimings(void);
204
204
205
-
extern void s3c2410_iotiming_debugfs(struct seq_file *seq,
206
-
struct s3c_cpufreq_config *cfg,
207
-
union s3c_iobank *iob);
208
-
209
-
extern void s3c2412_iotiming_debugfs(struct seq_file *seq,
210
-
struct s3c_cpufreq_config *cfg,
211
-
union s3c_iobank *iob);
212
-
213
205
#ifdef CONFIG_CPU_FREQ_S3C24XX_DEBUGFS
214
206
#define s3c_cpufreq_debugfs_call(x) x
215
207
#else
···
218
226
extern void s3c2410_set_fvco(struct s3c_cpufreq_config *cfg);
219
227
220
228
#ifdef CONFIG_S3C2410_IOTIMING
229
+
extern void s3c2410_iotiming_debugfs(struct seq_file *seq,
230
+
struct s3c_cpufreq_config *cfg,
231
+
union s3c_iobank *iob);
232
+
221
233
extern int s3c2410_iotiming_calc(struct s3c_cpufreq_config *cfg,
222
234
struct s3c_iotimings *iot);
223
235
···
231
235
extern void s3c2410_iotiming_set(struct s3c_cpufreq_config *cfg,
232
236
struct s3c_iotimings *iot);
233
237
#else
238
+
#define s3c2410_iotiming_debugfs NULL
234
239
#define s3c2410_iotiming_calc NULL
235
240
#define s3c2410_iotiming_get NULL
236
241
#define s3c2410_iotiming_set NULL
···
239
242
240
243
/* S3C2412 compatible routines */
241
244
242
-
extern int s3c2412_iotiming_get(struct s3c_cpufreq_config *cfg,
243
-
struct s3c_iotimings *timings);
245
+
#ifdef CONFIG_S3C2412_IOTIMING
246
+
extern void s3c2412_iotiming_debugfs(struct seq_file *seq,
247
+
struct s3c_cpufreq_config *cfg,
248
+
union s3c_iobank *iob);
244
249
245
250
extern int s3c2412_iotiming_get(struct s3c_cpufreq_config *cfg,
246
251
struct s3c_iotimings *timings);
···
252
253
253
254
extern void s3c2412_iotiming_set(struct s3c_cpufreq_config *cfg,
254
255
struct s3c_iotimings *iot);
256
+
#else
257
+
#define s3c2412_iotiming_debugfs NULL
258
+
#define s3c2412_iotiming_calc NULL
259
+
#define s3c2412_iotiming_get NULL
260
+
#define s3c2412_iotiming_set NULL
261
+
#endif /* CONFIG_S3C2412_IOTIMING */
255
262
256
263
#ifdef CONFIG_CPU_FREQ_S3C24XX_DEBUG
257
264
#define s3c_freq_dbg(x...) printk(KERN_INFO x)