Merge branch 'for-v5.15/tegra-mc' into for-next

krzk · krzk · commit 10dd9a8a5f7e · 2021-07-23T08:26:39.000+02:00
diff --git a/drivers/memory/tegra/tegra186.c b/drivers/memory/tegra/tegra186.c
@@ -71,6 +71,7 @@ static int tegra186_mc_resume(struct tegra_mc *mc)
 	return 0;
 }
 
+#if IS_ENABLED(CONFIG_IOMMU_API)
 static void tegra186_mc_client_sid_override(struct tegra_mc *mc,
 					    const struct tegra_mc_client *client,
 					    unsigned int sid)
@@ -108,6 +109,7 @@ static void tegra186_mc_client_sid_override(struct tegra_mc *mc,
 		writel(sid, mc->regs + client->regs.sid.override);
 	}
 }
+#endif
 
 static int tegra186_mc_probe_device(struct tegra_mc *mc, struct device *dev)
 {

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ static int tegra186_mc_resume(struct tegra_mc *mc)`
`71`	`71`	`return 0;`
`72`	`72`	`}`
`73`	`73`
	`74`	`+#if IS_ENABLED(CONFIG_IOMMU_API)`
`74`	`75`	`static void tegra186_mc_client_sid_override(struct tegra_mc *mc,`
`75`	`76`	`const struct tegra_mc_client *client,`
`76`	`77`	`unsigned int sid)`
`@@ -108,6 +109,7 @@ static void tegra186_mc_client_sid_override(struct tegra_mc *mc,`
`108`	`109`	`writel(sid, mc->regs + client->regs.sid.override);`
`109`	`110`	`}`
`110`	`111`	`}`
	`112`	`+#endif`
`111`	`113`
`112`	`114`	`static int tegra186_mc_probe_device(struct tegra_mc mc, struct device dev)`
`113`	`115`	`{`