Merge tag 'dm-pull-14dec20' of git://git.denx.de/u-boot-dm into next

[u-boot.git] / drivers / video / exynos / exynos_dp.c

diff --git a/drivers/video/exynos/exynos_dp.c b/drivers/video/exynos/exynos_dp.c
index 30e4020686a830b4369731b1e1203c86ed1b04b4..63b5b8e61a27938566c742ddcb50e331d97db603 100644 (file)
--- a/drivers/video/exynos/exynos_dp.c
+++ b/drivers/video/exynos/exynos_dp.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2012 Samsung Electronics
  *
  * Author: Donghwa Lee <[email protected]>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -11,6 +10,8 @@
 #include <common.h>
 #include <display.h>
 #include <fdtdec.h>
+#include <log.h>
+#include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
 #include <video_bridge.h>
@@ -321,7 +322,7 @@ static unsigned int exynos_dp_link_start(struct exynos_dp *regs,
 
 static unsigned int exynos_dp_training_pattern_dis(struct exynos_dp *regs)
 {
-       unsigned int ret = EXYNOS_DP_SUCCESS;
+       unsigned int ret;
 
        exynos_dp_set_training_pattern(regs, DP_NONE);
 
@@ -339,7 +340,7 @@ static unsigned int exynos_dp_enable_rx_to_enhanced_mode(
                struct exynos_dp *regs, unsigned char enable)
 {
        unsigned char data;
-       unsigned int ret = EXYNOS_DP_SUCCESS;
+       unsigned int ret;
 
        ret = exynos_dp_read_byte_from_dpcd(regs, DPCD_LANE_COUNT_SET,
                                            &data);
@@ -366,7 +367,7 @@ static unsigned int exynos_dp_enable_rx_to_enhanced_mode(
 static unsigned int exynos_dp_set_enhanced_mode(struct exynos_dp *regs,
                                                unsigned char enhance_mode)
 {
-       unsigned int ret = EXYNOS_DP_SUCCESS;
+       unsigned int ret;
 
        ret = exynos_dp_enable_rx_to_enhanced_mode(regs, enhance_mode);
        if (ret != EXYNOS_DP_SUCCESS) {
@@ -416,7 +417,7 @@ static int exynos_dp_read_dpcd_lane_stat(struct exynos_dp *regs,
 static unsigned int exynos_dp_read_dpcd_adj_req(struct exynos_dp *regs,
                unsigned char lane_num, unsigned char *sw, unsigned char *em)
 {
-       unsigned int ret = EXYNOS_DP_SUCCESS;
+       unsigned int ret;
        unsigned char buf;
        unsigned int dpcd_addr;
        unsigned char shift_val[DP_LANE_CNT_4] = {0, 4, 0, 4};
@@ -484,7 +485,7 @@ static int exynos_dp_reduce_link_rate(struct exynos_dp *regs,
 static unsigned int exynos_dp_process_clock_recovery(struct exynos_dp *regs,
                                        struct exynos_dp_priv *priv)
 {
-       unsigned int ret = EXYNOS_DP_SUCCESS;
+       unsigned int ret;
        unsigned char lane_stat;
        unsigned char lt_ctl_val[DP_LANE_CNT_4] = {0, };
        unsigned int i;
@@ -594,7 +595,7 @@ static unsigned int exynos_dp_process_clock_recovery(struct exynos_dp *regs,
 static unsigned int exynos_dp_process_equalizer_training(
                struct exynos_dp *regs, struct exynos_dp_priv *priv)
 {
-       unsigned int ret = EXYNOS_DP_SUCCESS;
+       unsigned int ret;
        unsigned char lane_stat, adj_req_sw, adj_req_em, i;
        unsigned char lt_ctl_val[DP_LANE_CNT_4] = {0,};
        unsigned char interlane_aligned = 0;
@@ -876,14 +877,14 @@ static unsigned int exynos_dp_config_video(struct exynos_dp *regs,
        return ret;
 }
 
-static int exynos_dp_ofdata_to_platdata(struct udevice *dev)
+static int exynos_dp_of_to_plat(struct udevice *dev)
 {
        struct exynos_dp_priv *priv = dev_get_priv(dev);
        const void *blob = gd->fdt_blob;
        unsigned int node = dev_of_offset(dev);
        fdt_addr_t addr;
 
-       addr = devfdt_get_addr(dev);
+       addr = dev_read_addr(dev);
        if (addr == FDT_ADDR_T_NONE) {
                debug("Can't get the DP base address\n");
                return -EINVAL;
@@ -1079,6 +1080,6 @@ U_BOOT_DRIVER(exynos_dp) = {
        .id     = UCLASS_DISPLAY,
        .of_match = exynos_dp_ids,
        .ops    = &exynos_dp_ops,
-       .ofdata_to_platdata     = exynos_dp_ofdata_to_platdata,
-       .priv_auto_alloc_size   = sizeof(struct exynos_dp_priv),
+       .of_to_plat     = exynos_dp_of_to_plat,
+       .priv_auto      = sizeof(struct exynos_dp_priv),
 };