[media] s5p-csis: Enable only data lanes that are actively used

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>

diff --git a/drivers/media/platform/s5p-fimc/mipi-csis.c b/drivers/media/platform/s5p-fimc/mipi-csis.c
index 36916d3..8ec7c3b 100644 (file)
--- a/drivers/media/platform/s5p-fimc/mipi-csis.c
+++ b/drivers/media/platform/s5p-fimc/mipi-csis.c
@@ -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)
@@ -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);
 }