All of lore.kernel.org
 help / color / mirror / Atom feed
From: Icenowy Zheng <icenowy@aosc.io>
To: "Maxime Ripard" <maxime.ripard@free-electrons.com>,
	"Rob Herring" <robh+dt@kernel.org>,
	"Chen-Yu Tsai" <wens@csie.org>,
	"Jernej Škrabec" <jernej.skrabec@siol.net>
Cc: 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, Icenowy Zheng <icenowy@aosc.xyz>
Subject: [PATCH v2 02/11] drm: sun4i: add support for H3 mixers
Date: Mon,  5 Jun 2017 00:01:40 +0800	[thread overview]
Message-ID: <20170604160149.30230-3-icenowy@aosc.io> (raw)
In-Reply-To: <20170604160149.30230-1-icenowy@aosc.io>

From: Icenowy Zheng <icenowy@aosc.xyz>

Allwinner H3 SoC has two mixers, one has 1 VI channel and 3 UI channels,
and the other has 1 VI and 1 UI.

Add support for these two variants.

Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
---
 drivers/gpu/drm/sun4i/sun8i_mixer.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c
index cb193c5f1686..d658a3a8159a 100644
--- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
@@ -390,11 +390,29 @@ static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = {
 	.ui_num = 1,
 };
 
+static const struct sun8i_mixer_cfg sun8i_h3_mixer0_cfg = {
+	.vi_num = 1,
+	.ui_num = 3,
+};
+
+static const struct sun8i_mixer_cfg sun8i_h3_mixer1_cfg = {
+	.vi_num = 1,
+	.ui_num = 1,
+};
+
 static const struct of_device_id sun8i_mixer_of_table[] = {
 	{
 		.compatible = "allwinner,sun8i-v3s-de2-mixer",
 		.data = &sun8i_v3s_mixer_cfg,
 	},
+	{
+		.compatible = "allwinner,sun8i-h3-de2-mixer0",
+		.data = &sun8i_h3_mixer0_cfg
+	},
+	{
+		.compatible = "allwinner,sun8i-h3-de2-mixer1",
+		.data = &sun8i_h3_mixer1_cfg
+	},
 	{ }
 };
 MODULE_DEVICE_TABLE(of, sun8i_mixer_of_table);
-- 
2.12.2

WARNING: multiple messages have this Message-ID (diff)
From: Icenowy Zheng <icenowy-h8G6r0blFSE@public.gmane.org>
To: "Maxime Ripard"
	<maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>,
	"Rob Herring" <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
	"Chen-Yu Tsai" <wens-jdAy2FN1RRM@public.gmane.org>,
	"Jernej Škrabec" <jernej.skrabec-gGgVlfcn5nU@public.gmane.org>
Cc: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
	devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-clk-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org,
	Icenowy Zheng <icenowy-ymACFijhrKM@public.gmane.org>
Subject: [PATCH v2 02/11] drm: sun4i: add support for H3 mixers
Date: Mon,  5 Jun 2017 00:01:40 +0800	[thread overview]
Message-ID: <20170604160149.30230-3-icenowy@aosc.io> (raw)
In-Reply-To: <20170604160149.30230-1-icenowy-h8G6r0blFSE@public.gmane.org>

From: Icenowy Zheng <icenowy-ymACFijhrKM@public.gmane.org>

Allwinner H3 SoC has two mixers, one has 1 VI channel and 3 UI channels,
and the other has 1 VI and 1 UI.

Add support for these two variants.

Signed-off-by: Icenowy Zheng <icenowy-ymACFijhrKM@public.gmane.org>
---
 drivers/gpu/drm/sun4i/sun8i_mixer.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c
index cb193c5f1686..d658a3a8159a 100644
--- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
@@ -390,11 +390,29 @@ static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = {
 	.ui_num = 1,
 };
 
