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

Commit 5c348ba9 authored by Jyri Sarha's avatar Jyri Sarha Committed by Tomi Valkeinen
Browse files

OMAPDSS: Change struct reg_field to dispc_reg_field 



Avoid colision with regmap's struct reg_field definition by renaming
omapdss's struct reg_field to dispc_reg_field, and moving it inside
dispc.c as that's the only place it is used.

Signed-off-by: default avatarJyri Sarha <jsarha@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent a57a22c8

drivers/video/omap2/dss/dispc.c

+9 −3
Original line number Diff line number Diff line
@@ -145,12 +145,18 @@ enum mgr_reg_fields { 
	DISPC_MGR_FLD_NUM,

};



struct dispc_reg_field {

	u16 reg;

	u8 high;

	u8 low;

};



static const struct {

	const char *name;

	u32 vsync_irq;

	u32 framedone_irq;

	u32 sync_lost_irq;

	struct reg_field reg_desc[DISPC_MGR_FLD_NUM];

	struct dispc_reg_field reg_desc[DISPC_MGR_FLD_NUM];

} mgr_desc[] = {

	[OMAP_DSS_CHANNEL_LCD] = {

		.name		= "LCD",
@@ -242,13 +248,13 @@ static inline u32 dispc_read_reg(const u16 idx) 


static u32 mgr_fld_read(enum omap_channel channel, enum mgr_reg_fields regfld)

{

	const struct reg_field rfld = mgr_desc[channel].reg_desc[regfld];

	const struct dispc_reg_field rfld = mgr_desc[channel].reg_desc[regfld];

	return REG_GET(rfld.reg, rfld.high, rfld.low);

}



static void mgr_fld_write(enum omap_channel channel,

					enum mgr_reg_fields regfld, int val) {

	const struct reg_field rfld = mgr_desc[channel].reg_desc[regfld];

	const struct dispc_reg_field rfld = mgr_desc[channel].reg_desc[regfld];

	REG_FLD_MOD(rfld.reg, val, rfld.high, rfld.low);

}

drivers/video/omap2/dss/dss.h

+0 −6
Original line number Diff line number Diff line
@@ -131,12 +131,6 @@ struct dsi_clock_info { 
	u16 lp_clk_div;

};



struct reg_field {

	u16 reg;

	u8 high;

	u8 low;

};



struct dss_lcd_mgr_config {

	enum dss_io_pad_mode io_pad_mode;