mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 19:07:52 +00:00
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
This commit is contained in:
commit
e95bf44fba
2 changed files with 15 additions and 15 deletions
|
@ -110,11 +110,6 @@ static struct map_desc exynos4_iodesc[] __initdata = {
|
||||||
.pfn = __phys_to_pfn(EXYNOS4_PA_DMC0),
|
.pfn = __phys_to_pfn(EXYNOS4_PA_DMC0),
|
||||||
.length = SZ_4K,
|
.length = SZ_4K,
|
||||||
.type = MT_DEVICE,
|
.type = MT_DEVICE,
|
||||||
}, {
|
|
||||||
.virtual = (unsigned long)S5P_VA_SROMC,
|
|
||||||
.pfn = __phys_to_pfn(EXYNOS4_PA_SROMC),
|
|
||||||
.length = SZ_4K,
|
|
||||||
.type = MT_DEVICE,
|
|
||||||
}, {
|
}, {
|
||||||
.virtual = (unsigned long)S3C_VA_USB_HSPHY,
|
.virtual = (unsigned long)S3C_VA_USB_HSPHY,
|
||||||
.pfn = __phys_to_pfn(EXYNOS4_PA_HSPHY),
|
.pfn = __phys_to_pfn(EXYNOS4_PA_HSPHY),
|
||||||
|
|
|
@ -202,14 +202,6 @@ extern int s3c_plltab_register(struct cpufreq_frequency_table *plls,
|
||||||
extern struct s3c_cpufreq_config *s3c_cpufreq_getconfig(void);
|
extern struct s3c_cpufreq_config *s3c_cpufreq_getconfig(void);
|
||||||
extern struct s3c_iotimings *s3c_cpufreq_getiotimings(void);
|
extern struct s3c_iotimings *s3c_cpufreq_getiotimings(void);
|
||||||
|
|
||||||
extern void s3c2410_iotiming_debugfs(struct seq_file *seq,
|
|
||||||
struct s3c_cpufreq_config *cfg,
|
|
||||||
union s3c_iobank *iob);
|
|
||||||
|
|
||||||
extern void s3c2412_iotiming_debugfs(struct seq_file *seq,
|
|
||||||
struct s3c_cpufreq_config *cfg,
|
|
||||||
union s3c_iobank *iob);
|
|
||||||
|
|
||||||
#ifdef CONFIG_CPU_FREQ_S3C24XX_DEBUGFS
|
#ifdef CONFIG_CPU_FREQ_S3C24XX_DEBUGFS
|
||||||
#define s3c_cpufreq_debugfs_call(x) x
|
#define s3c_cpufreq_debugfs_call(x) x
|
||||||
#else
|
#else
|
||||||
|
@ -226,6 +218,10 @@ extern void s3c2410_cpufreq_setrefresh(struct s3c_cpufreq_config *cfg);
|
||||||
extern void s3c2410_set_fvco(struct s3c_cpufreq_config *cfg);
|
extern void s3c2410_set_fvco(struct s3c_cpufreq_config *cfg);
|
||||||
|
|
||||||
#ifdef CONFIG_S3C2410_IOTIMING
|
#ifdef CONFIG_S3C2410_IOTIMING
|
||||||
|
extern void s3c2410_iotiming_debugfs(struct seq_file *seq,
|
||||||
|
struct s3c_cpufreq_config *cfg,
|
||||||
|
union s3c_iobank *iob);
|
||||||
|
|
||||||
extern int s3c2410_iotiming_calc(struct s3c_cpufreq_config *cfg,
|
extern int s3c2410_iotiming_calc(struct s3c_cpufreq_config *cfg,
|
||||||
struct s3c_iotimings *iot);
|
struct s3c_iotimings *iot);
|
||||||
|
|
||||||
|
@ -235,6 +231,7 @@ extern int s3c2410_iotiming_get(struct s3c_cpufreq_config *cfg,
|
||||||
extern void s3c2410_iotiming_set(struct s3c_cpufreq_config *cfg,
|
extern void s3c2410_iotiming_set(struct s3c_cpufreq_config *cfg,
|
||||||
struct s3c_iotimings *iot);
|
struct s3c_iotimings *iot);
|
||||||
#else
|
#else
|
||||||
|
#define s3c2410_iotiming_debugfs NULL
|
||||||
#define s3c2410_iotiming_calc NULL
|
#define s3c2410_iotiming_calc NULL
|
||||||
#define s3c2410_iotiming_get NULL
|
#define s3c2410_iotiming_get NULL
|
||||||
#define s3c2410_iotiming_set NULL
|
#define s3c2410_iotiming_set NULL
|
||||||
|
@ -242,8 +239,10 @@ extern void s3c2410_iotiming_set(struct s3c_cpufreq_config *cfg,
|
||||||
|
|
||||||
/* S3C2412 compatible routines */
|
/* S3C2412 compatible routines */
|
||||||
|
|
||||||
extern int s3c2412_iotiming_get(struct s3c_cpufreq_config *cfg,
|
#ifdef CONFIG_S3C2412_IOTIMING
|
||||||
struct s3c_iotimings *timings);
|
extern void s3c2412_iotiming_debugfs(struct seq_file *seq,
|
||||||
|
struct s3c_cpufreq_config *cfg,
|
||||||
|
union s3c_iobank *iob);
|
||||||
|
|
||||||
extern int s3c2412_iotiming_get(struct s3c_cpufreq_config *cfg,
|
extern int s3c2412_iotiming_get(struct s3c_cpufreq_config *cfg,
|
||||||
struct s3c_iotimings *timings);
|
struct s3c_iotimings *timings);
|
||||||
|
@ -253,6 +252,12 @@ extern int s3c2412_iotiming_calc(struct s3c_cpufreq_config *cfg,
|
||||||
|
|
||||||
extern void s3c2412_iotiming_set(struct s3c_cpufreq_config *cfg,
|
extern void s3c2412_iotiming_set(struct s3c_cpufreq_config *cfg,
|
||||||
struct s3c_iotimings *iot);
|
struct s3c_iotimings *iot);
|
||||||
|
#else
|
||||||
|
#define s3c2412_iotiming_debugfs NULL
|
||||||
|
#define s3c2412_iotiming_calc NULL
|
||||||
|
#define s3c2412_iotiming_get NULL
|
||||||
|
#define s3c2412_iotiming_set NULL
|
||||||
|
#endif /* CONFIG_S3C2412_IOTIMING */
|
||||||
|
|
||||||
#ifdef CONFIG_CPU_FREQ_S3C24XX_DEBUG
|
#ifdef CONFIG_CPU_FREQ_S3C24XX_DEBUG
|
||||||
#define s3c_freq_dbg(x...) printk(KERN_INFO x)
|
#define s3c_freq_dbg(x...) printk(KERN_INFO x)
|
||||||
|
|
Loading…
Reference in a new issue