From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761751AbdJQM2v (ORCPT ); Tue, 17 Oct 2017 08:28:51 -0400 Received: from hermes.aosc.io ([199.195.250.187]:39335 "EHLO hermes.aosc.io" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761733AbdJQM2s (ORCPT ); Tue, 17 Oct 2017 08:28:48 -0400 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Date: Tue, 17 Oct 2017 20:28:46 +0800 From: icenowy@aosc.io To: Maxime Ripard Cc: Daniel Vetter , David Airlie , Chen-Yu Tsai , Mark Rutland , Thomas Petazzoni , plaes@plaes.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Quentin Schulz , Rob Herring , Mylene Josserand , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 16/23] drm/sun4i: Add A83T support In-Reply-To: References: Message-ID: <709d66dedf590f19d10ad94129087fcc@aosc.io> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 在 2017-10-17 17:06，Maxime Ripard 写道： > Add support for the A83T display pipeline. > > Signed-off-by: Maxime Ripard > --- > Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt | 3 +++ > drivers/gpu/drm/sun4i/sun4i_drv.c | 2 ++ > drivers/gpu/drm/sun4i/sun4i_tcon.c | 1 + > drivers/gpu/drm/sun4i/sun8i_mixer.c | 4 ++++ > 4 files changed, 10 insertions(+) > > diff --git > a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt > b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt > index 46df3b78ae9e..c0fa233ec1fc 100644 > --- a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt > +++ b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt > @@ -90,6 +90,7 @@ Required properties: > * allwinner,sun6i-a31-tcon > * allwinner,sun6i-a31s-tcon > * allwinner,sun8i-a33-tcon > + * allwinner,sun8i-a83t-tcon Should be tcon0 -- tcon0 on A83T has only channel 0 and tcon1 has only channel 1. > * allwinner,sun8i-v3s-tcon > - reg: base address and size of memory-mapped region > - interrupts: interrupt associated to this IP > @@ -209,6 +210,7 @@ supported. > > Required properties: > - compatible: value must be one of: > + * allwinner,sun8i-a83t-de2-mixer Since the capability of mixer0 and mixer1 are different (smart backlight, write-back, VEP of the VI channel and extra UI channels), I suggest to use ID-specific compatibles here. > * allwinner,sun8i-v3s-de2-mixer > - reg: base address and size of the memory-mapped region. > - clocks: phandles to the clocks feeding the mixer > @@ -236,6 +238,7 @@ Required properties: > * allwinner,sun6i-a31-display-engine > * allwinner,sun6i-a31s-display-engine > * allwinner,sun8i-a33-display-engine > + * allwinner,sun8i-a83t-display-engine > * allwinner,sun8i-v3s-display-engine > > - allwinner,pipelines: list of phandle to the display engine > diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c > b/drivers/gpu/drm/sun4i/sun4i_drv.c > index a27efad9bc76..439f116bb3b5 100644 > --- a/drivers/gpu/drm/sun4i/sun4i_drv.c > +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c > @@ -189,6 +189,7 @@ static bool sun4i_drv_node_is_tcon(struct > device_node *node) > of_device_is_compatible(node, "allwinner,sun6i-a31-tcon") || > of_device_is_compatible(node, "allwinner,sun6i-a31s-tcon") || > of_device_is_compatible(node, "allwinner,sun8i-a33-tcon") || > + of_device_is_compatible(node, "allwinner,sun8i-a83t-tcon") || > of_device_is_compatible(node, "allwinner,sun8i-v3s-tcon"); > } > > @@ -347,6 +348,7 @@ static const struct of_device_id > sun4i_drv_of_table[] = { > { .compatible = "allwinner,sun6i-a31-display-engine" }, > { .compatible = "allwinner,sun6i-a31s-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 6a20a467ee6d..eb3c8bad4977 100644 > --- a/drivers/gpu/drm/sun4i/sun4i_tcon.c > +++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c > @@ -1063,6 +1063,7 @@ static const struct of_device_id > sun4i_tcon_of_table[] = { > { .compatible = "allwinner,sun6i-a31-tcon", .data = &sun6i_a31_quirks > }, > { .compatible = "allwinner,sun6i-a31s-tcon", .data = > &sun6i_a31s_quirks }, > { .compatible = "allwinner,sun8i-a33-tcon", .data = &sun8i_a33_quirks > }, > + { .compatible = "allwinner,sun8i-a83t-tcon", .data = > &sun8i_v3s_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 86c6c24b5105..c6030ce130d3 100644 > --- a/drivers/gpu/drm/sun4i/sun8i_mixer.c > +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c > @@ -385,6 +385,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", > + .data = &sun8i_v3s_mixer_cfg, As I said, V3s has 2 VI channels, so it totally shouldn't share config with A83T. > + }, > + { > .compatible = "allwinner,sun8i-v3s-de2-mixer", > .data = &sun8i_v3s_mixer_cfg, > },