lkml.org 
[lkml]   [2018]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v3 01/10] video: stm32: stm32_ltdc: update debug log
Date
Replace  macro debug by pr_error, pr_warn or pr_info.

Signed-off-by: yannick fertre <yannick.fertre@st.com>
---
drivers/video/stm32/stm32_ltdc.c | 67 ++++++++++++++++++----------------------
1 file changed, 30 insertions(+), 37 deletions(-)

diff --git a/drivers/video/stm32/stm32_ltdc.c b/drivers/video/stm32/stm32_ltdc.c
index bd9c0de..3e12c71 100644
--- a/drivers/video/stm32/stm32_ltdc.c
+++ b/drivers/video/stm32/stm32_ltdc.c
@@ -5,7 +5,6 @@
*
* SPDX-License-Identifier: GPL-2.0+
*/
-
#include <common.h>
#include <clk.h>
#include <display.h>
@@ -13,12 +12,10 @@
#include <panel.h>
#include <reset.h>
#include <video.h>
+#include <video_bridge.h>
#include <asm/io.h>
#include <asm/arch/gpio.h>
#include <dm/device-internal.h>
-#include <video_bridge.h>
-
-DECLARE_GLOBAL_DATA_PTR;

struct stm32_ltdc_priv {
void __iomem *regs;
@@ -176,13 +173,13 @@ static u32 stm32_ltdc_get_pixel_format(enum video_log2_bpp l2bpp)
case VIDEO_BPP2:
case VIDEO_BPP4:
default:
- debug("%s: warning %dbpp not supported yet, %dbpp instead\n",
- __func__, VNBITS(l2bpp), VNBITS(VIDEO_BPP16));
+ pr_warn("warning %dbpp not supported yet, %dbpp instead\n",
+ VNBITS(l2bpp), VNBITS(VIDEO_BPP16));
pf = PF_RGB565;
break;
}

- debug("%s: %d bpp -> ltdc pf %d\n", __func__, VNBITS(l2bpp), pf);
+ pr_info("%d bpp -> ltdc pf %d\n", VNBITS(l2bpp), pf);

