From f7dedd10c4ecefb891f74469a26ffa55f7def1ca Mon Sep 17 00:00:00 2001
From: Sunyoung Kang <sy0816.kang@samsung.com>
Date: Tue, 26 Jun 2018 15:10:09 +0900
Subject: [PATCH] [COMMON] media: mfc: DRV4.0: change to intuitive file name.

This changes the file names more intuitively.

mfc_regs_v10.h	=> mfc_regs.h
mfc_reg.c/h		=> mfc_reg_api.c/h
mfc_cal.c/h		=> mfc_hw_reg_api.c/h
mfc_dec_ops.c	=> mfc_dec_ctrl.c
mfc_enc_ops.c	=> mfc_enc_ctrl.c
mfc_dec.c/h		=> mfc_dec_v4l2.c/h
mfc_enc.c/h		=> mfc_enc_v4l2.c/h
mfc_dec_vb2_ops.c	=> mfc_dec_vb2.c
mfc_enc_vb2_ops.c	=> mfc_enc_vb2.c
mfc_irq.c/h		=> mfc_isr.c/h

Change-Id: Ie217f5ccead5ab12888ec3fe83c292be10a0f553
Signed-off-by: Sunyoung Kang <sy0816.kang@samsung.com>
---
 drivers/media/platform/exynos/mfc/Makefile            |  6 +++---
 drivers/media/platform/exynos/mfc/mfc.c               | 10 +++++-----
 drivers/media/platform/exynos/mfc/mfc_cmd.c           |  4 ++--
 drivers/media/platform/exynos/mfc/mfc_common.h        |  2 +-
 drivers/media/platform/exynos/mfc/mfc_ctrl.c          |  4 ++--
 .../exynos/mfc/{mfc_dec_ops.c => mfc_dec_ctrl.c}      |  2 +-
 .../platform/exynos/mfc/{mfc_dec.c => mfc_dec_v4l2.c} |  4 ++--
 .../platform/exynos/mfc/{mfc_dec.h => mfc_dec_v4l2.h} |  8 ++++----
 .../exynos/mfc/{mfc_dec_vb2_ops.c => mfc_dec_vb2.c}   |  0
 .../exynos/mfc/{mfc_enc_ops.c => mfc_enc_ctrl.c}      |  2 +-
 drivers/media/platform/exynos/mfc/mfc_enc_param.c     |  2 +-
 .../platform/exynos/mfc/{mfc_enc.c => mfc_enc_v4l2.c} |  4 ++--
 .../platform/exynos/mfc/{mfc_enc.h => mfc_enc_v4l2.h} |  8 ++++----
 .../exynos/mfc/{mfc_enc_vb2_ops.c => mfc_enc_vb2.c}   |  0
 .../exynos/mfc/{mfc_cal.c => mfc_hw_reg_api.c}        |  2 +-
 .../exynos/mfc/{mfc_cal.h => mfc_hw_reg_api.h}        | 11 +++++------
 drivers/media/platform/exynos/mfc/mfc_hwlock.c        |  4 ++--
 drivers/media/platform/exynos/mfc/mfc_inst.c          |  4 ++--
 .../platform/exynos/mfc/{mfc_irq.c => mfc_isr.c}      |  8 ++++----
 .../platform/exynos/mfc/{mfc_irq.h => mfc_isr.h}      |  8 ++++----
 drivers/media/platform/exynos/mfc/mfc_mmcache.c       |  2 +-
 drivers/media/platform/exynos/mfc/mfc_nal_q.c         |  4 ++--
 drivers/media/platform/exynos/mfc/mfc_opr.c           |  2 +-
 drivers/media/platform/exynos/mfc/mfc_otf.c           |  2 +-
 drivers/media/platform/exynos/mfc/mfc_perf_measure.h  |  2 +-
 drivers/media/platform/exynos/mfc/mfc_pm.c            |  4 ++--
 .../platform/exynos/mfc/{mfc_reg.c => mfc_reg_api.c}  |  2 +-
 .../platform/exynos/mfc/{mfc_reg.h => mfc_reg_api.h}  |  8 ++++----
 .../exynos/mfc/{mfc_regs_v10.h => mfc_regs.h}         |  8 ++++----
 drivers/media/platform/exynos/mfc/mfc_sync.c          |  2 +-
 drivers/media/platform/exynos/mfc/mfc_watchdog.c      |  4 ++--
 31 files changed, 66 insertions(+), 67 deletions(-)
 rename drivers/media/platform/exynos/mfc/{mfc_dec_ops.c => mfc_dec_ctrl.c} (99%)
 rename drivers/media/platform/exynos/mfc/{mfc_dec.c => mfc_dec_v4l2.c} (99%)
 rename drivers/media/platform/exynos/mfc/{mfc_dec.h => mfc_dec_v4l2.h} (75%)
 rename drivers/media/platform/exynos/mfc/{mfc_dec_vb2_ops.c => mfc_dec_vb2.c} (100%)
 rename drivers/media/platform/exynos/mfc/{mfc_enc_ops.c => mfc_enc_ctrl.c} (99%)
 rename drivers/media/platform/exynos/mfc/{mfc_enc.c => mfc_enc_v4l2.c} (99%)
 rename drivers/media/platform/exynos/mfc/{mfc_enc.h => mfc_enc_v4l2.h} (75%)
 rename drivers/media/platform/exynos/mfc/{mfc_enc_vb2_ops.c => mfc_enc_vb2.c} (100%)
 rename drivers/media/platform/exynos/mfc/{mfc_cal.c => mfc_hw_reg_api.c} (98%)
 rename drivers/media/platform/exynos/mfc/{mfc_cal.h => mfc_hw_reg_api.h} (93%)
 rename drivers/media/platform/exynos/mfc/{mfc_irq.c => mfc_isr.c} (99%)
 rename drivers/media/platform/exynos/mfc/{mfc_irq.h => mfc_isr.h} (86%)
 rename drivers/media/platform/exynos/mfc/{mfc_reg.c => mfc_reg_api.c} (99%)
 rename drivers/media/platform/exynos/mfc/{mfc_reg.h => mfc_reg_api.h} (98%)
 rename drivers/media/platform/exynos/mfc/{mfc_regs_v10.h => mfc_regs.h} (99%)

