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

Commit 5cfc1c3c authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPDSS: DSI: remove code related to old panel model 



Now that the old panel drivers have been removed, we can remove the
old-model API and related code from the DSS encoder drivers.

This patch removes the code from the DSI driver.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: default avatarArchit Taneja <archit@ti.com>
parent 164ebdd1

drivers/video/omap2/dss/dsi.c

+35 −236
Original line number Original line Diff line number Diff line
@@ -205,6 +205,8 @@ static int dsi_display_init_dispc(struct platform_device *dsidev, 
static void dsi_display_uninit_dispc(struct platform_device *dsidev,

static void dsi_display_uninit_dispc(struct platform_device *dsidev,

	struct omap_overlay_manager *mgr);

	struct omap_overlay_manager *mgr);





static int dsi_vc_send_null(struct omap_dss_device *dssdev, int channel);



#define DSI_MAX_NR_ISRS                2

#define DSI_MAX_NR_ISRS                2

#define DSI_MAX_NR_LANES	5

#define DSI_MAX_NR_LANES	5
@@ -383,16 +385,7 @@ static inline struct dsi_data *dsi_get_dsidrv_data(struct platform_device *dside 




static inline struct platform_device *dsi_get_dsidev_from_dssdev(struct omap_dss_device *dssdev)

static inline struct platform_device *dsi_get_dsidev_from_dssdev(struct omap_dss_device *dssdev)

{

{

	/* HACK: dssdev can be either the panel device, when using old API, or

	 * the dsi device itself, when using the new API. So we solve this for

	 * now by checking the dssdev->id. This will be removed when the old API

	 * is removed.

	 */

	if (dssdev->id == OMAP_DSS_OUTPUT_DSI1 ||

			dssdev->id == OMAP_DSS_OUTPUT_DSI2)

	return to_platform_device(dssdev->dev);

	return to_platform_device(dssdev->dev);



	return to_platform_device(dssdev->output->dev);

}

}





struct platform_device *dsi_get_dsidev_from_id(int module)

struct platform_device *dsi_get_dsidev_from_id(int module)
@@ -432,23 +425,21 @@ static inline u32 dsi_read_reg(struct platform_device *dsidev, 
	return __raw_readl(dsi->base + idx.idx);

	return __raw_readl(dsi->base + idx.idx);

}

}





void dsi_bus_lock(struct omap_dss_device *dssdev)

static void dsi_bus_lock(struct omap_dss_device *dssdev)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);





	down(&dsi->bus_lock);

	down(&dsi->bus_lock);

}

}

EXPORT_SYMBOL(dsi_bus_lock);





void dsi_bus_unlock(struct omap_dss_device *dssdev)

static void dsi_bus_unlock(struct omap_dss_device *dssdev)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);





	up(&dsi->bus_lock);

	up(&dsi->bus_lock);

}

}

EXPORT_SYMBOL(dsi_bus_unlock);





static bool dsi_bus_is_locked(struct platform_device *dsidev)

static bool dsi_bus_is_locked(struct platform_device *dsidev)

{

{
@@ -2713,7 +2704,7 @@ static int dsi_vc_config_source(struct platform_device *dsidev, int channel, 
	return 0;

	return 0;

}

}





void omapdss_dsi_vc_enable_hs(struct omap_dss_device *dssdev, int channel,

static void dsi_vc_enable_hs(struct omap_dss_device *dssdev, int channel,

		bool enable)

		bool enable)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
@@ -2737,7 +2728,6 @@ void omapdss_dsi_vc_enable_hs(struct omap_dss_device *dssdev, int channel, 
	if (dsi->vm_timings.ddr_clk_always_on && enable)

	if (dsi->vm_timings.ddr_clk_always_on && enable)

		dsi_vc_send_null(dssdev, channel);

		dsi_vc_send_null(dssdev, channel);

}

}

EXPORT_SYMBOL(omapdss_dsi_vc_enable_hs);





static void dsi_vc_flush_long_data(struct platform_device *dsidev, int channel)

