Re: [U-Boot] [PATCH v4 3/9] rockchip: video: refactor rk_vop and split RK3328-specific code off

2017-06-02 Thread Anatolij Gustschin 
On Wed, 31 May 2017 17:59:30 +0200
Philipp Tomsich philipp.toms...@theobroma-systems.com wrote:
...
> Changes in v4:
> - added to break down into smaller changes
> 
> Changes in v3: None
> Changes in v2: None
> 
>  arch/arm/include/asm/arch-rockchip/vop_rk3288.h |   1 +
>  drivers/video/rockchip/Makefile |   1 +
>  drivers/video/rockchip/rk3288_vop.c |  95 +
>  drivers/video/rockchip/rk_vop.c | 182 
> 
>  drivers/video/rockchip/rk_vop.h |  32 +
>  5 files changed, 217 insertions(+), 94 deletions(-)
>  create mode 100644 drivers/video/rockchip/rk3288_vop.c
>  create mode 100644 drivers/video/rockchip/rk_vop.h

Rebased on master and applied to u-boot-video/master (with
s/RK3328/RK3288/ in the subject. Thanks!

--
Anatolij
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH v4 3/9] rockchip: video: refactor rk_vop and split RK3328-specific code off

2017-06-01 Thread Eric 
headline  is wrong. it  should be  "rockchip: video: refactor rk_vop and 
split RK3288-specific code off



On 2017年05月31日 23:59, Philipp Tomsich wrote:

To prepare for adding the RK3399 VOP driver (which shares most of its
registers and config logic with the RK3228 VOP), this change refactors
the driver and splits the RK3288-specific driver off.

The changes in detail are:
- introduces a data-structure for chip-specific drivers to register
   features/callbacks with the common driver: at this time, this is
   limited to a callback for setting the pin polarities (between the
   VOP and the encoder modules) and a flag to signal 10bit RGB
   capability
- refactors the probing of regulators into a helper function that
   can take a list of regulator names to probe and autoset
- moves the priv data-structure into a (common) header file to be
   used by the chip-specific drivers to provide base addresses to
   the common driver
- uses a callback into the chip-specific driver to set pin polarities
   (replacing the direct register accesses previously used)
- splits enabling the output (towards an encoder) into a separate
   help function withint the common driver

Signed-off-by: Philipp Tomsich 

---

Changes in v4:
- added to break down into smaller changes

Changes in v3: None
Changes in v2: None

  arch/arm/include/asm/arch-rockchip/vop_rk3288.h |   1 +
  drivers/video/rockchip/Makefile |   1 +
  drivers/video/rockchip/rk3288_vop.c |  95 +
  drivers/video/rockchip/rk_vop.c | 182 
  drivers/video/rockchip/rk_vop.h |  32 +
  5 files changed, 217 insertions(+), 94 deletions(-)
  create mode 100644 drivers/video/rockchip/rk3288_vop.c
  create mode 100644 drivers/video/rockchip/rk_vop.h

diff --git a/arch/arm/include/asm/arch-rockchip/vop_rk3288.h 
b/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
index d5599ec..049f192 100644
--- a/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
@@ -197,6 +197,7 @@ enum vop_modes {
  #define V_DSP_DEN_POL(x)   (((x) & 1) << 6)
  #define V_DSP_VSYNC_POL(x) (((x) & 1) << 5)
  #define V_DSP_HSYNC_POL(x) (((x) & 1) << 4)
+#define V_DSP_PIN_POL(x)   (((x) & 0xf) << 4)
  #define V_DSP_OUT_MODE(x)  ((x) & 0xf)
  
  /* VOP_DSP_CTRL1 */

diff --git a/drivers/video/rockchip/Makefile b/drivers/video/rockchip/Makefile
index cd54b12..9477ad0 100644
--- a/drivers/video/rockchip/Makefile
+++ b/drivers/video/rockchip/Makefile
@@ -7,6 +7,7 @@
  
  ifdef CONFIG_VIDEO_ROCKCHIP

  obj-y += rk_vop.o
+obj-$(CONFIG_ROCKCHIP_RK3288) += rk3288_vop.o
  obj-$(CONFIG_DISPLAY_ROCKCHIP_EDP) += rk_edp.o
  obj-$(CONFIG_DISPLAY_ROCKCHIP_LVDS) += rk_lvds.o
  obj-$(CONFIG_DISPLAY_ROCKCHIP_HDMI) += rk_hdmi.o
diff --git a/drivers/video/rockchip/rk3288_vop.c 
b/drivers/video/rockchip/rk3288_vop.c
new file mode 100644
index 000..e3e1ec7
--- /dev/null
+++ b/drivers/video/rockchip/rk3288_vop.c
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2017 Theobroma Systems Design und Consulting GmbH
+ * Copyright (c) 2015 Google, Inc
+ * Copyright 2014 Rockchip Inc.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include "rk_vop.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static void rk3288_set_pin_polarity(struct udevice *dev,
+   enum vop_modes mode, u32 polarity)
+{
+   struct rk_vop_priv *priv = dev_get_priv(dev);
+   struct rk3288_vop *regs = priv->regs;
+
+   /* The RK3328 VOP (v3.1) has its polarity configuration in ctrl0 */
+   clrsetbits_le32(>dsp_ctrl0,
+   M_DSP_DCLK_POL | M_DSP_DEN_POL |
+   M_DSP_VSYNC_POL | M_DSP_HSYNC_POL,
+   V_DSP_PIN_POL(polarity));
+}
+
+static void rk3288_set_io_vsel(struct udevice *dev)
+{
+   struct rk3288_grf *grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF);
+
+   /* lcdc(vop) iodomain select 1.8V */
+   rk_setreg(>io_vsel, 1 << 0);
+}
+
+/*
+ * Try some common regulators. We should really get these from the
+ * device tree somehow.
+ */
+static const char * const rk3288_regulator_names[] = {
+   "vcc18_lcd",
+   "VCC18_LCD",
+   "vdd10_lcd_pwren_h",
+   "vdd10_lcd",
+   "VDD10_LCD",
+   "vcc33_lcd"
+};
+
+static int rk3288_vop_probe(struct udevice *dev)
+{
+   /* Before relocation we don't need to do anything */
+   if (!(gd->flags & GD_FLG_RELOC))
+   return 0;
+
+   /* Set the LCDC(vop) iodomain to 1.8V */
+   rk3288_set_io_vsel(dev);
+
+   /* Probe regulators required for the RK3288 VOP */
+   rk_vop_probe_regulators(dev, rk3288_regulator_names,
+   ARRAY_SIZE(rk3288_regulator_names));
+
+   return rk_vop_probe(dev);
+}
+
+struct

