diff options
| author | Tom Rini <trini@konsulko.com> | 2016-02-29 10:50:01 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-02-29 10:50:01 -0500 |
| commit | 9902c113ade2c9af701785b982a1a4db4a2395ec (patch) | |
| tree | 3604a5a7f6ace6bddc8f78abdd59e44b12ee5f72 /arch/arm/mach-uniphier/sg-regs.h | |
| parent | e5e88c65965b7c7e2d5dabd458b0e57dde2d6c17 (diff) | |
| parent | 11d3ede42ceccef9b5941ea7907f398cb97ed361 (diff) | |
| download | u-boot-imx-9902c113ade2c9af701785b982a1a4db4a2395ec.zip u-boot-imx-9902c113ade2c9af701785b982a1a4db4a2395ec.tar.gz u-boot-imx-9902c113ade2c9af701785b982a1a4db4a2395ec.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'arch/arm/mach-uniphier/sg-regs.h')
| -rw-r--r-- | arch/arm/mach-uniphier/sg-regs.h | 2 |
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 678d437..3a535c7 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; |