Commit 10dd9a8a authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

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

parents e460a86a eaf89f1c

drivers/memory/tegra/tegra186.c

+2 −0
Original line number Diff line number Diff line
@@ -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)

{