diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-11-21 07:05:26 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-21 07:05:26 -0500 |
commit | 3c6f4b154a63a78cefa08f7da861d90d13783136 (patch) | |
tree | 741e5abac9c792e3828551fb6d7869140c34145c | |
parent | 58a9e8f8fe71c4172198535d88f8fee4d2aea3b2 (diff) | |
parent | 3e940958ed3625187704f41129801800f70c2169 (diff) |
Merge tag 'renesas-soc-cleanups2-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup
Pull "Second Round of Renesas ARM Based SoC Cleanups for v3.19" from Simon Horman:
* Spelling and grammar fixes
* tag 'renesas-soc-cleanups2-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: r8a7779: Spelling/grammar s/entity/identity/, s/map/mapping/
ARM: shmobile: sh7372: Spelling/grammar s/entity map/identity mapping/
ARM: shmobile: sh73a0: Spelling/grammar s/entity map/identity mapping/
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7779.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/setup-sh7372.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/setup-sh73a0.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c index d08e75cceaab..645d7cca6238 100644 --- a/arch/arm/mach-shmobile/setup-r8a7779.c +++ b/arch/arm/mach-shmobile/setup-r8a7779.c | |||
@@ -48,14 +48,14 @@ | |||
48 | #include "r8a7779.h" | 48 | #include "r8a7779.h" |
49 | 49 | ||
50 | static struct map_desc r8a7779_io_desc[] __initdata = { | 50 | static struct map_desc r8a7779_io_desc[] __initdata = { |
51 | /* 2M entity map for 0xf0000000 (MPCORE) */ | 51 | /* 2M identity mapping for 0xf0000000 (MPCORE) */ |
52 | { | 52 | { |
53 | .virtual = 0xf0000000, | 53 | .virtual = 0xf0000000, |
54 | .pfn = __phys_to_pfn(0xf0000000), | 54 | .pfn = __phys_to_pfn(0xf0000000), |
55 | .length = SZ_2M, | 55 | .length = SZ_2M, |
56 | .type = MT_DEVICE_NONSHARED | 56 | .type = MT_DEVICE_NONSHARED |
57 | }, | 57 | }, |
58 | /* 16M entity map for 0xfexxxxxx (DMAC-S/HPBREG/INTC2/LRAM/DBSC) */ | 58 | /* 16M identity mapping for 0xfexxxxxx (DMAC-S/HPBREG/INTC2/LRAM/DBSC) */ |
59 | { | 59 | { |
60 | .virtual = 0xfe000000, | 60 | .virtual = 0xfe000000, |
61 | .pfn = __phys_to_pfn(0xfe000000), | 61 | .pfn = __phys_to_pfn(0xfe000000), |
@@ -679,7 +679,7 @@ void __init r8a7779_add_early_devices(void) | |||
679 | 679 | ||
680 | /* Early serial console setup is not included here due to | 680 | /* Early serial console setup is not included here due to |
681 | * memory map collisions. The SCIF serial ports in r8a7779 | 681 | * memory map collisions. The SCIF serial ports in r8a7779 |
682 | * are difficult to entity map 1:1 due to collision with the | 682 | * are difficult to identity map 1:1 due to collision with the |
683 | * virtual memory range used by the coherent DMA code on ARM. | 683 | * virtual memory range used by the coherent DMA code on ARM. |
684 | * | 684 | * |
685 | * Anyone wanting to debug early can remove UPF_IOREMAP from | 685 | * Anyone wanting to debug early can remove UPF_IOREMAP from |
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c index e81c38538e13..ca2b80b9bc90 100644 --- a/arch/arm/mach-shmobile/setup-sh7372.c +++ b/arch/arm/mach-shmobile/setup-sh7372.c | |||
@@ -43,7 +43,7 @@ | |||
43 | #include "sh7372.h" | 43 | #include "sh7372.h" |
44 | 44 | ||
45 | static struct map_desc sh7372_io_desc[] __initdata = { | 45 | static struct map_desc sh7372_io_desc[] __initdata = { |
46 | /* create a 1:1 entity map for 0xe6xxxxxx | 46 | /* create a 1:1 identity mapping for 0xe6xxxxxx |
47 | * used by CPGA, INTC and PFC. | 47 | * used by CPGA, INTC and PFC. |
48 | */ | 48 | */ |
49 | { | 49 | { |
diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c index 2955a08a655d..ca346cce4f30 100644 --- a/arch/arm/mach-shmobile/setup-sh73a0.c +++ b/arch/arm/mach-shmobile/setup-sh73a0.c | |||
@@ -41,7 +41,7 @@ | |||
41 | #include "sh73a0.h" | 41 | #include "sh73a0.h" |
42 | 42 | ||
43 | static struct map_desc sh73a0_io_desc[] __initdata = { | 43 | static struct map_desc sh73a0_io_desc[] __initdata = { |
44 | /* create a 1:1 entity map for 0xe6xxxxxx | 44 | /* create a 1:1 identity mapping for 0xe6xxxxxx |
45 | * used by CPGA, INTC and PFC. | 45 | * used by CPGA, INTC and PFC. |
46 | */ | 46 | */ |
47 | { | 47 | { |