From: Icenowy Zheng <icenowy@aosc.io> To: Maxime Ripard <maxime.ripard@bootlin.com>, Chen-Yu Tsai <wens@csie.org>, Jagan Teki <jagan@amarulasolutions.com>, Jernej Skrabec <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.io> Subject: [PATCH v4 04/11] drm/sun4i: Add support for A64 mixers Date: Tue, 4 Sep 2018 12:40:46 +0800 [thread overview] Message-ID: <20180904044053.15425-5-icenowy@aosc.io> (raw) In-Reply-To: <20180904044053.15425-1-icenowy@aosc.io> From: Jagan Teki <jagan@amarulasolutions.com> Mixers in Allwinner have similar capabilities as others SoCs with DE2. Add support for them. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> [Icenowy: Add mixer1] Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Reviewed-by: Jernej Skrabec <jernej.skrabec@siol.net> --- Changes for v4: - none 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 cb65b0ed53fd..091f6cf40353 100644 --- a/drivers/gpu/drm/sun4i/sun8i_mixer.c +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c @@ -553,6 +553,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", @@ -570,6 +586,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); -- 2.18.0
WARNING: multiple messages have this Message-ID (diff)
From: icenowy@aosc.io (Icenowy Zheng) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 04/11] drm/sun4i: Add support for A64 mixers Date: Tue, 4 Sep 2018 12:40:46 +0800 [thread overview] Message-ID: <20180904044053.15425-5-icenowy@aosc.io> (raw) In-Reply-To: <20180904044053.15425-1-icenowy@aosc.io> From: Jagan Teki <jagan@amarulasolutions.com> Mixers in Allwinner have similar capabilities as others SoCs with DE2. Add support for them. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> [Icenowy: Add mixer1] Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Reviewed-by: Jernej Skrabec <jernej.skrabec@siol.net> --- Changes for v4: - none 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 cb65b0ed53fd..091f6cf40353 100644 --- a/drivers/gpu/drm/sun4i/sun8i_mixer.c +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c @@ -553,6 +553,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", @@ -570,6 +586,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); -- 2.18.0
next prev parent reply other threads:[~2018-09-04 4:42 UTC|newest] Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-09-04 4:40 [PATCH v4 00/11] arm64: allwinner: Add A64 DE2 HDMI support Icenowy Zheng 2018-09-04 4:40 ` Icenowy Zheng 2018-09-04 4:40 ` Icenowy Zheng 2018-09-04 4:40 ` [PATCH v4 01/11] clk: sunxi-ng: a64: Add minimal rate for video PLLs Icenowy Zheng 2018-09-04 4:40 ` Icenowy Zheng 2018-09-04 4:40 ` Icenowy Zheng 2018-09-05 7:16 ` Maxime Ripard 2018-09-05 7:16 ` Maxime Ripard 2018-09-05 7:16 ` Maxime Ripard 2018-09-04 4:40 ` [PATCH v4 02/11] clk: sunxi-ng: a64: Add max. rate constraint to " Icenowy Zheng 2018-09-04 4:40 ` Icenowy Zheng 2018-09-04 4:40 ` Icenowy Zheng 2018-09-05 7:16 ` Maxime Ripard 2018-09-05 7:16 ` Maxime Ripard 2018-09-05 7:16 ` Maxime Ripard 2018-09-05 10:17 ` Sergey Suloev 2018-09-05 10:22 ` Sergey Suloev 2018-09-05 10:22 ` Sergey Suloev 2018-09-04 4:40 ` [PATCH v4 03/11] dt-bindings: display: Add compatible for A64 DE2 display pipeline Icenowy Zheng 2018-09-04 4:40 ` Icenowy Zheng 2018-09-05 7:20 ` Maxime Ripard 2018-09-05 7:20 ` Maxime Ripard 2018-09-05 7:20 ` Maxime Ripard 2018-09-04 4:40 ` Icenowy Zheng [this message] 2018-09-04 4:40 ` [PATCH v4 04/11] drm/sun4i: Add support for A64 mixers Icenowy Zheng 2018-09-05 7:21 ` Maxime Ripard 2018-09-05 7:21 ` Maxime Ripard 2018-09-05 7:21 ` Maxime Ripard 2018-09-04 4:40 ` [PATCH v4 05/11] drm/sun4i: Add support for A64 display engine Icenowy Zheng 2018-09-04 4:40 ` Icenowy Zheng 2018-09-05 7:21 ` Maxime Ripard 2018-09-05 7:21 ` Maxime Ripard 2018-09-05 7:21 ` Maxime Ripard 2018-09-04 4:40 ` [PATCH v4 06/11] dt-bindings: display: Add compatible for A64 HDMI Icenowy Zheng 2018-09-04 4:40 ` Icenowy Zheng 2018-09-04 4:40 ` Icenowy Zheng 2018-09-05 7:21 ` Maxime Ripard 2018-09-05 7:21 ` Maxime Ripard 2018-09-05 7:21 ` Maxime Ripard 2018-09-04 4:40 ` [PATCH v4 07/11] dt-bindings: clock: sun50i-a64-ccu: Add PLL_VIDEO0 macro Icenowy Zheng 2018-09-04 4:40 ` Icenowy Zheng 2018-09-04 4:40 ` Icenowy Zheng 2018-09-05 7:21 ` Maxime Ripard 2018-09-05 7:21 ` Maxime Ripard 2018-09-05 7:21 ` Maxime Ripard 2018-09-04 4:40 ` [PATCH v4 08/11] arm64: dts: allwinner: a64: Add display pipeline Icenowy Zheng 2018-09-04 4:40 ` Icenowy Zheng 2018-09-04 4:40 ` Icenowy Zheng 2018-09-05 7:50 ` Maxime Ripard 2018-09-05 7:50 ` Maxime Ripard 2018-09-05 7:50 ` Maxime Ripard 2018-09-07 4:13 ` Jagan Teki 2018-09-07 4:13 ` Jagan Teki 2018-09-07 4:13 ` Jagan Teki 2018-09-07 8:21 ` Maxime Ripard 2018-09-07 8:21 ` Maxime Ripard 2018-09-07 8:21 ` Maxime Ripard 2018-09-06 6:18 ` [linux-sunxi] " Jagan Teki 2018-09-06 6:18 ` Jagan Teki 2018-09-06 6:18 ` Jagan Teki 2018-09-06 6:19 ` [linux-sunxi] " Icenowy Zheng 2018-09-06 6:19 ` Icenowy Zheng 2018-09-06 6:19 ` Icenowy Zheng 2018-09-04 4:40 ` [PATCH v4 09/11] dt-bindings: sun4i-drm: add HDMI VCC supply property for sun8i-dw-hdmi Icenowy Zheng 2018-09-04 4:40 ` Icenowy Zheng 2018-09-04 4:40 ` Icenowy Zheng 2018-09-05 7:22 ` Maxime Ripard 2018-09-05 7:22 ` Maxime Ripard 2018-09-05 7:22 ` Maxime Ripard 2018-09-04 4:40 ` [PATCH v4 10/11] drm/sun4i: Add support for HDMI voltage regulator Icenowy Zheng 2018-09-04 4:40 ` Icenowy Zheng 2018-09-04 4:40 ` Icenowy Zheng 2018-09-05 7:22 ` Maxime Ripard 2018-09-05 7:22 ` Maxime Ripard 2018-09-05 7:22 ` Maxime Ripard 2018-09-04 4:40 ` [PATCH v4 11/11] arm64: dts: allwinner: a64: Enable HDMI output on A64 boards w/ HDMI Icenowy Zheng 2018-09-04 4:40 ` Icenowy Zheng 2018-09-04 4:40 ` Icenowy Zheng 2018-09-05 7:26 ` [linux-sunxi] " Jagan Teki 2018-09-05 7:26 ` Jagan Teki 2018-09-05 7:26 ` Jagan Teki 2018-09-05 7:51 ` [linux-sunxi] " Maxime Ripard 2018-09-05 7:51 ` Maxime Ripard 2018-09-05 7:51 ` Maxime Ripard 2018-09-05 7:57 ` [linux-sunxi] " Jagan Teki 2018-09-05 7:57 ` Jagan Teki 2018-09-05 7:57 ` Jagan Teki 2018-09-05 22:53 ` [linux-sunxi] " Vasily Khoruzhick 2018-09-05 22:53 ` Vasily Khoruzhick 2018-09-06 4:12 ` Vasily Khoruzhick 2018-09-06 4:12 ` Vasily Khoruzhick 2018-09-06 5:07 ` Jernej Škrabec 2018-09-06 5:07 ` Jernej Škrabec 2018-09-06 5:07 ` Jernej Škrabec
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=20180904044053.15425-5-icenowy@aosc.io \ --to=icenowy@aosc.io \ --cc=devicetree@vger.kernel.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=jagan@amarulasolutions.com \ --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@bootlin.com \ --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: linkBe 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.