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

Commit 9d8232a7 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPDSS: init omap_dss_devices internally 



Now that each output driver creates their own display devices, the
output drivers can also initialize those devices.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 35deca3d

drivers/video/omap2/dss/display.c

+0 −40
Original line number Diff line number Diff line
@@ -359,46 +359,6 @@ void dss_init_device(struct platform_device *pdev, 
	int i;

	int r;



	switch (dssdev->type) {

#ifdef CONFIG_OMAP2_DSS_DPI

	case OMAP_DISPLAY_TYPE_DPI:

		r = dpi_init_display(dssdev);

		break;

#endif

#ifdef CONFIG_OMAP2_DSS_RFBI

	case OMAP_DISPLAY_TYPE_DBI:

		r = rfbi_init_display(dssdev);

		break;

#endif

#ifdef CONFIG_OMAP2_DSS_VENC

	case OMAP_DISPLAY_TYPE_VENC:

		r = venc_init_display(dssdev);

		break;

#endif

#ifdef CONFIG_OMAP2_DSS_SDI

	case OMAP_DISPLAY_TYPE_SDI:

		r = sdi_init_display(dssdev);

		break;

#endif

#ifdef CONFIG_OMAP2_DSS_DSI

	case OMAP_DISPLAY_TYPE_DSI:

		r = dsi_init_display(dssdev);

		break;

#endif

	case OMAP_DISPLAY_TYPE_HDMI:

		r = hdmi_init_display(dssdev);

		break;

	default:

		DSSERR("Support for display '%s' not compiled in.\n",

				dssdev->name);

		return;

	}



	if (r) {

		DSSERR("failed to init display %s\n", dssdev->name);

		return;

	}



	/* create device sysfs files */

	i = 0;

	while ((attr = display_sysfs_attrs[i++]) != NULL) {

drivers/video/omap2/dss/dpi.c

+7 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ int dpi_check_timings(struct omap_dss_device *dssdev, 
}

EXPORT_SYMBOL(dpi_check_timings);



int dpi_init_display(struct omap_dss_device *dssdev)

static int __init dpi_init_display(struct omap_dss_device *dssdev)

{

	DSSDBG("init_display\n");
@@ -376,6 +376,12 @@ static int __init omap_dpi_probe(struct platform_device *pdev) 
		if (dssdev->type != OMAP_DISPLAY_TYPE_DPI)

			continue;



		r = dpi_init_display(dssdev);

		if (r) {

			DSSERR("device %s init failed: %d\n", dssdev->name, r);

			continue;

		}



		r = omap_dss_register_device(dssdev, &pdev->dev, i);

		if (r)

			DSSERR("device %s register failed: %d\n",

drivers/video/omap2/dss/dsi.c

+7 −1
Original line number Diff line number Diff line
@@ -4454,7 +4454,7 @@ int omapdss_dsi_enable_te(struct omap_dss_device *dssdev, bool enable) 
}

EXPORT_SYMBOL(omapdss_dsi_enable_te);



int dsi_init_display(struct omap_dss_device *dssdev)

static int __init dsi_init_display(struct omap_dss_device *dssdev)

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
@@ -4710,6 +4710,12 @@ static int __init omap_dsihw_probe(struct platform_device *dsidev) 
		if (dssdev->phy.dsi.module != dsi_module)

			continue;



		r = dsi_init_display(dssdev);

		if (r) {

			DSSERR("device %s init failed: %d\n", dssdev->name, r);

			continue;

		}



		r = omap_dss_register_device(dssdev, &dsidev->dev, i);

		if (r)

			DSSERR("device %s register failed: %d\n",

drivers/video/omap2/dss/dss.h

+0 −10
Original line number Diff line number Diff line
@@ -275,7 +275,6 @@ int dss_calc_clock_div(bool is_tft, unsigned long req_pck, 
/* SDI */

int sdi_init_platform_driver(void) __init;

void sdi_uninit_platform_driver(void) __exit;

int sdi_init_display(struct omap_dss_device *display);



/* DSI */

#ifdef CONFIG_OMAP2_DSS_DSI
@@ -291,7 +290,6 @@ void dsi_runtime_put(struct platform_device *dsidev); 


void dsi_dump_clocks(struct seq_file *s);



int dsi_init_display(struct omap_dss_device *display);

void dsi_irq_handler(void);

u8 dsi_get_pixel_size(enum omap_dss_dsi_pixel_format fmt);
@@ -366,7 +364,6 @@ static inline struct platform_device *dsi_get_dsidev_from_id(int module) 
/* DPI */

int dpi_init_platform_driver(void) __init;

void dpi_uninit_platform_driver(void) __exit;

int dpi_init_display(struct omap_dss_device *dssdev);



/* DISPC */

int dispc_init_platform_driver(void) __init;
@@ -437,7 +434,6 @@ void dispc_mgr_setup(enum omap_channel channel, 
#ifdef CONFIG_OMAP2_DSS_VENC

int venc_init_platform_driver(void) __init;

void venc_uninit_platform_driver(void) __exit;

int venc_init_display(struct omap_dss_device *display);

unsigned long venc_get_pixel_clock(void);

#else

static inline unsigned long venc_get_pixel_clock(void)
@@ -451,13 +447,8 @@ static inline unsigned long venc_get_pixel_clock(void) 
#ifdef CONFIG_OMAP4_DSS_HDMI

int hdmi_init_platform_driver(void) __init;

void hdmi_uninit_platform_driver(void) __exit;

int hdmi_init_display(struct omap_dss_device *dssdev);

unsigned long hdmi_get_pixel_clock(void);

#else

static inline int hdmi_init_display(struct omap_dss_device *dssdev)

{

	return 0;

}

static inline unsigned long hdmi_get_pixel_clock(void)

{

	WARN("%s: HDMI not compiled in, returning pclk as 0\n", __func__);
@@ -477,7 +468,6 @@ void hdmi_panel_exit(void); 
/* RFBI */

int rfbi_init_platform_driver(void) __init;

void rfbi_uninit_platform_driver(void) __exit;

int rfbi_init_display(struct omap_dss_device *display);





#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS

drivers/video/omap2/dss/hdmi.c

+7 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ static void hdmi_runtime_put(void) 
	WARN_ON(r < 0);

}



int hdmi_init_display(struct omap_dss_device *dssdev)

static int __init hdmi_init_display(struct omap_dss_device *dssdev)

{

	DSSDBG("init_display\n");
@@ -819,6 +819,12 @@ static int __init omapdss_hdmihw_probe(struct platform_device *pdev) 
		if (dssdev->type != OMAP_DISPLAY_TYPE_HDMI)

			continue;



		r = hdmi_init_display(dssdev);

		if (r) {

			DSSERR("device %s init failed: %d\n", dssdev->name, r);

			continue;

		}



		r = omap_dss_register_device(dssdev, &pdev->dev, i);

		if (r)

			DSSERR("device %s register failed: %d\n",