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 --- Hi David,
I've rebased this on top of you drm-next branch as you requested. The change in hdmi.c looks a bit odd, but that's due to the fact that the nvidia,tegra30-hdmi line was already part of a prior patch where it shouldn't have been introduced yet. This patch merely adjusts its sorting order as currently required by the OF code.
Thierry
drivers/gpu/drm/tegra/dc.c | 1 + drivers/gpu/drm/tegra/hdmi.c | 2 +- drivers/gpu/drm/tegra/host1x.c | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index 53b9852..37bd759 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) }
static struct of_device_id tegra_dc_of_match[] = { + { .compatible = "nvidia,tegra30-dc", }, { .compatible = "nvidia,tegra20-dc", }, { }, }; diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c index 58f55dc..ab40164 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) }
static struct of_device_id tegra_hdmi_of_match[] = { - { .compatible = "nvidia,tegra20-hdmi", }, { .compatible = "nvidia,tegra30-hdmi", }, + { .compatible = "nvidia,tegra20-hdmi", }, { }, };
diff --git a/drivers/gpu/drm/tegra/host1x.c b/drivers/gpu/drm/tegra/host1x.c index 1f728cd..bdb97a564 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) static const char * const compat[] = { "nvidia,tegra20-dc", "nvidia,tegra20-hdmi", + "nvidia,tegra30-dc", + "nvidia,tegra30-hdmi", }; unsigned int i; int err; @@ -268,6 +270,7 @@ int host1x_unregister_client(struct host1x *host1x, }
static struct of_device_id tegra_host1x_of_match[] = { + { .compatible = "nvidia,tegra30-host1x", }, { .compatible = "nvidia,tegra20-host1x", }, { }, };