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 /include/soc | |
| parent | 420f2629fa041ed92f7e687b3bc8020d80b209bb (diff) | |
| parent | 588c43a7bd5a53ae523b318e1db16bdd59963a3c (diff) | |
| download | linux-21815b9a24c6e6d3488703609561bd2892d3d9f3.tar.gz linux-21815b9a24c6e6d3488703609561bd2892d3d9f3.tar.bz2 linux-21815b9a24c6e6d3488703609561bd2892d3d9f3.zip | |
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 'include/soc')
| -rw-r--r-- | include/soc/tegra/mc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/soc/tegra/mc.h b/include/soc/tegra/mc.h index 1ab2813273cd..370f2909ec19 100644 --- a/include/soc/tegra/mc.h +++ b/include/soc/tegra/mc.h @@ -102,6 +102,8 @@ struct tegra_mc_soc { unsigned int num_address_bits; unsigned int atom_size; + u8 client_id_mask; + const struct tegra_smmu_soc *smmu; }; |