[U-Boot] [PATCH 0/2] Enable video in the rk3399-puma defconfig (includes rk_hdmi.c fix for compile warning)

[U-Boot] [PATCH 0/2] Enable video in the rk3399-puma defconfig (includes rk_hdmi.c fix for compile warning)

[Philipp Tomsich]

If our defconfig update to enable HDMI output for the RK3399-Q7 is
applied before my patch-series refactoring the rk_hdmi/rk_vop and
adding RK3399 support, compilers will raise warnings due to a missing
include-directive in the original rk_hdmi.c.

As the VOP/HDMI changes are propagating through Anatolij's tree and
the defconfig update through Simon's tree, this series bundles a fix
for the older rk_hdmi.c version with the defconfig update to allow
these changesets to be applied in any order.


Changes in v3:
- adds an include-directive to the (pre-RK3399 enabled) rk_hdmi to
  fix implicit definition warnings

Changes in v2:
- enable CMD_BMP in the puma-rk3399_defconfig (following a rebase to
  the upstream master after CMD_BMP was migrate to Kconfig)

Philipp Tomsich (2):
  rockchip: video: rk_hdmi: fix implicit definition warnings
  rockchip: defconfig: puma-rk3399: update defconfig with video-support

 configs/puma-rk3399_defconfig    | 8 ++++++++
 drivers/video/rockchip/rk_hdmi.c | 1 +
 2 files changed, 9 insertions(+)

-- 
1.9.1

[U-Boot] [PATCH 1/2] rockchip: video: rk_hdmi: fix implicit definition warnings

[Philipp Tomsich]

