From 92c0dff1bd9280a25fe99bcd3bf1aa0704964598 Mon Sep 17 00:00:00 2001
From: Hosung Kim <hosung0.kim@samsung.com>
Date: Thu, 24 May 2018 20:41:41 +0900
Subject: [PATCH] [COMMON] lib: dss: remove debug-snapshot-soc.h

debug-snapshot-soc.h file adds to the confusion.

Change-Id: I2d8bb7f2286636ec0c459b7f5aa55c60cf98136d
Signed-off-by: Hosung Kim <hosung0.kim@samsung.com>
---
 include/linux/debug-snapshot-soc.h | 37 ------------------------------
 lib/debug-snapshot-local.h         |  7 +++++-
 lib/debug-snapshot.c               | 10 ++++++++
 3 files changed, 16 insertions(+), 38 deletions(-)
 delete mode 100644 include/linux/debug-snapshot-soc.h

diff --git a/include/linux/debug-snapshot-soc.h b/include/linux/debug-snapshot-soc.h
deleted file mode 100644
index 0b1bd2bd3caf..000000000000
--- a/include/linux/debug-snapshot-soc.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2013 Samsung Electronics Co., Ltd.
- *		http://www.samsung.com
- *
- * Debug-SnapShot: Debug Framework for Ramdump based debugging method
- * The original code is Exynos-Snapshot for Exynos SoC
- *
- * Author: Hosung Kim <hosung0.kim@samsung.com>
- * Author: Changki Kim <changki.kim@samsung.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#ifndef DEBUG_SNAPSHOT_SOC_H
-#define DEBUG_SNAPSHOT_SOC_H
-
-/* To Support Samsung SoC */
-#include <dt-bindings/soc/samsung/debug-snapshot-table.h>
-#ifdef CONFIG_DEBUG_SNAPSHOT_PMU
-#include <soc/samsung/cal-if.h>
-#endif
-
-/* SoC Dependent Header */
-#define DSS_REG_MCT_ADDR	(0)
-#define DSS_REG_MCT_SIZE	(0)
-#define DSS_REG_UART_ADDR	(0)
-#define DSS_REG_UART_SIZE	(0)
-
-struct dbg_snapshot_ops {
-        int (*pd_status)(unsigned int id);
-};
-
-extern struct dbg_snapshot_ops dss_ops;
-#endif
diff --git a/lib/debug-snapshot-local.h b/lib/debug-snapshot-local.h
index f78ccfaf1a7c..d1a5580b5f60 100644
--- a/lib/debug-snapshot-local.h
+++ b/lib/debug-snapshot-local.h
@@ -17,7 +17,6 @@
 #define DEBUG_SNAPSHOT_LOCAL_H
 #include <linux/clk-provider.h>
 #include <linux/debug-snapshot.h>
-#include <linux/debug-snapshot-soc.h>
 #include <linux/debug-snapshot-helper.h>
 
 extern void dbg_snapshot_log_idx_init(void);
@@ -82,6 +81,12 @@ extern struct dbg_snapshot_helper_ops *dss_soc_ops;
 #define DSS_OFFSET_PANIC_STRING		(0xC00)
 #define DSS_OFFSET_SPARE_BASE		(DSS_HEADER_TOTAL_SZ)
 
+/* SoC Specific define, This will be removed */
+#define DSS_REG_MCT_ADDR	(0)
+#define DSS_REG_MCT_SIZE	(0)
+#define DSS_REG_UART_ADDR	(0)
+#define DSS_REG_UART_SIZE	(0)
+
 typedef int (*dss_initcall_t)(const struct device_node *);
 
 struct dbg_snapshot_base {
diff --git a/lib/debug-snapshot.c b/lib/debug-snapshot.c
index 8b8aad111d62..195d2a692d03 100644
--- a/lib/debug-snapshot.c
+++ b/lib/debug-snapshot.c
@@ -28,6 +28,12 @@
 
 #include "debug-snapshot-local.h"
 
+/* To Support Samsung SoC */
+#include <dt-bindings/soc/samsung/debug-snapshot-table.h>
+#ifdef CONFIG_DEBUG_SNAPSHOT_PMU
+#include <soc/samsung/cal-if.h>
+#endif
+
 extern void register_hook_logbuf(void (*)(const char *, size_t));
 extern void register_hook_logger(void (*)(const char *, const char *, size_t));
 
@@ -37,6 +43,10 @@ struct dbg_snapshot_interface {
 };
 
 #ifdef CONFIG_DEBUG_SNAPSHOT_PMU
+struct dbg_snapshot_ops {
+        int (*pd_status)(unsigned int id);
+};
+
 struct dbg_snapshot_ops dss_ops = {
 	.pd_status = cal_pd_status,
 };
-- 
2.20.1