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

Commit 349c3d95 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPDSS: SDI: change regulator handling 



Regulator handling for DPI and SDI is currently handled in the core.c,
using the 'virtual' omapdss platform device. Nowadays we have proper
devices for both DPI and SDI, and so we can handle the regulators inside
the respective drivers.

This patch moves the regulator handling for SDI into sdi.c.

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

drivers/video/omap2/dss/core.c

+0 −15
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ static struct { 
	struct platform_device *pdev;



	struct regulator *vdds_dsi_reg;

	struct regulator *vdds_sdi_reg;



	const char *default_display_name;

} core;
@@ -95,20 +94,6 @@ struct regulator *dss_get_vdds_dsi(void) 
	return reg;

}



struct regulator *dss_get_vdds_sdi(void)

{

	struct regulator *reg;



	if (core.vdds_sdi_reg != NULL)

		return core.vdds_sdi_reg;



	reg = devm_regulator_get(&core.pdev->dev, "vdds_sdi");

	if (!IS_ERR(reg))

		core.vdds_sdi_reg = reg;



	return reg;

}



int dss_dsi_enable_pads(int dsi_id, unsigned lane_mask)

{

	struct omap_dss_board_info *board_data = core.pdev->dev.platform_data;

drivers/video/omap2/dss/dss.h

+0 −1
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ struct platform_device; 
struct platform_device *dss_get_core_pdev(void);

struct bus_type *dss_get_bus(void);

struct regulator *dss_get_vdds_dsi(void);

struct regulator *dss_get_vdds_sdi(void);

int dss_dsi_enable_pads(int dsi_id, unsigned lane_mask);

void dss_dsi_disable_pads(int dsi_id, unsigned lane_mask);

int dss_set_min_bus_tput(struct device *dev, unsigned long tput);

drivers/video/omap2/dss/sdi.c

+3 −7
Original line number Diff line number Diff line
@@ -267,15 +267,11 @@ static int sdi_init_regulator(void) 
	if (sdi.vdds_sdi_reg)

		return 0;



	vdds_sdi = dss_get_vdds_sdi();



	if (IS_ERR(vdds_sdi)) {

	vdds_sdi = devm_regulator_get(&sdi.pdev->dev, "vdds_sdi");

	if (IS_ERR(vdds_sdi)) {

		DSSERR("can't get VDDS_SDI regulator\n");

		return PTR_ERR(vdds_sdi);

	}

	}



	sdi.vdds_sdi_reg = vdds_sdi;