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

Commit 675f9280 authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

fbdev: sh_mipi_dsi: Remove last reference to LCDC platform data 



The format check that references LCDC platform data isn't needed, as the
mismatch between LCDC and MIPI-DSI platform it detects would result in a
badly displayed image, which isn't worse than a complete failure to
setup the transmitter.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
parent 8e2b2033

drivers/video/sh_mipi_dsi.c

+0 −18
Original line number Diff line number Diff line
@@ -131,10 +131,8 @@ static int sh_mipi_setup(struct sh_mipi *mipi, const struct fb_videomode *mode) 
{

	void __iomem *base = mipi->base;

	struct sh_mipi_dsi_info *pdata = mipi->pdev->dev.platform_data;

	struct sh_mobile_lcdc_chan_cfg *ch = pdata->lcd_chan;

	u32 pctype, datatype, pixfmt, linelength, vmctr2;

	u32 tmp, top, bottom, delay, div;

	bool yuv;

	int bpp;



	/*
@@ -148,77 +146,66 @@ static int sh_mipi_setup(struct sh_mipi *mipi, const struct fb_videomode *mode) 
		datatype = MIPI_DSI_PACKED_PIXEL_STREAM_24;

		pixfmt = MIPI_DCS_PIXEL_FMT_24BIT;

		linelength = mode->xres * 3;

		yuv = false;

		break;

	case MIPI_RGB565:

		pctype = 1;

		datatype = MIPI_DSI_PACKED_PIXEL_STREAM_16;

		pixfmt = MIPI_DCS_PIXEL_FMT_16BIT;

		linelength = mode->xres * 2;

		yuv = false;

		break;

	case MIPI_RGB666_LP:

		pctype = 2;

		datatype = MIPI_DSI_PIXEL_STREAM_3BYTE_18;

		pixfmt = MIPI_DCS_PIXEL_FMT_24BIT;

		linelength = mode->xres * 3;

		yuv = false;

		break;

	case MIPI_RGB666:

		pctype = 3;

		datatype = MIPI_DSI_PACKED_PIXEL_STREAM_18;

		pixfmt = MIPI_DCS_PIXEL_FMT_18BIT;

		linelength = (mode->xres * 18 + 7) / 8;

		yuv = false;

		break;

	case MIPI_BGR888:

		pctype = 8;

		datatype = MIPI_DSI_PACKED_PIXEL_STREAM_24;

		pixfmt = MIPI_DCS_PIXEL_FMT_24BIT;

		linelength = mode->xres * 3;

		yuv = false;

		break;

	case MIPI_BGR565:

		pctype = 9;

		datatype = MIPI_DSI_PACKED_PIXEL_STREAM_16;

		pixfmt = MIPI_DCS_PIXEL_FMT_16BIT;

		linelength = mode->xres * 2;

		yuv = false;

		break;

	case MIPI_BGR666_LP:

		pctype = 0xa;

		datatype = MIPI_DSI_PIXEL_STREAM_3BYTE_18;

		pixfmt = MIPI_DCS_PIXEL_FMT_24BIT;

		linelength = mode->xres * 3;

		yuv = false;

		break;

	case MIPI_BGR666:

		pctype = 0xb;

		datatype = MIPI_DSI_PACKED_PIXEL_STREAM_18;

		pixfmt = MIPI_DCS_PIXEL_FMT_18BIT;

		linelength = (mode->xres * 18 + 7) / 8;

		yuv = false;

		break;

	case MIPI_YUYV:

		pctype = 4;

		datatype = MIPI_DSI_PACKED_PIXEL_STREAM_YCBCR16;

		pixfmt = MIPI_DCS_PIXEL_FMT_16BIT;

		linelength = mode->xres * 2;

		yuv = true;

		break;

	case MIPI_UYVY:

		pctype = 5;

		datatype = MIPI_DSI_PACKED_PIXEL_STREAM_YCBCR16;

		pixfmt = MIPI_DCS_PIXEL_FMT_16BIT;

		linelength = mode->xres * 2;

		yuv = true;

		break;

	case MIPI_YUV420_L:

		pctype = 6;

		datatype = MIPI_DSI_PACKED_PIXEL_STREAM_YCBCR12;

		pixfmt = MIPI_DCS_PIXEL_FMT_12BIT;

		linelength = (mode->xres * 12 + 7) / 8;

		yuv = true;

		break;

	case MIPI_YUV420:

		pctype = 7;
@@ -226,16 +213,11 @@ static int sh_mipi_setup(struct sh_mipi *mipi, const struct fb_videomode *mode) 
		pixfmt = MIPI_DCS_PIXEL_FMT_12BIT;

		/* Length of U/V line */

		linelength = (mode->xres + 1) / 2;

		yuv = true;

		break;

	default:

		return -EINVAL;

	}



	if ((yuv && ch->interface_type != YUV422) ||

	    (!yuv && ch->interface_type != RGB24))

		return -EINVAL;



	if (!pdata->lane)

		return -EINVAL;