aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2015-05-14 04:37:05 -0400
committerLinus Walleij <linus.walleij@linaro.org>2015-05-18 09:08:04 -0400
commit9bac89e069e2aa7c4602a2d76a76f3d8ba8a3aa3 (patch)
treee15d3ed619d06f6546406fb38cb9ad511fd60fa1
parent6252bd35782a3bf636b665c0d5700dd449492ca2 (diff)
ARM: ux500: rename ux500_map_io
This function is not mapping any I/O other than for probing the chip ID. Rename it to make the function graspable. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--arch/arm/mach-ux500/cpu-db8500.c2
-rw-r--r--arch/arm/mach-ux500/id.c2
-rw-r--r--arch/arm/mach-ux500/setup.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index d9359d7b80d7..16913800bbf9 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -46,7 +46,7 @@ static struct prcmu_pdata db8500_prcmu_pdata = {
46static void __init u8500_map_io(void) 46static void __init u8500_map_io(void)
47{ 47{
48 debug_ll_io_init(); 48 debug_ll_io_init();
49 ux500_map_io(); 49 ux500_setup_id();
50} 50}
51 51
52/* 52/*
diff --git a/arch/arm/mach-ux500/id.c b/arch/arm/mach-ux500/id.c
index 392f2fdb37d0..1e81e990044b 100644
--- a/arch/arm/mach-ux500/id.c
+++ b/arch/arm/mach-ux500/id.c
@@ -72,7 +72,7 @@ static unsigned int partnumber(unsigned int asicid)
72 * DB9540 0x413fc090 0xFFFFDBF4 0x009540xx 72 * DB9540 0x413fc090 0xFFFFDBF4 0x009540xx
73 */ 73 */
74 74
75void __init ux500_map_io(void) 75void __init ux500_setup_id(void)
76{ 76{
77 unsigned int cpuid = read_cpuid_id(); 77 unsigned int cpuid = read_cpuid_id();
78 unsigned int asicid = 0; 78 unsigned int asicid = 0;
diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h
index 2dea8b59d222..cf5a8736ea9d 100644
--- a/arch/arm/mach-ux500/setup.h
+++ b/arch/arm/mach-ux500/setup.h
@@ -18,7 +18,7 @@
18 18
19void ux500_restart(enum reboot_mode mode, const char *cmd); 19void ux500_restart(enum reboot_mode mode, const char *cmd);
20 20
21void __init ux500_map_io(void); 21void __init ux500_setup_id(void);
22 22
23extern void __init ux500_init_irq(void); 23extern void __init ux500_init_irq(void);
24 24