lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ARM] 5270/1: Fix Formatting in mach-sa1100/ machine files

Browse Source 
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>
This commit is contained in:
Kristoffer Ericson
2008-09-29 17:09:10 +01:00
committed by Russell King
parent 89c816b948
commit bda0308609
3 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
arch/arm/mach-sa1100/badge4.c
View File

@@ -95,19 +95,19 @@ static int __init badge4_sa1111_init(void)
* One-hundred-twenty-seven 32 KiW Main Blocks (8128 Ki b) * One-hundred-twenty-seven 32 KiW Main Blocks (8128 Ki b)
*/ */
static struct mtd_partition badge4_partitions[] = { static struct mtd_partition badge4_partitions[] = {
{ {
.name = "BLOB boot loader", .name = "BLOB boot loader",
.offset = 0, .offset = 0,
.size = 0x0000A000 .size = 0x0000A000
}, { }, {
.name = "params", .name = "params",
.offset = MTDPART_OFS_APPEND, .offset = MTDPART_OFS_APPEND,
.size = 0x00006000 .size = 0x00006000
}, { }, {
.name = "root", .name = "root",
.offset = MTDPART_OFS_APPEND, .offset = MTDPART_OFS_APPEND,
.size = MTDPART_SIZ_FULL .size = MTDPART_SIZ_FULL
} }
}; };
static struct flash_platform_data badge4_flash_data = { static struct flash_platform_data badge4_flash_data = {
@@ -126,7 +126,7 @@ static int five_v_on __initdata = 0;
static int __init five_v_on_setup(char *ignore) static int __init five_v_on_setup(char *ignore)
{ {
five_v_on = 1; five_v_on = 1;
return 1; return 1;
} }
__setup("five_v_on", five_v_on_setup); __setup("five_v_on", five_v_on_setup);
@@ -171,15 +171,15 @@ static int __init badge4_init(void)
GPCR = BADGE4_GPIO_TESTPT_J7; GPCR = BADGE4_GPIO_TESTPT_J7;
GPDR |= BADGE4_GPIO_TESTPT_J7; GPDR |= BADGE4_GPIO_TESTPT_J7;
/* 5V supply rail. */ /* 5V supply rail. */
GPCR = BADGE4_GPIO_PCMEN5V; /* initially off */ GPCR = BADGE4_GPIO_PCMEN5V; /* initially off */
GPDR |= BADGE4_GPIO_PCMEN5V; GPDR |= BADGE4_GPIO_PCMEN5V;
/* CPLD sdram type inputs; set up by blob */ /* CPLD sdram type inputs; set up by blob */
//GPDR |= (BADGE4_GPIO_SDTYP1 | BADGE4_GPIO_SDTYP0); //GPDR |= (BADGE4_GPIO_SDTYP1 | BADGE4_GPIO_SDTYP0);
printk(KERN_DEBUG __FILE__ ": SDRAM CPLD typ1=%d typ0=%d\n", printk(KERN_DEBUG __FILE__ ": SDRAM CPLD typ1=%d typ0=%d\n",
!!(GPLR & BADGE4_GPIO_SDTYP1), !!(GPLR & BADGE4_GPIO_SDTYP1),
!!(GPLR & BADGE4_GPIO_SDTYP0)); !!(GPLR & BADGE4_GPIO_SDTYP0));
/* SA1111 reset pin; set up by blob */ /* SA1111 reset pin; set up by blob */
//GPSR = BADGE4_GPIO_SA1111_NRST; //GPSR = BADGE4_GPIO_SA1111_NRST;
@@ -205,8 +205,8 @@ static int __init badge4_init(void)
ret = badge4_sa1111_init(); ret = badge4_sa1111_init();
if (ret < 0) if (ret < 0)
printk(KERN_ERR printk(KERN_ERR
"%s: SA-1111 initialization failed (%d)\n", "%s: SA-1111 initialization failed (%d)\n",
__func__, ret); __func__, ret);
/* maybe turn on 5v0 from the start */ /* maybe turn on 5v0 from the start */
@@ -254,7 +254,7 @@ EXPORT_SYMBOL(badge4_set_5V);
static struct map_desc badge4_io_desc[] __initdata = { static struct map_desc badge4_io_desc[] __initdata = {
{ /* SRAM bank 1 */ { /* SRAM bank 1 */
.virtual = 0xf1000000, .virtual = 0xf1000000,
.pfn = __phys_to_pfn(0x08000000), .pfn = __phys_to_pfn(0x08000000),
.length = 0x00100000, .length = 0x00100000,

12
arch/arm/mach-sa1100/generic.c
View File

@@ -42,7 +42,7 @@ EXPORT_SYMBOL(reset_status);
static const unsigned short cclk_frequency_100khz[NR_FREQS] = { static const unsigned short cclk_frequency_100khz[NR_FREQS] = {
590, /* 59.0 MHz */ 590, /* 59.0 MHz */
737, /* 73.7 MHz */ 737, /* 73.7 MHz */
885, /* 88.5 MHz */ 885, /* 88.5 MHz */
1032, /* 103.2 MHz */ 1032, /* 103.2 MHz */
1180, /* 118.0 MHz */ 1180, /* 118.0 MHz */
1327, /* 132.7 MHz */ 1327, /* 132.7 MHz */
@@ -52,10 +52,10 @@ static const unsigned short cclk_frequency_100khz[NR_FREQS] = {
1917, /* 191.7 MHz */ 1917, /* 191.7 MHz */
2064, /* 206.4 MHz */ 2064, /* 206.4 MHz */
2212, /* 221.2 MHz */ 2212, /* 221.2 MHz */
2359, /* 235.9 MHz */ 2359, /* 235.9 MHz */
2507, /* 250.7 MHz */ 2507, /* 250.7 MHz */
2654, /* 265.4 MHz */ 2654, /* 265.4 MHz */
2802 /* 280.2 MHz */ 2802 /* 280.2 MHz */
}; };
#if defined(CONFIG_CPU_FREQ_SA1100) || defined(CONFIG_CPU_FREQ_SA1110) #if defined(CONFIG_CPU_FREQ_SA1100) || defined(CONFIG_CPU_FREQ_SA1110)
@@ -389,7 +389,7 @@ EXPORT_SYMBOL(sa1100fb_lcd_power);
*/ */
static struct map_desc standard_io_desc[] __initdata = { static struct map_desc standard_io_desc[] __initdata = {
{ /* PCM */ { /* PCM */
.virtual = 0xf8000000, .virtual = 0xf8000000,
.pfn = __phys_to_pfn(0x80000000), .pfn = __phys_to_pfn(0x80000000),
.length = 0x00100000, .length = 0x00100000,

10
arch/arm/mach-sa1100/pleb.c
View File

@@ -39,8 +39,8 @@
static struct resource smc91x_resources[] = { static struct resource smc91x_resources[] = {
[0] = { [0] = {
.start = PLEB_ETH0_P, .start = PLEB_ETH0_P,
.end = PLEB_ETH0_P | 0x03ffffff, .end = PLEB_ETH0_P | 0x03ffffff,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
#if 0 /* Autoprobe instead, to get rising/falling edge characteristic right */ #if 0 /* Autoprobe instead, to get rising/falling edge characteristic right */
@@ -87,15 +87,15 @@ static struct resource pleb_flash_resources[] = {
static struct mtd_partition pleb_partitions[] = { static struct mtd_partition pleb_partitions[] = {
{ {
.name = "blob", .name = "blob",
.offset = 0, .offset = 0,
.size = 0x00020000, .size = 0x00020000,
}, { }, {
.name = "kernel", .name = "kernel",
.offset = MTDPART_OFS_APPEND, .offset = MTDPART_OFS_APPEND,
.size = 0x000e0000, .size = 0x000e0000,
}, { }, {
.name = "rootfs", .name = "rootfs",
.offset = MTDPART_OFS_APPEND, .offset = MTDPART_OFS_APPEND,
.size = 0x00300000, .size = 0x00300000,
} }
}; };