diff options
| author | Olof Johansson <olof@lixom.net> | 2015-08-20 18:50:17 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-08-20 18:50:17 -0700 |
| commit | 21815b9a24c6e6d3488703609561bd2892d3d9f3 (patch) | |
| tree | 25da6f09711154e2fdd1844fe7dded4236e72458 /drivers/memory/tegra/tegra114.c | |
| parent | 420f2629fa041ed92f7e687b3bc8020d80b209bb (diff) | |
| parent | 588c43a7bd5a53ae523b318e1db16bdd59963a3c (diff) | |
Merge tag 'tegra-for-4.3-memory' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/drivers
ARM: tegra: Memory controller updates for v4.3-rc1
Adds support for Tegra210, which allows the SMMU to be used on this new
SoC generation.
* tag 'tegra-for-4.3-memory' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
memory: tegra: Add Tegra210 support
memory: tegra: Add support for a variable-size client ID bitfield
memory: tegra: Expose supported rates via debugfs
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/memory/tegra/tegra114.c')
| -rw-r--r-- | drivers/memory/tegra/tegra114.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/memory/tegra/tegra114.c b/drivers/memory/tegra/tegra114.c index 9f579589e800..c8765db07a62 100644 --- a/drivers/memory/tegra/tegra114.c +++ b/drivers/memory/tegra/tegra114.c @@ -944,5 +944,6 @@ const struct tegra_mc_soc tegra114_mc_soc = { .num_clients = ARRAY_SIZE(tegra114_mc_clients), .num_address_bits = 32, .atom_size = 32, + .client_id_mask = 0x7f, .smmu = &tegra114_smmu_soc, }; |