fbdev: dpu20: CONFIG_EXYNOS9610_BTS is change to CONFIG_EXYNOS_BTS

Change-Id: Ief51b37323710df884df90e60c41ab8f0a12ae62
Signed-off-by: ChiHun Won <chihun.won@samsung.com>

diff --git a/drivers/video/fbdev/exynos/dpu20/Makefile b/drivers/video/fbdev/exynos/dpu20/Makefile
index cbbc7ae06d4bd8f70acf5ea7a42c523d78787d95..91bbeec38e64f407972d77b0a3c4420840295cbb 100644 (file)
--- a/drivers/video/fbdev/exynos/dpu20/Makefile
+++ b/drivers/video/fbdev/exynos/dpu20/Makefile
@@ -13,6 +13,6 @@ obj-$(CONFIG_EXYNOS_DISPLAYPORT) += displayport.o
 displayport-y += displayport_drv.o displayport_edid.o displayport_hdcp13.o ./cal_9610/displayport_reg.o
 obj-$(CONFIG_SOC_EXYNOS9610) += ./cal_9610/dsim_reg.o ./cal_9610/dpp_reg.o ./cal_9610/decon_reg.o
 obj-$(CONFIG_EXYNOS_DPU20) += decon.o
-obj-$(CONFIG_EXYNOS9610_BTS) += bts.o
+obj-$(CONFIG_EXYNOS_BTS) += bts.o
 decon-y += decon_core.o decon_dsi.o decon_wb.o helper.o win_update.o cursor.o fence.o event_log.o
 obj-y += panels/

diff --git a/drivers/video/fbdev/exynos/dpu20/bts.c b/drivers/video/fbdev/exynos/dpu20/bts.c
index 178c2d48edc135892ef48d45da107bf3ccd1d5a5..22c3a1f56e13506be769b9aab19b71b7492553d4 100644 (file)
--- a/drivers/video/fbdev/exynos/dpu20/bts.c
+++ b/drivers/video/fbdev/exynos/dpu20/bts.c
@@ -411,7 +411,7 @@ void dpu_bts_init(struct decon_device *decon)
 
        decon->bts.enabled = false;
 
