Commit 4f1ac76e authored by Thierry Reding's avatar Thierry Reding Committed by Krzysztof Kozlowski

memory: tegra: Consolidate register fields

Subsequent patches will add more register fields to the tegra_mc_client
structure, so consolidate all register field definitions into a common
sub-structure for coherency.
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Link: https://lore.kernel.org/r/20210602163302.120041-2-thierry.reding@gmail.comSigned-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
parent eeafcdea
...@@ -376,9 +376,9 @@ static void tegra_smmu_enable(struct tegra_smmu *smmu, unsigned int swgroup, ...@@ -376,9 +376,9 @@ static void tegra_smmu_enable(struct tegra_smmu *smmu, unsigned int swgroup,
if (client->swgroup != swgroup) if (client->swgroup != swgroup)
continue; continue;
value = smmu_readl(smmu, client->smmu.reg); value = smmu_readl(smmu, client->regs.smmu.reg);
value |= BIT(client->smmu.bit); value |= BIT(client->regs.smmu.bit);
smmu_writel(smmu, value, client->smmu.reg); smmu_writel(smmu, value, client->regs.smmu.reg);
} }
} }
...@@ -404,9 +404,9 @@ static void tegra_smmu_disable(struct tegra_smmu *smmu, unsigned int swgroup, ...@@ -404,9 +404,9 @@ static void tegra_smmu_disable(struct tegra_smmu *smmu, unsigned int swgroup,
if (client->swgroup != swgroup) if (client->swgroup != swgroup)
continue; continue;
value = smmu_readl(smmu, client->smmu.reg); value = smmu_readl(smmu, client->regs.smmu.reg);
value &= ~BIT(client->smmu.bit); value &= ~BIT(client->regs.smmu.bit);
smmu_writel(smmu, value, client->smmu.reg); smmu_writel(smmu, value, client->regs.smmu.reg);
} }
} }
...@@ -1042,9 +1042,9 @@ static int tegra_smmu_clients_show(struct seq_file *s, void *data) ...@@ -1042,9 +1042,9 @@ static int tegra_smmu_clients_show(struct seq_file *s, void *data)
const struct tegra_mc_client *client = &smmu->soc->clients[i]; const struct tegra_mc_client *client = &smmu->soc->clients[i];
const char *status; const char *status;
value = smmu_readl(smmu, client->smmu.reg); value = smmu_readl(smmu, client->regs.smmu.reg);
if (value & BIT(client->smmu.bit)) if (value & BIT(client->regs.smmu.bit))
status = "yes"; status = "yes";
else else
status = "no"; status = "no";
......
...@@ -316,13 +316,13 @@ static int tegra_mc_setup_latency_allowance(struct tegra_mc *mc) ...@@ -316,13 +316,13 @@ static int tegra_mc_setup_latency_allowance(struct tegra_mc *mc)
/* write latency allowance defaults */ /* write latency allowance defaults */
for (i = 0; i < mc->soc->num_clients; i++) { for (i = 0; i < mc->soc->num_clients; i++) {
const struct tegra_mc_la *la = &mc->soc->clients[i].la; const struct tegra_mc_client *client = &mc->soc->clients[i];
u32 value; u32 value;
value = mc_readl(mc, la->reg); value = mc_readl(mc, client->regs.la.reg);
value &= ~(la->mask << la->shift); value &= ~(client->regs.la.mask << client->regs.la.shift);
value |= (la->def & la->mask) << la->shift; value |= (client->regs.la.def & client->regs.la.mask) << client->regs.la.shift;
mc_writel(mc, value, la->reg); mc_writel(mc, value, client->regs.la.reg);
} }
/* latch new values */ /* latch new values */
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment