1 files changed, 76 insertions, 25 deletions

diff --git a/drivers/media/platform/s5p-fimc/mipi-csis.c b/drivers/media/platform/s5p-fimc/mipi-csis.c
index 7abae012f55e..981863d05aaa 100644
--- a/drivers/media/platform/s5p-fimc/mipi-csis.c
+++ b/drivers/media/platform/s5p-fimc/mipi-csis.c
@@ -187,7 +187,7 @@ struct csis_state {
         const struct csis_pix_format *csis_fmt;
         struct v4l2_mbus_framefmt format;
 
-        struct spinlock slock;
+        spinlock_t slock;
         struct csis_pktbuf pkt_buf;
         struct s5pcsis_event events[S5PCSIS_NUM_EVENTS];
 };
@@ -220,6 +220,18 @@ static const struct csis_pix_format s5pcsis_formats[] = {
                 .code = V4L2_MBUS_FMT_S5C_UYVY_JPEG_1X8,
                 .fmt_reg = S5PCSIS_CFG_FMT_USER(1),
                 .data_alignment = 32,
+        }, {
+                .code = V4L2_MBUS_FMT_SGRBG8_1X8,
+                .fmt_reg = S5PCSIS_CFG_FMT_RAW8,
+                .data_alignment = 24,
+        }, {
+                .code = V4L2_MBUS_FMT_SGRBG10_1X10,
+                .fmt_reg = S5PCSIS_CFG_FMT_RAW10,
+                .data_alignment = 24,
+        }, {
+                .code = V4L2_MBUS_FMT_SGRBG12_1X12,
+                .fmt_reg = S5PCSIS_CFG_FMT_RAW12,
+                .data_alignment = 24,
         }
 };
 
@@ -261,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)
@@ -271,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);
 }
 
@@ -338,11 +352,11 @@ static void s5pcsis_clk_put(struct csis_state *state)
         int i;
 
         for (i = 0; i < NUM_CSIS_CLOCKS; i++) {
-                if (IS_ERR_OR_NULL(state->clock[i]))
+                if (IS_ERR(state->clock[i]))
                         continue;
                 clk_unprepare(state->clock[i]);
                 clk_put(state->clock[i]);
-                state->clock[i] = NULL;
+                state->clock[i] = ERR_PTR(-EINVAL);
         }
 }
 
@@ -351,14 +365,19 @@ static int s5pcsis_clk_get(struct csis_state *state)
         struct device *dev = &state->pdev->dev;
         int i, ret;
 
+        for (i = 0; i < NUM_CSIS_CLOCKS; i++)
+                state->clock[i] = ERR_PTR(-EINVAL);
+
         for (i = 0; i < NUM_CSIS_CLOCKS; i++) {
                 state->clock[i] = clk_get(dev, csi_clock_name[i]);
-                if (IS_ERR(state->clock[i]))
+                if (IS_ERR(state->clock[i])) {
+                        ret = PTR_ERR(state->clock[i]);
                         goto err;
+                }
                 ret = clk_prepare(state->clock[i]);
                 if (ret < 0) {
                         clk_put(state->clock[i]);
-                        state->clock[i] = NULL;
+                        state->clock[i] = ERR_PTR(-EINVAL);
                         goto err;
                 }
         }
@@ -366,7 +385,31 @@ static int s5pcsis_clk_get(struct csis_state *state)
 err:
         s5pcsis_clk_put(state);
         dev_err(dev, "failed to get clock: %s\n", csi_clock_name[i]);
-        return -ENXIO;
+        return ret;
+}
+
+static void dump_regs(struct csis_state *state, const char *label)
+{
+        struct {
+                u32 offset;
+                const char * const name;
+        } registers[] = {
+                { 0x00, "CTRL" },
+                { 0x04, "DPHYCTRL" },
+                { 0x08, "CONFIG" },
+                { 0x0c, "DPHYSTS" },
+                { 0x10, "INTMSK" },
+                { 0x2c, "RESOL" },
+                { 0x38, "SDW_CONFIG" },
+        };
+        u32 i;
+
+        v4l2_info(&state->sd, "--- %s ---\n", label);
+
+        for (i = 0; i < ARRAY_SIZE(registers); i++) {
+                u32 cfg = s5pcsis_read(state, registers[i].offset);
+                v4l2_info(&state->sd, "%10s: 0x%08x\n", registers[i].name, cfg);
+        }
 }
 
 static void s5pcsis_start_stream(struct csis_state *state)