diff --git a/drivers/media/platform/exynos/mfc/Makefile b/drivers/media/platform/exynos/mfc/Makefile
index 72eddaeb1112..40c8cf76551e 100644
--- a/drivers/media/platform/exynos/mfc/Makefile
+++ b/drivers/media/platform/exynos/mfc/Makefile
@@ -1,8 +1,8 @@
 obj-$(CONFIG_VIDEO_EXYNOS_MFC) := exynos_mfc.o
-exynos_mfc-y += mfc.o mfc_irq.o mfc_dec.o mfc_dec_vb2_ops.o mfc_enc.o mfc_enc_vb2_ops.o
+exynos_mfc-y += mfc.o mfc_isr.o mfc_dec_v4l2.o mfc_dec_vb2.o mfc_enc_v4l2.o mfc_enc_vb2.o
 exynos_mfc-y += mfc_ctrl.o mfc_hwlock.o mfc_nal_q.o mfc_watchdog.o mfc_opr.o mfc_sync.o
-exynos_mfc-y += mfc_pm.o mfc_inst.o mfc_cmd.o mfc_cal.o mfc_reg.o mfc_perf_measure.o
-exynos_mfc-y += mfc_dec_ops.o mfc_enc_ops.o mfc_enc_param.o
+exynos_mfc-y += mfc_pm.o mfc_inst.o mfc_cmd.o mfc_hw_reg_api.o mfc_reg_api.o mfc_perf_measure.o
+exynos_mfc-y += mfc_dec_ctrl.o mfc_enc_ctrl.o mfc_enc_param.o
 exynos_mfc-y += mfc_queue.o mfc_buf.o mfc_utils.o mfc_qos.o mfc_mem.o
 exynos_mfc-y += mfc_debugfs.o mfc_otf.o
 exynos_mfc-y += mfc_mmcache.o
diff --git a/drivers/media/platform/exynos/mfc/mfc.c b/drivers/media/platform/exynos/mfc/mfc.c
index 5aef071bd3eb..8f5e8d3eedc3 100644
--- a/drivers/media/platform/exynos/mfc/mfc.c
+++ b/drivers/media/platform/exynos/mfc/mfc.c
@@ -23,9 +23,9 @@
 
 #include "mfc_common.h"
 
-#include "mfc_irq.h"
-#include "mfc_dec.h"
-#include "mfc_enc.h"
+#include "mfc_isr.h"
+#include "mfc_dec_v4l2.h"
+#include "mfc_enc_v4l2.h"
 
 #include "mfc_ctrl.h"
 #include "mfc_hwlock.h"