-       if (!IS_ENABLED(CONFIG_EXYNOS9610_BTS)) {
+       if (!IS_ENABLED(CONFIG_EXYNOS_BTS)) {
                DPU_ERR_BTS("decon%d bts feature is disabled\n", decon->id);
                return;
        }

diff --git a/drivers/video/fbdev/exynos/dpu20/decon.h b/drivers/video/fbdev/exynos/dpu20/decon.h
index 3b200079cfbf67801e4d7f89062a106d7446cd63..606ed83a04c02fd44fc7a4798eb9b209f593d405 100644 (file)
--- a/drivers/video/fbdev/exynos/dpu20/decon.h
+++ b/drivers/video/fbdev/exynos/dpu20/decon.h
@@ -25,7 +25,7 @@
 #include <linux/platform_device.h>
 #include <media/v4l2-device.h>
 #include <media/videobuf2-core.h>
-#if defined(CONFIG_EXYNOS9610_BTS)
+#if defined(CONFIG_EXYNOS_BTS)
 #include <soc/samsung/bts.h>
 #endif
 #if defined(CONFIG_EXYNOS_ITMON)
@@ -817,7 +817,7 @@ struct decon_bts {
        u32 max_disp_freq;
        u32 prev_max_disp_freq;
        u64 ppc;
-#if defined(CONFIG_EXYNOS9610_BTS)
+#if defined(CONFIG_EXYNOS_BTS)
        struct decon_bts_bw bw[BTS_DPP_MAX];
 
        /* each decon must know other decon's BW to get overall BW */

diff --git a/drivers/video/fbdev/exynos/dpu20/decon_core.c b/drivers/video/fbdev/exynos/dpu20/decon_core.c
index 1984ab51af868ace7f55e57f19ea9947fe606a3e..c98c812e8af18d78efd75e97dccd31d545730486 100644 (file)
--- a/drivers/video/fbdev/exynos/dpu20/decon_core.c
+++ b/drivers/video/fbdev/exynos/dpu20/decon_core.c
@@ -364,7 +364,7 @@ int decon_tui_protection(bool tui_en)
                aclk_khz = v4l2_subdev_call(decon->out_sd[0], core, ioctl,
                                EXYNOS_DPU_GET_ACLK, NULL) / 1000U;
                decon_info("%s:DPU_ACLK(%ld khz)\n", __func__, aclk_khz);
-#if defined(CONFIG_EXYNOS9610_BTS)
+#if defined(CONFIG_EXYNOS_BTS)
                decon_info("MIF(%lu), INT(%lu), DISP(%lu), total bw(%u, %u)\n",
                                cal_dfs_get_rate(ACPM_DVFS_MIF),
                                cal_dfs_get_rate(ACPM_DVFS_INT),
@@ -378,7 +378,7 @@ int decon_tui_protection(bool tui_en)
                aclk_khz = v4l2_subdev_call(decon->out_sd[0], core, ioctl,
                                EXYNOS_DPU_GET_ACLK, NULL) / 1000U;
                decon_info("%s:DPU_ACLK(%ld khz)\n", __func__, aclk_khz);
-#if defined(CONFIG_EXYNOS9610_BTS)
+#if defined(CONFIG_EXYNOS_BTS)
                decon_info("MIF(%lu), INT(%lu), DISP(%lu), total bw(%u, %u)\n",
                                cal_dfs_get_rate(ACPM_DVFS_MIF),
                                cal_dfs_get_rate(ACPM_DVFS_INT),
@@ -485,7 +485,7 @@ static int _decon_enable(struct decon_device *decon, enum decon_state state)
        pm_stay_awake(decon->dev);
        dev_warn(decon->dev, "pm_stay_awake");
 
-#if defined(CONFIG_EXYNOS9610_BTS)
+#if defined(CONFIG_EXYNOS_BTS)
        decon->bts.ops->bts_acquire_bw(decon);
 #endif
 
@@ -706,7 +706,7 @@ static int _decon_disable(struct decon_device *decon, enum decon_state state)
        decon->cur_using_dpp = 0;
        decon_dpp_stop(decon, false);
 
-#if defined(CONFIG_EXYNOS9610_BTS)
+#if defined(CONFIG_EXYNOS_BTS)
        decon->bts.ops->bts_release_bw(decon);
 #endif
 
@@ -901,7 +901,7 @@ static int decon_dp_disable(struct decon_device *decon)
                decon_dpp_stop(decon, false);
        }
 
-#if defined(CONFIG_EXYNOS9610_BTS)
+#if defined(CONFIG_EXYNOS_BTS)
        decon->bts.ops->bts_release_bw(decon);
 #endif
 
@@ -2081,7 +2081,7 @@ static void decon_update_regs(struct decon_device *decon,
 
        decon_update_hdr_info(decon, regs);
 
-#if defined(CONFIG_EXYNOS9610_BTS)
+#if defined(CONFIG_EXYNOS_BTS)
        /* add calc and update bw : cur > prev */
        decon->bts.ops->bts_calc_bw(decon, regs);
        decon->bts.ops->bts_update_bw(decon, regs, 0);
@@ -2161,7 +2161,7 @@ end:
        decon_update_vgf_info(decon, regs, false);
 #endif
 
-#if defined(CONFIG_EXYNOS9610_BTS)
+#if defined(CONFIG_EXYNOS_BTS)
        /* add update bw : cur < prev */
        decon->bts.ops->bts_update_bw(decon, regs, 1);
 #endif
@@ -3719,7 +3719,7 @@ static int decon_probe(struct platform_device *pdev)
        decon_init_low_persistence_mode(decon);
        dpu_init_cursor_mode(decon);
 
-#if defined(CONFIG_EXYNOS9610_BTS)
+#if defined(CONFIG_EXYNOS_BTS)
        decon->bts.ops = &decon_bts_control;
        decon->bts.ops->bts_init(decon);
 #endif

diff --git a/drivers/video/fbdev/exynos/dpu20/decon_dsi.c b/drivers/video/fbdev/exynos/dpu20/decon_dsi.c
index 3aca71c511940e555c9786e4ae8a5246e450aa52..f141ddc7ac1875184718929bdc502510944c06c3 100644 (file)
--- a/drivers/video/fbdev/exynos/dpu20/decon_dsi.c
+++ b/drivers/video/fbdev/exynos/dpu20/decon_dsi.c
@@ -881,7 +881,7 @@ int decon_enter_hiber(struct decon_device *decon)
                decon_dpp_stop(decon, false);
        }
 
-#if defined(CONFIG_EXYNOS9610_BTS)
+#if defined(CONFIG_EXYNOS_BTS)
        decon->bts.ops->bts_release_bw(decon);
 #endif
 

diff --git a/drivers/video/fbdev/exynos/dpu20/dpp.h b/drivers/video/fbdev/exynos/dpu20/dpp.h
index 266d6c81e1eb00f6ceca28a72402ebc50d8f73b5..4aee57114669e5017f7523daeb227113248dfbee 100644 (file)
--- a/drivers/video/fbdev/exynos/dpu20/dpp.h
+++ b/drivers/video/fbdev/exynos/dpu20/dpp.h
@@ -27,7 +27,7 @@
 #else
 #include <linux/ion_exynos.h>
 #endif
-#if defined(CONFIG_EXYNOS9610_BTS)
+#if defined(CONFIG_EXYNOS_BTS)
 #include <soc/samsung/bts.h>
 #endif
 

diff --git a/drivers/video/fbdev/exynos/dpu20/dsim_drv.c b/drivers/video/fbdev/exynos/dpu20/dsim_drv.c
index e1be71c31e027670c9f895006b8a35af3d4cee3c..ef5f28c950e3f8b8337db979baf111b5132f56d8 100644 (file)
--- a/drivers/video/fbdev/exynos/dpu20/dsim_drv.c
+++ b/drivers/video/fbdev/exynos/dpu20/dsim_drv.c
@@ -401,7 +401,7 @@ exit:
        return;
 }
 
-#if defined(CONFIG_EXYNOS9610_BTS)
+#if defined(CONFIG_EXYNOS_BTS)
 static void dsim_bts_print_info(struct bts_decon_info *info)
 {
        int i;
@@ -422,7 +422,7 @@ static void dsim_bts_print_info(struct bts_decon_info *info)
 
 static void dsim_underrun_info(struct dsim_device *dsim)
 {
-#if defined(CONFIG_EXYNOS9610_BTS)
+#if defined(CONFIG_EXYNOS_BTS)
        struct decon_device *decon;
        int i, decon_cnt;