diff options
| author | Tom Rini <trini@konsulko.com> | 2016-12-12 07:18:53 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-12-12 07:18:53 -0500 |
| commit | fe9822556e051e6c24a3832532166ade00a81a8c (patch) | |
| tree | f33860f004f973dbc30a42431691d28b84857603 /arch/arm/mach-uniphier | |
| parent | 170397f17d3b7731bfc754efad9fb6e626a5a639 (diff) | |
| parent | 6c498835af560ad850de4dad4ff8c60d26ef2898 (diff) | |
| download | u-boot-fe9822556e051e6c24a3832532166ade00a81a8c.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'arch/arm/mach-uniphier')
| -rw-r--r-- | arch/arm/mach-uniphier/dram/umc-ld20.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-uniphier/memconf/memconf.c | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/mach-uniphier/dram/umc-ld20.c b/arch/arm/mach-uniphier/dram/umc-ld20.c index b8c0f59e17..ecbe101617 100644 --- a/arch/arm/mach-uniphier/dram/umc-ld20.c +++ b/arch/arm/mach-uniphier/dram/umc-ld20.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2016 Socionext Inc. * - * based on commit a7a36122aa072fe1bb06e02b73b3634b7a6c555a of Diag + * based on commit 5e1cb0f1caeabc6c99469dd997cb6b4f46834443 of Diag * * SPDX-License-Identifier: GPL-2.0+ */ @@ -264,8 +264,8 @@ static int ddrphy_ip_dq_shift_val[DRAM_BOARD_NR][DRAM_CH_NR][32] = { static void ddrphy_select_lane(void __iomem *phy_base, unsigned int lane, unsigned int bit) { - WARN_ON(lane >= (1 << PHY_LANE_SEL_LANE_WIDTH)); - WARN_ON(bit >= (1 << PHY_LANE_SEL_BIT_WIDTH)); + WARN_ON(lane >= 1 << PHY_LANE_SEL_LANE_WIDTH); + WARN_ON(bit >= 1 << PHY_LANE_SEL_BIT_WIDTH); writel((bit << PHY_LANE_SEL_BIT_SHIFT) | (lane << PHY_LANE_SEL_LANE_SHIFT), diff --git a/arch/arm/mach-uniphier/memconf/memconf.c b/arch/arm/mach-uniphier/memconf/memconf.c index 3d4b50456b..e607ac9c3b 100644 --- a/arch/arm/mach-uniphier/memconf/memconf.c +++ b/arch/arm/mach-uniphier/memconf/memconf.c @@ -1,5 +1,7 @@ /* - * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com> + * Copyright (C) 2011-2015 Panasonic Corporation + * Copyright (C) 2016 Socionext Inc. + * Author: Masahiro Yamada <yamada.masahiro@socionext.com> * * SPDX-License-Identifier: GPL-2.0+ */ @@ -14,7 +16,7 @@ int memconf_init(const struct uniphier_board_data *bd) { - u32 tmp = 0; + u32 tmp; unsigned long size_per_word; tmp = readl(SG_MEMCONF); |