diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-sa1100/badge4.c | 44 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/generic.c | 14 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/pleb.c | 10 |
3 files changed, 34 insertions, 34 deletions
diff --git a/arch/arm/mach-sa1100/badge4.c b/arch/arm/mach-sa1100/badge4.c index 3efefbdd2527..ab5883b39ddf 100644 --- a/arch/arm/mach-sa1100/badge4.c +++ b/arch/arm/mach-sa1100/badge4.c | |||
@@ -95,19 +95,19 @@ static int __init badge4_sa1111_init(void) | |||
95 | * One-hundred-twenty-seven 32 KiW Main Blocks (8128 Ki b) | 95 | * One-hundred-twenty-seven 32 KiW Main Blocks (8128 Ki b) |
96 | */ | 96 | */ |
97 | static struct mtd_partition badge4_partitions[] = { | 97 | static struct mtd_partition badge4_partitions[] = { |
98 | { | 98 | { |
99 | .name = "BLOB boot loader", | 99 | .name = "BLOB boot loader", |
100 | .offset = 0, | 100 | .offset = 0, |
101 | .size = 0x0000A000 | 101 | .size = 0x0000A000 |
102 | }, { | 102 | }, { |
103 | .name = "params", | 103 | .name = "params", |
104 | .offset = MTDPART_OFS_APPEND, | 104 | .offset = MTDPART_OFS_APPEND, |
105 | .size = 0x00006000 | 105 | .size = 0x00006000 |
106 | }, { | 106 | }, { |
107 | .name = "root", | 107 | .name = "root", |
108 | .offset = MTDPART_OFS_APPEND, | 108 | .offset = MTDPART_OFS_APPEND, |
109 | .size = MTDPART_SIZ_FULL | 109 | .size = MTDPART_SIZ_FULL |
110 | } | 110 | } |
111 | }; | 111 | }; |
112 | 112 | ||
113 | static struct flash_platform_data badge4_flash_data = { | 113 | static struct flash_platform_data badge4_flash_data = { |
@@ -126,7 +126,7 @@ static int five_v_on __initdata = 0; | |||
126 | 126 | ||
127 | static int __init five_v_on_setup(char *ignore) | 127 | static int __init five_v_on_setup(char *ignore) |
128 | { | 128 | { |
129 | five_v_on = 1; | 129 | five_v_on = 1; |
130 | return 1; | 130 | return 1; |
131 | } | 131 | } |
132 | __setup("five_v_on", five_v_on_setup); | 132 | __setup("five_v_on", five_v_on_setup); |
@@ -171,15 +171,15 @@ static int __init badge4_init(void) | |||
171 | GPCR = BADGE4_GPIO_TESTPT_J7; | 171 | GPCR = BADGE4_GPIO_TESTPT_J7; |
172 | GPDR |= BADGE4_GPIO_TESTPT_J7; | 172 | GPDR |= BADGE4_GPIO_TESTPT_J7; |
173 | 173 | ||
174 | /* 5V supply rail. */ | 174 | /* 5V supply rail. */ |
175 | GPCR = BADGE4_GPIO_PCMEN5V; /* initially off */ | 175 | GPCR = BADGE4_GPIO_PCMEN5V; /* initially off */ |
176 | GPDR |= BADGE4_GPIO_PCMEN5V; | 176 | GPDR |= BADGE4_GPIO_PCMEN5V; |
177 | 177 | ||
178 | /* CPLD sdram type inputs; set up by blob */ | 178 | /* CPLD sdram type inputs; set up by blob */ |
179 | //GPDR |= (BADGE4_GPIO_SDTYP1 | BADGE4_GPIO_SDTYP0); | 179 | //GPDR |= (BADGE4_GPIO_SDTYP1 | BADGE4_GPIO_SDTYP0); |
180 | printk(KERN_DEBUG __FILE__ ": SDRAM CPLD typ1=%d typ0=%d\n", | 180 | printk(KERN_DEBUG __FILE__ ": SDRAM CPLD typ1=%d typ0=%d\n", |
181 | !!(GPLR & BADGE4_GPIO_SDTYP1), | 181 | !!(GPLR & BADGE4_GPIO_SDTYP1), |
182 | !!(GPLR & BADGE4_GPIO_SDTYP0)); | 182 | !!(GPLR & BADGE4_GPIO_SDTYP0)); |
183 | 183 | ||
184 | /* SA1111 reset pin; set up by blob */ | 184 | /* SA1111 reset pin; set up by blob */ |
185 | //GPSR = BADGE4_GPIO_SA1111_NRST; | 185 | //GPSR = BADGE4_GPIO_SA1111_NRST; |
@@ -205,8 +205,8 @@ static int __init badge4_init(void) | |||
205 | ret = badge4_sa1111_init(); | 205 | ret = badge4_sa1111_init(); |
206 | if (ret < 0) | 206 | if (ret < 0) |
207 | printk(KERN_ERR | 207 | printk(KERN_ERR |
208 | "%s: SA-1111 initialization failed (%d)\n", | 208 | "%s: SA-1111 initialization failed (%d)\n", |
209 | __func__, ret); | 209 | __func__, ret); |
210 | 210 | ||
211 | 211 | ||
212 | /* maybe turn on 5v0 from the start */ | 212 | /* maybe turn on 5v0 from the start */ |
@@ -254,7 +254,7 @@ EXPORT_SYMBOL(badge4_set_5V); | |||
254 | 254 | ||
255 | 255 | ||
256 | static struct map_desc badge4_io_desc[] __initdata = { | 256 | static struct map_desc badge4_io_desc[] __initdata = { |
257 | { /* SRAM bank 1 */ | 257 | { /* SRAM bank 1 */ |
258 | .virtual = 0xf1000000, | 258 | .virtual = 0xf1000000, |
259 | .pfn = __phys_to_pfn(0x08000000), | 259 | .pfn = __phys_to_pfn(0x08000000), |
260 | .length = 0x00100000, | 260 | .length = 0x00100000, |
diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c index 1362994c78aa..b9fae2a39851 100644 --- a/arch/arm/mach-sa1100/generic.c +++ b/arch/arm/mach-sa1100/generic.c | |||
@@ -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, |
diff --git a/arch/arm/mach-sa1100/pleb.c b/arch/arm/mach-sa1100/pleb.c index 83be1c6c5f80..ec519ecfef1b 100644 --- a/arch/arm/mach-sa1100/pleb.c +++ b/arch/arm/mach-sa1100/pleb.c | |||
@@ -39,8 +39,8 @@ | |||
39 | 39 | ||
40 | static struct resource smc91x_resources[] = { | 40 | static struct resource smc91x_resources[] = { |
41 | [0] = { | 41 | [0] = { |
42 | .start = PLEB_ETH0_P, | 42 | .start = PLEB_ETH0_P, |
43 | .end = PLEB_ETH0_P | 0x03ffffff, | 43 | .end = PLEB_ETH0_P | 0x03ffffff, |
44 | .flags = IORESOURCE_MEM, | 44 | .flags = IORESOURCE_MEM, |
45 | }, | 45 | }, |
46 | #if 0 /* Autoprobe instead, to get rising/falling edge characteristic right */ | 46 | #if 0 /* Autoprobe instead, to get rising/falling edge characteristic right */ |
@@ -87,15 +87,15 @@ static struct resource pleb_flash_resources[] = { | |||
87 | static struct mtd_partition pleb_partitions[] = { | 87 | static struct mtd_partition pleb_partitions[] = { |
88 | { | 88 | { |
89 | .name = "blob", | 89 | .name = "blob", |
90 | .offset = 0, | 90 | .offset = 0, |
91 | .size = 0x00020000, | 91 | .size = 0x00020000, |
92 | }, { | 92 | }, { |
93 | .name = "kernel", | 93 | .name = "kernel", |
94 | .offset = MTDPART_OFS_APPEND, | 94 | .offset = MTDPART_OFS_APPEND, |
95 | .size = 0x000e0000, | 95 | .size = 0x000e0000, |
96 | }, { | 96 | }, { |
97 | .name = "rootfs", | 97 | .name = "rootfs", |
98 | .offset = MTDPART_OFS_APPEND, | 98 | .offset = MTDPART_OFS_APPEND, |
99 | .size = 0x00300000, | 99 | .size = 0x00300000, |
100 | } | 100 | } |
101 | }; | 101 | }; |