@@ -401,12 +444,12 @@ static void s5pcsis_log_counters(struct csis_state *state, bool non_errors)
 
         spin_lock_irqsave(&state->slock, flags);
 
-        for (i--; i >= 0; i--)
-                if (state->events[i].counter >= 0)
+        for (i--; i >= 0; i--) {
+                if (state->events[i].counter > 0 || debug)
                         v4l2_info(&state->sd, "%s events: %d\n",
                                   state->events[i].name,
                                   state->events[i].counter);
-
+        }
         spin_unlock_irqrestore(&state->slock, flags);
 }
 
@@ -569,7 +612,11 @@ static int s5pcsis_log_status(struct v4l2_subdev *sd)
 {
         struct csis_state *state = sd_to_csis_state(sd);
 
+        mutex_lock(&state->lock);
         s5pcsis_log_counters(state, true);
+        if (debug && (state->flags & ST_POWERED))
+                dump_regs(state, __func__);
+        mutex_unlock(&state->lock);
         return 0;
 }
 
@@ -699,26 +746,32 @@ static int s5pcsis_probe(struct platform_device *pdev)
         for (i = 0; i < CSIS_NUM_SUPPLIES; i++)
                 state->supplies[i].supply = csis_supply_name[i];
 
-        ret = regulator_bulk_get(&pdev->dev, CSIS_NUM_SUPPLIES,
+        ret = devm_regulator_bulk_get(&pdev->dev, CSIS_NUM_SUPPLIES,
                                  state->supplies);
         if (ret)
                 return ret;
 
         ret = s5pcsis_clk_get(state);
-        if (ret)
-                goto e_clkput;
+        if (ret < 0)
+                return ret;
 
-        clk_enable(state->clock[CSIS_CLK_MUX]);
         if (pdata->clk_rate)
-                clk_set_rate(state->clock[CSIS_CLK_MUX], pdata->clk_rate);
+                ret = clk_set_rate(state->clock[CSIS_CLK_MUX],
+                                   pdata->clk_rate);
         else
                 dev_WARN(&pdev->dev, "No clock frequency specified!\n");
+        if (ret < 0)
+                goto e_clkput;
+
+        ret = clk_enable(state->clock[CSIS_CLK_MUX]);
+        if (ret < 0)
+                goto e_clkput;
 
         ret = devm_request_irq(&pdev->dev, state->irq, s5pcsis_irq_handler,
                                0, dev_name(&pdev->dev), state);
         if (ret) {
                 dev_err(&pdev->dev, "Interrupt request failed\n");
-                goto e_regput;
+                goto e_clkdis;
         }
 
         v4l2_subdev_init(&state->sd, &s5pcsis_subdev_ops);
@@ -736,7 +789,7 @@ static int s5pcsis_probe(struct platform_device *pdev)
         ret = media_entity_init(&state->sd.entity,
                                 CSIS_PADS_NUM, state->pads, 0);
         if (ret < 0)
-                goto e_clkput;
+                goto e_clkdis;
 
         /* This allows to retrieve the platform device id by the host driver */
         v4l2_set_subdevdata(&state->sd, pdev);
@@ -749,10 +802,9 @@ static int s5pcsis_probe(struct platform_device *pdev)
         pm_runtime_enable(&pdev->dev);
         return 0;
 
-e_regput:
-        regulator_bulk_free(CSIS_NUM_SUPPLIES, state->supplies);
-e_clkput:
+e_clkdis:
         clk_disable(state->clock[CSIS_CLK_MUX]);
+e_clkput:
         s5pcsis_clk_put(state);
         return ret;
 }
@@ -859,7 +911,6 @@ static int s5pcsis_remove(struct platform_device *pdev)
         clk_disable(state->clock[CSIS_CLK_MUX]);
         pm_runtime_set_suspended(&pdev->dev);
         s5pcsis_clk_put(state);
-        regulator_bulk_free(CSIS_NUM_SUPPLIES, state->supplies);
 
         media_entity_cleanup(&state->sd.entity);