From mboxrd@z Thu Jan  1 00:00:00 1970
From: Kever Yang <kever.yang@rock-chips.com>
Date: Thu, 21 Jan 2021 20:50:05 +0800
Subject: [patch v3 9/9] rockchip: videp: vop: Add reset support
In-Reply-To: <20201120132824.063180167@rtp-net.org>
References: <20201120132421.500365403@rtp-net.org>
 <20201120132824.063180167@rtp-net.org>
Message-ID: <CAKUh=Ryh9ECYgOb=ig0LC05surS-9af2qXvpiOifdUBn1ey_0g@mail.gmail.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Hi Arnaud,
    Please update the typo at subject line, /videp/video/
    Other change looks good to me, you can add my review tag after update:
Reviewed-by: Kever Yang<kever.yang@rock-chips.com>

Thanks,
- Kever

Arnaud Patard <arnaud.patard@rtp-net.org> ?2020?11?20??? ??9:32???

> In order to ensure that the VOP registers are in correct state,
> add missing support for the VOP reset lines found in the device-tree
>
> Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
> Index: u-boot/drivers/video/rockchip/rk_vop.c
> ===================================================================
> --- u-boot.orig/drivers/video/rockchip/rk_vop.c
> +++ u-boot/drivers/video/rockchip/rk_vop.c
> @@ -8,9 +8,11 @@
>  #include <clk.h>
>  #include <display.h>
>  #include <dm.h>
> +#include <dm/device_compat.h>
>  #include <edid.h>
>  #include <log.h>
>  #include <regmap.h>
> +#include <reset.h>
>  #include <syscon.h>
>  #include <video.h>
>  #include <asm/gpio.h>
> @@ -36,14 +38,16 @@ enum vop_pol {
>         DCLK_INVERT    = 3
>  };
>
> -static void rkvop_enable(struct rk3288_vop *regs, ulong fbbase,
> +static void rkvop_enable(struct udevice *dev, struct rk3288_vop *regs,
> ulong fbbase,
>                          int fb_bits_per_pixel,
> -                        const struct display_timing *edid)
> +                        const struct display_timing *edid,
> +                        struct reset_ctl *dclk_rst)
>  {
>         u32 lb_mode;
>         u32 rgb_mode;
>         u32 hactive = edid->hactive.typ;
>         u32 vactive = edid->vactive.typ;
> +       int ret;
>
>         writel(V_ACT_WIDTH(hactive - 1) | V_ACT_HEIGHT(vactive - 1),
>                &regs->win0_act_info);
> @@ -91,6 +95,18 @@ static void rkvop_enable(struct rk3288_v
>
>         writel(fbbase, &regs->win0_yrgb_mst);
>         writel(0x01, &regs->reg_cfg_done); /* enable reg config */
> +
> +       ret = reset_assert(dclk_rst);
> +       if (ret) {
> +               dev_warn(dev, "failed to assert dclk reset (ret=%d)\n",
> ret);
> +               return;
> +       }
> +       udelay(20);
> +
> +       ret = reset_deassert(dclk_rst);
> +       if (ret)
> +               dev_warn(dev, "failed to deassert dclk reset (ret=%d)\n",
> ret);
> +
>  }
>
>  static void rkvop_set_pin_polarity(struct udevice *dev,
> @@ -238,6 +254,7 @@ static int rk_display_init(struct udevic
>         enum video_log2_bpp l2bpp;
>         ofnode remote;
>         const char *compat;
> +       struct reset_ctl dclk_rst;
>
>         debug("%s(%s, %lx, %s)\n", __func__,
>               dev_read_name(dev), fbbase, ofnode_get_name(ep_node));
> @@ -354,7 +371,14 @@ static int rk_display_init(struct udevic
>         }
>
>         rkvop_mode_set(dev, &timing, vop_id);
> -       rkvop_enable(regs, fbbase, 1 << l2bpp, &timing);
> +
> +       ret = reset_get_by_name(dev, "dclk", &dclk_rst);
> +       if (ret) {
> +               dev_err(dev, "failed to get dclk reset (ret=%d)\n", ret);
> +               return ret;
> +       }
> +
> +       rkvop_enable(dev, regs, fbbase, 1 << l2bpp, &timing, &dclk_rst);
>
>         ret = display_enable(disp, 1 << l2bpp, &timing);
>         if (ret)
> @@ -391,11 +415,31 @@ int rk_vop_probe(struct udevice *dev)
>         struct rk_vop_priv *priv = dev_get_priv(dev);
>         int ret = 0;
>         ofnode port, node;
> +       struct reset_ctl ahb_rst;
>
>         /* Before relocation we don't need to do anything */
>         if (!(gd->flags & GD_FLG_RELOC))
>                 return 0;
>
> +       ret = reset_get_by_name(dev, "ahb", &ahb_rst);
> +       if (ret) {
> +               dev_err(dev, "failed to get ahb reset (ret=%d)\n", ret);
> +               return ret;
> +       }
> +
> +       ret = reset_assert(&ahb_rst);
> +       if (ret) {
> +               dev_err(dev, "failed to assert ahb reset (ret=%d)\n", ret);
> +       return ret;
> +       }
> +       udelay(20);
> +
> +       ret = reset_deassert(&ahb_rst);
> +       if (ret) {
> +               dev_err(dev, "failed to deassert ahb reset (ret=%d)\n",
> ret);
> +               return ret;
> +       }
> +
>         plat->base = gd->bd->bi_dram[0].start + gd->bd->bi_dram[0].size -
> plat->size;
>
>  #if defined(CONFIG_EFI_LOADER)
>
>
>