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

Commit d21f43bc authored by Archit Taneja's avatar Archit Taneja Committed by Tomi Valkeinen
Browse files

OMAPDSS: Remove passive matrix LCD support (part 3) 



Remove omap_lcd_display_type enum

The enum omap_lcd_display_type is used to configure the lcd display type in
DISPC. Remove this enum and always set display type to TFT by creating function
dss_mgr_set_lcd_type_tft().

Signed-off-by: default avatarArchit Taneja <archit@ti.com>
parent 5ae9eaa6

drivers/video/omap2/dss/dispc.c

+2 −19
Original line number Original line Diff line number Diff line
@@ -2490,26 +2490,9 @@ void dispc_mgr_enable_fifohandcheck(enum omap_channel channel, bool enable) 
}

}









void dispc_mgr_set_lcd_display_type(enum omap_channel channel,

void dispc_mgr_set_lcd_type_tft(enum omap_channel channel)

		enum omap_lcd_display_type type)

{

{

	int mode;

	mgr_fld_write(channel, DISPC_MGR_FLD_STNTFT, 1);



	switch (type) {

	case OMAP_DSS_LCD_DISPLAY_STN:

		mode = 0;

		break;



	case OMAP_DSS_LCD_DISPLAY_TFT:

		mode = 1;

		break;



	default:

		BUG();

		return;

	}



	mgr_fld_write(channel, DISPC_MGR_FLD_STNTFT, mode);

}

}





void dispc_set_loadmode(enum omap_dss_load_mode mode)

void dispc_set_loadmode(enum omap_dss_load_mode mode)

drivers/video/omap2/dss/dpi.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -163,8 +163,8 @@ static void dpi_basic_init(struct omap_dss_device *dssdev) 
	dispc_mgr_set_io_pad_mode(DSS_IO_PAD_MODE_BYPASS);

	dispc_mgr_set_io_pad_mode(DSS_IO_PAD_MODE_BYPASS);

	dispc_mgr_enable_stallmode(dssdev->manager->id, false);

	dispc_mgr_enable_stallmode(dssdev->manager->id, false);





	dispc_mgr_set_lcd_display_type(dssdev->manager->id,

	dispc_mgr_set_lcd_type_tft(dssdev->manager->id);

			OMAP_DSS_LCD_DISPLAY_TFT);



	dispc_mgr_set_tft_data_lines(dssdev->manager->id,

	dispc_mgr_set_tft_data_lines(dssdev->manager->id,

			dssdev->phy.dpi.data_lines);

			dssdev->phy.dpi.data_lines);

}

}

drivers/video/omap2/dss/dsi.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -4380,10 +4380,11 @@ static int dsi_display_init_dispc(struct omap_dss_device *dssdev) 
		dss_mgr_set_timings(dssdev->manager, &dssdev->panel.timings);

		dss_mgr_set_timings(dssdev->manager, &dssdev->panel.timings);

	}

	}





		dispc_mgr_set_lcd_display_type(dssdev->manager->id,

	dispc_mgr_set_lcd_type_tft(dssdev->manager->id);

			OMAP_DSS_LCD_DISPLAY_TFT);



	dispc_mgr_set_tft_data_lines(dssdev->manager->id,

	dispc_mgr_set_tft_data_lines(dssdev->manager->id,

		dsi_get_pixel_size(dssdev->panel.dsi_pix_fmt));

		dsi_get_pixel_size(dssdev->panel.dsi_pix_fmt));



	return 0;

	return 0;

}

}

drivers/video/omap2/dss/dss.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -420,8 +420,7 @@ bool dispc_mgr_is_channel_enabled(enum omap_channel channel); 
void dispc_mgr_set_io_pad_mode(enum dss_io_pad_mode mode);

void dispc_mgr_set_io_pad_mode(enum dss_io_pad_mode mode);

void dispc_mgr_enable_stallmode(enum omap_channel channel, bool enable);

void dispc_mgr_enable_stallmode(enum omap_channel channel, bool enable);

void dispc_mgr_set_tft_data_lines(enum omap_channel channel, u8 data_lines);

void dispc_mgr_set_tft_data_lines(enum omap_channel channel, u8 data_lines);

void dispc_mgr_set_lcd_display_type(enum omap_channel channel,

void dispc_mgr_set_lcd_type_tft(enum omap_channel channel);

		enum omap_lcd_display_type type);

void dispc_mgr_set_timings(enum omap_channel channel,

void dispc_mgr_set_timings(enum omap_channel channel,

		struct omap_video_timings *timings);

		struct omap_video_timings *timings);

void dispc_mgr_set_pol_freq(enum omap_channel channel,

void dispc_mgr_set_pol_freq(enum omap_channel channel,

drivers/video/omap2/dss/rfbi.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -885,8 +885,7 @@ int omapdss_rfbi_display_enable(struct omap_dss_device *dssdev) 
		goto err1;

		goto err1;

	}

	}





	dispc_mgr_set_lcd_display_type(dssdev->manager->id,

	dispc_mgr_set_lcd_type_tft(dssdev->manager->id);

			OMAP_DSS_LCD_DISPLAY_TFT);





	dispc_mgr_set_io_pad_mode(DSS_IO_PAD_MODE_RFBI);

	dispc_mgr_set_io_pad_mode(DSS_IO_PAD_MODE_RFBI);

	dispc_mgr_enable_stallmode(dssdev->manager->id, true);

	dispc_mgr_enable_stallmode(dssdev->manager->id, true);