From 901b9a53f6d63a50862c50ee75d7034f7ab86647 Mon Sep 17 00:00:00 2001
From: Sylwester Nawrocki <s.nawrocki@samsung.com>
Date: Fri, 28 Sep 2012 11:05:53 -0300
Subject: [PATCH] --- yaml --- r: 357042 b: refs/heads/master c:
 a2fea0dfddf95b7f1e7adb3630c7d07a92cfb09b h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../media/platform/s5p-fimc/mipi-csis.c       | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d2f210414107..d92f2f4fd8b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd65a645a4f5e456607067734f9a11385c9dce7b
+refs/heads/master: a2fea0dfddf95b7f1e7adb3630c7d07a92cfb09b
diff --git a/trunk/drivers/media/platform/s5p-fimc/mipi-csis.c b/trunk/drivers/media/platform/s5p-fimc/mipi-csis.c
index 8ec7c3b79659..8a06f1402f37 100644
--- a/trunk/drivers/media/platform/s5p-fimc/mipi-csis.c
+++ b/trunk/drivers/media/platform/s5p-fimc/mipi-csis.c
@@ -383,6 +383,30 @@ static int s5pcsis_clk_get(struct csis_state *state)
 	return -ENXIO;
 }
 
+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)
 {
 	s5pcsis_reset(state);
@@ -583,7 +607,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;
 }