Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...

[linux-2.6-block.git] / drivers / memory / tegra / tegra210.c

diff --git a/drivers/memory/tegra/tegra210.c b/drivers/memory/tegra/tegra210.c
index 5e144abe4c181eea8fb330ec9f68acb9735fe46f..d398bcd3fc5714dc32be85464e11e7cdec88e7a5 100644 (file)
--- a/drivers/memory/tegra/tegra210.c
+++ b/drivers/memory/tegra/tegra210.c
@@ -1059,11 +1059,26 @@ static const struct tegra_smmu_swgroup tegra210_swgroups[] = {
        { .name = "tsecb",     .swgroup = TEGRA_SWGROUP_TSECB,     .reg = 0xad4 },
 };
 
+static const unsigned int tegra210_group_display[] = {
+       TEGRA_SWGROUP_DC,
+       TEGRA_SWGROUP_DCB,
+};
+
+static const struct tegra_smmu_group_soc tegra210_groups[] = {
+       {
+               .name = "display",
+               .swgroups = tegra210_group_display,
+               .num_swgroups = ARRAY_SIZE(tegra210_group_display),
+       },
+};
+
 static const struct tegra_smmu_soc tegra210_smmu_soc = {
        .clients = tegra210_mc_clients,
        .num_clients = ARRAY_SIZE(tegra210_mc_clients),
        .swgroups = tegra210_swgroups,
        .num_swgroups = ARRAY_SIZE(tegra210_swgroups),
+       .groups = tegra210_groups,
+       .num_groups = ARRAY_SIZE(tegra210_groups),
        .supports_round_robin_arbitration = true,
        .supports_request_limit = true,
        .num_tlb_lines = 32,