diff options
author | Kristoffer Ericson <kristoffer.ericson@gmail.com> | 2008-09-29 12:09:10 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-01 17:29:43 -0400 |
commit | bda03086093d4535e39ee8a6120e3fbb73e83b1a (patch) | |
tree | 3c941b3944d7a97681180b9705c7cb9350087d13 /arch/arm/mach-sa1100/badge4.c | |
parent | 89c816b94892e4132aaf4a8b92b0d512e3adc6f3 (diff) |
[ARM] 5270/1: Fix Formatting in mach-sa1100/ machine files
This patch fixes formatting issues in mach-sa1100/
machine files. More specificly badge4.c,generic.c and
pleb.c.
Signed-off-by: Kristoffer Ericson <Kristoffer.Ericson@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100/badge4.c')
-rw-r--r-- | arch/arm/mach-sa1100/badge4.c | 44 |
1 files changed, 22 insertions, 22 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, |