@@ -38,9 +38,9 @@
 
 #include "mfc_inst.h"
 #include "mfc_pm.h"
-#include "mfc_cal.h"
 #include "mfc_perf_measure.h"
-#include "mfc_reg.h"
+#include "mfc_reg_api.h"
+#include "mfc_hw_reg_api.h"
 #include "mfc_mmcache.h"
 
 #include "mfc_qos.h"
diff --git a/drivers/media/platform/exynos/mfc/mfc_cmd.c b/drivers/media/platform/exynos/mfc/mfc_cmd.c
index 87dad6691230..bbbb4fb5bf4f 100644
--- a/drivers/media/platform/exynos/mfc/mfc_cmd.c
+++ b/drivers/media/platform/exynos/mfc/mfc_cmd.c
@@ -14,8 +14,8 @@
 
 #include "mfc_cmd.h"
 
-#include "mfc_cal.h"
-#include "mfc_reg.h"
+#include "mfc_reg_api.h"
+#include "mfc_hw_reg_api.h"
 #include "mfc_mmcache.h"
 
 #include "mfc_utils.h"
diff --git a/drivers/media/platform/exynos/mfc/mfc_common.h b/drivers/media/platform/exynos/mfc/mfc_common.h
index c45acb36903e..33481ca6aa86 100644
--- a/drivers/media/platform/exynos/mfc/mfc_common.h
+++ b/drivers/media/platform/exynos/mfc/mfc_common.h
@@ -22,7 +22,7 @@
 #include <media/videobuf2-dma-sg.h>
 #include <asm/cacheflush.h>
 
-#include "mfc_regs_v10.h"
+#include "mfc_regs.h"
 #include "mfc_macros.h"
 #include "mfc_debug.h"
 #include "exynos_mfc_media.h"
diff --git a/drivers/media/platform/exynos/mfc/mfc_ctrl.c b/drivers/media/platform/exynos/mfc/mfc_ctrl.c
index cef16fa01ba0..9da4eb37d58e 100644
--- a/drivers/media/platform/exynos/mfc/mfc_ctrl.c
+++ b/drivers/media/platform/exynos/mfc/mfc_ctrl.c
@@ -18,8 +18,8 @@
 
 #include "mfc_pm.h"
 #include "mfc_cmd.h"
-#include "mfc_cal.h"
-#include "mfc_reg.h"
+#include "mfc_reg_api.h"
+#include "mfc_hw_reg_api.h"
 
 #include "mfc_utils.h"
 
diff --git a/drivers/media/platform/exynos/mfc/mfc_dec_ops.c b/drivers/media/platform/exynos/mfc/mfc_dec_ctrl.c
similarity index 99%
rename from drivers/media/platform/exynos/mfc/mfc_dec_ops.c
rename to drivers/media/platform/exynos/mfc/mfc_dec_ctrl.c
index cbc0bfc2cfa0..6cbedd71880b 100644
--- a/drivers/media/platform/exynos/mfc/mfc_dec_ops.c
+++ b/drivers/media/platform/exynos/mfc/mfc_dec_ctrl.c
@@ -12,7 +12,7 @@
 
 #include  "mfc_common.h"
 
-#include "mfc_reg.h"
+#include "mfc_reg_api.h"
 
 #define NUM_CTRL_CFGS ARRAY_SIZE(mfc_ctrl_list)
 
diff --git a/drivers/media/platform/exynos/mfc/mfc_dec.c b/drivers/media/platform/exynos/mfc/mfc_dec_v4l2.c
similarity index 99%
rename from drivers/media/platform/exynos/mfc/mfc_dec.c
rename to drivers/media/platform/exynos/mfc/mfc_dec_v4l2.c
index 9c004a2a6b41..27dc71142f67 100644
--- a/drivers/media/platform/exynos/mfc/mfc_dec.c
+++ b/drivers/media/platform/exynos/mfc/mfc_dec_v4l2.c
@@ -1,5 +1,5 @@
 /*
- * drivers/media/platform/exynos/mfc/mfc_dec.c
+ * drivers/media/platform/exynos/mfc/mfc_dec_v4l2.c
  *
  * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com/
@@ -10,7 +10,7 @@
  * (at your option) any later version.
  */
 
