xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm: mxsfb: Remove register definitions from mxsfb_crtc.c

Browse Source 
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
This commit is contained in:
Laurent Pinchart
2020-07-27 05:06:40 +03:00
committed by Stefan Agner
parent 7865cd5aae
commit eb28c5cee2
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/mxsfb/mxsfb_crtc.c
View File

@@ -29,10 +29,6 @@
#include "mxsfb_drv.h" #include "mxsfb_drv.h"
#include "mxsfb_regs.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 */ /* 1 second delay should be plenty of time for block reset */
#define RESET_TIMEOUT 1000000 #define RESET_TIMEOUT 1000000
@@ -162,7 +158,7 @@ static int clear_poll_bit(void __iomem *addr, u32 mask)
{ {
u32 reg; u32 reg;
writel(mask, addr + MXS_CLR_ADDR); writel(mask, addr + REG_CLR);
return readl_poll_timeout(addr, reg, !(reg & mask), 0, RESET_TIMEOUT); return readl_poll_timeout(addr, reg, !(reg & mask), 0, RESET_TIMEOUT);
} }
@@ -170,17 +166,17 @@ static int mxsfb_reset_block(struct mxsfb_drm_private *mxsfb)
{ {
int ret; int ret;
ret = clear_poll_bit(mxsfb->base + LCDC_CTRL, MODULE_SFTRST); ret = clear_poll_bit(mxsfb->base + LCDC_CTRL, CTRL_SFTRST);
if (ret) if (ret)
return 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) if (ret)
return 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) static dma_addr_t mxsfb_get_fb_paddr(struct mxsfb_drm_private *mxsfb)