Commit bd3bcb91 authored by Jernej Skrabec's avatar Jernej Skrabec Committed by Maxime Ripard

drm/sun4i: Add CCSC property to DE2 configuration

Base addresses of channel output CSC (CCSC) depends whether mixer in
question is first or second and if it is second, if supports VEP or not.
This new property will tell which set of base addresses to take.
Signed-off-by: default avatarJernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171201060550.10392-23-jernej.skrabec@siol.net
parent b862a648
...@@ -337,6 +337,7 @@ static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = { ...@@ -337,6 +337,7 @@ static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = {
.vi_num = 2, .vi_num = 2,
.ui_num = 1, .ui_num = 1,
.scaler_mask = 0x3, .scaler_mask = 0x3,
.ccsc = 0,
}; };
static const struct of_device_id sun8i_mixer_of_table[] = { static const struct of_device_id sun8i_mixer_of_table[] = {
......
...@@ -98,11 +98,16 @@ struct de2_fmt_info { ...@@ -98,11 +98,16 @@ struct de2_fmt_info {
* First, scaler supports for VI channels is defined and after that, scaler * First, scaler supports for VI channels is defined and after that, scaler
* support for UI channels. For example, if mixer has 2 VI channels without * support for UI channels. For example, if mixer has 2 VI channels without
* scaler and 2 UI channels with scaler, bitmask would be 0xC. * scaler and 2 UI channels with scaler, bitmask would be 0xC.
* @ccsc: select set of CCSC base addresses
* Set value to 0 if this is first mixer or second mixer with VEP support.
* Set value to 1 if this is second mixer without VEP support. Other values
* are invalid.
*/ */
struct sun8i_mixer_cfg { struct sun8i_mixer_cfg {
int vi_num; int vi_num;
int ui_num; int ui_num;
int scaler_mask; int scaler_mask;
int ccsc;
}; };
struct sun8i_mixer { struct sun8i_mixer {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment