From patchwork Thu Dec 7 15:58:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 120999 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp8533570qgn; Thu, 7 Dec 2017 07:59:41 -0800 (PST) X-Google-Smtp-Source: AGs4zMZNeG2fToLMl4HNSNl83x/CxR7zcuDbWNqJ3Hd7hTzogM2S/ARjIYpRd4eFppHQB9tDKrrb X-Received: by 10.84.150.164 with SMTP id h33mr26965622plh.200.1512662381829; Thu, 07 Dec 2017 07:59:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512662381; cv=none; d=google.com; s=arc-20160816; b=uLi2+3weIHiYezEm486fXn4ZdNNc2hKG9QVaTQFWrPDdWZM4XmPoA2CGH84ks/eXMn FXJ2OK3irIt7e2Nn85F9rAkPjl2hNvKQ3mLWknUuLnZiTCptOcPkgahGtVba4Z87W5co NrIt4dj20ZQoIR9Z1cE9o98rj2ABbQih3XNTHWiuEnxUyfJOpvgGNAGiuzHXydmiy9Xe vzlvmTxAzgP67FgaSwLRvtJiLxuGM27eVI9a9XdmZbBQBcvutNNUvqL//waoeLQAmLoO yVBi4iRVmFVPpyhIyPnAqN8lvFEbWmL6fugkCpQ8CWHhQqhx8o4tDJl30md0eFBI7Hm6 NQxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=tmWn0cLLFUkhvp8YZGZKaq6Q0iyjOIfuTZNy0UiVHvc=; b=kJvmjGSRjG53Z5v+1X/7bRsy15tYbFgclDZ49TzxhZZjaiPa7C52Li+JdPNb092Vmx 2hNnLwgYlELYidyf4DW4EkirmVrCJr7teZEJIX1aBfkv5uySFHaJN/AjJdFDFlF1aovq tSKukgK0ZRrR25gDpM2ZqCfsZ0WB/mpdMJ2mKH1HmZrmvxiYJVFxQbtqAB15DVpC04vH KlcM8i8FkQi3i4vjrXIDvc35ErP0TRButufHLt8WRh74Tld1rpBk20pG+eD5jaEXLITK j7fiD5oIR7w1yvm2+fr660hM4udjxbHK0wDPZKLVKGPGEBm7PsXaxRj09Ly16xwXBVd4 m76A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z77si4345317pff.100.2017.12.07.07.59.41; Thu, 07 Dec 2017 07:59:41 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933414AbdLGP7k (ORCPT + 21 others); Thu, 7 Dec 2017 10:59:40 -0500 Received: from mail.free-electrons.com ([62.4.15.54]:38834 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933388AbdLGP7c (ORCPT ); Thu, 7 Dec 2017 10:59:32 -0500 Received: by mail.free-electrons.com (Postfix, from userid 110) id D608720D9F; Thu, 7 Dec 2017 16:59:30 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0 Received: from localhost (unknown [185.94.189.187]) by mail.free-electrons.com (Postfix) with ESMTPSA id 8CF75209A0; Thu, 7 Dec 2017 16:59:20 +0100 (CET) From: Maxime Ripard To: Daniel Vetter , David Airlie , Chen-Yu Tsai , Maxime Ripard Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Mark Rutland , Rob Herring , linux-arm-kernel@lists.infradead.org, plaes@plaes.org, icenowy@aosc.io, Thomas Petazzoni , jernej.skrabec@siol.net, devicetree@vger.kernel.org, thierry.reding@gmail.com Subject: [PATCH v4 09/15] drm/sun4i: Add A83T support Date: Thu, 7 Dec 2017 16:58:54 +0100 Message-Id: X-Mailer: git-send-email 2.14.3 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add support for the A83T display pipeline. Reviewed-by: Chen-Yu Tsai Signed-off-by: Maxime Ripard --- drivers/gpu/drm/sun4i/sun4i_drv.c | 1 + drivers/gpu/drm/sun4i/sun4i_tcon.c | 5 +++++ drivers/gpu/drm/sun4i/sun8i_mixer.c | 11 +++++++++++ 3 files changed, 17 insertions(+) -- git-series 0.9.1 diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c index 49215d91c853..6f5e721b545e 100644 --- a/drivers/gpu/drm/sun4i/sun4i_drv.c +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c @@ -347,6 +347,7 @@ static const struct of_device_id sun4i_drv_of_table[] = { { .compatible = "allwinner,sun6i-a31s-display-engine" }, { .compatible = "allwinner,sun7i-a20-display-engine" }, { .compatible = "allwinner,sun8i-a33-display-engine" }, + { .compatible = "allwinner,sun8i-a83t-display-engine" }, { .compatible = "allwinner,sun8i-v3s-display-engine" }, { } }; diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c index 777c7348d0cf..a0f651d2a495 100644 --- a/drivers/gpu/drm/sun4i/sun4i_tcon.c +++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c @@ -1136,6 +1136,10 @@ static const struct sun4i_tcon_quirks sun8i_a33_quirks = { .has_lvds_pll = true, }; +static const struct sun4i_tcon_quirks sun8i_a83t_lcd_quirks = { + /* nothing is supported */ +}; + static const struct sun4i_tcon_quirks sun8i_v3s_quirks = { /* nothing is supported */ }; @@ -1148,6 +1152,7 @@ const struct of_device_id sun4i_tcon_of_table[] = { { .compatible = "allwinner,sun6i-a31s-tcon", .data = &sun6i_a31s_quirks }, { .compatible = "allwinner,sun7i-a20-tcon", .data = &sun7i_a20_quirks }, { .compatible = "allwinner,sun8i-a33-tcon", .data = &sun8i_a33_quirks }, + { .compatible = "allwinner,sun8i-a83t-tcon-lcd", .data = &sun8i_a83t_lcd_quirks }, { .compatible = "allwinner,sun8i-v3s-tcon", .data = &sun8i_v3s_quirks }, { } }; diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c index ff235e3228ce..1c963b5af522 100644 --- a/drivers/gpu/drm/sun4i/sun8i_mixer.c +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c @@ -477,6 +477,13 @@ static int sun8i_mixer_remove(struct platform_device *pdev) return 0; } +static const struct sun8i_mixer_cfg sun8i_a83t_mixer0_cfg = { + .ccsc = 0, + .scaler_mask = 0xf, + .ui_num = 3, + .vi_num = 1, +}; + static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = { .vi_num = 2, .ui_num = 1, @@ -487,6 +494,10 @@ static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = { static const struct of_device_id sun8i_mixer_of_table[] = { { + .compatible = "allwinner,sun8i-a83t-de2-mixer-0", + .data = &sun8i_a83t_mixer0_cfg, + }, + { .compatible = "allwinner,sun8i-v3s-de2-mixer", .data = &sun8i_v3s_mixer_cfg, },