-#include "mfc_dec.h"
+#include "mfc_dec_v4l2.h"
 #include "mfc_dec_internal.h"
 
 #include "mfc_hwlock.h"
diff --git a/drivers/media/platform/exynos/mfc/mfc_dec.h b/drivers/media/platform/exynos/mfc/mfc_dec_v4l2.h
similarity index 75%
rename from drivers/media/platform/exynos/mfc/mfc_dec.h
rename to drivers/media/platform/exynos/mfc/mfc_dec_v4l2.h
index b9f9081ab422..2617461d1a16 100644
--- a/drivers/media/platform/exynos/mfc/mfc_dec.h
+++ b/drivers/media/platform/exynos/mfc/mfc_dec_v4l2.h
@@ -1,5 +1,5 @@
 /*
- * drivers/media/platform/exynos/mfc/mfc_dec.h
+ * drivers/media/platform/exynos/mfc/mfc_dec_v4l2.h
  *
  * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com/
@@ -10,11 +10,11 @@
  * (at your option) any later version.
  */
 
-#ifndef __MFC_DEC_H
-#define __MFC_DEC_H __FILE__
+#ifndef __MFC_DEC_V4L2_H
+#define __MFC_DEC_V4L2_H __FILE__
 
 #include "mfc_common.h"
 
 const struct v4l2_ioctl_ops *mfc_get_dec_v4l2_ioctl_ops(void);
 
-#endif /* __MFC_DEC_H */
+#endif /* __MFC_DEC_V4L2_H */
diff --git a/drivers/media/platform/exynos/mfc/mfc_dec_vb2_ops.c b/drivers/media/platform/exynos/mfc/mfc_dec_vb2.c
similarity index 100%
rename from drivers/media/platform/exynos/mfc/mfc_dec_vb2_ops.c
rename to drivers/media/platform/exynos/mfc/mfc_dec_vb2.c
diff --git a/drivers/media/platform/exynos/mfc/mfc_enc_ops.c b/drivers/media/platform/exynos/mfc/mfc_enc_ctrl.c
similarity index 99%
rename from drivers/media/platform/exynos/mfc/mfc_enc_ops.c
rename to drivers/media/platform/exynos/mfc/mfc_enc_ctrl.c
index 824fe5330651..eb6269a046ec 100644
--- a/drivers/media/platform/exynos/mfc/mfc_enc_ops.c
+++ b/drivers/media/platform/exynos/mfc/mfc_enc_ctrl.c
@@ -12,7 +12,7 @@
 
 #include "mfc_common.h"
 
-#include "mfc_reg.h"
+#include "mfc_reg_api.h"
 
 static int __mfc_enc_ctrl_read_cst(struct mfc_ctx *ctx,
 		struct mfc_buf_ctrl *buf_ctrl)
diff --git a/drivers/media/platform/exynos/mfc/mfc_enc_param.c b/drivers/media/platform/exynos/mfc/mfc_enc_param.c
index aaea80deb188..d037643a5b53 100644
--- a/drivers/media/platform/exynos/mfc/mfc_enc_param.c
+++ b/drivers/media/platform/exynos/mfc/mfc_enc_param.c
@@ -12,7 +12,7 @@
 
 #include "mfc_enc_param.h"
 
-#include "mfc_reg.h"
+#include "mfc_reg_api.h"
 
 /* Definition */
 #define FRAME_DELTA_DEFAULT		1
diff --git a/drivers/media/platform/exynos/mfc/mfc_enc.c b/drivers/media/platform/exynos/mfc/mfc_enc_v4l2.c
similarity index 99%
rename from drivers/media/platform/exynos/mfc/mfc_enc.c
rename to drivers/media/platform/exynos/mfc/mfc_enc_v4l2.c
index ab5249b9f3ba..d491a2379eb6 100644
--- a/drivers/media/platform/exynos/mfc/mfc_enc.c
+++ b/drivers/media/platform/exynos/mfc/mfc_enc_v4l2.c
@@ -1,5 +1,5 @@
 /*
- * drivers/media/platform/exynos/mfc/mfc_enc.c
+ * drivers/media/platform/exynos/mfc/mfc_enc_v4l2.c
  *
  * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com/
@@ -10,7 +10,7 @@
  * (at your option) any later version.
  */
 
-#include "mfc_enc.h"
+#include "mfc_enc_v4l2.h"
 #include "mfc_enc_internal.h"
 
 #include "mfc_hwlock.h"
