On Sat, 6 Mar 2021 20:54:31 +0100
Jernej Skrabec <jernej.skra...@siol.net> wrote:
> Currently DE2 uses hardcoded address based on SoC for which U-Boot is
> built. Read it from DT instead so there is no need to specify it when
> support for new SoC is added.
>
> Signed-off-by: Jernej Skrabec <jernej.skra...@siol.net>
Looks alright. Since this was the only user of SUNXI_DE2_MUX[01]_BASE,
I wonder if we should remove those symbols from display2.h, to avoid
future code using them?
Reviewed-by: Andre Przywara <andre.przyw...@arm.com>
Cheers,
Andre
> ---
> drivers/video/sunxi/sunxi_de2.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/video/sunxi/sunxi_de2.c b/drivers/video/sunxi/sunxi_de2.c
> index 81576e45e9ef..f6c8ca075aba 100644
> --- a/drivers/video/sunxi/sunxi_de2.c
> +++ b/drivers/video/sunxi/sunxi_de2.c
> @@ -64,11 +64,10 @@ static void sunxi_de2_composer_init(void)
> setbits_le32(&ccm->de_clk_cfg, CCM_DE2_CTRL_GATE);
> }
>
> -static void sunxi_de2_mode_set(int mux, const struct display_timing *mode,
> +static void sunxi_de2_mode_set(ulong de_mux_base, int mux,
> + const struct display_timing *mode,
> int bpp, ulong address, bool is_composite)
> {
> - ulong de_mux_base = (mux == 0) ?
> - SUNXI_DE2_MUX0_BASE : SUNXI_DE2_MUX1_BASE;
> struct de_clk * const de_clk_regs =
> (struct de_clk *)(SUNXI_DE2_BASE);
> struct de_glb * const de_glb_regs =
> @@ -208,7 +207,8 @@ static int sunxi_de2_init(struct udevice *dev, ulong
> fbbase,
> }
>
> sunxi_de2_composer_init();
> - sunxi_de2_mode_set(mux, &timing, 1 << l2bpp, fbbase, is_composite);
> + sunxi_de2_mode_set((ulong)dev_read_addr(dev), mux, &timing,
> + 1 << l2bpp, fbbase, is_composite);
>
> ret = display_enable(disp, 1 << l2bpp, &timing);
> if (ret) {
