fbdev: sh_mipi_dsi: add lane control support (26c3d7ac) · Commits · 戴 / test

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -324,6 +324,7 @@ static struct resource mipidsi0_resources[] = {
	static struct sh_mipi_dsi_info mipidsi0_info = {		static struct sh_mipi_dsi_info mipidsi0_info = {
	.data_format = MIPI_RGB888,		.data_format = MIPI_RGB888,
	.lcd_chan = &lcdc0_info.ch[0],		.lcd_chan = &lcdc0_info.ch[0],
			.lane = 2,
	.vsynw_offset = 20,		.vsynw_offset = 20,
	.clksrc = 1,		.clksrc = 1,
	.flags = SH_MIPI_DSI_HSABM,		.flags = SH_MIPI_DSI_HSABM,

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -580,6 +580,7 @@ static struct resource mipidsi0_resources[] = {
	static struct sh_mipi_dsi_info mipidsi0_info = {		static struct sh_mipi_dsi_info mipidsi0_info = {
	.data_format = MIPI_RGB888,		.data_format = MIPI_RGB888,
	.lcd_chan = &lcdc_info.ch[0],		.lcd_chan = &lcdc_info.ch[0],
			.lane = 2,
	.vsynw_offset = 17,		.vsynw_offset = 17,
	};		};

drivers/video/sh_mipi_dsi.c

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -8,6 +8,7 @@
	* published by the Free Software Foundation.		* published by the Free Software Foundation.
	*/		*/

			#include <linux/bitmap.h>
	#include <linux/clk.h>		#include <linux/clk.h>
	#include <linux/delay.h>		#include <linux/delay.h>
	#include <linux/init.h>		#include <linux/init.h>
	@@ -153,6 +154,7 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi,
	struct sh_mobile_lcdc_chan_cfg *ch = pdata->lcd_chan;		struct sh_mobile_lcdc_chan_cfg *ch = pdata->lcd_chan;
	u32 pctype, datatype, pixfmt, linelength, vmctr2 = 0x00e00000;		u32 pctype, datatype, pixfmt, linelength, vmctr2 = 0x00e00000;
	bool yuv;		bool yuv;
			u32 tmp;

	/*		/*
	* Select data format. MIPI DSI is not hot-pluggable, so, we just use		* Select data format. MIPI DSI is not hot-pluggable, so, we just use
	@@ -253,6 +255,9 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi,
	(!yuv && ch->interface_type != RGB24))		(!yuv && ch->interface_type != RGB24))
	return -EINVAL;		return -EINVAL;

			if (!pdata->lane)
			return -EINVAL;

	/* reset DSI link */		/* reset DSI link */
	iowrite32(0x00000001, base + SYSCTRL);		iowrite32(0x00000001, base + SYSCTRL);
	/* Hold reset for 100 cycles of the slowest of bus, HS byte and LP clock */		/* Hold reset for 100 cycles of the slowest of bus, HS byte and LP clock */
	@@ -269,7 +274,10 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi,
	* ECC check enable		* ECC check enable
	* additionally enable first two lanes		* additionally enable first two lanes
	*/		*/
	iowrite32(0x00003703, base + SYSCONF);		bitmap_fill((unsigned long *)&tmp, pdata->lane);
			tmp \|= 0x00003700;
			iowrite32(tmp, base + SYSCONF);

	/*		/*
	* T_wakeup = 0x7000		* T_wakeup = 0x7000
	* T_hs-trail = 3		* T_hs-trail = 3

include/video/sh_mipi_dsi.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -35,6 +35,7 @@ struct sh_mobile_lcdc_chan_cfg;
	struct sh_mipi_dsi_info {		struct sh_mipi_dsi_info {
	enum sh_mipi_dsi_data_fmt data_format;		enum sh_mipi_dsi_data_fmt data_format;
	struct sh_mobile_lcdc_chan_cfg *lcd_chan;		struct sh_mobile_lcdc_chan_cfg *lcd_chan;
			int lane;
	unsigned long flags;		unsigned long flags;
	u32 clksrc;		u32 clksrc;
	unsigned int vsynw_offset;		unsigned int vsynw_offset;

Admin message