diff --git a/drivers/media/platform/exynos/mfc/mfc_enc.h b/drivers/media/platform/exynos/mfc/mfc_enc_v4l2.h
similarity index 75%
rename from drivers/media/platform/exynos/mfc/mfc_enc.h
rename to drivers/media/platform/exynos/mfc/mfc_enc_v4l2.h
index f2092faf966c..24a24dd277c0 100644
--- a/drivers/media/platform/exynos/mfc/mfc_enc.h
+++ b/drivers/media/platform/exynos/mfc/mfc_enc_v4l2.h
@@ -1,5 +1,5 @@
 /*
- * drivers/media/platform/exynos/mfc/mfc_enc.h
+ * drivers/media/platform/exynos/mfc/mfc_enc_v4l2.h
  *
  * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com/
@@ -10,11 +10,11 @@
  * (at your option) any later version.
  */
 
-#ifndef __MFC_ENC_H
-#define __MFC_ENC_H __FILE__
+#ifndef __MFC_ENC_V4L2_H
+#define __MFC_ENC_V4L2_H __FILE__
 
 #include "mfc_common.h"
 
 const struct v4l2_ioctl_ops *mfc_get_enc_v4l2_ioctl_ops(void);
 
-#endif /* __MFC_ENC_H */
+#endif /* __MFC_ENC_V4L2_H */
diff --git a/drivers/media/platform/exynos/mfc/mfc_enc_vb2_ops.c b/drivers/media/platform/exynos/mfc/mfc_enc_vb2.c
similarity index 100%
rename from drivers/media/platform/exynos/mfc/mfc_enc_vb2_ops.c
rename to drivers/media/platform/exynos/mfc/mfc_enc_vb2.c
diff --git a/drivers/media/platform/exynos/mfc/mfc_cal.c b/drivers/media/platform/exynos/mfc/mfc_hw_reg_api.c
similarity index 98%
rename from drivers/media/platform/exynos/mfc/mfc_cal.c
rename to drivers/media/platform/exynos/mfc/mfc_hw_reg_api.c
index 56f9a1c6fee6..40260069d3ff 100644
--- a/drivers/media/platform/exynos/mfc/mfc_cal.c
+++ b/drivers/media/platform/exynos/mfc/mfc_hw_reg_api.c
@@ -12,7 +12,7 @@
 
 #include <trace/events/mfc.h>
 
-#include "mfc_cal.h"
+#include "mfc_hw_reg_api.h"
 #include "mfc_pm.h"
 
 /* Reset the device */
diff --git a/drivers/media/platform/exynos/mfc/mfc_cal.h b/drivers/media/platform/exynos/mfc/mfc_hw_reg_api.h
similarity index 93%
rename from drivers/media/platform/exynos/mfc/mfc_cal.h
rename to drivers/media/platform/exynos/mfc/mfc_hw_reg_api.h
index 7bed92ca4370..9d1245ddf684 100644
--- a/drivers/media/platform/exynos/mfc/mfc_cal.h
+++ b/drivers/media/platform/exynos/mfc/mfc_hw_reg_api.h
@@ -1,5 +1,5 @@
 /*
- * drivers/media/platform/exynos/mfc/mfc_cal.h
+ * drivers/media/platform/exynos/mfc/mfc_hw_reg_api.h
  *
  * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com/
@@ -10,16 +10,15 @@
  * (at your option) any later version.
  */
 
-#ifndef __MFC_CAL_H
-#define __MFC_CAL_H __FILE__
+#ifndef __MFC_HW_REG_API_H
+#define __MFC_HW_REG_API_H __FILE__
 
-#include "mfc_reg.h"
+#include "mfc_reg_api.h"
 
 #include "mfc_common.h"
 
 #include "mfc_utils.h"
 
-
 #define mfc_get_int_reason()	(MFC_READL(MFC_REG_RISC2HOST_CMD)		\
 						& MFC_REG_RISC2HOST_CMD_MASK)
 #define mfc_clear_int_sfr()				\
