diff options
author | Thierry Reding <thierry.reding@avionic-design.de> | 2012-11-21 03:50:41 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-11-28 05:07:02 -0500 |
commit | 219e81536c8776b30ccf3262c1ceaeaddf7a231a (patch) | |
tree | 947a7c80ef807380482cc12e59f45d241da809d1 /drivers | |
parent | ac8f7c4894bea3ae1af31e78fea31b1ba3347834 (diff) |
drm: tegra: Add Tegra30 support
Add support for host1x, the display controllers and HDMI on the Tegra30
SoC.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Tested-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Mark Zhang <markz@nvidia.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/tegra/dc.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/tegra/hdmi.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/tegra/host1x.c | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index 54f05d887dce..074410371e2a 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c | |||
@@ -818,6 +818,7 @@ static int tegra_dc_remove(struct platform_device *pdev) | |||
818 | } | 818 | } |
819 | 819 | ||
820 | static struct of_device_id tegra_dc_of_match[] = { | 820 | static struct of_device_id tegra_dc_of_match[] = { |
821 | { .compatible = "nvidia,tegra30-dc", }, | ||
821 | { .compatible = "nvidia,tegra20-dc", }, | 822 | { .compatible = "nvidia,tegra20-dc", }, |
822 | { }, | 823 | { }, |
823 | }; | 824 | }; |
diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c index 58f55dc6d59d..ab4016412bbf 100644 --- a/drivers/gpu/drm/tegra/hdmi.c +++ b/drivers/gpu/drm/tegra/hdmi.c | |||
@@ -1318,8 +1318,8 @@ static int tegra_hdmi_remove(struct platform_device *pdev) | |||
1318 | } | 1318 | } |
1319 | 1319 | ||
1320 | static struct of_device_id tegra_hdmi_of_match[] = { | 1320 | static struct of_device_id tegra_hdmi_of_match[] = { |
1321 | { .compatible = "nvidia,tegra20-hdmi", }, | ||
1322 | { .compatible = "nvidia,tegra30-hdmi", }, | 1321 | { .compatible = "nvidia,tegra30-hdmi", }, |
1322 | { .compatible = "nvidia,tegra20-hdmi", }, | ||
1323 | { }, | 1323 | { }, |
1324 | }; | 1324 | }; |
1325 | 1325 | ||
diff --git a/drivers/gpu/drm/tegra/host1x.c b/drivers/gpu/drm/tegra/host1x.c index 1f728cd7f61a..bdb97a564d82 100644 --- a/drivers/gpu/drm/tegra/host1x.c +++ b/drivers/gpu/drm/tegra/host1x.c | |||
@@ -68,6 +68,8 @@ static int host1x_parse_dt(struct host1x *host1x) | |||
68 | static const char * const compat[] = { | 68 | static const char * const compat[] = { |
69 | "nvidia,tegra20-dc", | 69 | "nvidia,tegra20-dc", |
70 | "nvidia,tegra20-hdmi", | 70 | "nvidia,tegra20-hdmi", |
71 | "nvidia,tegra30-dc", | ||
72 | "nvidia,tegra30-hdmi", | ||
71 | }; | 73 | }; |
72 | unsigned int i; | 74 | unsigned int i; |
73 | int err; | 75 | int err; |
@@ -268,6 +270,7 @@ int host1x_unregister_client(struct host1x *host1x, | |||
268 | } | 270 | } |
269 | 271 | ||
270 | static struct of_device_id tegra_host1x_of_match[] = { | 272 | static struct of_device_id tegra_host1x_of_match[] = { |
273 | { .compatible = "nvidia,tegra30-host1x", }, | ||
271 | { .compatible = "nvidia,tegra20-host1x", }, | 274 | { .compatible = "nvidia,tegra20-host1x", }, |
272 | { }, | 275 | { }, |
273 | }; | 276 | }; |