Skip to content

Commit

Permalink
[media] s5p-csis: Enable only data lanes that are actively used
Browse files Browse the repository at this point in the history
Enable only MIPI CSI-2 data lanes at the DPHY that are actively
used, rather than unmasking all unconditionally.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Sylwester Nawrocki authored and Mauro Carvalho Chehab committed Dec 21, 2012
1 parent e26991b commit cd65a64
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions drivers/media/platform/s5p-fimc/mipi-csis.c
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,8 @@ static void s5pcsis_reset(struct csis_state *state)

static void s5pcsis_system_enable(struct csis_state *state, int on)
{
u32 val;
struct s5p_platform_mipi_csis *pdata = state->pdev->dev.platform_data;
u32 val, mask;

val = s5pcsis_read(state, S5PCSIS_CTRL);
if (on)
Expand All @@ -283,10 +284,11 @@ static void s5pcsis_system_enable(struct csis_state *state, int on)
s5pcsis_write(state, S5PCSIS_CTRL, val);

val = s5pcsis_read(state, S5PCSIS_DPHYCTRL);
if (on)
val |= S5PCSIS_DPHYCTRL_ENABLE;
else
val &= ~S5PCSIS_DPHYCTRL_ENABLE;
val &= ~S5PCSIS_DPHYCTRL_ENABLE;
if (on) {
mask = (1 << (pdata->lanes + 1)) - 1;
val |= (mask & S5PCSIS_DPHYCTRL_ENABLE);
}
s5pcsis_write(state, S5PCSIS_DPHYCTRL, val);
}

Expand Down

0 comments on commit cd65a64

Please sign in to comment.