static void dsi_vc_flush_long_data(struct platform_device *dsidev, int channel)

{

{
@@ -2842,7 +2832,7 @@ static int dsi_vc_send_bta(struct platform_device *dsidev, int channel) 
	return 0;

	return 0;

}

}





int dsi_vc_send_bta_sync(struct omap_dss_device *dssdev, int channel)

static int dsi_vc_send_bta_sync(struct omap_dss_device *dssdev, int channel)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	DECLARE_COMPLETION_ONSTACK(completion);

	DECLARE_COMPLETION_ONSTACK(completion);
@@ -2885,7 +2875,6 @@ int dsi_vc_send_bta_sync(struct omap_dss_device *dssdev, int channel) 
err0:

err0:

	return r;

	return r;

}

}

EXPORT_SYMBOL(dsi_vc_send_bta_sync);





static inline void dsi_vc_write_long_header(struct platform_device *dsidev,

static inline void dsi_vc_write_long_header(struct platform_device *dsidev,

		int channel, u8 data_type, u16 len, u8 ecc)

		int channel, u8 data_type, u16 len, u8 ecc)
@@ -3011,14 +3000,13 @@ static int dsi_vc_send_short(struct platform_device *dsidev, int channel, 
	return 0;

	return 0;

}

}





int dsi_vc_send_null(struct omap_dss_device *dssdev, int channel)

static int dsi_vc_send_null(struct omap_dss_device *dssdev, int channel)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);





	return dsi_vc_send_long(dsidev, channel, MIPI_DSI_NULL_PACKET, NULL,

	return dsi_vc_send_long(dsidev, channel, MIPI_DSI_NULL_PACKET, NULL,

		0, 0);

		0, 0);

}

}

EXPORT_SYMBOL(dsi_vc_send_null);





static int dsi_vc_write_nosync_common(struct platform_device *dsidev,

static int dsi_vc_write_nosync_common(struct platform_device *dsidev,

		int channel, u8 *data, int len, enum dss_dsi_content_type type)

		int channel, u8 *data, int len, enum dss_dsi_content_type type)
@@ -3050,7 +3038,7 @@ static int dsi_vc_write_nosync_common(struct platform_device *dsidev, 
	return r;

	return r;

}

}





int dsi_vc_dcs_write_nosync(struct omap_dss_device *dssdev, int channel,

static int dsi_vc_dcs_write_nosync(struct omap_dss_device *dssdev, int channel,

		u8 *data, int len)

		u8 *data, int len)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
@@ -3058,9 +3046,8 @@ int dsi_vc_dcs_write_nosync(struct omap_dss_device *dssdev, int channel, 
	return dsi_vc_write_nosync_common(dsidev, channel, data, len,

	return dsi_vc_write_nosync_common(dsidev, channel, data, len,

			DSS_DSI_CONTENT_DCS);

			DSS_DSI_CONTENT_DCS);

}

}

EXPORT_SYMBOL(dsi_vc_dcs_write_nosync);





int dsi_vc_generic_write_nosync(struct omap_dss_device *dssdev, int channel,

static int dsi_vc_generic_write_nosync(struct omap_dss_device *dssdev, int channel,

		u8 *data, int len)

		u8 *data, int len)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
@@ -3068,7 +3055,6 @@ int dsi_vc_generic_write_nosync(struct omap_dss_device *dssdev, int channel, 
	return dsi_vc_write_nosync_common(dsidev, channel, data, len,

	return dsi_vc_write_nosync_common(dsidev, channel, data, len,

			DSS_DSI_CONTENT_GENERIC);

			DSS_DSI_CONTENT_GENERIC);

}

}

EXPORT_SYMBOL(dsi_vc_generic_write_nosync);





static int dsi_vc_write_common(struct omap_dss_device *dssdev, int channel,

static int dsi_vc_write_common(struct omap_dss_device *dssdev, int channel,

		u8 *data, int len, enum dss_dsi_content_type type)

		u8 *data, int len, enum dss_dsi_content_type type)