+static const struct sun8i_mixer_cfg sun8i_h3_mixer0_cfg = {
+	.vi_num = 1,
+	.ui_num = 3,
+};
+
+static const struct sun8i_mixer_cfg sun8i_h3_mixer1_cfg = {
+	.vi_num = 1,
+	.ui_num = 1,
+};
+
 static const struct of_device_id sun8i_mixer_of_table[] = {
 	{
 		.compatible = "allwinner,sun8i-v3s-de2-mixer",
 		.data = &sun8i_v3s_mixer_cfg,
 	},
+	{
+		.compatible = "allwinner,sun8i-h3-de2-mixer0",
+		.data = &sun8i_h3_mixer0_cfg
+	},
+	{
+		.compatible = "allwinner,sun8i-h3-de2-mixer1",
+		.data = &sun8i_h3_mixer1_cfg
+	},
 	{ }
 };
 MODULE_DEVICE_TABLE(of, sun8i_mixer_of_table);
-- 
2.12.2

WARNING: multiple messages have this Message-ID (diff)
From: Icenowy Zheng <icenowy@aosc.io>
To: "Maxime Ripard" <maxime.ripard@free-electrons.com>,
	"Rob Herring" <robh+dt@kernel.org>,
	"Chen-Yu Tsai" <wens@csie.org>,
	"Jernej Škrabec" <jernej.skrabec@siol.net>
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
	dri-devel@lists.freedesktop.org, linux-sunxi@googlegroups.com,
	Icenowy Zheng <icenowy@aosc.xyz>,
	linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 02/11] drm: sun4i: add support for H3 mixers
Date: Mon,  5 Jun 2017 00:01:40 +0800	[thread overview]
Message-ID: <20170604160149.30230-3-icenowy@aosc.io> (raw)
In-Reply-To: <20170604160149.30230-1-icenowy@aosc.io>

From: Icenowy Zheng <icenowy@aosc.xyz>

Allwinner H3 SoC has two mixers, one has 1 VI channel and 3 UI channels,
and the other has 1 VI and 1 UI.

Add support for these two variants.

Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
---
 drivers/gpu/drm/sun4i/sun8i_mixer.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c
index cb193c5f1686..d658a3a8159a 100644
--- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
@@ -390,11 +390,29 @@ static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = {
 	.ui_num = 1,
 };
 
+static const struct sun8i_mixer_cfg sun8i_h3_mixer0_cfg = {
+	.vi_num = 1,
+	.ui_num = 3,
+};
+
+static const struct sun8i_mixer_cfg sun8i_h3_mixer1_cfg = {
+	.vi_num = 1,
+	.ui_num = 1,
+};
+
 static const struct of_device_id sun8i_mixer_of_table[] = {
 	{
 		.compatible = "allwinner,sun8i-v3s-de2-mixer",
 		.data = &sun8i_v3s_mixer_cfg,
 	},
+	{
+		.compatible = "allwinner,sun8i-h3-de2-mixer0",
+		.data = &sun8i_h3_mixer0_cfg
+	},
+	{
+		.compatible = "allwinner,sun8i-h3-de2-mixer1",
+		.data = &sun8i_h3_mixer1_cfg
+	},
 	{ }
 };
 MODULE_DEVICE_TABLE(of, sun8i_mixer_of_table);
-- 
2.12.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

WARNING: multiple messages have this Message-ID (diff)
From: icenowy@aosc.io (Icenowy Zheng)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 02/11] drm: sun4i: add support for H3 mixers
Date: Mon,  5 Jun 2017 00:01:40 +0800	[thread overview]
Message-ID: <20170604160149.30230-3-icenowy@aosc.io> (raw)
In-Reply-To: <20170604160149.30230-1-icenowy@aosc.io>

From: Icenowy Zheng <icenowy@aosc.xyz>

Allwinner H3 SoC has two mixers, one has 1 VI channel and 3 UI channels,
and the other has 1 VI and 1 UI.

Add support for these two variants.

Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
---
 drivers/gpu/drm/sun4i/sun8i_mixer.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c
index cb193c5f1686..d658a3a8159a 100644
--- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
@@ -390,11 +390,29 @@ static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = {
 	.ui_num = 1,
 };
 
