Skip to content

Commit eb28c5c

Browse files
pinchartlagners
authored andcommitted
drm: mxsfb: Remove register definitions from mxsfb_crtc.c
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 <[email protected]> Reviewed-by: Stefan Agner <[email protected]> Reviewed-by: Emil Velikov <[email protected]> Signed-off-by: Stefan Agner <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 7865cd5 commit eb28c5c

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

drivers/gpu/drm/mxsfb/mxsfb_crtc.c

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929
#include "mxsfb_drv.h"
3030
#include "mxsfb_regs.h"
3131

32-
#define MXS_SET_ADDR 0x4
33-
#define MXS_CLR_ADDR 0x8
34-
#define MODULE_CLKGATE BIT(30)
35-
#define MODULE_SFTRST BIT(31)
3632
/* 1 second delay should be plenty of time for block reset */
3733
#define RESET_TIMEOUT 1000000
3834

@@ -162,25 +158,25 @@ static int clear_poll_bit(void __iomem *addr, u32 mask)
162158
{
163159
u32 reg;
164160

165-
writel(mask, addr + MXS_CLR_ADDR);
161+
writel(mask, addr + REG_CLR);
166162
return readl_poll_timeout(addr, reg, !(reg & mask), 0, RESET_TIMEOUT);
167163
}
168164

169165
static int mxsfb_reset_block(struct mxsfb_drm_private *mxsfb)
170166
{
171167
int ret;
172168

173-
ret = clear_poll_bit(mxsfb->base + LCDC_CTRL, MODULE_SFTRST);
169+
ret = clear_poll_bit(mxsfb->base + LCDC_CTRL, CTRL_SFTRST);
174170
if (ret)
175171
return ret;
176172

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

179-
ret = clear_poll_bit(mxsfb->base + LCDC_CTRL, MODULE_SFTRST);
175+
ret = clear_poll_bit(mxsfb->base + LCDC_CTRL, CTRL_SFTRST);
180176
if (ret)
181177
return ret;
182178

183-
return clear_poll_bit(mxsfb->base + LCDC_CTRL, MODULE_CLKGATE);
179+
return clear_poll_bit(mxsfb->base + LCDC_CTRL, CTRL_CLKGATE);
184180
}
185181

186182
static dma_addr_t mxsfb_get_fb_paddr(struct mxsfb_drm_private *mxsfb)

0 commit comments

Comments
 (0)