Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1739597

[PATCH v2 05/13] drm/sun4i: hdmi: create a regmap for later use

Show all headers | View raw

The HDMI driver is written with readl/writel I/O to the registers.
However, to support the A31 variant, which has a different layout
for the DDC registers, it was recommended to use regfields to have
a cleaner implementation. To use regfields, we need to create an
underlying regmap.

This patch only adds the regmap. It does not convert the existing
driver accesses to use regmap.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 drivers/gpu/drm/sun4i/sun4i_hdmi.h     |  1 +
 drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi.h b/drivers/gpu/drm/sun4i/sun4i_hdmi.h
index 1457750988da..b95512ec8eb6 100644
--- a/drivers/gpu/drm/sun4i/sun4i_hdmi.h
+++ b/drivers/gpu/drm/sun4i/sun4i_hdmi.h
@@ -163,6 +163,7 @@ struct sun4i_hdmi {
 	struct device		*dev;
 
 	void __iomem		*base;
+	struct regmap		*regmap;
 
 	/* Parent clocks */
 	struct clk		*bus_clk;
diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
index 3cf1a6932fac..5ab811cda00e 100644
--- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
+++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
@@ -22,6 +22,7 @@
 #include <linux/iopoll.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
+#include <linux/regmap.h>
 
 #include "sun4i_backend.h"
 #include "sun4i_crtc.h"
@@ -267,6 +268,13 @@ static const struct cec_pin_ops sun4i_hdmi_cec_pin_ops = {
 };
 #endif
 
+static const struct regmap_config sun4i_hdmi_regmap_config = {
+	.reg_bits	= 32,
+	.val_bits	= 32,
+	.reg_stride	= 4,
+	.max_register	= 0x580,
+};
+
 static int sun4i_hdmi_bind(struct device *dev, struct device *master,
 			   void *data)
 {
@@ -321,6 +329,13 @@ static int sun4i_hdmi_bind(struct device *dev, struct device *master,
 		goto err_disable_mod_clk;
 	}
 
+	hdmi->regmap = devm_regmap_init_mmio(dev, hdmi->base,
+					     &sun4i_hdmi_regmap_config);
+	if (IS_ERR(hdmi->regmap)) {
+		dev_err(dev, "Couldn't create HDMI encoder regmap\n");
+		return PTR_ERR(hdmi->regmap);
+	}
+
 	ret = sun4i_tmds_create(hdmi);
 	if (ret) {
 		dev_err(dev, "Couldn't create the TMDS clock\n");
-- 
2.14.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 00/13] drm/sun4i: hdmi: Support HDMI controller on A31 Chen-Yu Tsai <wens@csie.org> - 2017-09-26 09:10 +0200
  [PATCH v2 07/13] dt-bindings: display: sun4i: Add binding for A31 HDMI controller Chen-Yu Tsai <wens@csie.org> - 2017-09-26 09:10 +0200
  [PATCH v2 02/13] clk: sunxi-ng: sun6i: Rename HDMI DDC clock to avoid name collision Chen-Yu Tsai <wens@csie.org> - 2017-09-26 09:10 +0200
    Re: [PATCH v2 02/13] clk: sunxi-ng: sun6i: Rename HDMI DDC clock to  avoid name collision Maxime Ripard <maxime.ripard@free-electrons.com> - 2017-09-26 11:40 +0200
      Re: [PATCH v2 02/13] clk: sunxi-ng: sun6i: Rename HDMI DDC clock to  avoid name collision Chen-Yu Tsai <wens@csie.org> - 2017-09-27 05:50 +0200
  [PATCH v2 09/13] drm/sun4i: hdmi: Add support for controller hardware variants Chen-Yu Tsai <wens@csie.org> - 2017-09-26 09:10 +0200
    Re: [PATCH v2 09/13] drm/sun4i: hdmi: Add support for controller  hardware variants Maxime Ripard <maxime.ripard@free-electrons.com> - 2017-09-26 12:10 +0200
  [PATCH v2 13/13] ARM: dts: sun6i: Enable HDMI support on some A31/A31s devices Chen-Yu Tsai <wens@csie.org> - 2017-09-26 09:10 +0200
  [PATCH v2 08/13] regmap: add iopoll-like polling macro for regmap_field Chen-Yu Tsai <wens@csie.org> - 2017-09-26 09:10 +0200
  [PATCH v2 10/13] drm/sun4i: hdmi: Add A31 specific DDC register definitions Chen-Yu Tsai <wens@csie.org> - 2017-09-26 09:10 +0200
    Re: [PATCH v2 10/13] drm/sun4i: hdmi: Add A31 specific DDC register  definitions Maxime Ripard <maxime.ripard@free-electrons.com> - 2017-09-26 12:10 +0200
  [PATCH v2 04/13] drm/sun4i: hdmi: Disable clks in bind function error path and unbind function Chen-Yu Tsai <wens@csie.org> - 2017-09-26 09:10 +0200
    Re: [PATCH v2 04/13] drm/sun4i: hdmi: Disable clks in bind function  error path and unbind function Maxime Ripard <maxime.ripard@free-electrons.com> - 2017-09-26 12:00 +0200
  [PATCH v2 03/13] drm/sun4i: tcon: Add support for demuxing TCON output on A31 Chen-Yu Tsai <wens@csie.org> - 2017-09-26 09:10 +0200
    Re: [PATCH v2 03/13] drm/sun4i: tcon: Add support for demuxing TCON  output on A31 Maxime Ripard <maxime.ripard@free-electrons.com> - 2017-09-26 12:00 +0200
      Re: [PATCH v2 03/13] drm/sun4i: tcon: Add support for demuxing TCON  output on A31 Chen-Yu Tsai <wens@csie.org> - 2017-09-27 06:10 +0200
  [PATCH v2 05/13] drm/sun4i: hdmi: create a regmap for later use Chen-Yu Tsai <wens@csie.org> - 2017-09-26 09:10 +0200
    Re: [PATCH v2 05/13] drm/sun4i: hdmi: create a regmap for later use Maxime Ripard <maxime.ripard@free-electrons.com> - 2017-09-26 12:00 +0200
  [PATCH v2 06/13] drm/sun4i: hdmi: Allow using second PLL as TMDS clk parent Chen-Yu Tsai <wens@csie.org> - 2017-09-26 09:10 +0200
    Re: [PATCH v2 06/13] drm/sun4i: hdmi: Allow using second PLL as TMDS  clk parent Maxime Ripard <maxime.ripard@free-electrons.com> - 2017-09-26 12:00 +0200

csiph-web