diff options
| author | Sandor Yu <R01008@freescale.com> | 2015-09-30 16:55:01 +0800 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@nxp.com> | 2016-01-14 11:01:43 -0600 |
| commit | 1fb5bc2fef25d836f08fa095fd9f40847e859039 (patch) | |
| tree | 6ab5f6d33f310224a111eb281746fd7c41f10a5b /drivers/mxc | |
| parent | fc647f47a740086fcab7abf07732832843566139 (diff) | |
MLK-11661: ipuv3: Fix build warning
Fix buiulding warning:
drivers/mxc/ipu3/ipu_disp.c:435:29: warning: initialization discards
'const' qualifier from pointer target type
[-Wdiscarded-array-qualifiers]
{{DP_COM_CONF_CSC_DEF_BOTH, &rgb2ycbcr_coeff}, {0, 0}, {0, 0},
{DP_COM_CONF_CSC_DEF_BG, &rgb2ycbcr_coeff}, {DP_COM_CONF_CSC_DEF_BG,
&rgb2ycbcr_coeff} },
Signed-off-by: Sandor Yu <R01008@freescale.com>
Diffstat (limited to 'drivers/mxc')
| -rw-r--r-- | drivers/mxc/ipu3/ipu_disp.c | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/drivers/mxc/ipu3/ipu_disp.c b/drivers/mxc/ipu3/ipu_disp.c index 633fc56bca85..a983ba7f10de 100644 --- a/drivers/mxc/ipu3/ipu_disp.c +++ b/drivers/mxc/ipu3/ipu_disp.c @@ -432,11 +432,33 @@ static int _rgb_to_yuv(int n, int red, int green, int blue) * Column is for FG: RGB2YUV YUV2RGB RGB2RGB YUV2YUV CSC_NONE */ static struct dp_csc_param_t dp_csc_array[CSC_NUM][CSC_NUM] = { -{{DP_COM_CONF_CSC_DEF_BOTH, &rgb2ycbcr_coeff}, {0, 0}, {0, 0}, {DP_COM_CONF_CSC_DEF_BG, &rgb2ycbcr_coeff}, {DP_COM_CONF_CSC_DEF_BG, &rgb2ycbcr_coeff} }, -{{0, 0}, {DP_COM_CONF_CSC_DEF_BOTH, &ycbcr2rgb_coeff}, {DP_COM_CONF_CSC_DEF_BG, &ycbcr2rgb_coeff}, {0, 0}, {DP_COM_CONF_CSC_DEF_BG, &ycbcr2rgb_coeff} }, -{{0, 0}, {DP_COM_CONF_CSC_DEF_FG, &ycbcr2rgb_coeff}, {0, 0}, {0, 0}, {0, 0} }, -{{DP_COM_CONF_CSC_DEF_FG, &rgb2ycbcr_coeff}, {0, 0}, {0, 0}, {0, 0}, {0, 0} }, -{{DP_COM_CONF_CSC_DEF_FG, &rgb2ycbcr_coeff}, {DP_COM_CONF_CSC_DEF_FG, &ycbcr2rgb_coeff}, {0, 0}, {0, 0}, {0, 0} } +{ + {DP_COM_CONF_CSC_DEF_BOTH, (void *)&rgb2ycbcr_coeff}, + {0, 0}, {0, 0}, + {DP_COM_CONF_CSC_DEF_BG, (void *)&rgb2ycbcr_coeff}, + {DP_COM_CONF_CSC_DEF_BG, (void *)&rgb2ycbcr_coeff} +}, +{ + {0, 0}, + {DP_COM_CONF_CSC_DEF_BOTH, (void *)&ycbcr2rgb_coeff}, + {DP_COM_CONF_CSC_DEF_BG, (void *)&ycbcr2rgb_coeff}, + {0, 0}, + {DP_COM_CONF_CSC_DEF_BG, (void *)&ycbcr2rgb_coeff} +}, +{ + {0, 0}, + {DP_COM_CONF_CSC_DEF_FG, (void *)&ycbcr2rgb_coeff}, + {0, 0}, {0, 0}, {0, 0} +}, +{ + {DP_COM_CONF_CSC_DEF_FG, (void *)&rgb2ycbcr_coeff}, + {0, 0}, {0, 0}, {0, 0}, {0, 0} +}, +{ + {DP_COM_CONF_CSC_DEF_FG, (void *)&rgb2ycbcr_coeff}, + {DP_COM_CONF_CSC_DEF_FG, (void *)&ycbcr2rgb_coeff}, + {0, 0}, {0, 0}, {0, 0} +} }; void __ipu_dp_csc_setup(struct ipu_soc *ipu, |