summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArto Merilainen <amerilainen@nvidia.com>2014-04-16 02:53:04 -0400
committerDan Willemsen <dwillemsen@nvidia.com>2015-03-18 15:09:47 -0400
commit6f80a44c984793dd324dcdce03b244b9a0d4679c (patch)
tree8750cc3842656b83c53861d13b5fbe265104eef0
parentebe7f110a1d6ebb714354e2739e84e3799ca4b3b (diff)
gpu: nvgpu: Fall-back to generic platform
Currently the generic platform is used only if the device tree defines that we have a generic platform available, however, the generic platform is fully compatible with the gk20a we have in tegra. This patch modifies the definitions so that we use generic platform also for tegra - even if if tegra configuration option is not enabled. Bug 1434573 Change-Id: Ib35ce0ab935d27764e960bf4d74a5016ae047a1f Signed-off-by: Arto Merilainen <amerilainen@nvidia.com> Reviewed-on: http://git-master/r/396867 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index a78e1e5d..029bfca2 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -930,6 +930,11 @@ static struct of_device_id tegra_gk20a_of_match[] = {
930 .data = &gk20a_tegra_platform }, 930 .data = &gk20a_tegra_platform },
931 { .compatible = "nvidia,tegra210-gm20b", 931 { .compatible = "nvidia,tegra210-gm20b",
932 .data = &gm20b_tegra_platform }, 932 .data = &gm20b_tegra_platform },
933#else
934 { .compatible = "nvidia,tegra124-gk20a",
935 .data = &gk20a_generic_platform },
936 { .compatible = "nvidia,tegra210-gm20b",
937 .data = &gk20a_generic_platform },
933#endif 938#endif
934 { .compatible = "nvidia,generic-gk20a", 939 { .compatible = "nvidia,generic-gk20a",
935 .data = &gk20a_generic_platform }, 940 .data = &gk20a_generic_platform },