From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752732AbdKWIz3 (ORCPT ); Thu, 23 Nov 2017 03:55:29 -0500 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:54609 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751643AbdKWIz2 (ORCPT ); Thu, 23 Nov 2017 03:55:28 -0500 Message-ID: <1511427282.7685.1.camel@pengutronix.de> Subject: Re: [PATCH 1/8] drm/mediatek: Use regmap for register access From: Philipp Zabel To: Matthias Brugger , ulrich.hecht+renesas@gmail.com, laurent.pinchart@ideasonboard.com, ck.hu@mediatek.com, airlied@linux.ie, robh+dt@kernel.org, mark.rutland@arm.com, mturquette@baylibre.com, sboyd@codeaurora.org, lee.jones@linaro.org Cc: davem@davemloft.net, gregkh@linuxfoundation.org, mchehab@kernel.org, rdunlap@infradead.org, pi-cheng.chen@linaro.org, sean.wang@mediatek.com, linux-clk@vger.kernel.org, linux@armlinux.org.uk, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Matthias Brugger Date: Thu, 23 Nov 2017 09:54:42 +0100 In-Reply-To: <20171114214114.15793-2-mbrugger@suse.com> References: <20171114214114.15793-1-mbrugger@suse.com> <20171114214114.15793-2-mbrugger@suse.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.22.6-1+deb9u1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 2001:67c:670:100:3ad5:47ff:feaf:1a17 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Matthias, On Tue, 2017-11-14 at 22:41 +0100, Matthias Brugger wrote: > The mmsys memory space is shared between the drm and the > clk driver. Use regmap to access it. > > Signed-off-by: Matthias Brugger > --- > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 4 ++-- > drivers/gpu/drm/mediatek/mtk_drm_ddp.c | 30 +++++++++++++++++------------- > drivers/gpu/drm/mediatek/mtk_drm_ddp.h | 4 ++-- > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 13 ++++--------- > drivers/gpu/drm/mediatek/mtk_drm_drv.h | 2 +- > 5 files changed, 26 insertions(+), 27 deletions(-) [...] > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp.c > index 8130f3dab661..1227d6db07da 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp.c > @@ -185,16 +185,16 @@ static unsigned int mtk_ddp_sel_in(enum mtk_ddp_comp_id cur, > return value; > } > > -static void mtk_ddp_sout_sel(void __iomem *config_regs, > +static void mtk_ddp_sout_sel(struct regmap *config_regs, > enum mtk_ddp_comp_id cur, > enum mtk_ddp_comp_id next) > { > if (cur == DDP_COMPONENT_BLS && next == DDP_COMPONENT_DSI0) > - writel_relaxed(BLS_TO_DSI_RDMA1_TO_DPI1, > - config_regs + DISP_REG_CONFIG_OUT_SEL); > + regmap_write(config_regs, DISP_REG_CONFIG_OUT_SEL, > + BLS_TO_DSI_RDMA1_TO_DPI1); > } > > -void mtk_ddp_add_comp_to_path(void __iomem *config_regs, > +void mtk_ddp_add_comp_to_path(struct regmap *config_regs, > enum mtk_ddp_comp_id cur, > enum mtk_ddp_comp_id next) > { > @@ -202,20 +202,22 @@ void mtk_ddp_add_comp_to_path(void __iomem *config_regs, > > value = mtk_ddp_mout_en(cur, next, &addr); > if (value) { > - reg = readl_relaxed(config_regs + addr) | value; > - writel_relaxed(reg, config_regs + addr); > + regmap_read(config_regs, addr, ®); > + reg |= value; > + regmap_write(config_regs, addr, reg); You can use regmap_update_bits(config_regs, addr, value, value); here and drop the local variable reg. > } > > mtk_ddp_sout_sel(config_regs, cur, next); > > value = mtk_ddp_sel_in(cur, next, &addr); > if (value) { > - reg = readl_relaxed(config_regs + addr) | value; > - writel_relaxed(reg, config_regs + addr); > + regmap_read(config_regs, addr, ®); > + reg |= value; > + regmap_write(config_regs, addr, reg); regmap_update_bits(config_regs, addr, value, value); > } > } > > -void mtk_ddp_remove_comp_from_path(void __iomem *config_regs, > +void mtk_ddp_remove_comp_from_path(struct regmap *config_regs, > enum mtk_ddp_comp_id cur, > enum mtk_ddp_comp_id next) > { > @@ -223,14 +225,16 @@ void mtk_ddp_remove_comp_from_path(void __iomem *config_regs, > > value = mtk_ddp_mout_en(cur, next, &addr); > if (value) { > - reg = readl_relaxed(config_regs + addr) & ~value; > - writel_relaxed(reg, config_regs + addr); > + regmap_read(config_regs, addr, ®); > + reg &= ~value; > + regmap_write(config_regs, addr, reg); regmap_update_bits(config_regs, addr, value, 0); > } > > value = mtk_ddp_sel_in(cur, next, &addr); > if (value) { > - reg = readl_relaxed(config_regs + addr) & ~value; > - writel_relaxed(reg, config_regs + addr); > + regmap_read(config_regs, addr, ®); > + reg &= ~value; > + regmap_write(config_regs, addr, reg); regmap_update_bits(config_regs, addr, value, 0); Reviewed-by: Philipp Zabel regards Philipp