From patchwork Thu Jul 26 17:12:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Icenowy Zheng X-Patchwork-Id: 10546253 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8A2F0139A for ; Thu, 26 Jul 2018 17:18:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 791A62B821 for ; Thu, 26 Jul 2018 17:18:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6B07F2B833; Thu, 26 Jul 2018 17:18:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F1FDE2B821 for ; Thu, 26 Jul 2018 17:18:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=uBqM4UcmLNeq4HhCtSFLqBe77MI2GQW3S0rtdaIRHFs=; b=u9Dx6xy15UXCTwDCN6bSnZFOvU iQg1EKoYbWXyHE28uMwGMMWkVCkN12VdSUcHVdyEpwXgROjOn+MH5OFVqi2va9sZvdvogS6iUILqq tRpGdu97ArA1g/7AKvlBtwG+S9IFiQH2GyzdOg3Hg132HAhfXSwI8T6REU776hh+7Fx9XEkC6p9q7 GX7bCIMSnK+6TGe9AoHtApKH8P83ZT6qGKRRLRbgFHJshkas7pWu/C4L16d/ZcTkDv0jRJb2OpXNX H3oLf1Mkqm9yea8Ae266LV42vlAmeHOQPMXrNMOEZztBsq1HdM12CNkyWqdr0DGt4FcjbCVnymWcl Q++EE8Dw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fijtm-0006RD-BR; Thu, 26 Jul 2018 17:17:58 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fijtj-0006Js-Ld for linux-arm-kernel@bombadil.infradead.org; Thu, 26 Jul 2018 17:17:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=9zEYVNPRgy8oPeXTGPooavLLY9kYR9yIcXo2cBz63Uo=; b=TATz5wWIH5hHTHeVaUfavUNg2 87HuxoolumWtvUqaB1J/5aUDbciVVF1Yl1bXPF5hnXQZI0rr4rbcsiP3ypp7uy1GQwcG+2sw4Mjm+ ivkx1CD9X52F9Lx8B27UtAvEvjRh55YpMfup7wXCVZ0v9FVgoTladfZpxjck62nD/6slMkiWq0kW/ 5tKkObD3Jo/AUiGCFbPmjtyguPm+y37MxjDp/ZPNak9IN+caUfL+IR+aLFryemJxhqfL+vibg9PPA 2gHl4wml/7nt1Od0iANKkD5J12ItUH5Om37/USGt4fgeTZmCl8Dtk7a2ORYX9yF/9nJkKaaGfsfJm Et+JK2C9A==; Received: from glass.birch.relay.mailchannels.net ([23.83.209.70]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fijr8-0003dX-UC for linux-arm-kernel@lists.infradead.org; Thu, 26 Jul 2018 17:15:17 +0000 X-Sender-Id: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id E62A7121A75; Thu, 26 Jul 2018 17:14:59 +0000 (UTC) Received: from hermes.aosc.io (unknown [100.96.19.194]) (Authenticated sender: lmn-TZDUIOWCRQMW) by relay.mailchannels.net (Postfix) with ESMTPA id C642B1234F7; Thu, 26 Jul 2018 17:14:58 +0000 (UTC) X-Sender-Id: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io Received: from hermes.aosc.io (hermes.aosc.io [199.195.250.187]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.16.1); Thu, 26 Jul 2018 17:14:59 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io X-MailChannels-Auth-Id: lmn-TZDUIOWCRQMW X-Snatch-Thoughtful: 74928baf39195222_1532625299614_1045011187 X-MC-Loop-Signature: 1532625299614:1049782888 X-MC-Ingress-Time: 1532625299613 Received: from localhost (localhost [127.0.0.1]) (Authenticated sender: icenowy@aosc.io) by hermes.aosc.io (Postfix) with ESMTPSA id 4F45A9FA66; Thu, 26 Jul 2018 17:14:45 +0000 (UTC) From: Icenowy Zheng To: Maxime Ripard , Rob Herring , Chen-Yu Tsai , Jagan Teki , Jernej Skrabec Subject: [PATCH v3.1 03/10] drm/sun4i: Add support for A64 mixers Date: Fri, 27 Jul 2018 01:12:50 +0800 Message-Id: <20180726171257.6688-4-icenowy@aosc.io> In-Reply-To: <20180726171257.6688-1-icenowy@aosc.io> References: <20180726171257.6688-1-icenowy@aosc.io> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180726_181515_264811_6A875231 X-CRM114-Status: GOOD ( 17.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sunxi@googlegroups.com, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Icenowy Zheng MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jagan Teki Mixers in Allwinner have similar capabilities as others SoCs with DE2. Add support for them. Signed-off-by: Jagan Teki [Icenowy: Add mixer0] Signed-off-by: Icenowy Zheng Reviewed-by: Jernej Skrabec --- Changes for v3.1: - Add mixer0 Changes for v3: - none Changes for v2: - New patch drivers/gpu/drm/sun4i/sun8i_mixer.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c index fc3713608f78..8b3d02b146b7 100644 --- a/drivers/gpu/drm/sun4i/sun8i_mixer.c +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c @@ -569,6 +569,22 @@ static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = { .mod_rate = 150000000, }; +static const struct sun8i_mixer_cfg sun50i_a64_mixer0_cfg = { + .ccsc = 0, + .mod_rate = 297000000, + .scaler_mask = 0xf, + .ui_num = 3, + .vi_num = 1, +}; + +static const struct sun8i_mixer_cfg sun50i_a64_mixer1_cfg = { + .ccsc = 1, + .mod_rate = 297000000, + .scaler_mask = 0x3, + .ui_num = 1, + .vi_num = 1, +}; + static const struct of_device_id sun8i_mixer_of_table[] = { { .compatible = "allwinner,sun8i-a83t-de2-mixer-0", @@ -594,6 +610,14 @@ static const struct of_device_id sun8i_mixer_of_table[] = { .compatible = "allwinner,sun8i-v3s-de2-mixer", .data = &sun8i_v3s_mixer_cfg, }, + { + .compatible = "allwinner,sun50i-a64-de2-mixer-0", + .data = &sun50i_a64_mixer0_cfg, + }, + { + .compatible = "allwinner,sun50i-a64-de2-mixer-1", + .data = &sun50i_a64_mixer1_cfg, + }, { } }; MODULE_DEVICE_TABLE(of, sun8i_mixer_of_table);