aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/cpu/armv7/uniphier/ph1-pro4
diff options
context:
space:
mode:
authorMasahiro Yamada2015-02-05 20:56:23 +0900
committerMasahiro Yamada2015-02-07 00:15:03 +0900
commit4431684910217022bad85a0bc931ad9bfb78859f (patch)
tree81f5b2f61d5f56eec377709e365d1cb95adaf05e /arch/arm/cpu/armv7/uniphier/ph1-pro4
parentee470645d169cd0f47f66be8c8f69e061e3665d4 (diff)
ARM: UniPhier: refactor pinmon command
The return value of get_boot_mode_sel() is used as the index of the boot_device_table[] array. Its type should be "int" rather than "u32". Use only the iterator "i" for the loop in do_pinmon(). Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Diffstat (limited to 'arch/arm/cpu/armv7/uniphier/ph1-pro4')
-rw-r--r--arch/arm/cpu/armv7/uniphier/ph1-pro4/boot-mode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-pro4/boot-mode.c b/arch/arm/cpu/armv7/uniphier/ph1-pro4/boot-mode.c
index 33bccff2a5e..90d41865e92 100644
--- a/arch/arm/cpu/armv7/uniphier/ph1-pro4/boot-mode.c
+++ b/arch/arm/cpu/armv7/uniphier/ph1-pro4/boot-mode.c
@@ -48,14 +48,14 @@ struct boot_device_info boot_device_table[] = {
{BOOT_DEVICE_NONE, ""}
};
-u32 get_boot_mode_sel(void)
+int get_boot_mode_sel(void)
{
return (readl(SG_PINMON0) >> 1) & 0x1f;
}
u32 spl_boot_device(void)
{
- u32 boot_mode;
+ int boot_mode;
if (boot_is_swapped())
return BOOT_DEVICE_NOR;