@@ -3099,60 +3085,19 @@ static int dsi_vc_write_common(struct omap_dss_device *dssdev, int channel, 
	return r;

	return r;

}

}





int dsi_vc_dcs_write(struct omap_dss_device *dssdev, int channel, u8 *data,

static int dsi_vc_dcs_write(struct omap_dss_device *dssdev, int channel, u8 *data,

		int len)

		int len)

{

{

	return dsi_vc_write_common(dssdev, channel, data, len,

	return dsi_vc_write_common(dssdev, channel, data, len,

			DSS_DSI_CONTENT_DCS);

			DSS_DSI_CONTENT_DCS);

}

}

EXPORT_SYMBOL(dsi_vc_dcs_write);





int dsi_vc_generic_write(struct omap_dss_device *dssdev, int channel, u8 *data,

static int dsi_vc_generic_write(struct omap_dss_device *dssdev, int channel, u8 *data,

		int len)

		int len)

{

{

	return dsi_vc_write_common(dssdev, channel, data, len,

	return dsi_vc_write_common(dssdev, channel, data, len,

			DSS_DSI_CONTENT_GENERIC);

			DSS_DSI_CONTENT_GENERIC);

}

}

EXPORT_SYMBOL(dsi_vc_generic_write);



int dsi_vc_dcs_write_0(struct omap_dss_device *dssdev, int channel, u8 dcs_cmd)

{

	return dsi_vc_dcs_write(dssdev, channel, &dcs_cmd, 1);

}

EXPORT_SYMBOL(dsi_vc_dcs_write_0);



int dsi_vc_generic_write_0(struct omap_dss_device *dssdev, int channel)

{

	return dsi_vc_generic_write(dssdev, channel, NULL, 0);

}

EXPORT_SYMBOL(dsi_vc_generic_write_0);



int dsi_vc_dcs_write_1(struct omap_dss_device *dssdev, int channel, u8 dcs_cmd,

		u8 param)

{

	u8 buf[2];

	buf[0] = dcs_cmd;

	buf[1] = param;

	return dsi_vc_dcs_write(dssdev, channel, buf, 2);

}

EXPORT_SYMBOL(dsi_vc_dcs_write_1);



int dsi_vc_generic_write_1(struct omap_dss_device *dssdev, int channel,

		u8 param)

{

	return dsi_vc_generic_write(dssdev, channel, &param, 1);

}

EXPORT_SYMBOL(dsi_vc_generic_write_1);



int dsi_vc_generic_write_2(struct omap_dss_device *dssdev, int channel,

		u8 param1, u8 param2)

{

	u8 buf[2];

	buf[0] = param1;

	buf[1] = param2;

	return dsi_vc_generic_write(dssdev, channel, buf, 2);

}

EXPORT_SYMBOL(dsi_vc_generic_write_2);





static int dsi_vc_dcs_send_read_request(struct platform_device *dsidev,

static int dsi_vc_dcs_send_read_request(struct platform_device *dsidev,

		int channel, u8 dcs_cmd)

		int channel, u8 dcs_cmd)
@@ -3319,7 +3264,7 @@ static int dsi_vc_read_rx_fifo(struct platform_device *dsidev, int channel, 
	return r;

	return r;

}

}





int dsi_vc_dcs_read(struct omap_dss_device *dssdev, int channel, u8 dcs_cmd,

static int dsi_vc_dcs_read(struct omap_dss_device *dssdev, int channel, u8 dcs_cmd,

		u8 *buf, int buflen)

		u8 *buf, int buflen)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
@@ -3348,7 +3293,6 @@ int dsi_vc_dcs_read(struct omap_dss_device *dssdev, int channel, u8 dcs_cmd, 
	DSSERR("dsi_vc_dcs_read(ch %d, cmd 0x%02x) failed\n", channel, dcs_cmd);

	DSSERR("dsi_vc_dcs_read(ch %d, cmd 0x%02x) failed\n", channel, dcs_cmd);

	return r;

	return r;

}

}

EXPORT_SYMBOL(dsi_vc_dcs_read);





