diff options
Diffstat (limited to 'arch/arm/mach-sa1100/generic.c')
| -rw-r--r-- | arch/arm/mach-sa1100/generic.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c index 1362994c78aa..c1fbd5b5f9c4 100644 --- a/arch/arm/mach-sa1100/generic.c +++ b/arch/arm/mach-sa1100/generic.c | |||
| @@ -18,9 +18,9 @@ | |||
| 18 | #include <linux/ioport.h> | 18 | #include <linux/ioport.h> |
| 19 | #include <linux/sched.h> /* just for sched_clock() - funny that */ | 19 | #include <linux/sched.h> /* just for sched_clock() - funny that */ |
| 20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
| 21 | #include <linux/cnt32_to_63.h> | ||
| 21 | 22 | ||
| 22 | #include <asm/div64.h> | 23 | #include <asm/div64.h> |
| 23 | #include <asm/cnt32_to_63.h> | ||
| 24 | #include <mach/hardware.h> | 24 | #include <mach/hardware.h> |
| 25 | #include <asm/system.h> | 25 | #include <asm/system.h> |
| 26 | #include <asm/pgtable.h> | 26 | #include <asm/pgtable.h> |
| @@ -42,7 +42,7 @@ EXPORT_SYMBOL(reset_status); | |||
| 42 | static const unsigned short cclk_frequency_100khz[NR_FREQS] = { | 42 | static const unsigned short cclk_frequency_100khz[NR_FREQS] = { |
| 43 | 590, /* 59.0 MHz */ | 43 | 590, /* 59.0 MHz */ |
| 44 | 737, /* 73.7 MHz */ | 44 | 737, /* 73.7 MHz */ |
| 45 | 885, /* 88.5 MHz */ | 45 | 885, /* 88.5 MHz */ |
| 46 | 1032, /* 103.2 MHz */ | 46 | 1032, /* 103.2 MHz */ |
| 47 | 1180, /* 118.0 MHz */ | 47 | 1180, /* 118.0 MHz */ |
| 48 | 1327, /* 132.7 MHz */ | 48 | 1327, /* 132.7 MHz */ |
| @@ -52,10 +52,10 @@ static const unsigned short cclk_frequency_100khz[NR_FREQS] = { | |||
| 52 | 1917, /* 191.7 MHz */ | 52 | 1917, /* 191.7 MHz */ |
| 53 | 2064, /* 206.4 MHz */ | 53 | 2064, /* 206.4 MHz */ |
| 54 | 2212, /* 221.2 MHz */ | 54 | 2212, /* 221.2 MHz */ |
| 55 | 2359, /* 235.9 MHz */ | 55 | 2359, /* 235.9 MHz */ |
| 56 | 2507, /* 250.7 MHz */ | 56 | 2507, /* 250.7 MHz */ |
| 57 | 2654, /* 265.4 MHz */ | 57 | 2654, /* 265.4 MHz */ |
| 58 | 2802 /* 280.2 MHz */ | 58 | 2802 /* 280.2 MHz */ |
| 59 | }; | 59 | }; |
| 60 | 60 | ||
| 61 | #if defined(CONFIG_CPU_FREQ_SA1100) || defined(CONFIG_CPU_FREQ_SA1110) | 61 | #if defined(CONFIG_CPU_FREQ_SA1100) || defined(CONFIG_CPU_FREQ_SA1110) |
| @@ -113,7 +113,7 @@ unsigned int sa11x0_getspeed(unsigned int cpu) | |||
| 113 | #else | 113 | #else |
| 114 | /* | 114 | /* |
| 115 | * We still need to provide this so building without cpufreq works. | 115 | * We still need to provide this so building without cpufreq works. |
| 116 | */ | 116 | */ |
| 117 | unsigned int cpufreq_get(unsigned int cpu) | 117 | unsigned int cpufreq_get(unsigned int cpu) |
| 118 | { | 118 | { |
| 119 | return cclk_frequency_100khz[PPCR & 0xf] * 100; | 119 | return cclk_frequency_100khz[PPCR & 0xf] * 100; |
| @@ -389,7 +389,7 @@ EXPORT_SYMBOL(sa1100fb_lcd_power); | |||
| 389 | */ | 389 | */ |
| 390 | 390 | ||
| 391 | static struct map_desc standard_io_desc[] __initdata = { | 391 | static struct map_desc standard_io_desc[] __initdata = { |
| 392 | { /* PCM */ | 392 | { /* PCM */ |
| 393 | .virtual = 0xf8000000, | 393 | .virtual = 0xf8000000, |
| 394 | .pfn = __phys_to_pfn(0x80000000), | 394 | .pfn = __phys_to_pfn(0x80000000), |
| 395 | .length = 0x00100000, | 395 | .length = 0x00100000, |
