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

Commit a2e62971 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Florian Tobias Schandinat
Browse files

fbdev: sh_mipi_dsi: add HSxxCLK support 



SH MIPI manual explains the calculation method of HBP/HFP.
it is based on HSbyteCLK settings.
SH73a0 chip can use HS6divCLK/HS4divCLK for it.
This patch has compatibility to SH7372 mipi

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
parent 5e47431a

arch/arm/mach-shmobile/board-ag5evm.c

+3 −2
Original line number Diff line number Diff line
@@ -358,7 +358,8 @@ static struct sh_mipi_dsi_info mipidsi0_info = { 
	.vsynw_offset	= 20,

	.clksrc		= 1,

	.flags		= SH_MIPI_DSI_HSABM		|

			  SH_MIPI_DSI_SYNC_PULSES_MODE,

			  SH_MIPI_DSI_SYNC_PULSES_MODE	|

			  SH_MIPI_DSI_HSbyteCLK,

	.set_dot_clock	= sh_mipi_set_dot_clock,

};

arch/arm/mach-shmobile/board-ap4evb.c

+2 −1
Original line number Diff line number Diff line
@@ -606,7 +606,8 @@ static struct sh_mipi_dsi_info mipidsi0_info = { 
	.lcd_chan	= &lcdc_info.ch[0],

	.lane		= 2,

	.vsynw_offset	= 17,

	.flags		= SH_MIPI_DSI_SYNC_PULSES_MODE,

	.flags		= SH_MIPI_DSI_SYNC_PULSES_MODE |

			  SH_MIPI_DSI_HSbyteCLK,

	.set_dot_clock	= sh_mipi_set_dot_clock,

};

drivers/video/sh_mipi_dsi.c

+10 −4
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi, 
	void __iomem *base = mipi->base;

	struct sh_mobile_lcdc_chan_cfg *ch = pdata->lcd_chan;

	u32 pctype, datatype, pixfmt, linelength, vmctr2;

	u32 tmp, top, bottom, delay;

	u32 tmp, top, bottom, delay, div;

	bool yuv;

	int bpp;
@@ -364,17 +364,23 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi, 
	bottom	= 0x00000001;

	delay	= 0;



	div = 1;	/* HSbyteCLK is calculation base

			 * HS4divCLK = HSbyteCLK/2

			 * HS6divCLK is not supported for now */

	if (pdata->flags & SH_MIPI_DSI_HS4divCLK)

		div = 2;



	if (pdata->flags & SH_MIPI_DSI_HFPBM) {	/* HBPLEN */

		top = ch->lcd_cfg[0].hsync_len + ch->lcd_cfg[0].left_margin;

		top = ((pdata->lane * top) - 10) << 16;

		top = ((pdata->lane * top / div) - 10) << 16;

	}

	if (pdata->flags & SH_MIPI_DSI_HBPBM) { /* HFPLEN */

		bottom = ch->lcd_cfg[0].right_margin;

		bottom = (pdata->lane * bottom) - 12;

		bottom = (pdata->lane * bottom / div) - 12;

	}



	bpp = linelength / ch->lcd_cfg[0].xres; /* byte / pixel */

	if (pdata->lane > bpp) {

	if ((pdata->lane / div) > bpp) {

		tmp = ch->lcd_cfg[0].xres / bpp; /* output cycle */

		tmp = ch->lcd_cfg[0].xres - tmp; /* (input - output) cycle */

		delay = (pdata->lane * tmp);

include/video/sh_mipi_dsi.h

+4 −0
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ struct sh_mobile_lcdc_chan_cfg; 
#define SH_MIPI_DSI_HSEE	(1 << 5)

#define SH_MIPI_DSI_HSAE	(1 << 6)



#define SH_MIPI_DSI_HSbyteCLK	(1 << 24)

#define SH_MIPI_DSI_HS6divCLK	(1 << 25)

#define SH_MIPI_DSI_HS4divCLK	(1 << 26)



#define SH_MIPI_DSI_SYNC_PULSES_MODE	(SH_MIPI_DSI_VSEE | \

					 SH_MIPI_DSI_HSEE | \

					 SH_MIPI_DSI_HSAE)