@@ -109,4 +108,4 @@ void mfc_set_risc_base_addr(struct mfc_dev *dev,
 void mfc_cmd_host2risc(struct mfc_dev *dev, int cmd);
 int mfc_check_risc2host(struct mfc_dev *dev);
 
-#endif /* __MFC_CAL_H */
+#endif /* __MFC_HW_REG_API_H */
diff --git a/drivers/media/platform/exynos/mfc/mfc_hwlock.c b/drivers/media/platform/exynos/mfc/mfc_hwlock.c
index 0821b1834bab..f67ba97070c0 100644
--- a/drivers/media/platform/exynos/mfc/mfc_hwlock.c
+++ b/drivers/media/platform/exynos/mfc/mfc_hwlock.c
@@ -20,8 +20,8 @@
 #include "mfc_inst.h"
 #include "mfc_pm.h"
 #include "mfc_cmd.h"
-#include "mfc_cal.h"
-#include "mfc_reg.h"
+#include "mfc_reg_api.h"
+#include "mfc_hw_reg_api.h"
 
 #include "mfc_queue.h"
 #include "mfc_utils.h"
diff --git a/drivers/media/platform/exynos/mfc/mfc_inst.c b/drivers/media/platform/exynos/mfc/mfc_inst.c
index 8e130879aba3..2e37a49f7f3f 100644
--- a/drivers/media/platform/exynos/mfc/mfc_inst.c
+++ b/drivers/media/platform/exynos/mfc/mfc_inst.c
@@ -14,9 +14,9 @@
 
 #include "mfc_cmd.h"
 #include "mfc_enc_param.h"
-#include "mfc_cal.h"
 #include "mfc_perf_measure.h"
-#include "mfc_reg.h"
+#include "mfc_reg_api.h"
+#include "mfc_hw_reg_api.h"
 
 #include "mfc_utils.h"
 
diff --git a/drivers/media/platform/exynos/mfc/mfc_irq.c b/drivers/media/platform/exynos/mfc/mfc_isr.c
similarity index 99%
rename from drivers/media/platform/exynos/mfc/mfc_irq.c
rename to drivers/media/platform/exynos/mfc/mfc_isr.c
index 680ce74ef09a..d940839dcc13 100644
--- a/drivers/media/platform/exynos/mfc/mfc_irq.c
+++ b/drivers/media/platform/exynos/mfc/mfc_isr.c
@@ -1,5 +1,5 @@
 /*
- * drivers/media/platform/exynos/mfc/mfc_irq.c
+ * drivers/media/platform/exynos/mfc/mfc_isr.c
  *
  * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com/
@@ -10,7 +10,7 @@
  * (at your option) any later version.
  */
 
-#include "mfc_irq.h"
+#include "mfc_isr.h"
 
 #include "mfc_hwlock.h"
 #include "mfc_nal_q.h"
@@ -19,9 +19,9 @@
 #include "mfc_sync.h"
 
 #include "mfc_pm.h"
-#include "mfc_cal.h"
 #include "mfc_perf_measure.h"
-#include "mfc_reg.h"
+#include "mfc_reg_api.h"
+#include "mfc_hw_reg_api.h"
 #include "mfc_mmcache.h"
 
 #include "mfc_qos.h"
diff --git a/drivers/media/platform/exynos/mfc/mfc_irq.h b/drivers/media/platform/exynos/mfc/mfc_isr.h
similarity index 86%
rename from drivers/media/platform/exynos/mfc/mfc_irq.h
rename to drivers/media/platform/exynos/mfc/mfc_isr.h
index 872596a2653c..e9767e70b430 100644
--- a/drivers/media/platform/exynos/mfc/mfc_irq.h
+++ b/drivers/media/platform/exynos/mfc/mfc_isr.h
@@ -1,5 +1,5 @@
 /*
- * drivers/media/platform/exynos/mfc/mfc_irq.h
+ * drivers/media/platform/exynos/mfc/mfc_isr.h
  *
  * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com/
@@ -10,8 +10,8 @@
  * (at your option) any later version.
  */
 
-#ifndef __MFC_IRQ_H
-#define __MFC_IRQ_H __FILE__
+#ifndef __MFC_ISR_H
+#define __MFC_ISR_H __FILE__
 
 #include <linux/interrupt.h>
 
@@ -29,4 +29,4 @@ static inline void mfc_handle_force_change_status(struct mfc_ctx *ctx)
 		mfc_change_state(ctx, MFCINST_RUNNING);
 }
 
-#endif /* __MFC_IRQ_H */
+#endif /* __MFC_ISR_H */
diff --git a/drivers/media/platform/exynos/mfc/mfc_mmcache.c b/drivers/media/platform/exynos/mfc/mfc_mmcache.c
index 3587d8bc27c7..624478d11a45 100644
--- a/drivers/media/platform/exynos/mfc/mfc_mmcache.c
+++ b/drivers/media/platform/exynos/mfc/mfc_mmcache.c
@@ -12,7 +12,7 @@
 
 #include "mfc_mmcache.h"
 
