From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: dri-devel@lists.freedesktop.org
Cc: Marek Vasut <marex@denx.de>,
robert.chiras@nxp.com, leonard.crestez@nxp.com,
linux-imx@nxp.com, kernel@pengutronix.de
Subject: [PATCH v3 08/22] drm: mxsfb: Remove register definitions from mxsfb_crtc.c
Date: Wed, 17 Jun 2020 19:40:01 +0300 [thread overview]
Message-ID: <20200617164015.30448-9-laurent.pinchart@ideasonboard.com> (raw)
In-Reply-To: <20200617164015.30448-1-laurent.pinchart@ideasonboard.com>
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>
---
drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/mxsfb/mxsfb_crtc.c b/drivers/gpu/drm/mxsfb/mxsfb_crtc.c
index 722bd9b4f5f9..aef72adabf41 100644
--- a/drivers/gpu/drm/mxsfb/mxsfb_crtc.c
+++ b/drivers/gpu/drm/mxsfb/mxsfb_crtc.c
@@ -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
@@ -162,7 +158,7 @@ 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);
}
@@ -170,17 +166,17 @@ 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)
--
Regards,
Laurent Pinchart
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-06-17 16:41 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-17 16:39 [PATCH v3 00/22] drm: mxsfb: Add i.MX7 support Laurent Pinchart
2020-06-17 16:39 ` [PATCH v3 01/22] drm: mxsfb: Remove fbdev leftovers Laurent Pinchart
2020-06-17 16:39 ` [PATCH v3 02/22] drm: mxsfb: Use drm_panel_bridge Laurent Pinchart
2020-06-17 16:39 ` [PATCH v3 03/22] drm: mxsfb: Use BIT() macro to define register bitfields Laurent Pinchart
2020-06-17 16:39 ` [PATCH v3 04/22] drm: mxsfb: Remove unused macros from mxsfb_regs.h Laurent Pinchart
2020-06-17 16:39 ` [PATCH v3 05/22] drm: mxsfb: Clarify format and bus width configuration Laurent Pinchart
2020-06-17 16:39 ` [PATCH v3 06/22] drm: mxsfb: Pass mxsfb_drm_private pointer to mxsfb_reset_block() Laurent Pinchart
2020-06-17 16:40 ` [PATCH v3 07/22] drm: mxsfb: Use LCDC_CTRL register name explicitly Laurent Pinchart
2020-06-17 16:40 ` Laurent Pinchart [this message]
2020-06-17 16:40 ` [PATCH v3 09/22] drm: mxsfb: Remove unneeded includes Laurent Pinchart
2020-06-17 16:40 ` [PATCH v3 10/22] drm: mxsfb: Rename mxsfb_crtc.c to mxsfb_kms.c Laurent Pinchart
2020-06-17 16:40 ` [PATCH v3 11/22] drm: mxsfb: Stop using DRM simple display pipeline helper Laurent Pinchart
2020-06-17 16:40 ` [PATCH v3 12/22] drm: mxsfb: Move vblank event arm to CRTC .atomic_flush() Laurent Pinchart
2020-06-17 16:40 ` [PATCH v3 13/22] drm: mxsfb: Don't touch AXI clock in IRQ context Laurent Pinchart
2020-06-17 16:40 ` [PATCH v3 14/22] drm: mxsfb: Enable vblank handling Laurent Pinchart
2020-06-17 16:40 ` [PATCH v3 15/22] drm: mxsfb: Remove mxsfb_devdata unused fields Laurent Pinchart
2020-06-17 16:40 ` [PATCH v3 16/22] drm: mxsfb: Add i.MX7 and i.MX8M to the list of supported SoCs in Kconfig Laurent Pinchart
2020-06-17 16:40 ` [PATCH v3 17/22] drm: mxsfb: Update internal IP version number for i.MX6SX Laurent Pinchart
2020-06-17 16:40 ` [PATCH v3 18/22] drm: mxsfb: Drop non-OF support Laurent Pinchart
2020-06-17 16:40 ` [PATCH v3 19/22] drm: mxsfb: Turn mxsfb_set_pixel_fmt() into a void function Laurent Pinchart
2020-06-17 16:40 ` [PATCH v3 20/22] drm: mxsfb: Merge mxsfb_set_pixel_fmt() and mxsfb_set_bus_fmt() Laurent Pinchart
2020-06-17 16:40 ` [PATCH v3 21/22] drm: mxsfb: Remove unnecessary spaces after tab Laurent Pinchart
2020-06-17 16:40 ` [PATCH v3 22/22] drm: mxsfb: Support the alpha plane Laurent Pinchart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200617164015.30448-9-laurent.pinchart@ideasonboard.com \
--to=laurent.pinchart@ideasonboard.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=kernel@pengutronix.de \
--cc=leonard.crestez@nxp.com \
--cc=linux-imx@nxp.com \
--cc=marex@denx.de \
--cc=robert.chiras@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.