diff options
| author | Thierry Reding <thierry.reding@avionic-design.de> | 2012-11-21 09:50:41 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-11-28 20:07:02 +1000 |
| commit | 219e81536c8776b30ccf3262c1ceaeaddf7a231a (patch) | |
| tree | 947a7c80ef807380482cc12e59f45d241da809d1 | |
| 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>
| -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 @@ -815,12 +815,13 @@ static int tegra_dc_remove(struct platform_device *pdev) clk_disable_unprepare(dc->clk); return 0; } static struct of_device_id tegra_dc_of_match[] = { + { .compatible = "nvidia,tegra30-dc", }, { .compatible = "nvidia,tegra20-dc", }, { }, }; struct platform_driver tegra_dc_driver = { .driver = { 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 @@ -1315,14 +1315,14 @@ static int tegra_hdmi_remove(struct platform_device *pdev) clk_unprepare(hdmi->clk); return 0; } static struct of_device_id tegra_hdmi_of_match[] = { - { .compatible = "nvidia,tegra20-hdmi", }, { .compatible = "nvidia,tegra30-hdmi", }, + { .compatible = "nvidia,tegra20-hdmi", }, { }, }; struct platform_driver tegra_hdmi_driver = { .driver = { .name = "tegra-hdmi", 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 @@ -65,12 +65,14 @@ static int host1x_remove_drm_client(struct host1x *host1x, static int host1x_parse_dt(struct host1x *host1x) { static const char * const compat[] = { "nvidia,tegra20-dc", "nvidia,tegra20-hdmi", + "nvidia,tegra30-dc", + "nvidia,tegra30-hdmi", }; unsigned int i; int err; for (i = 0; i < ARRAY_SIZE(compat); i++) { struct device_node *np; @@ -265,12 +267,13 @@ int host1x_unregister_client(struct host1x *host1x, mutex_unlock(&host1x->clients_lock); return 0; } static struct of_device_id tegra_host1x_of_match[] = { + { .compatible = "nvidia,tegra30-host1x", }, { .compatible = "nvidia,tegra20-host1x", }, { }, }; MODULE_DEVICE_TABLE(of, tegra_host1x_of_match); struct platform_driver tegra_host1x_driver = { |