diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-ep93xx/micro9.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-nomadik/board-nhk8815.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-u300/core.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-u300/include/mach/debug-macro.S | 2 | ||||
-rw-r--r-- | arch/arm/plat-s3c/include/plat/gpio-cfg-helpers.h | 2 | ||||
-rw-r--r-- | arch/arm/plat-s3c/include/plat/regs-usb-hsotg-phy.h | 2 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/include/plat/cpu-freq-core.h | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-ep93xx/micro9.c b/arch/arm/mach-ep93xx/micro9.c index f3757a1c5a10..c33360e82868 100644 --- a/arch/arm/mach-ep93xx/micro9.c +++ b/arch/arm/mach-ep93xx/micro9.c | |||
@@ -28,7 +28,7 @@ | |||
28 | * | 28 | * |
29 | * Micro9-High has up to 64MB of 32-bit flash on CS1 | 29 | * Micro9-High has up to 64MB of 32-bit flash on CS1 |
30 | * Micro9-Mid has up to 64MB of either 32-bit or 16-bit flash on CS1 | 30 | * Micro9-Mid has up to 64MB of either 32-bit or 16-bit flash on CS1 |
31 | * Micro9-Lite uses a seperate MTD map driver for flash support | 31 | * Micro9-Lite uses a separate MTD map driver for flash support |
32 | * Micro9-Slim has up to 64MB of either 32-bit or 16-bit flash on CS1 | 32 | * Micro9-Slim has up to 64MB of either 32-bit or 16-bit flash on CS1 |
33 | *************************************************************************/ | 33 | *************************************************************************/ |
34 | static struct physmap_flash_data micro9_flash_data; | 34 | static struct physmap_flash_data micro9_flash_data; |
diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c index 9438bf6613a3..ab3712c86d2b 100644 --- a/arch/arm/mach-nomadik/board-nhk8815.c +++ b/arch/arm/mach-nomadik/board-nhk8815.c | |||
@@ -38,7 +38,7 @@ | |||
38 | #define SRC_CR_INIT_MASK 0x00007fff | 38 | #define SRC_CR_INIT_MASK 0x00007fff |
39 | #define SRC_CR_INIT_VAL 0x2aaa8000 | 39 | #define SRC_CR_INIT_VAL 0x2aaa8000 |
40 | 40 | ||
41 | /* These adresses span 16MB, so use three individual pages */ | 41 | /* These addresses span 16MB, so use three individual pages */ |
42 | static struct resource nhk8815_nand_resources[] = { | 42 | static struct resource nhk8815_nand_resources[] = { |
43 | { | 43 | { |
44 | .name = "nand_addr", | 44 | .name = "nand_addr", |
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c index 653e25be3dd8..d0cb5e940776 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c | |||
@@ -356,7 +356,7 @@ static struct resource ave_resources[] = { | |||
356 | /* | 356 | /* |
357 | * The AVE3e requires two regions of 256MB that it considers | 357 | * The AVE3e requires two regions of 256MB that it considers |
358 | * "invisible". The hardware will not be able to access these | 358 | * "invisible". The hardware will not be able to access these |
359 | * adresses, so they should never point to system RAM. | 359 | * addresses, so they should never point to system RAM. |
360 | */ | 360 | */ |
361 | { | 361 | { |
362 | .name = "AVE3e Reserved 0", | 362 | .name = "AVE3e Reserved 0", |
@@ -571,7 +571,7 @@ static void __init u300_init_check_chip(void) | |||
571 | /* | 571 | /* |
572 | * Some devices and their resources require reserved physical memory from | 572 | * Some devices and their resources require reserved physical memory from |
573 | * the end of the available RAM. This function traverses the list of devices | 573 | * the end of the available RAM. This function traverses the list of devices |
574 | * and assigns actual adresses to these. | 574 | * and assigns actual addresses to these. |
575 | */ | 575 | */ |
576 | static void __init u300_assign_physmem(void) | 576 | static void __init u300_assign_physmem(void) |
577 | { | 577 | { |
diff --git a/arch/arm/mach-u300/include/mach/debug-macro.S b/arch/arm/mach-u300/include/mach/debug-macro.S index f3a1cbbeeab3..d591fe13ed13 100644 --- a/arch/arm/mach-u300/include/mach/debug-macro.S +++ b/arch/arm/mach-u300/include/mach/debug-macro.S | |||
@@ -11,7 +11,7 @@ | |||
11 | #include <mach/hardware.h> | 11 | #include <mach/hardware.h> |
12 | 12 | ||
13 | .macro addruart,rx | 13 | .macro addruart,rx |
14 | /* If we move the adress using MMU, use this. */ | 14 | /* If we move the address using MMU, use this. */ |
15 | mrc p15, 0, \rx, c1, c0 | 15 | mrc p15, 0, \rx, c1, c0 |
16 | tst \rx, #1 @ MMU enabled? | 16 | tst \rx, #1 @ MMU enabled? |
17 | ldreq \rx, = U300_SLOW_PER_PHYS_BASE @ MMU off, physical address | 17 | ldreq \rx, = U300_SLOW_PER_PHYS_BASE @ MMU off, physical address |
diff --git a/arch/arm/plat-s3c/include/plat/gpio-cfg-helpers.h b/arch/arm/plat-s3c/include/plat/gpio-cfg-helpers.h index 652e2bbdaa20..dda19da037ad 100644 --- a/arch/arm/plat-s3c/include/plat/gpio-cfg-helpers.h +++ b/arch/arm/plat-s3c/include/plat/gpio-cfg-helpers.h | |||
@@ -78,7 +78,7 @@ extern int s3c_gpio_setcfg_s3c24xx_a(struct s3c_gpio_chip *chip, | |||
78 | * others = Special functions (dependant on bank) | 78 | * others = Special functions (dependant on bank) |
79 | * | 79 | * |
80 | * Note, since the code to deal with the case where there are two control | 80 | * Note, since the code to deal with the case where there are two control |
81 | * registers instead of one, we do not have a seperate set of functions for | 81 | * registers instead of one, we do not have a separate set of functions for |
82 | * each case. | 82 | * each case. |
83 | */ | 83 | */ |
84 | extern int s3c_gpio_setcfg_s3c64xx_4bit(struct s3c_gpio_chip *chip, | 84 | extern int s3c_gpio_setcfg_s3c64xx_4bit(struct s3c_gpio_chip *chip, |
diff --git a/arch/arm/plat-s3c/include/plat/regs-usb-hsotg-phy.h b/arch/arm/plat-s3c/include/plat/regs-usb-hsotg-phy.h index 36a85f5000c8..a111ad871833 100644 --- a/arch/arm/plat-s3c/include/plat/regs-usb-hsotg-phy.h +++ b/arch/arm/plat-s3c/include/plat/regs-usb-hsotg-phy.h | |||
@@ -12,7 +12,7 @@ | |||
12 | * published by the Free Software Foundation. | 12 | * published by the Free Software Foundation. |
13 | */ | 13 | */ |
14 | 14 | ||
15 | /* Note, this is a seperate header file as some of the clock framework | 15 | /* Note, this is a separate header file as some of the clock framework |
16 | * needs to touch this if the clk_48m is used as the USB OHCI or other | 16 | * needs to touch this if the clk_48m is used as the USB OHCI or other |
17 | * peripheral source. | 17 | * peripheral source. |
18 | */ | 18 | */ |
diff --git a/arch/arm/plat-s3c24xx/include/plat/cpu-freq-core.h b/arch/arm/plat-s3c24xx/include/plat/cpu-freq-core.h index 33d421d78bad..d623235ae961 100644 --- a/arch/arm/plat-s3c24xx/include/plat/cpu-freq-core.h +++ b/arch/arm/plat-s3c24xx/include/plat/cpu-freq-core.h | |||
@@ -135,7 +135,7 @@ struct s3c_cpufreq_config { | |||
135 | * @locktime_m: The lock-time in uS for the MPLL. | 135 | * @locktime_m: The lock-time in uS for the MPLL. |
136 | * @locktime_u: The lock-time in uS for the UPLL. | 136 | * @locktime_u: The lock-time in uS for the UPLL. |
137 | * @locttime_bits: The number of bits each LOCKTIME field. | 137 | * @locttime_bits: The number of bits each LOCKTIME field. |
138 | * @need_pll: Set if this driver needs to change the PLL values to acheive | 138 | * @need_pll: Set if this driver needs to change the PLL values to achieve |
139 | * any frequency changes. This is really only need by devices like the | 139 | * any frequency changes. This is really only need by devices like the |
140 | * S3C2410 where there is no or limited divider between the PLL and the | 140 | * S3C2410 where there is no or limited divider between the PLL and the |
141 | * ARMCLK. | 141 | * ARMCLK. |