Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 07408459 authored by Jernej Skrabec's avatar Jernej Skrabec Committed by Maxime Ripard
Browse files

drm/sun4i: Add support for R40 mixers 



Both mixers have similar capabilities as others SoCs with DE2.

First mixer has 1 VI and 3 UI planes and supports HW scaling on all
planes.

Second mixer has 1 VI and 1 UI planes and also supports HW scaling on
all planes.

Signed-off-by: default avatarJernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180625120304.7543-15-jernej.skrabec@siol.net
parent 63d6310f

drivers/gpu/drm/sun4i/sun8i_mixer.c

+24 −0
Original line number Diff line number Diff line
@@ -500,6 +500,22 @@ static const struct sun8i_mixer_cfg sun8i_h3_mixer0_cfg = { 
	.vi_num		= 1,

};



static const struct sun8i_mixer_cfg sun8i_r40_mixer0_cfg = {

	.ccsc		= 0,

	.mod_rate	= 297000000,

	.scaler_mask	= 0xf,

	.ui_num		= 3,

	.vi_num		= 1,

};



static const struct sun8i_mixer_cfg sun8i_r40_mixer1_cfg = {

	.ccsc		= 1,

	.mod_rate	= 297000000,

	.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,
@@ -521,6 +537,14 @@ static const struct of_device_id sun8i_mixer_of_table[] = { 
		.compatible = "allwinner,sun8i-h3-de2-mixer-0",

		.data = &sun8i_h3_mixer0_cfg,

	},

	{

		.compatible = "allwinner,sun8i-r40-de2-mixer-0",

		.data = &sun8i_r40_mixer0_cfg,

	},

	{

		.compatible = "allwinner,sun8i-r40-de2-mixer-1",

		.data = &sun8i_r40_mixer1_cfg,

	},

	{

		.compatible = "allwinner,sun8i-v3s-de2-mixer",

		.data = &sun8i_v3s_mixer_cfg,