static int dsi_vc_generic_read(struct omap_dss_device *dssdev, int channel,

static int dsi_vc_generic_read(struct omap_dss_device *dssdev, int channel,

		u8 *reqdata, int reqlen, u8 *buf, int buflen)

		u8 *reqdata, int reqlen, u8 *buf, int buflen)
@@ -3377,56 +3321,7 @@ static int dsi_vc_generic_read(struct omap_dss_device *dssdev, int channel, 
	return 0;

	return 0;

}

}





int dsi_vc_generic_read_0(struct omap_dss_device *dssdev, int channel, u8 *buf,

static int dsi_vc_set_max_rx_packet_size(struct omap_dss_device *dssdev, int channel,

		int buflen)

{

	int r;



	r = dsi_vc_generic_read(dssdev, channel, NULL, 0, buf, buflen);

	if (r) {

		DSSERR("dsi_vc_generic_read_0(ch %d) failed\n", channel);

		return r;

	}



	return 0;

}

EXPORT_SYMBOL(dsi_vc_generic_read_0);



int dsi_vc_generic_read_1(struct omap_dss_device *dssdev, int channel, u8 param,

		u8 *buf, int buflen)

{

	int r;



	r = dsi_vc_generic_read(dssdev, channel, &param, 1, buf, buflen);

	if (r) {

		DSSERR("dsi_vc_generic_read_1(ch %d) failed\n", channel);

		return r;

	}



	return 0;

}

EXPORT_SYMBOL(dsi_vc_generic_read_1);



int dsi_vc_generic_read_2(struct omap_dss_device *dssdev, int channel,

		u8 param1, u8 param2, u8 *buf, int buflen)

{

	int r;

	u8 reqdata[2];



	reqdata[0] = param1;

	reqdata[1] = param2;



	r = dsi_vc_generic_read(dssdev, channel, reqdata, 2, buf, buflen);

	if (r) {

		DSSERR("dsi_vc_generic_read_2(ch %d) failed\n", channel);

		return r;

	}



	return 0;

}

EXPORT_SYMBOL(dsi_vc_generic_read_2);



int dsi_vc_set_max_rx_packet_size(struct omap_dss_device *dssdev, int channel,

		u16 len)

		u16 len)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
@@ -3434,7 +3329,6 @@ int dsi_vc_set_max_rx_packet_size(struct omap_dss_device *dssdev, int channel, 
	return dsi_vc_send_short(dsidev, channel,

	return dsi_vc_send_short(dsidev, channel,

			MIPI_DSI_SET_MAXIMUM_RETURN_PACKET_SIZE, len, 0);

			MIPI_DSI_SET_MAXIMUM_RETURN_PACKET_SIZE, len, 0);

}

}

EXPORT_SYMBOL(dsi_vc_set_max_rx_packet_size);





static int dsi_enter_ulps(struct platform_device *dsidev)

static int dsi_enter_ulps(struct platform_device *dsidev)

{

{
@@ -4068,7 +3962,7 @@ static void dsi_proto_timings(struct platform_device *dsidev) 
	}

	}

}

}





int omapdss_dsi_configure_pins(struct omap_dss_device *dssdev,

static int dsi_configure_pins(struct omap_dss_device *dssdev,

		const struct omap_dsi_pin_config *pin_cfg)

		const struct omap_dsi_pin_config *pin_cfg)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
@@ -4134,9 +4028,8 @@ int omapdss_dsi_configure_pins(struct omap_dss_device *dssdev, 




	return 0;

	return 0;

}

}

EXPORT_SYMBOL(omapdss_dsi_configure_pins);





int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel)

static int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
@@ -4206,9 +4099,8 @@ int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel) 
err_init_dispc:

err_init_dispc:

	return r;

	return r;

}

}

EXPORT_SYMBOL(dsi_enable_video_output);





void dsi_disable_video_output(struct omap_dss_device *dssdev, int channel)