-#include "mfc_reg.h"
+#include "mfc_reg_api.h"
 
 static const unsigned char mmcache_SFR_0x0010[] = {
 	0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
diff --git a/drivers/media/platform/exynos/mfc/mfc_nal_q.c b/drivers/media/platform/exynos/mfc/mfc_nal_q.c
index 870620e10792..ac533e3fdc2f 100644
--- a/drivers/media/platform/exynos/mfc/mfc_nal_q.c
+++ b/drivers/media/platform/exynos/mfc/mfc_nal_q.c
@@ -15,8 +15,8 @@
 #include "mfc_sync.h"
 
 #include "mfc_pm.h"
-#include "mfc_cal.h"
-#include "mfc_reg.h"
+#include "mfc_reg_api.h"
+#include "mfc_hw_reg_api.h"
 
 #include "mfc_qos.h"
 #include "mfc_queue.h"
diff --git a/drivers/media/platform/exynos/mfc/mfc_opr.c b/drivers/media/platform/exynos/mfc/mfc_opr.c
index 776e67363375..34bd0be0ff4e 100644
--- a/drivers/media/platform/exynos/mfc/mfc_opr.c
+++ b/drivers/media/platform/exynos/mfc/mfc_opr.c
@@ -13,7 +13,7 @@
 #include "mfc_opr.h"
 
 #include "mfc_inst.h"
-#include "mfc_reg.h"
+#include "mfc_reg_api.h"
 
 #include "mfc_queue.h"
 #include "mfc_utils.h"
diff --git a/drivers/media/platform/exynos/mfc/mfc_otf.c b/drivers/media/platform/exynos/mfc/mfc_otf.c
index aa95f5133a84..59b04c43adce 100644
--- a/drivers/media/platform/exynos/mfc/mfc_otf.c
+++ b/drivers/media/platform/exynos/mfc/mfc_otf.c
@@ -26,7 +26,7 @@
 #include "mfc_inst.h"
 #include "mfc_pm.h"
 #include "mfc_cmd.h"
-#include "mfc_reg.h"
+#include "mfc_reg_api.h"
 
 #include "mfc_qos.h"
 #include "mfc_queue.h"
diff --git a/drivers/media/platform/exynos/mfc/mfc_perf_measure.h b/drivers/media/platform/exynos/mfc/mfc_perf_measure.h
index 9b74b773ce3e..dc3a41b99c0e 100644
--- a/drivers/media/platform/exynos/mfc/mfc_perf_measure.h
+++ b/drivers/media/platform/exynos/mfc/mfc_perf_measure.h
@@ -15,7 +15,7 @@
 
 #include <linux/clk.h>
 
-#include "mfc_reg.h"
+#include "mfc_reg_api.h"
 
 void mfc_perf_register(struct mfc_dev *dev);
 void __mfc_measure_init(void);
diff --git a/drivers/media/platform/exynos/mfc/mfc_pm.c b/drivers/media/platform/exynos/mfc/mfc_pm.c
index 0f7bfd26b312..efa109dc7583 100644
--- a/drivers/media/platform/exynos/mfc/mfc_pm.c
+++ b/drivers/media/platform/exynos/mfc/mfc_pm.c
@@ -16,8 +16,8 @@
 
 #include "mfc_pm.h"
 
-#include "mfc_cal.h"
-#include "mfc_reg.h"
+#include "mfc_reg_api.h"
+#include "mfc_hw_reg_api.h"
 
 void mfc_pm_init(struct mfc_dev *dev)
 {
diff --git a/drivers/media/platform/exynos/mfc/mfc_reg.c b/drivers/media/platform/exynos/mfc/mfc_reg_api.c
similarity index 99%
rename from drivers/media/platform/exynos/mfc/mfc_reg.c
rename to drivers/media/platform/exynos/mfc/mfc_reg_api.c
index 772af91d4ada..469a7fc39221 100644
--- a/drivers/media/platform/exynos/mfc/mfc_reg.c
+++ b/drivers/media/platform/exynos/mfc/mfc_reg_api.c
@@ -12,7 +12,7 @@
 
 #include <linux/delay.h>
 
-#include "mfc_reg.h"
+#include "mfc_reg_api.h"
 
 void mfc_dbg_enable(struct mfc_dev *dev)
 {
diff --git a/drivers/media/platform/exynos/mfc/mfc_reg.h b/drivers/media/platform/exynos/mfc/mfc_reg_api.h
similarity index 98%
rename from drivers/media/platform/exynos/mfc/mfc_reg.h
rename to drivers/media/platform/exynos/mfc/mfc_reg_api.h
index 757b3d11e00e..4a0110e1bda8 100644
--- a/drivers/media/platform/exynos/mfc/mfc_reg.h
+++ b/drivers/media/platform/exynos/mfc/mfc_reg_api.h
@@ -1,5 +1,5 @@
 /*
- * drivers/media/platform/exynos/mfc/mfc_reg.h
+ * drivers/media/platform/exynos/mfc/mfc_reg_api.h
  *
  * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com/
@@ -10,8 +10,8 @@
  * (at your option) any later version.
  */
 
-#ifndef __MFC_REG_H
-#define __MFC_REG_H __FILE__
+#ifndef __MFC_REG_API_H
+#define __MFC_REG_API_H __FILE__
 
 #include "mfc_common.h"
 
@@ -268,4 +268,4 @@ int mfc_set_dynamic_dpb(struct mfc_ctx *ctx, struct mfc_buf *dst_vb);
 
 void mfc_set_pixel_format(struct mfc_dev *dev, unsigned int format);
 
-#endif /* __MFC_REG_H */
+#endif /* __MFC_REG_API_H */
diff --git a/drivers/media/platform/exynos/mfc/mfc_regs_v10.h b/drivers/media/platform/exynos/mfc/mfc_regs.h
similarity index 99%
rename from drivers/media/platform/exynos/mfc/mfc_regs_v10.h
rename to drivers/media/platform/exynos/mfc/mfc_regs.h
index e50d495ad0b6..ee569f44849a 100644
--- a/drivers/media/platform/exynos/mfc/mfc_regs_v10.h
+++ b/drivers/media/platform/exynos/mfc/mfc_regs.h
@@ -1,5 +1,5 @@
 /*
- * drivers/media/platform/exynos/mfc/regs-mfc-v10.h
+ * drivers/media/platform/exynos/mfc/mfc_regs.h
  *
  * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com/
@@ -10,8 +10,8 @@
  * (at your option) any later version.
  */
 
-#ifndef __REGS_MFC_V10_H
-#define __REGS_MFC_V10_H __FILE__
+#ifndef __MFC_REGS_H
+#define __MFC_REGS_H __FILE__
 
 #define MFC_MMU_INTERRUPT_STATUS				0x0060
 #define MFC_MMU_FAULT_TRANS_INFO				0x0078
@@ -740,4 +740,4 @@
 #define MFC_REG_E_SLICE_TYPE_SKIPPED			4
 
 
-#endif /* __REGS_MFC_V10_H */
+#endif /* __MFC_REGS_H */
diff --git a/drivers/media/platform/exynos/mfc/mfc_sync.c b/drivers/media/platform/exynos/mfc/mfc_sync.c
index 0a7669b053b6..b3a85415e45f 100644
--- a/drivers/media/platform/exynos/mfc/mfc_sync.c
+++ b/drivers/media/platform/exynos/mfc/mfc_sync.c
@@ -12,7 +12,7 @@
 
 #include "mfc_sync.h"
 
-#include "mfc_cal.h"
+#include "mfc_hw_reg_api.h"
 #include "mfc_perf_measure.h"
 
 #include "mfc_queue.h"
diff --git a/drivers/media/platform/exynos/mfc/mfc_watchdog.c b/drivers/media/platform/exynos/mfc/mfc_watchdog.c
index 0a10cfbf4d18..64a3d8e43528 100644
--- a/drivers/media/platform/exynos/mfc/mfc_watchdog.c
+++ b/drivers/media/platform/exynos/mfc/mfc_watchdog.c
@@ -19,8 +19,8 @@
 
 #include "mfc_pm.h"
 #include "mfc_cmd.h"
-#include "mfc_cal.h"
-#include "mfc_reg.h"
+#include "mfc_reg_api.h"
+#include "mfc_hw_reg_api.h"
 
 #include "mfc_queue.h"
 #include "mfc_utils.h"
-- 
2.20.1