p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm/omap: use regmap_update_bit() when muxing DSI pads 

Use regmap_update_bits instead of regmap_read/write, which simplifies
the code.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Tomi Valkeinen 2017-08-10 15:11:03 +03:00
parent d874b3a7c4
commit 5cdc8dbbda
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/gpu/drm/omapdrm/dss/dsi.c
View File

@ -2107,7 +2107,6 @@ static int dsi_omap4_mux_pads(struct dsi_data *dsi, unsigned int lanes)
{ {
u32 enable_mask, enable_shift; u32 enable_mask, enable_shift;
u32 pipd_mask, pipd_shift; u32 pipd_mask, pipd_shift;
u32 reg;
if (!dsi->syscon) if (!dsi->syscon)
return 0; return 0;
@ -2126,17 +2125,9 @@ static int dsi_omap4_mux_pads(struct dsi_data *dsi, unsigned int lanes)
return -ENODEV; return -ENODEV;
} }
regmap_read(dsi->syscon, OMAP4_DSIPHY_SYSCON_OFFSET, &reg); return regmap_update_bits(dsi->syscon, OMAP4_DSIPHY_SYSCON_OFFSET,
enable_mask | pipd_mask,
reg &= ~enable_mask; (lanes << enable_shift) | (lanes << pipd_shift));
reg &= ~pipd_mask;
reg |= (lanes << enable_shift) & enable_mask;
reg |= (lanes << pipd_shift) & pipd_mask;
regmap_write(dsi->syscon, OMAP4_DSIPHY_SYSCON_OFFSET, reg);
return 0;
} }
static int dsi_enable_pads(struct dsi_data *dsi, unsigned int lane_mask) static int dsi_enable_pads(struct dsi_data *dsi, unsigned int lane_mask)