Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0f21e6d authored by Axel Lin's avatar Axel Lin Committed by Greg Kroah-Hartman
Browse files

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: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Tested-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0a18b050

drivers/memory/tegra20-mc.c

+3 −7
Original line number Diff line number Diff line
@@ -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[] = {

drivers/memory/tegra30-mc.c

+7 −15
Original line number Diff line number Diff line
@@ -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[] = {