static void dsi_disable_video_output(struct omap_dss_device *dssdev, int channel)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
@@ -4229,7 +4121,6 @@ void dsi_disable_video_output(struct omap_dss_device *dssdev, int channel) 




	dsi_display_uninit_dispc(dsidev, mgr);

	dsi_display_uninit_dispc(dsidev, mgr);

}

}

EXPORT_SYMBOL(dsi_disable_video_output);





static void dsi_update_screen_dispc(struct platform_device *dsidev)

static void dsi_update_screen_dispc(struct platform_device *dsidev)

{

{
@@ -4369,7 +4260,7 @@ static void dsi_framedone_irq_callback(void *data) 
	dsi_handle_framedone(dsidev, 0);

	dsi_handle_framedone(dsidev, 0);

}

}





int omap_dsi_update(struct omap_dss_device *dssdev, int channel,

static int dsi_update(struct omap_dss_device *dssdev, int channel,

		void (*callback)(int, void *), void *data)

		void (*callback)(int, void *), void *data)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
@@ -4394,7 +4285,6 @@ int omap_dsi_update(struct omap_dss_device *dssdev, int channel, 




	return 0;

	return 0;

}

}

EXPORT_SYMBOL(omap_dsi_update);





/* Display funcs */

/* Display funcs */
@@ -4589,7 +4479,7 @@ static void dsi_display_uninit_dsi(struct platform_device *dsidev, 
	dsi_pll_uninit(dsidev, disconnect_lanes);

	dsi_pll_uninit(dsidev, disconnect_lanes);

}

}





int omapdss_dsi_display_enable(struct omap_dss_device *dssdev)

static int dsi_display_enable(struct omap_dss_device *dssdev)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
@@ -4625,9 +4515,8 @@ int omapdss_dsi_display_enable(struct omap_dss_device *dssdev) 
	DSSDBG("dsi_display_enable FAILED\n");

	DSSDBG("dsi_display_enable FAILED\n");

	return r;

	return r;

}

}

EXPORT_SYMBOL(omapdss_dsi_display_enable);





void omapdss_dsi_display_disable(struct omap_dss_device *dssdev,

static void dsi_display_disable(struct omap_dss_device *dssdev,

		bool disconnect_lanes, bool enter_ulps)

		bool disconnect_lanes, bool enter_ulps)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
@@ -4651,9 +4540,8 @@ void omapdss_dsi_display_disable(struct omap_dss_device *dssdev, 




	mutex_unlock(&dsi->lock);

	mutex_unlock(&dsi->lock);

}

}

EXPORT_SYMBOL(omapdss_dsi_display_disable);





int omapdss_dsi_enable_te(struct omap_dss_device *dssdev, bool enable)

static int dsi_enable_te(struct omap_dss_device *dssdev, bool enable)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
@@ -4661,7 +4549,6 @@ int omapdss_dsi_enable_te(struct omap_dss_device *dssdev, bool enable) 
	dsi->te_enabled = enable;

	dsi->te_enabled = enable;

	return 0;

	return 0;

}

}

EXPORT_SYMBOL(omapdss_dsi_enable_te);





#ifdef PRINT_VERBOSE_VM_TIMINGS

#ifdef PRINT_VERBOSE_VM_TIMINGS

static void print_dsi_vm(const char *str,

static void print_dsi_vm(const char *str,
@@ -5136,7 +5023,7 @@ static bool dsi_vm_calc(struct dsi_data *dsi, 
			dsi_vm_calc_pll_cb, ctx);

			dsi_vm_calc_pll_cb, ctx);

}

}





int omapdss_dsi_set_config(struct omap_dss_device *dssdev,

static int dsi_set_config(struct omap_dss_device *dssdev,

		const struct omap_dss_dsi_config *config)

		const struct omap_dss_dsi_config *config)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
@@ -5184,7 +5071,6 @@ int omapdss_dsi_set_config(struct omap_dss_device *dssdev, 




	return r;

	return r;

}

}

EXPORT_SYMBOL(omapdss_dsi_set_config);





