From: Thierry Reding <treding@nvidia.com>
Date: Sun, 22 Dec 2019 15:10:26 +0100
Subject: memory: tegra: Rename tegra_mc to tegra186_mc on Tegra186
Git-commit: 0859fe9ff50d69614f509656ab23a908cb3d1ba3
Patch-mainline: v5.6-rc1
References: jsc#SLE-15847
This is just for consistency with the rest of the driver.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
---
drivers/memory/tegra/tegra186.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/memory/tegra/tegra186.c b/drivers/memory/tegra/tegra186.c
index 441213a35930..f72e89877295 100644
--- a/drivers/memory/tegra/tegra186.c
+++ b/drivers/memory/tegra/tegra186.c
@@ -15,7 +15,7 @@ struct tegra_mc {
void __iomem *regs;
};
-struct tegra_mc_client {
+struct tegra186_mc_client {
const char *name;
unsigned int sid;
struct {
@@ -24,7 +24,13 @@ struct tegra_mc_client {
} regs;
};
-static const struct tegra_mc_client tegra186_mc_clients[] = {
+struct tegra186_mc {
+ struct memory_controller base;
+ struct device *dev;
+ void __iomem *regs;
+};
+
+static const struct tegra186_mc_client tegra186_mc_clients[] = {
{
.name = "ptcr",
.sid = TEGRA186_SID_PASSTHROUGH,
@@ -534,8 +540,8 @@ static const struct tegra_mc_client tegra186_mc_clients[] = {
static int tegra186_mc_probe(struct platform_device *pdev)
{
+ struct tegra186_mc *mc;
struct resource *res;
- struct tegra_mc *mc;
unsigned int i;
int err = 0;
@@ -551,7 +557,7 @@ static int tegra186_mc_probe(struct platform_device *pdev)
mc->dev = &pdev->dev;
for (i = 0; i < ARRAY_SIZE(tegra186_mc_clients); i++) {
- const struct tegra_mc_client *client = &tegra186_mc_clients[i];
+ const struct tegra186_mc_client *client = &tegra186_mc_clients[i];
u32 override, security;
override = readl(mc->regs + client->regs.override);
--
2.26.2