Skip to content

Commit

Permalink
drm: mxsfb: Remove register definitions from mxsfb_crtc.c
Browse files Browse the repository at this point in the history
mxsfb_crtc.c defines several macros related to register addresses and
bit, which duplicates macros from mxsfb_regs.h. Use the macros from
mxsfb_regs.h instead and remove them.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Stefan Agner <stefan@agner.ch>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Stefan Agner <stefan@agner.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20200727020654.8231-9-laurent.pinchart@ideasonboard.com
  • Loading branch information
Laurent Pinchart authored and Stefan Agner committed Jul 28, 2020
1 parent 7865cd5 commit eb28c5c
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions drivers/gpu/drm/mxsfb/mxsfb_crtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@
#include "mxsfb_drv.h"
#include "mxsfb_regs.h"

#define MXS_SET_ADDR 0x4
#define MXS_CLR_ADDR 0x8
#define MODULE_CLKGATE BIT(30)
#define MODULE_SFTRST BIT(31)
/* 1 second delay should be plenty of time for block reset */
#define RESET_TIMEOUT 1000000

Expand Down Expand Up @@ -162,25 +158,25 @@ static int clear_poll_bit(void __iomem *addr, u32 mask)
{
u32 reg;

writel(mask, addr + MXS_CLR_ADDR);
writel(mask, addr + REG_CLR);
return readl_poll_timeout(addr, reg, !(reg & mask), 0, RESET_TIMEOUT);
}

static int mxsfb_reset_block(struct mxsfb_drm_private *mxsfb)
{
int ret;

ret = clear_poll_bit(mxsfb->base + LCDC_CTRL, MODULE_SFTRST);
ret = clear_poll_bit(mxsfb->base + LCDC_CTRL, CTRL_SFTRST);
if (ret)
return ret;

writel(MODULE_CLKGATE, mxsfb->base + LCDC_CTRL + MXS_CLR_ADDR);
writel(CTRL_CLKGATE, mxsfb->base + LCDC_CTRL + REG_CLR);

ret = clear_poll_bit(mxsfb->base + LCDC_CTRL, MODULE_SFTRST);
ret = clear_poll_bit(mxsfb->base + LCDC_CTRL, CTRL_SFTRST);
if (ret)
return ret;

return clear_poll_bit(mxsfb->base + LCDC_CTRL, MODULE_CLKGATE);
return clear_poll_bit(mxsfb->base + LCDC_CTRL, CTRL_CLKGATE);
}

static dma_addr_t mxsfb_get_fb_paddr(struct mxsfb_drm_private *mxsfb)
Expand Down

0 comments on commit eb28c5c

Please sign in to comment.