openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Axel Lin 2012-09-20 09:32:53 +08:00 committed by Greg Kroah-Hartman
parent 0a18b05043
commit e0f21e6d52
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/memory/tegra20-mc.c
View File

@ -57,7 +57,7 @@ static inline u32 mc_readl(struct tegra20_mc *mc, u32 offs)
if (offs < 0x24)
val = readl(mc->regs[0] + offs);
if (offs < 0x400)
else if (offs < 0x400)
val = readl(mc->regs[1] + offs - 0x3c);
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)
{
if (offs < 0x24) {
if (offs < 0x24)
writel(val, mc->regs[0] + offs);
return;
}
if (offs < 0x400) {
else if (offs < 0x400)
writel(val, mc->regs[1] + offs - 0x3c);
return;
}
}
static const char * const tegra20_mc_client[] = {

22
drivers/memory/tegra30-mc.c
View File

@ -95,11 +95,11 @@ static inline u32 mc_readl(struct tegra30_mc *mc, u32 offs)
if (offs < 0x10)
val = readl(mc->regs[0] + offs);
if (offs < 0x1f0)
else if (offs < 0x1f0)
val = readl(mc->regs[1] + offs - 0x3c);
if (offs < 0x228)
else if (offs < 0x228)
val = readl(mc->regs[2] + offs - 0x200);
if (offs < 0x400)
else if (offs < 0x400)
val = readl(mc->regs[3] + offs - 0x284);
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)
{
if (offs < 0x10) {
if (offs < 0x10)
writel(val, mc->regs[0] + offs);
return;
}
if (offs < 0x1f0) {
else if (offs < 0x1f0)
writel(val, mc->regs[1] + offs - 0x3c);
return;
}
if (offs < 0x228) {
else if (offs < 0x228)
writel(val, mc->regs[2] + offs - 0x200);
return;
}
if (offs < 0x400) {
else if (offs < 0x400)
writel(val, mc->regs[3] + offs - 0x284);
return;
}
}
static const char * const tegra30_mc_client[] = {