mirror of
https://github.com/torvalds/linux
synced 2024-09-20 19:17:24 +00:00
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>
This commit is contained in:
parent
0a18b05043
commit
e0f21e6d52
|
@ -57,7 +57,7 @@ static inline u32 mc_readl(struct tegra20_mc *mc, u32 offs)
|
||||||
|
|
||||||
if (offs < 0x24)
|
if (offs < 0x24)
|
||||||
val = readl(mc->regs[0] + offs);
|
val = readl(mc->regs[0] + offs);
|
||||||
if (offs < 0x400)
|
else if (offs < 0x400)
|
||||||
val = readl(mc->regs[1] + offs - 0x3c);
|
val = readl(mc->regs[1] + offs - 0x3c);
|
||||||
|
|
||||||
return val;
|
return val;
|
||||||
|
@ -65,14 +65,10 @@ static inline u32 mc_readl(struct tegra20_mc *mc, u32 offs)
|
||||||
|
|
||||||
static inline void mc_writel(struct tegra20_mc *mc, u32 val, u32 offs)
|
static inline void mc_writel(struct tegra20_mc *mc, u32 val, u32 offs)
|
||||||
{
|
{
|
||||||
if (offs < 0x24) {
|
if (offs < 0x24)
|
||||||
writel(val, mc->regs[0] + offs);
|
writel(val, mc->regs[0] + offs);
|
||||||
return;
|
else if (offs < 0x400)
|
||||||
}
|
|
||||||
if (offs < 0x400) {
|
|
||||||
writel(val, mc->regs[1] + offs - 0x3c);
|
writel(val, mc->regs[1] + offs - 0x3c);
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char * const tegra20_mc_client[] = {
|
static const char * const tegra20_mc_client[] = {
|
||||||
|
|
|
@ -95,11 +95,11 @@ static inline u32 mc_readl(struct tegra30_mc *mc, u32 offs)
|
||||||
|
|
||||||
if (offs < 0x10)
|
if (offs < 0x10)
|
||||||
val = readl(mc->regs[0] + offs);
|
val = readl(mc->regs[0] + offs);
|
||||||
if (offs < 0x1f0)
|
else if (offs < 0x1f0)
|
||||||
val = readl(mc->regs[1] + offs - 0x3c);
|
val = readl(mc->regs[1] + offs - 0x3c);
|
||||||
if (offs < 0x228)
|
else if (offs < 0x228)
|
||||||
val = readl(mc->regs[2] + offs - 0x200);
|
val = readl(mc->regs[2] + offs - 0x200);
|
||||||
if (offs < 0x400)
|
else if (offs < 0x400)
|
||||||
val = readl(mc->regs[3] + offs - 0x284);
|
val = readl(mc->regs[3] + offs - 0x284);
|
||||||
|
|
||||||
return val;
|
return val;
|
||||||
|
@ -107,22 +107,14 @@ static inline u32 mc_readl(struct tegra30_mc *mc, u32 offs)
|
||||||
|
|
||||||
static inline void mc_writel(struct tegra30_mc *mc, u32 val, u32 offs)
|
static inline void mc_writel(struct tegra30_mc *mc, u32 val, u32 offs)
|
||||||
{
|
{
|
||||||
if (offs < 0x10) {
|
if (offs < 0x10)
|
||||||
writel(val, mc->regs[0] + offs);
|
writel(val, mc->regs[0] + offs);
|
||||||
return;
|
else if (offs < 0x1f0)
|
||||||
}
|
|
||||||
if (offs < 0x1f0) {
|
|
||||||
writel(val, mc->regs[1] + offs - 0x3c);
|
writel(val, mc->regs[1] + offs - 0x3c);
|
||||||
return;
|
else if (offs < 0x228)
|
||||||
}
|
|
||||||
if (offs < 0x228) {
|
|
||||||
writel(val, mc->regs[2] + offs - 0x200);
|
writel(val, mc->regs[2] + offs - 0x200);
|
||||||
return;
|
else if (offs < 0x400)
|
||||||
}
|
|
||||||
if (offs < 0x400) {
|
|
||||||
writel(val, mc->regs[3] + offs - 0x284);
|
writel(val, mc->regs[3] + offs - 0x284);
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char * const tegra30_mc_client[] = {
|
static const char * const tegra30_mc_client[] = {
|
||||||
|
|
Loading…
Reference in a new issue