Re: [U-Boot] [PATCH v4 3/9] rockchip: video: refactor rk_vop and split RK3328-specific code off

2017-06-01 Thread Simon Glass 
On 31 May 2017 at 09:59, Philipp Tomsich
 wrote:
> To prepare for adding the RK3399 VOP driver (which shares most of its
> registers and config logic with the RK3228 VOP), this change refactors
> the driver and splits the RK3288-specific driver off.
>
> The changes in detail are:
> - introduces a data-structure for chip-specific drivers to register
>   features/callbacks with the common driver: at this time, this is
>   limited to a callback for setting the pin polarities (between the
>   VOP and the encoder modules) and a flag to signal 10bit RGB
>   capability
> - refactors the probing of regulators into a helper function that
>   can take a list of regulator names to probe and autoset
> - moves the priv data-structure into a (common) header file to be
>   used by the chip-specific drivers to provide base addresses to
>   the common driver
> - uses a callback into the chip-specific driver to set pin polarities
>   (replacing the direct register accesses previously used)
> - splits enabling the output (towards an encoder) into a separate
>   help function withint the common driver
>
> Signed-off-by: Philipp Tomsich 
>
> ---
>
> Changes in v4:
> - added to break down into smaller changes
>
> Changes in v3: None
> Changes in v2: None
>
>  arch/arm/include/asm/arch-rockchip/vop_rk3288.h |   1 +
>  drivers/video/rockchip/Makefile |   1 +
>  drivers/video/rockchip/rk3288_vop.c |  95 +
>  drivers/video/rockchip/rk_vop.c | 182 
> 
>  drivers/video/rockchip/rk_vop.h |  32 +
>  5 files changed, 217 insertions(+), 94 deletions(-)
>  create mode 100644 drivers/video/rockchip/rk3288_vop.c
>  create mode 100644 drivers/video/rockchip/rk_vop.h

Reviewed-by: Simon Glass 

But please comment the functions in the header files:

> +
> +int rk_vop_probe(struct udevice *dev);
> +int rk_vop_bind(struct udevice *dev);
> +void rk_vop_probe_regulators(struct udevice *dev,
> +const char * const *names, int cnt);
> +
> +#endif
> --
> 1.9.1
>
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

[U-Boot] [PATCH v4 3/9] rockchip: video: refactor rk_vop and split RK3328-specific code off

2017-05-31 Thread Philipp Tomsich 
To prepare for adding the RK3399 VOP driver (which shares most of its
registers and config logic with the RK3228 VOP), this change refactors
the driver and splits the RK3288-specific driver off.

The changes in detail are:
- introduces a data-structure for chip-specific drivers to register
  features/callbacks with the common driver: at this time, this is
  limited to a callback for setting the pin polarities (between the
  VOP and the encoder modules) and a flag to signal 10bit RGB
  capability
- refactors the probing of regulators into a helper function that
  can take a list of regulator names to probe and autoset
- moves the priv data-structure into a (common) header file to be
  used by the chip-specific drivers to provide base addresses to
  the common driver
