tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
memory: tegra{20,30}-mc: Fix reading incorrect register in mc_readl()
The code reading the register does not match the code writing to the register,
fix it.
Also fix the coding style in mc_writel() for better readability.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
authored by
Axel Lin
and committed by
Greg Kroah-Hartman
e0f21e6d
0a18b050
+10
-22
+3
-7
drivers/memory/tegra20-mc.c
+3
-7
drivers/memory/tegra20-mc.c
···
57
57
58
58
if (offs < 0x24)
59
59
val = readl(mc->regs[0] + offs);
60
-
if (offs < 0x400)
60
+
else if (offs < 0x400)
61
61
val = readl(mc->regs[1] + offs - 0x3c);
62
62
63
63
return val;
···
65
65
66
66
static inline void mc_writel(struct tegra20_mc *mc, u32 val, u32 offs)
67
67
{
68
-
if (offs < 0x24) {
68
+
if (offs < 0x24)
69
69
writel(val, mc->regs[0] + offs);
70
-
return;
71
-
}
72
-
if (offs < 0x400) {
70
+
else if (offs < 0x400)
73
71
writel(val, mc->regs[1] + offs - 0x3c);
74
-
return;
75
-
}
76
72
}
77
73
78
74
static const char * const tegra20_mc_client[] = {
+7
-15
drivers/memory/tegra30-mc.c
+7
-15
drivers/memory/tegra30-mc.c
···
95
95
96
96
if (offs < 0x10)
97
97
val = readl(mc->regs[0] + offs);
98
-
if (offs < 0x1f0)
98
+
else if (offs < 0x1f0)
99
99
val = readl(mc->regs[1] + offs - 0x3c);
100
-
if (offs < 0x228)
100
+
else if (offs < 0x228)
101
101
val = readl(mc->regs[2] + offs - 0x200);
102
-
if (offs < 0x400)
102
+
else if (offs < 0x400)
103
103
val = readl(mc->regs[3] + offs - 0x284);
104
104
105
105
return val;
···
107
107
108
108
static inline void mc_writel(struct tegra30_mc *mc, u32 val, u32 offs)
109
109
{
110
-
if (offs < 0x10) {
110
+
if (offs < 0x10)
111
111
writel(val, mc->regs[0] + offs);
112
-
return;
113
-
}
114
-
if (offs < 0x1f0) {
112
+
else if (offs < 0x1f0)
115
113
writel(val, mc->regs[1] + offs - 0x3c);
116
-
return;
117
-
}
118
-
if (offs < 0x228) {
114
+
else if (offs < 0x228)
119
115
writel(val, mc->regs[2] + offs - 0x200);
120
-
return;
121
-
}
122
-
if (offs < 0x400) {
116
+
else if (offs < 0x400)
123
117
writel(val, mc->regs[3] + offs - 0x284);
124
-
return;
125
-
}
126
118
}
127
119
128
120
static const char * const tegra30_mc_client[] = {