+static const struct sun8i_mixer_cfg sun8i_h3_mixer0_cfg = {
+	.vi_num = 1,
+	.ui_num = 3,
+};
+
+static const struct sun8i_mixer_cfg sun8i_h3_mixer1_cfg = {
+	.vi_num = 1,
+	.ui_num = 1,
+};
+
 static const struct of_device_id sun8i_mixer_of_table[] = {
 	{
 		.compatible = "allwinner,sun8i-v3s-de2-mixer",
 		.data = &sun8i_v3s_mixer_cfg,
 	},
+	{
+		.compatible = "allwinner,sun8i-h3-de2-mixer0",
+		.data = &sun8i_h3_mixer0_cfg
+	},
+	{
+		.compatible = "allwinner,sun8i-h3-de2-mixer1",
+		.data = &sun8i_h3_mixer1_cfg
+	},
 	{ }
 };
 MODULE_DEVICE_TABLE(of, sun8i_mixer_of_table);
-- 
2.12.2

  parent reply	other threads:[~2017-06-04 16:02 UTC|newest]

Thread overview: 165+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-04 16:01 [PATCH v2 00/11] Support for H3 Composite Output support Icenowy Zheng
2017-06-04 16:01 ` Icenowy Zheng
2017-06-04 16:01 ` Icenowy Zheng
2017-06-04 16:01 ` [PATCH v2 01/11] dt-bindings: update the binding for Allwinner H3 TVE support Icenowy Zheng
2017-06-04 16:01   ` Icenowy Zheng
2017-06-04 16:01   ` Icenowy Zheng
2017-06-07  8:45   ` Maxime Ripard
2017-06-07  8:45     ` Maxime Ripard
2017-06-07  8:45     ` Maxime Ripard
2017-06-07  8:48     ` Icenowy Zheng
2017-06-07  8:48       ` Icenowy Zheng
2017-06-07  8:48       ` Icenowy Zheng
2017-06-09 16:49       ` Maxime Ripard
2017-06-09 16:49         ` Maxime Ripard
2017-06-09 16:49         ` Maxime Ripard
2017-06-09 16:51         ` [linux-sunxi] " Icenowy Zheng
2017-06-09 16:51           ` Icenowy Zheng
2017-06-09 16:51           ` Icenowy Zheng
2017-06-09 21:24           ` [linux-sunxi] " Jernej Škrabec
2017-06-09 21:24             ` Jernej Škrabec
2017-06-09 21:24             ` Jernej Škrabec
2017-06-10 15:26             ` [linux-sunxi] " icenowy
2017-06-10 15:26               ` icenowy at aosc.io
2017-06-13  7:41           ` Maxime Ripard
2017-06-13  7:41             ` Maxime Ripard
2017-06-13  7:41             ` Maxime Ripard
2017-06-04 16:01 ` Icenowy Zheng [this message]
2017-06-04 16:01   ` [PATCH v2 02/11] drm: sun4i: add support for H3 mixers Icenowy Zheng
2017-06-04 16:01   ` Icenowy Zheng
2017-06-04 16:01   ` Icenowy Zheng
2017-06-04 16:01 ` [PATCH v2 03/11] drm: sun4i: ignore swapped mixer<->tcon connection for DE2 Icenowy Zheng
2017-06-04 16:01   ` Icenowy Zheng
2017-06-04 16:01   ` Icenowy Zheng
2017-06-04 16:01   ` Icenowy Zheng
2017-06-07  9:35   ` Maxime Ripard
2017-06-07  9:35     ` Maxime Ripard
2017-06-07  9:35     ` Maxime Ripard
2017-06-07  9:44     ` Icenowy Zheng
2017-06-07  9:44       ` Icenowy Zheng
2017-06-07  9:44       ` Icenowy Zheng
2017-06-07 10:01     ` Icenowy Zheng
2017-06-07 10:01       ` Icenowy Zheng
2017-06-07 14:38       ` Maxime Ripard
2017-06-07 14:38         ` Maxime Ripard
2017-06-07 14:38         ` Maxime Ripard
2017-06-07 18:15         ` Jernej Škrabec
2017-06-07 18:15           ` Jernej Škrabec
2017-06-07 18:15           ` Jernej Škrabec
2017-06-09 14:45           ` Maxime Ripard
2017-06-09 14:45             ` Maxime Ripard
2017-06-09 14:45             ` Maxime Ripard
2017-06-08  5:01         ` icenowy
2017-06-08  5:01           ` icenowy at aosc.io
2017-06-08  5:01           ` icenowy-h8G6r0blFSE
2017-06-09 14:46           ` Maxime Ripard
2017-06-09 14:46             ` Maxime Ripard
2017-06-09 14:46             ` Maxime Ripard
2017-06-10 14:57             ` icenowy
2017-06-10 14:57               ` icenowy at aosc.io
2017-06-10 14:57               ` icenowy-h8G6r0blFSE
2017-06-10 15:16               ` icenowy
2017-06-10 15:16                 ` icenowy at aosc.io
2017-06-10 15:16                 ` icenowy-h8G6r0blFSE
2017-06-13  9:46                 ` Maxime Ripard
2017-06-13  9:46                   ` Maxime Ripard
2017-06-13  9:46                   ` Maxime Ripard
2017-06-13  9:43               ` Maxime Ripard
2017-06-13  9:43                 ` Maxime Ripard
2017-06-13  9:43                 ` Maxime Ripard
2017-06-13 10:05                 ` Chen-Yu Tsai
2017-06-13 10:05                   ` Chen-Yu Tsai
2017-06-13 10:05                   ` Chen-Yu Tsai
2017-06-13 10:05                   ` Chen-Yu Tsai
2017-06-23  7:31                   ` Maxime Ripard
2017-06-23  7:31                     ` Maxime Ripard
2017-06-04 16:01 ` [PATCH v2 04/11] drm: sun4i: add support for H3's TCON0/1 Icenowy Zheng
2017-06-04 16:01   ` Icenowy Zheng
2017-06-04 16:01   ` Icenowy Zheng
2017-06-04 16:01   ` Icenowy Zheng
2017-06-04 18:46   ` Jernej Škrabec
2017-06-04 18:46     ` Jernej Škrabec
2017-06-04 18:46     ` Jernej Škrabec
2017-06-04 18:46     ` Jernej Škrabec
2017-06-04 19:03     ` Icenowy Zheng
2017-06-04 19:03       ` Icenowy Zheng
2017-06-04 19:03       ` Icenowy Zheng
2017-06-04 19:03       ` Icenowy Zheng
2017-06-07  9:43       ` Maxime Ripard
2017-06-07  9:43         ` Maxime Ripard
2017-06-07  9:43         ` Maxime Ripard
2017-06-07  9:43         ` Maxime Ripard
2017-06-07  9:44         ` Icenowy Zheng
2017-06-07  9:44           ` Icenowy Zheng
2017-06-07  9:44           ` Icenowy Zheng
2017-06-07  9:44           ` Icenowy Zheng
2017-06-07 14:19           ` Maxime Ripard
2017-06-07 14:19             ` Maxime Ripard
2017-06-07 14:19             ` Maxime Ripard
2017-06-07 14:19             ` Maxime Ripard
2017-06-07 14:21             ` Icenowy Zheng
2017-06-07 14:21               ` Icenowy Zheng
2017-06-07 14:21               ` Icenowy Zheng
2017-06-07 14:21               ` Icenowy Zheng
2017-06-09 14:48               ` Maxime Ripard
2017-06-09 14:48                 ` Maxime Ripard
2017-06-09 14:48                 ` Maxime Ripard
2017-06-09 14:48                 ` Maxime Ripard
2017-06-07 10:00         ` Icenowy Zheng
2017-06-07 10:00           ` Icenowy Zheng
2017-06-07 10:00           ` Icenowy Zheng
2017-06-07 10:00           ` Icenowy Zheng
2017-06-04 22:43   ` kbuild test robot
2017-06-04 22:43     ` kbuild test robot
2017-06-04 22:43     ` kbuild test robot
2017-06-04 22:43     ` kbuild test robot
2017-06-04 16:01 ` [PATCH v2 05/11] drm: sun4i: add compatible for H3 display engine Icenowy Zheng
2017-06-04 16:01   ` Icenowy Zheng
2017-06-04 16:01   ` Icenowy Zheng
2017-06-04 16:01   ` Icenowy Zheng
2017-06-04 16:01 ` [PATCH v2 06/11] drm: sun4i: add color space correction support for DE2 mixer Icenowy Zheng
2017-06-04 16:01   ` Icenowy Zheng
2017-06-04 16:01   ` Icenowy Zheng
2017-06-04 16:01 ` [PATCH v2 07/11] drm: sun4i: add support for the TV encoder in H3 SoC Icenowy Zheng
2017-06-04 16:01   ` Icenowy Zheng
2017-06-04 16:01   ` Icenowy Zheng
2017-06-07  9:38   ` Maxime Ripard
2017-06-07  9:38     ` Maxime Ripard
2017-06-07  9:38     ` Maxime Ripard
2017-06-11  6:43     ` icenowy
2017-06-11  6:43       ` icenowy at aosc.io
2017-06-11  6:43       ` icenowy-h8G6r0blFSE
2017-06-13  7:44       ` Maxime Ripard
2017-06-13  7:44         ` Maxime Ripard
2017-06-13  7:44         ` Maxime Ripard
2017-06-13  9:51         ` Icenowy Zheng
2017-06-13  9:51           ` Icenowy Zheng
2017-06-13  9:51           ` Icenowy Zheng
2017-06-23 14:44           ` Maxime Ripard
2017-06-23 14:44             ` Maxime Ripard
2017-06-23 14:44             ` Maxime Ripard
2017-06-04 16:01 ` [PATCH v2 08/11] clk: sunxi-ng: allow CLK_DE to set CLK_PLL_DE for H3 Icenowy Zheng
2017-06-04 16:01   ` Icenowy Zheng
2017-06-04 16:01   ` Icenowy Zheng
2017-06-04 16:01 ` [PATCH v2 09/11] clk: sunxi-ng: export " Icenowy Zheng
2017-06-04 16:01   ` Icenowy Zheng
2017-06-04 16:01   ` Icenowy Zheng
2017-06-04 16:01   ` Icenowy Zheng
2017-06-04 16:01 ` [PATCH v2 10/11] ARM: sun8i: h3: add display engine pipeline for TVE Icenowy Zheng
2017-06-04 16:01   ` Icenowy Zheng
2017-06-04 16:01   ` Icenowy Zheng
2017-06-07  9:42   ` Maxime Ripard
2017-06-07  9:42     ` Maxime Ripard
2017-06-07  9:42     ` Maxime Ripard
2017-06-11  6:58     ` [linux-sunxi] " icenowy
2017-06-11  6:58       ` icenowy at aosc.io
2017-06-11  6:58       ` icenowy-h8G6r0blFSE
2017-06-13  8:02       ` [linux-sunxi] " Maxime Ripard
2017-06-13  8:02         ` Maxime Ripard
2017-06-13  8:02         ` Maxime Ripard
2017-06-04 16:01 ` [PATCH v2 11/11] [DO NOT MERGE] ARM: sun8i: h3: enable TV output on Orange Pi PC Icenowy Zheng
2017-06-04 16:01   ` Icenowy Zheng
2017-06-04 16:01   ` Icenowy Zheng
2017-06-07  0:26 ` [PATCH v2 00/11] Support for H3 Composite Output support icenowy
2017-06-07  0:26   ` icenowy at aosc.io
2017-06-07  0:26   ` icenowy-h8G6r0blFSE

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170604160149.30230-3-icenowy@aosc.io \
    --to=icenowy@aosc.io \
    --cc=devicetree@vger.kernel.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=icenowy@aosc.xyz \
    --cc=jernej.skrabec@siol.net \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-clk@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sunxi@googlegroups.com \
    --cc=maxime.ripard@free-electrons.com \
    --cc=robh+dt@kernel.org \
    --cc=wens@csie.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.