diff options
| author | Olof Johansson <olof@lixom.net> | 2019-04-28 23:35:18 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-04-28 23:35:18 -0700 |
| commit | 21954712549cc74a39b5eae922679a705b3bedad (patch) | |
| tree | dde520329b041da6ee7cb3e47e12ba8d0a4e5897 /drivers/memory/tegra/tegra30.c | |
| parent | 990d4322cc8dd57ba460b9ad7cf454d4aee50ed0 (diff) | |
| parent | 67a8d5b0fadfd931f7e6a78e9ee7b2792a7114aa (diff) | |
Merge tag 'tegra-for-5.2-memory' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/drivers
memory: tegra: Changes for v5.2-rc1
These are a set of fixes for various issues related to the Tegra memory
controller.
* tag 'tegra-for-5.2-memory' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
memory: tegra: Fix a typos for "fdcdwr2" mc client
Revert "ARM: tegra: Restore memory arbitration on resume from LP1 on Tegra30+"
memory: tegra: Replace readl-writel with mc_readl-mc_writel
memory: tegra: Fix integer overflow on tick value calculation
memory: tegra: Fix missed registers values latching
memory: tegra: Properly spell "tegra"
memory: tegra: Make terga20_mc_reset_ops static
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/memory/tegra/tegra30.c')
| -rw-r--r-- | drivers/memory/tegra/tegra30.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/memory/tegra/tegra30.c b/drivers/memory/tegra/tegra30.c index bee5314ed404..c9af0f682ead 100644 --- a/drivers/memory/tegra/tegra30.c +++ b/drivers/memory/tegra/tegra30.c @@ -726,7 +726,7 @@ static const struct tegra_mc_client tegra30_mc_clients[] = { }, }, { .id = 0x34, - .name = "fdcwr2", + .name = "fdcdwr2", .swgroup = TEGRA_SWGROUP_NV2, .smmu = { .reg = 0x22c, @@ -999,7 +999,7 @@ const struct tegra_mc_soc tegra30_mc_soc = { .smmu = &tegra30_smmu_soc, .intmask = MC_INT_INVALID_SMMU_PAGE | MC_INT_SECURITY_VIOLATION | MC_INT_DECERR_EMEM, - .reset_ops = &terga_mc_reset_ops_common, + .reset_ops = &tegra_mc_reset_ops_common, .resets = tegra30_mc_resets, .num_resets = ARRAY_SIZE(tegra30_mc_resets), }; |