summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-uniphier/sg-regs.h
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-02-26 18:59:45 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2016-03-01 00:33:29 +0900
commit11d3ede42ceccef9b5941ea7907f398cb97ed361 (patch)
tree3575c69b10b42f3eadc4f1fb5fe6ae4fa482a896 /arch/arm/mach-uniphier/sg-regs.h
parentfe5ea57bdbdeb8429793faaca2d6bd5f38218fe3 (diff)
downloadtalos-obmc-uboot-11d3ede42ceccef9b5941ea7907f398cb97ed361.tar.gz
talos-obmc-uboot-11d3ede42ceccef9b5941ea7907f398cb97ed361.zip
ARM: uniphier: fix warnings reported by aarch64 compiler
The UniPhier SoC family has not supported ARMv8 yet, but these would cause warnings if they were compiled with a 64bit compiler. Before adding the ARMv8 support really, fix them now. Because UniPhier SoCs do not support Large Physical Address Extension, casting "phys_addr_t" into "unsigned long" would carry the address as is. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/mach-uniphier/sg-regs.h')
-rw-r--r--arch/arm/mach-uniphier/sg-regs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-uniphier/sg-regs.h b/arch/arm/mach-uniphier/sg-regs.h
index 678d437fc9..3a535c70b2 100644
--- a/arch/arm/mach-uniphier/sg-regs.h
+++ b/arch/arm/mach-uniphier/sg-regs.h
@@ -105,7 +105,7 @@ static inline void sg_set_pinsel(unsigned pin, unsigned muxval,
unsigned mux_bits, unsigned reg_stride)
{
unsigned shift = pin * mux_bits % 32;
- unsigned reg = SG_PINCTRL_BASE + pin * mux_bits / 32 * reg_stride;
+ unsigned long reg = SG_PINCTRL_BASE + pin * mux_bits / 32 * reg_stride;
u32 mask = (1U << mux_bits) - 1;
u32 tmp;
OpenPOWER on IntegriCloud