Received: by 10.223.148.5 with SMTP id 5csp6328113wrq; Wed, 17 Jan 2018 12:18:13 -0800 (PST) X-Google-Smtp-Source: ACJfBotDt9Ob3EFTNt/hPmhCIOkQS4xaSEEOUcfB7DlI+s4gZlY1nQrpTh+H0KAlGyA83lz+Fe05 X-Received: by 10.84.224.78 with SMTP id a14mr36088099plt.362.1516220293360; Wed, 17 Jan 2018 12:18:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516220293; cv=none; d=google.com; s=arc-20160816; b=Vcfrdv6RhlICIVQKhePdA3g9VTA17s5k+eOnQ07zPmenKXd2ybn+nreW7ZbAeip6we zXLjKvZXiUNFwICbSwUB722dRJTUjWiafw+Wfx/IY5phK1MD2Sr/JyDABTycuksboICT J7cFOf9GFrQvLub7HAdHvlVkFzczWd8+fdFBw/03bynNkmH5pmRJ+3/yyRz57R55uona 07TCs8Yc+rWNLL8WucZ/NV0iD2Nz7Hn326JrZ+7v0p1zMiOjmbetoZ2pWPWxmbvZF1Ua FMZeGiDgUkjJIrVZ9E+igjAxdg1dF7m0aDaXM7joMompDDw7FB0LZE2za1C0hBIiwHEA CCuw== 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:message-id:date :subject:cc:to:from:arc-authentication-results; bh=7kimvoZ43IlPkD7koT2zzL5VYwvrFD+QiitZ7HuXma8=; b=AhNOaL/B2pEhAx4UejerhfyNxZHePAT/iiiNEo/ij3OKvqDFOeSC3Qsw66fB9vnyF5 Wd++CAnw+gywJOehgFIAgpaqrkW4YaSUUC1f0XfH1xNyR+t6nw1ko8nBHesGizcTZDLs yRQEpuOPO8HNIhWj9/M1kuI+AUcutTv0+ByReS5f5NjGa3stOqR2d9c+PkQlk4hd0OxY iN54Vj1z9mYCME7lNl7QGUQrU6qpfcmc0r4QliYsuXesjzV6Y0TOKy+uUredtkpvs5yY mOBoCoOLeoRGrmo0RuSwSxrCq+9XUt3QO7PEbhPWJ0+fTnk6PkltriaiD07iAZQpyrdA ISoQ== 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 x3si4167514pln.340.2018.01.17.12.17.59; Wed, 17 Jan 2018 12:18:13 -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 S1752719AbeAQUP7 (ORCPT + 99 others); Wed, 17 Jan 2018 15:15:59 -0500 Received: from mailoutvs3.siol.net ([213.250.19.136]:42823 "EHLO mail.siol.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753111AbeAQUPA (ORCPT ); Wed, 17 Jan 2018 15:15:00 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.siol.net (Postfix) with ESMTP id 1D1865220C0; Wed, 17 Jan 2018 21:14:58 +0100 (CET) X-Virus-Scanned: amavisd-new at psrvmta11.zcs-production.pri Received: from mail.siol.net ([127.0.0.1]) by localhost (psrvmta11.zcs-production.pri [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id mIlwRto4oFi9; Wed, 17 Jan 2018 21:14:57 +0100 (CET) Received: from mail.siol.net (localhost [127.0.0.1]) by mail.siol.net (Postfix) with ESMTPS id 74BC65220BE; Wed, 17 Jan 2018 21:14:57 +0100 (CET) Received: from localhost.localdomain (cpe-86-58-68-135.ftth.triera.net [86.58.68.135]) (Authenticated sender: 031275009) by mail.siol.net (Postfix) with ESMTPSA id 0B8BD5220D0; Wed, 17 Jan 2018 21:14:55 +0100 (CET) From: Jernej Skrabec To: maxime.ripard@free-electrons.com, airlied@linux.ie, robh+dt@kernel.org, mark.rutland@arm.com, wens@csie.org, architt@codeaurora.org, a.hajda@samsung.com, Laurent.pinchart@ideasonboard.com Cc: mturquette@baylibre.com, sboyd@codeaurora.org, Jose.Abreu@synopsys.com, narmstrong@baylibre.com, jernej.skrabec@siol.net, dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-sunxi@googlegroups.com Subject: [PATCH v3 09/12] drm/sun4i: Add support for A83T second DE2 mixer Date: Wed, 17 Jan 2018 21:14:18 +0100 Message-Id: <20180117201421.25954-10-jernej.skrabec@siol.net> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180117201421.25954-1-jernej.skrabec@siol.net> References: <20180117201421.25954-1-jernej.skrabec@siol.net> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It supports 1 VI and 1 UI plane and HW scaling on both planes. Acked-by: Maxime Ripard Signed-off-by: Jernej Skrabec --- drivers/gpu/drm/sun4i/sun8i_mixer.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c index 2cbb2de6d39c..9b0256d31a61 100644 --- a/drivers/gpu/drm/sun4i/sun8i_mixer.c +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c @@ -485,6 +485,13 @@ static const struct sun8i_mixer_cfg sun8i_a83t_mixer0_cfg = { .vi_num = 1, }; +static const struct sun8i_mixer_cfg sun8i_a83t_mixer1_cfg = { + .ccsc = 1, + .scaler_mask = 0x3, + .ui_num = 1, + .vi_num = 1, +}; + static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = { .vi_num = 2, .ui_num = 1, @@ -498,6 +505,10 @@ 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-a83t-de2-mixer-1", + .data = &sun8i_a83t_mixer1_cfg, + }, { .compatible = "allwinner,sun8i-v3s-de2-mixer", .data = &sun8i_v3s_mixer_cfg, -- 2.15.1