summaryrefslogtreecommitdiff
path: root/arch/arm/mach-uniphier/dram/umc-ld11.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-06-24 18:18:41 -0400
committerTom Rini <trini@konsulko.com>2017-06-24 18:18:41 -0400
commit524b42bc2c6ae0a3d1d73a83de59346e4b3becd7 (patch)
tree21e4c068d383ba640804b7b53126f216589504e3 /arch/arm/mach-uniphier/dram/umc-ld11.c
parent7df4ff2c2689a6d3c16eb0c3cce098fcac622b0c (diff)
parent7bf378043f653d4edd0dc4a54a0a4c43fa8914c2 (diff)
Merge git://git.denx.de/u-boot-uniphier
- fix sparse warnings - sync DT with Linux - add new board support (LD11/LD20 global)
Diffstat (limited to 'arch/arm/mach-uniphier/dram/umc-ld11.c')
-rw-r--r--arch/arm/mach-uniphier/dram/umc-ld11.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-uniphier/dram/umc-ld11.c b/arch/arm/mach-uniphier/dram/umc-ld11.c
index 69aa4f2eeb..9e2021a627 100644
--- a/arch/arm/mach-uniphier/dram/umc-ld11.c
+++ b/arch/arm/mach-uniphier/dram/umc-ld11.c
@@ -28,11 +28,11 @@ enum dram_size {
};
/* PHY */
-const int rof_pos_shift_pre[RANK_BLOCKS_TR][2] = { {0, 0}, {0, 0} };
-const int rof_neg_shift_pre[RANK_BLOCKS_TR][2] = { {0, 0}, {0, 0} };
-const int rof_pos_shift[RANK_BLOCKS_TR][2] = { {-35, -35}, {-35, -35} };
-const int rof_neg_shift[RANK_BLOCKS_TR][2] = { {-17, -17}, {-17, -17} };
-const int tof_shift[RANK_BLOCKS_TR][2] = { {-50, -50}, {-50, -50} };
+static const int rof_pos_shift_pre[RANK_BLOCKS_TR][2] = { {0, 0}, {0, 0} };
+static const int rof_neg_shift_pre[RANK_BLOCKS_TR][2] = { {0, 0}, {0, 0} };
+static const int rof_pos_shift[RANK_BLOCKS_TR][2] = { {-35, -35}, {-35, -35} };
+static const int rof_neg_shift[RANK_BLOCKS_TR][2] = { {-17, -17}, {-17, -17} };
+static const int tof_shift[RANK_BLOCKS_TR][2] = { {-50, -50}, {-50, -50} };
/* Register address */
#define PHY_ZQ0CR1 0x00000184
@@ -65,7 +65,7 @@ const int tof_shift[RANK_BLOCKS_TR][2] = { {-50, -50}, {-50, -50} };
#define PHY_DSWBD_MASK 0x3F000000 /* bit[29:24] */
#define PHY_DSDQOE_MASK 0x00000FFF
-static void ddrphy_maskwritel(u32 data, u32 mask, void *addr)
+static void ddrphy_maskwritel(u32 data, u32 mask, void __iomem *addr)
{
u32 value;
@@ -73,7 +73,7 @@ static void ddrphy_maskwritel(u32 data, u32 mask, void *addr)
writel(value, addr);
}
-static u32 ddrphy_maskreadl(u32 mask, void *addr)
+static u32 ddrphy_maskreadl(u32 mask, void __iomem *addr)
{
return readl(addr) & mask;
}