- uses a callback into the chip-specific driver to set pin polarities
  (replacing the direct register accesses previously used)
- splits enabling the output (towards an encoder) into a separate
  help function withint the common driver

Signed-off-by: Philipp Tomsich 

---

Changes in v4:
- added to break down into smaller changes

Changes in v3: None
Changes in v2: None

 arch/arm/include/asm/arch-rockchip/vop_rk3288.h |   1 +
 drivers/video/rockchip/Makefile |   1 +
 drivers/video/rockchip/rk3288_vop.c |  95 +
 drivers/video/rockchip/rk_vop.c | 182 
 drivers/video/rockchip/rk_vop.h |  32 +
 5 files changed, 217 insertions(+), 94 deletions(-)
 create mode 100644 drivers/video/rockchip/rk3288_vop.c
 create mode 100644 drivers/video/rockchip/rk_vop.h

diff --git a/arch/arm/include/asm/arch-rockchip/vop_rk3288.h 
b/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
index d5599ec..049f192 100644
--- a/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/vop_rk3288.h
@@ -197,6 +197,7 @@ enum vop_modes {
 #define V_DSP_DEN_POL(x)   (((x) & 1) << 6)
 #define V_DSP_VSYNC_POL(x) (((x) & 1) << 5)
 #define V_DSP_HSYNC_POL(x) (((x) & 1) << 4)
+#define V_DSP_PIN_POL(x)   (((x) & 0xf) << 4)
 #define V_DSP_OUT_MODE(x)  ((x) & 0xf)
 
 /* VOP_DSP_CTRL1 */
diff --git a/drivers/video/rockchip/Makefile b/drivers/video/rockchip/Makefile
index cd54b12..9477ad0 100644
--- a/drivers/video/rockchip/Makefile
+++ b/drivers/video/rockchip/Makefile
@@ -7,6 +7,7 @@
 
 ifdef CONFIG_VIDEO_ROCKCHIP
 obj-y += rk_vop.o
+obj-$(CONFIG_ROCKCHIP_RK3288) += rk3288_vop.o
 obj-$(CONFIG_DISPLAY_ROCKCHIP_EDP) += rk_edp.o
 obj-$(CONFIG_DISPLAY_ROCKCHIP_LVDS) += rk_lvds.o
 obj-$(CONFIG_DISPLAY_ROCKCHIP_HDMI) += rk_hdmi.o
diff --git a/drivers/video/rockchip/rk3288_vop.c 
b/drivers/video/rockchip/rk3288_vop.c
new file mode 100644
index 000..e3e1ec7
--- /dev/null
+++ b/drivers/video/rockchip/rk3288_vop.c
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2017 Theobroma Systems Design und Consulting GmbH
+ * Copyright (c) 2015 Google, Inc
+ * Copyright 2014 Rockchip Inc.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include "rk_vop.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static void rk3288_set_pin_polarity(struct udevice *dev,
+   enum vop_modes mode, u32 polarity)
+{
+   struct rk_vop_priv *priv = dev_get_priv(dev);
+   struct rk3288_vop *regs = priv->regs;
+
+   /* The RK3328 VOP (v3.1) has its polarity configuration in ctrl0 */
+   clrsetbits_le32(>dsp_ctrl0,
+   M_DSP_DCLK_POL | M_DSP_DEN_POL |
+   M_DSP_VSYNC_POL | M_DSP_HSYNC_POL,
+   V_DSP_PIN_POL(polarity));
+}
+
+static void rk3288_set_io_vsel(struct udevice *dev)
+{
+   struct rk3288_grf *grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF);
+
+   /* lcdc(vop) iodomain select 1.8V */
+   rk_setreg(>io_vsel, 1 << 0);
+}
+
+/*
+ * Try some common regulators. We should really get these from the
+ * device tree somehow.
+ */
+static const char * const rk3288_regulator_names[] = {
+   "vcc18_lcd",
+   "VCC18_LCD",
+   "vdd10_lcd_pwren_h",
+   "vdd10_lcd",
+   "VDD10_LCD",
+   "vcc33_lcd"
+};
+
+static int rk3288_vop_probe(struct udevice *dev)
+{
+   /* Before relocation we don't need to do anything */
+   if (!(gd->flags & GD_FLG_RELOC))
+   return 0;
+
+   /* Set the LCDC(vop) iodomain to 1.8V */
+   rk3288_set_io_vsel(dev);
+
+   /* Probe regulators required for the RK3288 VOP */
+   rk_vop_probe_regulators(dev, rk3288_regulator_names,
+   ARRAY_SIZE(rk3288_regulator_names));
+
+   return rk_vop_probe(dev);
+}
+
+struct rkvop_driverdata rk3288_driverdata = {
+   .features = VOP_FEATURE_OUTPUT_10BIT,
+   .set_pin_polarity = rk3288_set_pin_polarity,
+};
+
+static const struct udevice_id