return (u32)pf;
}
@@ -249,7 +246,7 @@ static void stm32_ltdc_set_mode(struct stm32_ltdc_priv *priv,

/* Signal polarities */
val = 0;
- debug("%s: timing->flags 0x%08x\n", __func__, timings->flags);
+ dev_info(dev, "timing->flags 0x%08x\n", timings->flags);
if (timings->flags & DISPLAY_FLAGS_HSYNC_HIGH)
val |= GCR_HSPOL;
if (timings->flags & DISPLAY_FLAGS_VSYNC_HIGH)
@@ -343,26 +340,25 @@ static int stm32_ltdc_probe(struct udevice *dev)

priv->regs = (void *)dev_read_addr(dev);
if ((fdt_addr_t)priv->regs == FDT_ADDR_T_NONE) {
- debug("%s: ltdc dt register address error\n", __func__);
+ dev_err(dev, "ltdc dt register address error\n");
return -EINVAL;
}

ret = clk_get_by_index(dev, 0, &pclk);
if (ret) {
- debug("%s: peripheral clock get error %d\n", __func__, ret);
+ dev_err(dev, "peripheral clock get error %d\n", ret);
return ret;
}

ret = clk_enable(&pclk);
if (ret) {
- debug("%s: peripheral clock enable error %d\n",
- __func__, ret);
+ dev_err(dev, "peripheral clock enable error %d\n", ret);
return ret;
}

ret = reset_get_by_index(dev, 0, &rst);
if (ret) {
- debug("%s: missing ltdc hardware reset\n", __func__);
+ dev_err(dev, "missing ltdc hardware reset\n");
return -ENODEV;
}

@@ -371,42 +367,39 @@ static int stm32_ltdc_probe(struct udevice *dev)

#ifdef CONFIG_VIDEO_BRIDGE
ret = uclass_get_device(UCLASS_VIDEO_BRIDGE, 0, &bridge);
- if (ret) {
- debug("%s: No video bridge, or no backlight on bridge\n",
- __func__);
- }
+ if (ret)
+ dev_info(dev, "No video bridge, or no backlight on bridge\n");

if (bridge) {
ret = video_bridge_attach(bridge);
if (ret) {
- debug("%s: fail to attach bridge\n", __func__);
+ dev_err(dev, "fail to attach bridge\n");
return ret;
}
}
#endif
ret = uclass_first_device(UCLASS_PANEL, &panel);
if (ret) {
- debug("%s: panel device error %d\n", __func__, ret);
+ dev_err(dev, "panel device error %d\n", ret);
return ret;
}

ret = fdtdec_decode_display_timing(gd->fdt_blob, dev_of_offset(panel),
0, &timings);
if (ret) {
- debug("%s: decode display timing error %d\n",
- __func__, ret);
+ dev_err(dev, "decode display timing error %d\n", ret);
return ret;
}

rate = clk_set_rate(&pclk, timings.pixelclock.typ);
if (rate < 0) {
- debug("%s: fail to set pixel clock %d hz %d hz\n",
- __func__, timings.pixelclock.typ, rate);
+ dev_err(dev, "fail to set pixel clock %d hz %d hz\n",
+ timings.pixelclock.typ, rate);
return rate;
}

- debug("%s: Set pixel clock req %d hz get %d hz\n", __func__,
- timings.pixelclock.typ, rate);
+ dev_info(dev, "set pixel clock req %d hz get %d hz\n",
+ timings.pixelclock.typ, rate);

/* TODO Below parameters are hard-coded for the moment... */
priv->l2bpp = VIDEO_BPP16;
@@ -417,12 +410,12 @@ static int stm32_ltdc_probe(struct udevice *dev)
priv->crop_h = timings.vactive.typ;
priv->alpha = 0xFF;

- debug("%s: %dx%d %dbpp frame buffer at 0x%lx\n", __func__,
- timings.hactive.typ, timings.vactive.typ,
- VNBITS(priv->l2bpp), uc_plat->base);
- debug("%s: crop %d,%d %dx%d bg 0x%08x alpha %d\n", __func__,
- priv->crop_x, priv->crop_y, priv->crop_w, priv->crop_h,
- priv->bg_col_argb, priv->alpha);
+ dev_info(dev, "%dx%d %dbpp frame buffer at 0x%lx\n",
+ timings.hactive.typ, timings.vactive.typ,
+ VNBITS(priv->l2bpp), uc_plat->base);
+ dev_info(dev, "crop %d,%d %dx%d bg 0x%08x alpha %d\n",
+ priv->crop_x, priv->crop_y, priv->crop_w, priv->crop_h,
+ priv->bg_col_argb, priv->alpha);

/* Configure & start LTDC */
stm32_ltdc_set_mode(priv, &timings);
@@ -437,22 +430,22 @@ static int stm32_ltdc_probe(struct udevice *dev)
if (bridge) {
ret = video_bridge_set_backlight(bridge, 80);
if (ret) {
- debug("%s: fail to set backlight\n", __func__);
+ dev_err(dev, "fail to set backlight\n");
return ret;
}
} else {
ret = panel_enable_backlight(panel);
if (ret) {
- debug("%s: panel %s enable backlight error %d\n",
- __func__, panel->name, ret);
+ dev_err(dev, "panel %s enable backlight error %d\n",
+ panel->name, ret);
return ret;
}
}
#else
ret = panel_enable_backlight(panel);
if (ret) {
- debug("%s: panel %s enable backlight error %d\n",
- __func__, panel->name, ret);
+ dev_err(dev, "panel %s enable backlight error %d\n",
+ panel->name, ret);
return ret;
}
#endif
@@ -468,7 +461,7 @@ static int stm32_ltdc_bind(struct udevice *dev)
uc_plat->size = CONFIG_VIDEO_STM32_MAX_XRES *
CONFIG_VIDEO_STM32_MAX_YRES *
(CONFIG_VIDEO_STM32_MAX_BPP >> 3);
- debug("%s: frame buffer max size %d bytes\n", __func__, uc_plat->size);
+ dev_info(dev, "frame buffer max size %d bytes\n", uc_plat->size);

return 0;
}
--
1.9.1
\
 
 \ /
  Last update: 2018-03-13 14:59    [W:0.074 / U:3.872 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site