summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-01-20 02:05:38 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2016-01-20 08:40:33 +0900
commit048c61d674c4e5c793f5391fb7a57c8c79c99ebd (patch)
tree3068d0aeb6320c565725304dbe6ab66854e77a47
parentfaefef9994ed58d21f27f0b857426c0e2ad02ebe (diff)
downloadblackbird-obmc-uboot-048c61d674c4e5c793f5391fb7a57c8c79c99ebd.tar.gz
blackbird-obmc-uboot-048c61d674c4e5c793f5391fb7a57c8c79c99ebd.zip
ARM: uniphier: remove unneeded if conditionals
The if block does the same as the else block does. The conditional is not necessary at all. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-rw-r--r--arch/arm/mach-uniphier/dram/ddrphy-ph1-pro4.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/mach-uniphier/dram/ddrphy-ph1-pro4.c b/arch/arm/mach-uniphier/dram/ddrphy-ph1-pro4.c
index 2c8cbc2579..9fb34f79a7 100644
--- a/arch/arm/mach-uniphier/dram/ddrphy-ph1-pro4.c
+++ b/arch/arm/mach-uniphier/dram/ddrphy-ph1-pro4.c
@@ -40,18 +40,12 @@ int ph1_pro4_ddrphy_init(struct ddrphy __iomem *phy, int freq, int size)
writel(0x0000040B, &phy->dcr);
if (freq == 1333) {
writel(0x85589955, &phy->dtpr[0]);
- if (size == 1)
- writel(0x1a8363c0, &phy->dtpr[1]);
- else
- writel(0x1a8363c0, &phy->dtpr[1]);
+ writel(0x1a8363c0, &phy->dtpr[1]);
writel(0x5002c200, &phy->dtpr[2]);
writel(0x00000b51, &phy->mr0);
} else {
writel(0x999cbb66, &phy->dtpr[0]);
- if (size == 1)
- writel(0x1a878400, &phy->dtpr[1]);
- else
- writel(0x1a878400, &phy->dtpr[1]);
+ writel(0x1a878400, &phy->dtpr[1]);
writel(0xa00214f8, &phy->dtpr[2]);
writel(0x00000d71, &phy->mr0);
}
OpenPOWER on IntegriCloud