When enabling CONFIG_DISPLAY_ROCKCHIP_HDMI, compile-time warning for
the following implicitly defined functions are raised due to a missing
include directive:

  drivers/video/rockchip/rk_hdmi.c: In function 'rk_hdmi_probe':
  drivers/video/rockchip/rk_hdmi.c:150:2: warning: implicit declaration of function 'rk_setreg' [-Wimplicit-function-declaration]
    rk_setreg(&priv->grf->soc_con6, 1 << 15);
    ^~~~~~~~~
  drivers/video/rockchip/rk_hdmi.c:153:2: warning: implicit declaration of function 'rk_clrsetreg' [-Wimplicit-function-declaration]
    rk_clrsetreg(&priv->grf->soc_con6, 1 << 4,
    ^~~~~~~~~~~~

This change fixes this by including <asm/hardware.h> in rk_hdmi.c.

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

---

Changes in v3:
- adds an include-directive to the (pre-RK3399 enabled) rk_hdmi to
  fix implicit definition warnings

Changes in v2: None

 drivers/video/rockchip/rk_hdmi.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/video/rockchip/rk_hdmi.c b/drivers/video/rockchip/rk_hdmi.c
index cd695ca..0479d6e 100644
--- a/drivers/video/rockchip/rk_hdmi.c
+++ b/drivers/video/rockchip/rk_hdmi.c
@@ -14,6 +14,7 @@
 #include <regmap.h>
 #include <syscon.h>
 #include <asm/gpio.h>
+#include <asm/hardware.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/grf_rk3288.h>
-- 
1.9.1

[U-Boot] [PATCH 2/2] rockchip: defconfig: puma-rk3399: update defconfig with video-support

[Philipp Tomsich]

With HDMI output for the RK3399 working, this update the RK3399-Q7
(Puma) defconfig for the new functionality:
1. enables PMIC command (to check if the HDMI voltages are correct)
      +CONFIG_CMD_PMIC=y
      +CONFIG_CMD_REGULATOR=y
2. enables video-output (via HDMI)
      +CONFIG_DM_VIDEO=y
      +CONFIG_DISPLAY=y
      +CONFIG_VIDEO_ROCKCHIP=y
      +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
3. turns on the 'dcache'-command (for a dcache flush) for our QA to
   fill the framebuffer using 'mw.l'
      +CONFIG_CMD_CACHE=y
4. turns on the 'bmp'-command
      +CONFIG_CMD_BMP=y

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

---

Changes in v3: None
Changes in v2:
- enable CMD_BMP in the puma-rk3399_defconfig (following a rebase to
  the upstream master after CMD_BMP was migrate to Kconfig)

 configs/puma-rk3399_defconfig | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig
index 577aa02..52fec39 100644
--- a/configs/puma-rk3399_defconfig
+++ b/configs/puma-rk3399_defconfig
@@ -26,7 +26,11 @@ CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_BMP=y
+CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
+CONFIG_CMD_PMIC=y
+CONFIG_CMD_REGULATOR=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_REGMAP=y
@@ -74,4 +78,8 @@ CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_STORAGE=y
+CONFIG_DM_VIDEO=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
 CONFIG_ERRNO_STR=y
-- 
1.9.1

[U-Boot] [PATCH 1/2] rockchip: video: rk_hdmi: fix implicit definition warnings

[Simon Glass]

On 6 June 2017 at 01:15, Philipp Tomsich
<philipp.tomsich@theobroma-systems.com> wrote:
> When enabling CONFIG_DISPLAY_ROCKCHIP_HDMI, compile-time warning for
> the following implicitly defined functions are raised due to a missing
> include directive:
>
>   drivers/video/rockchip/rk_hdmi.c: In function 'rk_hdmi_probe':
>   drivers/video/rockchip/rk_hdmi.c:150:2: warning: implicit declaration of function 'rk_setreg' [-Wimplicit-function-declaration]
>     rk_setreg(&priv->grf->soc_con6, 1 << 15);
>     ^~~~~~~~~
>   drivers/video/rockchip/rk_hdmi.c:153:2: warning: implicit declaration of function 'rk_clrsetreg' [-Wimplicit-function-declaration]
>     rk_clrsetreg(&priv->grf->soc_con6, 1 << 4,
>     ^~~~~~~~~~~~
>
> This change fixes this by including <asm/hardware.h> in rk_hdmi.c.
>
> Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
>
> ---
>
> Changes in v3:
> - adds an include-directive to the (pre-RK3399 enabled) rk_hdmi to
>   fix implicit definition warnings
>
> Changes in v2: None
>
>  drivers/video/rockchip/rk_hdmi.c | 1 +
>  1 file changed, 1 insertion(+)

Acked-by: Simon Glass <sjg@chromium.org>

[U-Boot] [PATCH 2/2] rockchip: defconfig: puma-rk3399: update defconfig with video-support

[Simon Glass]

On 6 June 2017 at 01:15, Philipp Tomsich
<philipp.tomsich@theobroma-systems.com> wrote:
> With HDMI output for the RK3399 working, this update the RK3399-Q7
> (Puma) defconfig for the new functionality:
> 1. enables PMIC command (to check if the HDMI voltages are correct)
>       +CONFIG_CMD_PMIC=y
>       +CONFIG_CMD_REGULATOR=y
> 2. enables video-output (via HDMI)
>       +CONFIG_DM_VIDEO=y
>       +CONFIG_DISPLAY=y
>       +CONFIG_VIDEO_ROCKCHIP=y
>       +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> 3. turns on the 'dcache'-command (for a dcache flush) for our QA to
>    fill the framebuffer using 'mw.l'
>       +CONFIG_CMD_CACHE=y
> 4. turns on the 'bmp'-command
>       +CONFIG_CMD_BMP=y
>
> Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
>
> ---
>
> Changes in v3: None
> Changes in v2:
> - enable CMD_BMP in the puma-rk3399_defconfig (following a rebase to
>   the upstream master after CMD_BMP was migrate to Kconfig)
>
>  configs/puma-rk3399_defconfig | 8 ++++++++
>  1 file changed, 8 insertions(+)

Acked-by: Simon Glass <sjg@chromium.org>

[U-Boot] [PATCH 2/2] rockchip: defconfig: puma-rk3399: update defconfig with video-support

[sjg at google.com]

On 6 June 2017 at 01:15, Philipp Tomsich
<philipp.tomsich@theobroma-systems.com> wrote:
> With HDMI output for the RK3399 working, this update the RK3399-Q7
> (Puma) defconfig for the new functionality:
> 1. enables PMIC command (to check if the HDMI voltages are correct)
>       +CONFIG_CMD_PMIC=y
>       +CONFIG_CMD_REGULATOR=y
> 2. enables video-output (via HDMI)
>       +CONFIG_DM_VIDEO=y
>       +CONFIG_DISPLAY=y
>       +CONFIG_VIDEO_ROCKCHIP=y
>       +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> 3. turns on the 'dcache'-command (for a dcache flush) for our QA to
>    fill the framebuffer using 'mw.l'
>       +CONFIG_CMD_CACHE=y
> 4. turns on the 'bmp'-command
>       +CONFIG_CMD_BMP=y
>
> Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
>
> ---
>
> Changes in v3: None
> Changes in v2:
> - enable CMD_BMP in the puma-rk3399_defconfig (following a rebase to
>   the upstream master after CMD_BMP was migrate to Kconfig)
>
>  configs/puma-rk3399_defconfig | 8 ++++++++
>  1 file changed, 8 insertions(+)

Acked-by: Simon Glass <sjg@chromium.org>

Applied to u-boot-rockchip, thanks!

[U-Boot] [PATCH 1/2] rockchip: video: rk_hdmi: fix implicit definition warnings

[sjg at google.com]

On 6 June 2017 at 01:15, Philipp Tomsich
<philipp.tomsich@theobroma-systems.com> wrote:
> When enabling CONFIG_DISPLAY_ROCKCHIP_HDMI, compile-time warning for
> the following implicitly defined functions are raised due to a missing
> include directive:
>
>   drivers/video/rockchip/rk_hdmi.c: In function 'rk_hdmi_probe':
>   drivers/video/rockchip/rk_hdmi.c:150:2: warning: implicit declaration of function 'rk_setreg' [-Wimplicit-function-declaration]
>     rk_setreg(&priv->grf->soc_con6, 1 << 15);
>     ^~~~~~~~~
>   drivers/video/rockchip/rk_hdmi.c:153:2: warning: implicit declaration of function 'rk_clrsetreg' [-Wimplicit-function-declaration]
>     rk_clrsetreg(&priv->grf->soc_con6, 1 << 4,
>     ^~~~~~~~~~~~
>
> This change fixes this by including <asm/hardware.h> in rk_hdmi.c.
>
> Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
>
> ---
>
> Changes in v3:
> - adds an include-directive to the (pre-RK3399 enabled) rk_hdmi to
>   fix implicit definition warnings
>
> Changes in v2: None
>
>  drivers/video/rockchip/rk_hdmi.c | 1 +
>  1 file changed, 1 insertion(+)

Acked-by: Simon Glass <sjg@chromium.org>

Applied to u-boot-rockchip, thanks!