video imx: specify num_modes in platform_data
Without num_modes the imx fb driver won't work. Specify this in the boards and also bail out in the driver when num_modes is unspecified. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
e3d1b99292
commit
ef191db8af
|
@ -116,6 +116,7 @@ static struct imx_fb_videomode imxfb_mode = {
|
|||
|
||||
static struct imx_fb_platform_data eukrea_cpuimx25_fb_data = {
|
||||
.mode = &imxfb_mode,
|
||||
.num_modes = 1,
|
||||
.pwmr = 0x00A903FF,
|
||||
.lscr1 = 0x00120300,
|
||||
.dmacr = 0x80040060,
|
||||
|
|
|
@ -116,6 +116,7 @@ static struct imx_fb_videomode imxfb_mode = {
|
|||
|
||||
static struct imx_fb_platform_data eukrea_cpuimx27_fb_data = {
|
||||
.mode = &imxfb_mode,
|
||||
.num_modes = 1,
|
||||
.pwmr = 0x00A903FF,
|
||||
.lscr1 = 0x00120300,
|
||||
.dmacr = 0x00020010,
|
||||
|
|
|
@ -105,6 +105,7 @@ static void neso_fb_enable(int enable)
|
|||
|
||||
static struct imx_fb_platform_data neso_fb_data = {
|
||||
.mode = &imxfb_mode,
|
||||
.num_modes = 1,
|
||||
.pwmr = 0x00000000, /* doesn't matter */
|
||||
.lscr1 = 0x00120300, /* doesn't matter */
|
||||
/* dynamic mode -> using the reset values (as recommended in the datasheet) */
|
||||
|
|
|
@ -70,6 +70,7 @@ static struct imx_fb_videomode imx_fb_modedata = {
|
|||
|
||||
static struct imx_fb_platform_data imx_fb_data = {
|
||||
.mode = &imx_fb_modedata,
|
||||
.num_modes = 1,
|
||||
.cmap_greyscale = 0,
|
||||
.cmap_inverse = 0,
|
||||
.cmap_static = 0,
|
||||
|
|
|
@ -239,6 +239,7 @@ static void tx25_fb_enable(int enable)
|
|||
|
||||
static struct imx_fb_platform_data tx25_fb_data = {
|
||||
.mode = &stk5_fb_mode,
|
||||
.num_modes = 1,
|
||||
.dmacr = 0x80040060,
|
||||
.enable = tx25_fb_enable,
|
||||
};
|
||||
|
|
|
@ -104,6 +104,7 @@ static struct imx_fb_videomode imxfb_mode = {
|
|||
|
||||
static struct imx_fb_platform_data pcm038_fb_data = {
|
||||
.mode = &imxfb_mode,
|
||||
.num_modes = 1,
|
||||
.pwmr = 0x00A903FF,
|
||||
.lscr1 = 0x00120300,
|
||||
.dmacr = 0x00020010,
|
||||
|
|
|
@ -552,6 +552,11 @@ static int imxfb_probe(struct device_d *dev)
|
|||
writel(readl(IMX_CCM_BASE + CCM_CGCR1) & ~(1 << 29),
|
||||
IMX_CCM_BASE + CCM_CGCR1);
|
||||
#endif
|
||||
if (!pdata->num_modes) {
|
||||
dev_err(dev, "no modes. bailing out\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
mode_list = xzalloc(sizeof(*mode_list) * pdata->num_modes);
|
||||
for (i = 0; i < pdata->num_modes; i++)
|
||||
mode_list[i] = pdata->mode[i].mode;
|
||||
|
|
Loading…
Reference in New Issue