/*

/*

 * Return a hardcoded channel for the DSI output. This should work for

 * Return a hardcoded channel for the DSI output. This should work for
@@ -5235,7 +5121,7 @@ static enum omap_channel dsi_get_channel(int module_id) 
	}

	}

}

}





int omap_dsi_request_vc(struct omap_dss_device *dssdev, int *channel)

static int dsi_request_vc(struct omap_dss_device *dssdev, int *channel)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
@@ -5252,9 +5138,8 @@ int omap_dsi_request_vc(struct omap_dss_device *dssdev, int *channel) 
	DSSERR("cannot get VC for display %s", dssdev->name);

	DSSERR("cannot get VC for display %s", dssdev->name);

	return -ENOSPC;

	return -ENOSPC;

}

}

EXPORT_SYMBOL(omap_dsi_request_vc);





int omap_dsi_set_vc_id(struct omap_dss_device *dssdev, int channel, int vc_id)

static int dsi_set_vc_id(struct omap_dss_device *dssdev, int channel, int vc_id)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
@@ -5279,9 +5164,8 @@ int omap_dsi_set_vc_id(struct omap_dss_device *dssdev, int channel, int vc_id) 




	return 0;

	return 0;

}

}

EXPORT_SYMBOL(omap_dsi_set_vc_id);





void omap_dsi_release_vc(struct omap_dss_device *dssdev, int channel)

static void dsi_release_vc(struct omap_dss_device *dssdev, int channel)

{

{

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
@@ -5292,7 +5176,6 @@ void omap_dsi_release_vc(struct omap_dss_device *dssdev, int channel) 
		dsi->vc[channel].vc_id = 0;

		dsi->vc[channel].vc_id = 0;

	}

	}

}

}

EXPORT_SYMBOL(omap_dsi_release_vc);





void dsi_wait_pll_hsdiv_dispc_active(struct platform_device *dsidev)

void dsi_wait_pll_hsdiv_dispc_active(struct platform_device *dsidev)

{

{
@@ -5348,79 +5231,6 @@ static int dsi_get_clocks(struct platform_device *dsidev) 
	return 0;

	return 0;

}

}





static struct omap_dss_device *dsi_find_dssdev(struct platform_device *pdev)

{

	struct omap_dss_board_info *pdata = pdev->dev.platform_data;

	struct dsi_data *dsi = dsi_get_dsidrv_data(pdev);

	const char *def_disp_name = omapdss_get_default_display_name();

	struct omap_dss_device *def_dssdev;

	int i;



	def_dssdev = NULL;



	for (i = 0; i < pdata->num_devices; ++i) {

		struct omap_dss_device *dssdev = pdata->devices[i];



		if (dssdev->type != OMAP_DISPLAY_TYPE_DSI)

			continue;



		if (dssdev->phy.dsi.module != dsi->module_id)

			continue;



		if (def_dssdev == NULL)

			def_dssdev = dssdev;



		if (def_disp_name != NULL &&

				strcmp(dssdev->name, def_disp_name) == 0) {

			def_dssdev = dssdev;

			break;

		}

	}



	return def_dssdev;

}



static int dsi_probe_pdata(struct platform_device *dsidev)

{

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct omap_dss_device *plat_dssdev;

	struct omap_dss_device *dssdev;

	int r;



	plat_dssdev = dsi_find_dssdev(dsidev);



	if (!plat_dssdev)

		return 0;



	r = dsi_regulator_init(dsidev);

	if (r)

		return r;



	dssdev = dss_alloc_and_init_device(&dsidev->dev);

	if (!dssdev)

		return -ENOMEM;



	dss_copy_device_pdata(dssdev, plat_dssdev);



	r = omapdss_output_set_device(&dsi->output, dssdev);

	if (r) {

		DSSERR("failed to connect output to new device: %s\n",

				dssdev->name);

		dss_put_device(dssdev);

		return r;

	}



	r = dss_add_device(dssdev);

	if (r) {

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

		omapdss_output_unset_device(&dsi->output);

		dss_put_device(dssdev);

		return r;

	}



	return 0;

}



static int dsi_connect(struct omap_dss_device *dssdev,

static int dsi_connect(struct omap_dss_device *dssdev,

		struct omap_dss_device *dst)

		struct omap_dss_device *dst)

{

{
@@ -5472,24 +5282,24 @@ static const struct omapdss_dsi_ops dsi_ops = { 
	.bus_lock = dsi_bus_lock,

	.bus_lock = dsi_bus_lock,

	.bus_unlock = dsi_bus_unlock,

	.bus_unlock = dsi_bus_unlock,





	.enable = omapdss_dsi_display_enable,

	.enable = dsi_display_enable,

	.disable = omapdss_dsi_display_disable,

	.disable = dsi_display_disable,





	.enable_hs = omapdss_dsi_vc_enable_hs,

	.enable_hs = dsi_vc_enable_hs,





	.configure_pins = omapdss_dsi_configure_pins,

	.configure_pins = dsi_configure_pins,

	.set_config = omapdss_dsi_set_config,

	.set_config = dsi_set_config,





	.enable_video_output = dsi_enable_video_output,

	.enable_video_output = dsi_enable_video_output,

	.disable_video_output = dsi_disable_video_output,

	.disable_video_output = dsi_disable_video_output,





	.update = omap_dsi_update,

	.update = dsi_update,





	.enable_te = omapdss_dsi_enable_te,

	.enable_te = dsi_enable_te,





	.request_vc = omap_dsi_request_vc,

	.request_vc = dsi_request_vc,

	.set_vc_id = omap_dsi_set_vc_id,

	.set_vc_id = dsi_set_vc_id,

	.release_vc = omap_dsi_release_vc,

	.release_vc = dsi_release_vc,





	.dcs_write = dsi_vc_dcs_write,

	.dcs_write = dsi_vc_dcs_write,

	.dcs_write_nosync = dsi_vc_dcs_write_nosync,

	.dcs_write_nosync = dsi_vc_dcs_write_nosync,
@@ -5627,12 +5437,6 @@ static int omap_dsihw_probe(struct platform_device *dsidev) 




	dsi_init_output(dsidev);

	dsi_init_output(dsidev);





	if (dsidev->dev.platform_data) {

		r = dsi_probe_pdata(dsidev);

		if (r)

			goto err_probe;

	}



	dsi_runtime_put(dsidev);

	dsi_runtime_put(dsidev);





	if (dsi->module_id == 0)

	if (dsi->module_id == 0)
@@ -5648,9 +5452,6 @@ static int omap_dsihw_probe(struct platform_device *dsidev) 
#endif

#endif

	return 0;

	return 0;





err_probe:

	dsi_runtime_put(dsidev);

	dsi_uninit_output(dsidev);

err_runtime_get:

err_runtime_get:

	pm_runtime_disable(&dsidev->dev);

	pm_runtime_disable(&dsidev->dev);

	return r;

	return r;
@@ -5662,8 +5463,6 @@ static int __exit omap_dsihw_remove(struct platform_device *dsidev) 




	WARN_ON(dsi->scp_clk_refcount > 0);

	WARN_ON(dsi->scp_clk_refcount > 0);





	dss_unregister_child_devices(&dsidev->dev);



	dsi_uninit_output(dsidev);

	dsi_uninit_output(dsidev);





	pm_runtime_disable(&dsidev->dev);

	pm_runtime_disable(&dsidev->dev);

include/video/omapdss.h

+0 −51
Original line number Original line Diff line number Diff line
@@ -321,39 +321,6 @@ struct omap_dss_dsi_config { 
	enum omap_dss_dsi_trans_mode trans_mode;

	enum omap_dss_dsi_trans_mode trans_mode;

};

};





void dsi_bus_lock(struct omap_dss_device *dssdev);

void dsi_bus_unlock(struct omap_dss_device *dssdev);

int dsi_vc_dcs_write(struct omap_dss_device *dssdev, int channel, u8 *data,

		int len);

int dsi_vc_generic_write(struct omap_dss_device *dssdev, int channel, u8 *data,

		int len);

int dsi_vc_dcs_write_0(struct omap_dss_device *dssdev, int channel, u8 dcs_cmd);

int dsi_vc_generic_write_0(struct omap_dss_device *dssdev, int channel);

int dsi_vc_dcs_write_1(struct omap_dss_device *dssdev, int channel, u8 dcs_cmd,

		u8 param);

int dsi_vc_generic_write_1(struct omap_dss_device *dssdev, int channel,

		u8 param);

int dsi_vc_generic_write_2(struct omap_dss_device *dssdev, int channel,

		u8 param1, u8 param2);

int dsi_vc_dcs_write_nosync(struct omap_dss_device *dssdev, int channel,

		u8 *data, int len);

int dsi_vc_generic_write_nosync(struct omap_dss_device *dssdev, int channel,

		u8 *data, int len);

int dsi_vc_dcs_read(struct omap_dss_device *dssdev, int channel, u8 dcs_cmd,

		u8 *buf, int buflen);

int dsi_vc_generic_read_0(struct omap_dss_device *dssdev, int channel, u8 *buf,

		int buflen);

int dsi_vc_generic_read_1(struct omap_dss_device *dssdev, int channel, u8 param,

		u8 *buf, int buflen);

int dsi_vc_generic_read_2(struct omap_dss_device *dssdev, int channel,

		u8 param1, u8 param2, u8 *buf, int buflen);

int dsi_vc_set_max_rx_packet_size(struct omap_dss_device *dssdev, int channel,

		u16 len);

int dsi_vc_send_null(struct omap_dss_device *dssdev, int channel);

int dsi_vc_send_bta_sync(struct omap_dss_device *dssdev, int channel);

int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel);

void dsi_disable_video_output(struct omap_dss_device *dssdev, int channel);



enum omapdss_version {

enum omapdss_version {

	OMAPDSS_VER_UNKNOWN = 0,

	OMAPDSS_VER_UNKNOWN = 0,

	OMAPDSS_VER_OMAP24xx,

	OMAPDSS_VER_OMAP24xx,
@@ -1020,24 +987,6 @@ int dispc_ovl_setup(enum omap_plane plane, const struct omap_overlay_info *oi, 
#define to_dss_driver(x) container_of((x), struct omap_dss_driver, driver)

#define to_dss_driver(x) container_of((x), struct omap_dss_driver, driver)

#define to_dss_device(x) container_of((x), struct omap_dss_device, old_dev)

#define to_dss_device(x) container_of((x), struct omap_dss_device, old_dev)





void omapdss_dsi_vc_enable_hs(struct omap_dss_device *dssdev, int channel,

		bool enable);

int omapdss_dsi_enable_te(struct omap_dss_device *dssdev, bool enable);

int omapdss_dsi_set_config(struct omap_dss_device *dssdev,

		const struct omap_dss_dsi_config *config);



int omap_dsi_update(struct omap_dss_device *dssdev, int channel,

		void (*callback)(int, void *), void *data);

int omap_dsi_request_vc(struct omap_dss_device *dssdev, int *channel);

int omap_dsi_set_vc_id(struct omap_dss_device *dssdev, int channel, int vc_id);

void omap_dsi_release_vc(struct omap_dss_device *dssdev, int channel);

int omapdss_dsi_configure_pins(struct omap_dss_device *dssdev,

		const struct omap_dsi_pin_config *pin_cfg);



int omapdss_dsi_display_enable(struct omap_dss_device *dssdev);

void omapdss_dsi_display_disable(struct omap_dss_device *dssdev,

		bool disconnect_lanes, bool enter_ulps);



int omapdss_sdi_display_enable(struct omap_dss_device *dssdev);

int omapdss_sdi_display_enable(struct omap_dss_device *dssdev);

void omapdss_sdi_display_disable(struct omap_dss_device *dssdev);

void omapdss_sdi_display_disable(struct omap_dss_device *dssdev);

void omapdss_sdi_set_timings(struct omap_dss_device *dssdev,

void omapdss_sdi_set_timings(struct omap_dss_device *dssdev,