From: Robert Chiras <robert.chiras@nxp.com> To: "Guido Günther" <agx@sigxcpu.org>, "Marek Vasut" <marex@denx.de>, "Stefan Agner" <stefan@agner.ch>, "David Airlie" <airlied@linux.ie>, "Daniel Vetter" <daniel@ffwll.ch>, "Rob Herring" <robh+dt@kernel.org>, "Mark Rutland" <mark.rutland@arm.com>, "Shawn Guo" <shawnguo@kernel.org>, "Sascha Hauer" <s.hauer@pengutronix.de>, "Fabio Estevam" <festevam@gmail.com> Cc: Pengutronix Kernel Team <kernel@pengutronix.de>, NXP Linux Team <linux-imx@nxp.com>, dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 11/15] drm/mxsfb: Update mxsfb to support LCD reset Date: Wed, 21 Aug 2019 13:15:51 +0300 [thread overview] Message-ID: <1566382555-12102-12-git-send-email-robert.chiras@nxp.com> (raw) In-Reply-To: <1566382555-12102-1-git-send-email-robert.chiras@nxp.com> The eLCDIF controller has control pin for the external LCD reset pin. Add support for it and assert this pin in enable and de-assert it in disable. Signed-off-by: Robert Chiras <robert.chiras@nxp.com> --- drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 14 ++++++++++---- drivers/gpu/drm/mxsfb/mxsfb_regs.h | 2 ++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/mxsfb/mxsfb_crtc.c b/drivers/gpu/drm/mxsfb/mxsfb_crtc.c index 1be29f5..a4ba368 100644 --- a/drivers/gpu/drm/mxsfb/mxsfb_crtc.c +++ b/drivers/gpu/drm/mxsfb/mxsfb_crtc.c @@ -224,9 +224,12 @@ static void mxsfb_enable_controller(struct mxsfb_drm_private *mxsfb) clk_prepare_enable(mxsfb->clk_disp_axi); clk_prepare_enable(mxsfb->clk); - if (mxsfb->devdata->ipversion >= 4) + if (mxsfb->devdata->ipversion >= 4) { writel(CTRL2_OUTSTANDING_REQS(REQ_16), mxsfb->base + LCDC_V4_CTRL2 + REG_SET); + /* Assert LCD Reset bit */ + writel(CTRL2_LCD_RESET, mxsfb->base + LCDC_V4_CTRL2 + REG_SET); + } /* If it was disabled, re-enable the mode again */ writel(CTRL_DOTCLK_MODE, mxsfb->base + LCDC_CTRL + REG_SET); @@ -244,11 +247,14 @@ static void mxsfb_disable_controller(struct mxsfb_drm_private *mxsfb) { u32 reg; - if (mxsfb->devdata->ipversion >= 4) + writel(CTRL_RUN, mxsfb->base + LCDC_CTRL + REG_CLR); + + if (mxsfb->devdata->ipversion >= 4) { writel(CTRL2_OUTSTANDING_REQS(0x7), mxsfb->base + LCDC_V4_CTRL2 + REG_CLR); - - writel(CTRL_RUN, mxsfb->base + LCDC_CTRL + REG_CLR); + /* De-assert LCD Reset bit */ + writel(CTRL2_LCD_RESET, mxsfb->base + LCDC_V4_CTRL2 + REG_CLR); + } /* * Even if we disable the controller here, it will still continue diff --git a/drivers/gpu/drm/mxsfb/mxsfb_regs.h b/drivers/gpu/drm/mxsfb/mxsfb_regs.h index dc4daa0..0f63ba1 100644 --- a/drivers/gpu/drm/mxsfb/mxsfb_regs.h +++ b/drivers/gpu/drm/mxsfb/mxsfb_regs.h @@ -108,6 +108,8 @@ #define CTRL2_LINE_PATTERN_BGR 5 #define CTRL2_LINE_PATTERN_CLR 7 +#define CTRL2_LCD_RESET BIT(0) + #define TRANSFER_COUNT_SET_VCOUNT(x) REG_PUT((x), 31, 16) #define TRANSFER_COUNT_GET_VCOUNT(x) REG_GET((x), 31, 16) #define TRANSFER_COUNT_SET_HCOUNT(x) REG_PUT((x), 15, 0) -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Robert Chiras <robert.chiras@nxp.com> To: "Guido Günther" <agx@sigxcpu.org>, "Marek Vasut" <marex@denx.de>, "Stefan Agner" <stefan@agner.ch>, "David Airlie" <airlied@linux.ie>, "Daniel Vetter" <daniel@ffwll.ch>, "Rob Herring" <robh+dt@kernel.org>, "Mark Rutland" <mark.rutland@arm.com>, "Shawn Guo" <shawnguo@kernel.org>, "Sascha Hauer" <s.hauer@pengutronix.de>, "Fabio Estevam" <festevam@gmail.com> Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, NXP Linux Team <linux-imx@nxp.com>, Pengutronix Kernel Team <kernel@pengutronix.de>, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 11/15] drm/mxsfb: Update mxsfb to support LCD reset Date: Wed, 21 Aug 2019 13:15:51 +0300 [thread overview] Message-ID: <1566382555-12102-12-git-send-email-robert.chiras@nxp.com> (raw) In-Reply-To: <1566382555-12102-1-git-send-email-robert.chiras@nxp.com> The eLCDIF controller has control pin for the external LCD reset pin. Add support for it and assert this pin in enable and de-assert it in disable. Signed-off-by: Robert Chiras <robert.chiras@nxp.com> --- drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 14 ++++++++++---- drivers/gpu/drm/mxsfb/mxsfb_regs.h | 2 ++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/mxsfb/mxsfb_crtc.c b/drivers/gpu/drm/mxsfb/mxsfb_crtc.c index 1be29f5..a4ba368 100644 --- a/drivers/gpu/drm/mxsfb/mxsfb_crtc.c +++ b/drivers/gpu/drm/mxsfb/mxsfb_crtc.c @@ -224,9 +224,12 @@ static void mxsfb_enable_controller(struct mxsfb_drm_private *mxsfb) clk_prepare_enable(mxsfb->clk_disp_axi); clk_prepare_enable(mxsfb->clk); - if (mxsfb->devdata->ipversion >= 4) + if (mxsfb->devdata->ipversion >= 4) { writel(CTRL2_OUTSTANDING_REQS(REQ_16), mxsfb->base + LCDC_V4_CTRL2 + REG_SET); + /* Assert LCD Reset bit */ + writel(CTRL2_LCD_RESET, mxsfb->base + LCDC_V4_CTRL2 + REG_SET); + } /* If it was disabled, re-enable the mode again */ writel(CTRL_DOTCLK_MODE, mxsfb->base + LCDC_CTRL + REG_SET); @@ -244,11 +247,14 @@ static void mxsfb_disable_controller(struct mxsfb_drm_private *mxsfb) { u32 reg; - if (mxsfb->devdata->ipversion >= 4) + writel(CTRL_RUN, mxsfb->base + LCDC_CTRL + REG_CLR); + + if (mxsfb->devdata->ipversion >= 4) { writel(CTRL2_OUTSTANDING_REQS(0x7), mxsfb->base + LCDC_V4_CTRL2 + REG_CLR); - - writel(CTRL_RUN, mxsfb->base + LCDC_CTRL + REG_CLR); + /* De-assert LCD Reset bit */ + writel(CTRL2_LCD_RESET, mxsfb->base + LCDC_V4_CTRL2 + REG_CLR); + } /* * Even if we disable the controller here, it will still continue diff --git a/drivers/gpu/drm/mxsfb/mxsfb_regs.h b/drivers/gpu/drm/mxsfb/mxsfb_regs.h index dc4daa0..0f63ba1 100644 --- a/drivers/gpu/drm/mxsfb/mxsfb_regs.h +++ b/drivers/gpu/drm/mxsfb/mxsfb_regs.h @@ -108,6 +108,8 @@ #define CTRL2_LINE_PATTERN_BGR 5 #define CTRL2_LINE_PATTERN_CLR 7 +#define CTRL2_LCD_RESET BIT(0) + #define TRANSFER_COUNT_SET_VCOUNT(x) REG_PUT((x), 31, 16) #define TRANSFER_COUNT_GET_VCOUNT(x) REG_GET((x), 31, 16) #define TRANSFER_COUNT_SET_HCOUNT(x) REG_PUT((x), 15, 0) -- 2.7.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-08-21 10:16 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-21 10:15 [PATCH v3 00/15] Improvements and fixes for mxsfb DRM driver Robert Chiras 2019-08-21 10:15 ` Robert Chiras 2019-08-21 10:15 ` [PATCH v3 01/15] drm/mxsfb: Update mxsfb to support a bridge Robert Chiras 2019-08-21 10:15 ` Robert Chiras 2019-08-21 10:15 ` [PATCH v3 02/15] drm/mxsfb: Read bus flags from bridge if present Robert Chiras 2019-08-21 10:15 ` Robert Chiras 2019-08-21 10:15 ` [PATCH v3 03/15] drm/mxsfb: Add defines for the rest of registers Robert Chiras 2019-08-21 10:15 ` Robert Chiras 2019-08-21 10:15 ` [PATCH v3 04/15] drm/mxsfb: Reset vital registers for a proper initialization Robert Chiras 2019-08-21 10:15 ` Robert Chiras 2019-08-21 10:15 ` [PATCH v3 05/15] drm/mxsfb: Update register definitions using bit manipulation defines Robert Chiras 2019-08-21 10:15 ` Robert Chiras 2019-08-21 10:15 ` [PATCH v3 06/15] drm/mxsfb: Update mxsfb with additional pixel formats Robert Chiras 2019-08-21 10:15 ` Robert Chiras 2019-08-21 10:15 ` [PATCH v3 07/15] drm/mxsfb: Fix the vblank events Robert Chiras 2019-08-21 10:15 ` Robert Chiras 2019-08-21 10:15 ` [PATCH v3 08/15] drm/mxsfb: Signal mode changed when bpp changed Robert Chiras 2019-08-21 10:15 ` Robert Chiras 2019-08-21 10:15 ` [PATCH v3 09/15] drm/mxsfb: Add max-memory-bandwidth property for MXSFB Robert Chiras 2019-08-21 10:15 ` Robert Chiras 2019-08-21 10:15 ` [PATCH v3 10/15] dt-bindings: display: Add max-memory-bandwidth property for mxsfb Robert Chiras 2019-08-21 10:15 ` Robert Chiras 2019-08-27 17:25 ` Rob Herring 2019-08-27 17:25 ` Rob Herring 2019-08-21 10:15 ` Robert Chiras [this message] 2019-08-21 10:15 ` [PATCH v3 11/15] drm/mxsfb: Update mxsfb to support LCD reset Robert Chiras 2019-08-21 10:15 ` [PATCH v3 12/15] drm/mxsfb: Improve the axi clock usage Robert Chiras 2019-08-21 10:15 ` Robert Chiras 2019-08-21 10:15 ` [PATCH v3 13/15] drm/mxsfb: Clear OUTSTANDING_REQS bits Robert Chiras 2019-08-21 10:15 ` Robert Chiras 2019-08-21 10:15 ` [PATCH v3 14/15] drm/mxsfb: Add support for horizontal stride Robert Chiras 2019-08-21 10:15 ` Robert Chiras 2019-08-21 10:15 ` [PATCH v3 15/15] drm/mxsfb: Add support for live pixel format change Robert Chiras 2019-08-21 10:15 ` Robert Chiras 2019-08-26 12:05 ` [PATCH v3 00/15] Improvements and fixes for mxsfb DRM driver Guido Günther 2019-08-26 12:05 ` Guido Günther 2019-08-26 14:35 ` Stefan Agner 2019-08-26 14:35 ` Stefan Agner 2019-08-26 16:34 ` Guido Günther 2019-08-26 16:34 ` Guido Günther 2019-08-26 19:19 ` Leonard Crestez 2019-08-26 19:19 ` Leonard Crestez 2019-08-28 6:49 ` Robert Chiras 2019-08-28 6:49 ` Robert Chiras
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=1566382555-12102-12-git-send-email-robert.chiras@nxp.com \ --to=robert.chiras@nxp.com \ --cc=agx@sigxcpu.org \ --cc=airlied@linux.ie \ --cc=daniel@ffwll.ch \ --cc=devicetree@vger.kernel.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=festevam@gmail.com \ --cc=kernel@pengutronix.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-imx@nxp.com \ --cc=linux-kernel@vger.kernel.org \ --cc=marex@denx.de \ --cc=mark.rutland@arm.com \ --cc=robh+dt@kernel.org \ --cc=s.hauer@pengutronix.de \ --cc=shawnguo@kernel.org \ --cc=stefan@agner.ch \ /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: linkBe 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.