Revert "Merge patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet""

[J-u-boot.git] / drivers / video / rockchip / rk3288_mipi.c

diff --git a/drivers/video/rockchip/rk3288_mipi.c b/drivers/video/rockchip/rk3288_mipi.c
index 71d3faf169dec23b4e9801a91736ddcbac3a1b80..9d42119c82611ac83d44553d8ffc0311bfa611a6 100644 (file)
--- a/drivers/video/rockchip/rk3288_mipi.c
+++ b/drivers/video/rockchip/rk3288_mipi.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2017, Fuzhou Rockchip Electronics Co., Ltd
  * Author: Eric Gao <[email protected]>
@@ -8,12 +8,12 @@
 #include <clk.h>
 #include <display.h>
 #include <dm.h>
+#include <log.h>
 #include <panel.h>
 #include <regmap.h>
 #include "rk_mipi.h"
 #include <syscon.h>
 #include <asm/gpio.h>
-#include <asm/io.h>
 #include <dm/uclass-internal.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
@@ -30,7 +30,7 @@ static int rk_mipi_dsi_source_select(struct udevice *dev)
 {
        struct rk_mipi_priv *priv = dev_get_priv(dev);
        struct rk3288_grf *grf = priv->grf;
-       struct display_plat *disp_uc_plat = dev_get_uclass_platdata(dev);
+       struct display_plat *disp_uc_plat = dev_get_uclass_plat(dev);
 
        /* Select the video source */
        switch (disp_uc_plat->source_id) {
@@ -128,7 +128,7 @@ static int rk_mipi_enable(struct udevice *dev, int panel_bpp,
        return 0;
 }
 
-static int rk_mipi_ofdata_to_platdata(struct udevice *dev)
+static int rk_mipi_of_to_plat(struct udevice *dev)
 {
        struct rk_mipi_priv *priv = dev_get_priv(dev);
 
@@ -173,6 +173,7 @@ static const struct dm_display_ops rk_mipi_dsi_ops = {
 };
 
 static const struct udevice_id rk_mipi_dsi_ids[] = {
+       { .compatible = "rockchip,rk3288-mipi-dsi" },
        { .compatible = "rockchip,rk3288_mipi_dsi" },
        { }
 };
@@ -181,8 +182,8 @@ U_BOOT_DRIVER(rk_mipi_dsi) = {
        .name   = "rk_mipi_dsi",
        .id     = UCLASS_DISPLAY,
        .of_match = rk_mipi_dsi_ids,
-       .ofdata_to_platdata = rk_mipi_ofdata_to_platdata,
+       .of_to_plat = rk_mipi_of_to_plat,
        .probe  = rk_mipi_probe,
        .ops    = &rk_mipi_dsi_ops,
-       .priv_auto_alloc_size   = sizeof(struct rk_mipi_priv),
+       .priv_auto        = sizeof(struct rk_mipi_priv),
 };