video: exynos_dp: Make dp_regs global

dp_regs variable was redundantly defined across all the functions in
the driver even though it contains just the same address. We make it
global and initialize it once using exynos_dp_set_base_addr().
>From then on, other funtions can use the address stored in the global variable.

Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/drivers/video/exynos_dp.c b/drivers/video/exynos_dp.c
index b2accc7..5f4f25e 100644 (file)
--- a/drivers/video/exynos_dp.c
+++ b/drivers/video/exynos_dp.c
@@ -876,6 +876,8 @@ unsigned int exynos_init_dp(void)
                return -EFAULT;
        }
 
+       exynos_dp_set_base_addr();
+
        exynos_dp_disp_info(&edp_info->disp_info);
 
        exynos_set_dp_phy(1);

diff --git a/drivers/video/exynos_dp_lowlevel.c b/drivers/video/exynos_dp_lowlevel.c
index 7b54c80..0be91a5 100644 (file)
--- a/drivers/video/exynos_dp_lowlevel.c
+++ b/drivers/video/exynos_dp_lowlevel.c
@@ -26,10 +26,16 @@
 #include <asm/arch/dp_info.h>
 #include <asm/arch/dp.h>
 
+struct exynos_dp *dp_regs;
+
+void exynos_dp_set_base_addr(void)
+{
+       dp_regs = (struct exynos_dp *)samsung_get_base_dp();
+}
+
 static void exynos_dp_enable_video_input(unsigned int enable)
 {
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        reg = readl(&dp_regs->video_ctl1);
        reg &= ~VIDEO_EN_MASK;
@@ -47,7 +53,6 @@ void exynos_dp_enable_video_bist(unsigned int enable)
 {
        /*enable video bist*/
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        reg = readl(&dp_regs->video_ctl4);
        reg &= ~VIDEO_BIST_MASK;
@@ -64,7 +69,6 @@ void exynos_dp_enable_video_bist(unsigned int enable)
 void exynos_dp_enable_video_mute(unsigned int enable)
 {
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        reg = readl(&dp_regs->video_ctl1);
        reg &= ~(VIDEO_MUTE_MASK);
@@ -80,7 +84,6 @@ void exynos_dp_enable_video_mute(unsigned int enable)
 static void exynos_dp_init_analog_param(void)
 {
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        /*
         * Set termination
@@ -129,7 +132,6 @@ static void exynos_dp_init_analog_param(void)
 
 static void exynos_dp_init_interrupt(void)
 {
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
        /* Set interrupt registers to initial states */
 
        /*
@@ -158,7 +160,6 @@ static void exynos_dp_init_interrupt(void)
 void exynos_dp_reset(void)
 {
        unsigned int reg_func_1;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        /*dp tx sw reset*/
        writel(RESET_DP_TX, &dp_regs->tx_sw_reset);
@@ -186,7 +187,6 @@ void exynos_dp_reset(void)
 void exynos_dp_enable_sw_func(unsigned int enable)
 {
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        reg = readl(&dp_regs->func_en1);
        reg &= ~(SW_FUNC_EN_N);
@@ -202,7 +202,6 @@ void exynos_dp_enable_sw_func(unsigned int enable)
 unsigned int exynos_dp_set_analog_power_down(unsigned int block, u32 enable)
 {
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        reg = readl(&dp_regs->phy_pd);
        switch (block) {
@@ -256,7 +255,6 @@ unsigned int exynos_dp_set_analog_power_down(unsigned int block, u32 enable)
 unsigned int exynos_dp_get_pll_lock_status(void)
 {
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        reg = readl(&dp_regs->debug_ctl);
 
@@ -269,7 +267,6 @@ unsigned int exynos_dp_get_pll_lock_status(void)
 static void exynos_dp_set_pll_power(unsigned int enable)
 {
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        reg = readl(&dp_regs->pll_ctl);
        reg &= ~(DP_PLL_PD);
@@ -285,7 +282,6 @@ int exynos_dp_init_analog_func(void)
        int ret = EXYNOS_DP_SUCCESS;
        unsigned int retry_cnt = 10;
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        /*Power On All Analog block */
        exynos_dp_set_analog_power_down(POWER_ALL, DP_DISABLE);
@@ -335,7 +331,6 @@ int exynos_dp_init_analog_func(void)
 void exynos_dp_init_hpd(void)
 {
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        /* Clear interrupts releated to Hot Plug Dectect */
        reg = HOTPLUG_CHG | HPD_LOST | PLUG;
@@ -354,7 +349,6 @@ void exynos_dp_init_hpd(void)
 static inline void exynos_dp_reset_aux(void)
 {
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        /* Disable AUX channel module */
        reg = readl(&dp_regs->func_en2);
@@ -367,7 +361,6 @@ static inline void exynos_dp_reset_aux(void)
 void exynos_dp_init_aux(void)
 {
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        /* Clear inerrupts related to AUX channel */
        reg = RPLY_RECEIV | AUX_ERR;
@@ -395,7 +388,6 @@ void exynos_dp_init_aux(void)
 void exynos_dp_config_interrupt(void)
 {
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        /* 0: mask, 1: unmask */
        reg = COMMON_INT_MASK_1;
@@ -419,7 +411,6 @@ void exynos_dp_config_interrupt(void)
 unsigned int exynos_dp_get_plug_in_status(void)
 {
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        reg = readl(&dp_regs->sys_ctl3);
        if (reg & HPD_STATUS)
@@ -449,7 +440,6 @@ unsigned int exynos_dp_start_aux_transaction(void)
        unsigned int reg;
        unsigned int ret = 0;
        unsigned int retry_cnt;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        /* Enable AUX CH operation */
        reg = readl(&dp_regs->aux_ch_ctl2);
@@ -498,7 +488,6 @@ unsigned int exynos_dp_write_byte_to_dpcd(unsigned int reg_addr,
                                unsigned char data)
 {
        unsigned int reg, ret;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        /* Clear AUX CH data buffer */
        reg = BUF_CLR;
@@ -539,7 +528,6 @@ unsigned int exynos_dp_read_byte_from_dpcd(unsigned int reg_addr,
 {
        unsigned int reg;
        int retval;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        /* Clear AUX CH data buffer */
        reg = BUF_CLR;
@@ -583,7 +571,6 @@ unsigned int exynos_dp_write_bytes_to_dpcd(unsigned int reg_addr,
        unsigned int cur_data_idx;
        unsigned int retry_cnt;
        unsigned int ret = 0;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        /* Clear AUX CH data buffer */
        reg = BUF_CLR;
@@ -649,7 +636,6 @@ unsigned int exynos_dp_read_bytes_from_dpcd(unsigned int reg_addr,
        unsigned int cur_data_idx;
        unsigned int retry_cnt;
        unsigned int ret = 0;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        /* Clear AUX CH data buffer */
        reg = BUF_CLR;
@@ -711,7 +697,6 @@ int exynos_dp_select_i2c_device(unsigned int device_addr,
 {
        unsigned int reg;
        int retval;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        /* Set EDID device address */
        reg = device_addr;
@@ -746,7 +731,6 @@ int exynos_dp_read_byte_from_i2c(unsigned int device_addr,
        unsigned int reg;
        int i;
        int retval;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        for (i = 0; i < 10; i++) {
                /* Clear AUX CH data buffer */
@@ -790,7 +774,6 @@ int exynos_dp_read_bytes_from_i2c(unsigned int device_addr,
        unsigned int cur_data_idx;
        unsigned int defer = 0;
        int retval = 0;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        for (i = 0; i < count; i += 16) { /* use 16 burst */
                for (j = 0; j < 100; j++) {
@@ -854,7 +837,6 @@ int exynos_dp_read_bytes_from_i2c(unsigned int device_addr,
 void exynos_dp_reset_macro(void)
 {
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        reg = readl(&dp_regs->phy_test);
        reg |= MACRO_RST;
@@ -870,7 +852,6 @@ void exynos_dp_reset_macro(void)
 void exynos_dp_set_link_bandwidth(unsigned char bwtype)
 {
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        reg = (unsigned int)bwtype;
 
@@ -883,7 +864,6 @@ unsigned char exynos_dp_get_link_bandwidth(void)
 {
        unsigned char ret;
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        reg = readl(&dp_regs->link_bw_set);
        ret = (unsigned char)reg;
@@ -894,7 +874,6 @@ unsigned char exynos_dp_get_link_bandwidth(void)
 void exynos_dp_set_lane_count(unsigned char count)
 {
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        reg = (unsigned int)count;
 
@@ -906,7 +885,6 @@ void exynos_dp_set_lane_count(unsigned char count)
 unsigned int exynos_dp_get_lane_count(void)
 {
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        reg = readl(&dp_regs->lane_count_set);
 
@@ -915,7 +893,6 @@ unsigned int exynos_dp_get_lane_count(void)
 
 unsigned char exynos_dp_get_lanex_pre_emphasis(unsigned char lanecnt)
 {
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
        unsigned int reg_list[DP_LANE_CNT_4] = {
                (unsigned int)&dp_regs->ln0_link_training_ctl,
                (unsigned int)&dp_regs->ln1_link_training_ctl,
@@ -929,7 +906,6 @@ unsigned char exynos_dp_get_lanex_pre_emphasis(unsigned char lanecnt)
 void exynos_dp_set_lanex_pre_emphasis(unsigned char request_val,
                unsigned char lanecnt)
 {
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
        unsigned int reg_list[DP_LANE_CNT_4] = {
                (unsigned int)&dp_regs->ln0_link_training_ctl,
                (unsigned int)&dp_regs->ln1_link_training_ctl,
@@ -944,7 +920,6 @@ void exynos_dp_set_lane_pre_emphasis(unsigned int level, unsigned char lanecnt)
 {
        unsigned char i;
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
        unsigned int reg_list[DP_LANE_CNT_4] = {
                (unsigned int)&dp_regs->ln0_link_training_ctl,
                (unsigned int)&dp_regs->ln1_link_training_ctl,
@@ -967,7 +942,6 @@ void exynos_dp_set_lane_pre_emphasis(unsigned int level, unsigned char lanecnt)
 void exynos_dp_set_training_pattern(unsigned int pattern)
 {
        unsigned int reg = 0;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        switch (pattern) {
        case PRBS7:
@@ -996,7 +970,6 @@ void exynos_dp_set_training_pattern(unsigned int pattern)
 void exynos_dp_enable_enhanced_mode(unsigned char enable)
 {
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        reg = readl(&dp_regs->sys_ctl4);
        reg &= ~ENHANCED;
@@ -1010,7 +983,6 @@ void exynos_dp_enable_enhanced_mode(unsigned char enable)
 void exynos_dp_enable_scrambling(unsigned int enable)
 {
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        reg = readl(&dp_regs->training_ptn_set);
        reg &= ~(SCRAMBLING_DISABLE);
@@ -1024,7 +996,6 @@ void exynos_dp_enable_scrambling(unsigned int enable)
 int exynos_dp_init_video(void)
 {
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        /* Clear VID_CLK_CHG[1] and VID_FORMAT_CHG[3] and VSYNC_DET[7] */
        reg = VSYNC_DET | VID_FORMAT_CHG | VID_CLK_CHG;
@@ -1040,7 +1011,6 @@ int exynos_dp_init_video(void)
 void exynos_dp_config_video_slave_mode(struct edp_video_info *video_info)
 {
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        /* Video Slave mode setting */
        reg = readl(&dp_regs->func_en1);
@@ -1074,7 +1044,6 @@ void exynos_dp_config_video_slave_mode(struct edp_video_info *video_info)
 void exynos_dp_set_video_color_format(struct edp_video_info *video_info)
 {
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        /* Configure the input color depth, color space, dynamic range */
        reg = (video_info->dynamic_range << IN_D_RANGE_SHIFT) |
@@ -1097,7 +1066,6 @@ int exynos_dp_config_video_bist(struct edp_device_info *edp_info)
        unsigned int reg;
        unsigned int bist_type = 0;
        struct edp_video_info video_info = edp_info->video_info;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        /* For master mode, you don't need to set the video format */
        if (video_info.master_mode == 0) {
@@ -1186,7 +1154,6 @@ int exynos_dp_config_video_bist(struct edp_device_info *edp_info)
 unsigned int exynos_dp_is_slave_video_stream_clock_on(void)
 {
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        /* Update Video stream clk detect status */
        reg = readl(&dp_regs->sys_ctl1);
@@ -1206,7 +1173,6 @@ void exynos_dp_set_video_cr_mn(unsigned int type, unsigned int m_value,
                unsigned int n_value)
 {
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        if (type == REGISTER_M) {
                reg = readl(&dp_regs->sys_ctl4);
@@ -1235,7 +1201,6 @@ void exynos_dp_set_video_cr_mn(unsigned int type, unsigned int m_value,
 void exynos_dp_set_video_timing_mode(unsigned int type)
 {
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        reg = readl(&dp_regs->video_ctl10);
        reg &= ~FORMAT_SEL;
@@ -1249,7 +1214,6 @@ void exynos_dp_set_video_timing_mode(unsigned int type)
 void exynos_dp_enable_video_master(unsigned int enable)
 {
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        reg = readl(&dp_regs->soc_general_ctl);
        if (enable) {
@@ -1266,7 +1230,6 @@ void exynos_dp_enable_video_master(unsigned int enable)
 void exynos_dp_start_video(void)
 {
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        /* Enable Video input and disable Mute */
        reg = readl(&dp_regs->video_ctl1);
@@ -1277,7 +1240,6 @@ void exynos_dp_start_video(void)
 unsigned int exynos_dp_is_video_stream_on(void)
 {
        unsigned int reg;
-       struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();
 
        /* Update STRM_VALID */
        reg = readl(&dp_regs->sys_ctl3);

diff --git a/drivers/video/exynos_dp_lowlevel.h b/drivers/video/exynos_dp_lowlevel.h
index a041a7a..2c0ae12 100644 (file)
--- a/drivers/video/exynos_dp_lowlevel.h
+++ b/drivers/video/exynos_dp_lowlevel.h
@@ -76,5 +76,6 @@ void exynos_dp_set_video_timing_mode(unsigned int type);
 void exynos_dp_enable_video_master(unsigned int enable);
 void exynos_dp_start_video(void);
 unsigned int exynos_dp_is_video_stream_on(void);
+void exynos_dp_set_base_addr(void);
 
 #endif /* _EXYNOS_DP_LOWLEVEL_H */