From patchwork Wed Nov 21 08:50:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 1778941 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 7C577DF288 for ; Wed, 21 Nov 2012 08:51:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DA245E6523 for ; Wed, 21 Nov 2012 00:51:10 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.171]) by gabe.freedesktop.org (Postfix) with ESMTP id 036B5E5BF0 for ; Wed, 21 Nov 2012 00:50:54 -0800 (PST) Received: from mailbox.adnet.avionic-design.de (mailbox.avionic-design.de [109.75.18.3]) by mrelayeu.kundenserver.de (node=mrbap1) with ESMTP (Nemesis) id 0MELbk-1TUWR63nVA-00FcWI; Wed, 21 Nov 2012 09:50:49 +0100 Received: from localhost (localhost [127.0.0.1]) by mailbox.adnet.avionic-design.de (Postfix) with ESMTP id 525862A280EF; Wed, 21 Nov 2012 09:50:48 +0100 (CET) X-Virus-Scanned: amavisd-new at avionic-design.de Received: from mailbox.adnet.avionic-design.de ([127.0.0.1]) by localhost (mailbox.avionic-design.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JvWOvZqPWV1e; Wed, 21 Nov 2012 09:50:47 +0100 (CET) Received: from localhost (avionic-0098.adnet.avionic-design.de [172.20.31.233]) (Authenticated sender: thierry.reding) by mailbox.adnet.avionic-design.de (Postfix) with ESMTPA id 1E8EF2A280E1; Wed, 21 Nov 2012 09:50:47 +0100 (CET) From: Thierry Reding To: Dave Airlie Subject: [PATCH] drm: tegra: Add Tegra30 support Date: Wed, 21 Nov 2012 09:50:41 +0100 Message-Id: <1353487841-25955-1-git-send-email-thierry.reding@avionic-design.de> X-Mailer: git-send-email 1.8.0 X-Provags-ID: V02:K0:O0gaXsrmKpxsURxjFgFcZf+pMzqACi6BHShVvoRXU6q LRlh4L7PVCyyfKwMGC0u1unfoDyAgppQHH0Ujq+eESY181WusH Ta2j+4aDChC70nSPkbqrPbDNCbIj8N65aAJPo2ZMgR4MXO8S0M olvYf1GcwFKHxRVzkn4xYAsc3uyhtU9QoHsqORiuRFnctIVsqR 39PncibP7r0N8lCsbIOu71PFq5KuhGkQuaBRFmJkX3LEMe2NBU 8AHYZX+ZFhr7bTBArXXp+3H+2NIK/WWszsXum8FqcjN/wrGM8o 0DQ/2u/wOBm0v85LbvVP26EWp8LGipV8Vf1jXXxk6vHhPcxEP5 VNyZ5VpBy+womQ7AVsjgfB54Az6mwQoY/n2wZpeq9j54g7Xn7m bq5bbGogq2RVeu9/CJ4PaZ9mbKEF8+lKh3kshCbWVgOMNuQEqW fSN8o Cc: linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Add support for host1x, the display controllers and HDMI on the Tegra30 SoC. Signed-off-by: Thierry Reding Tested-by: Stephen Warren Tested-by: Mark Zhang --- 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", }, { }, };