summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/pl111/pl111_versatile.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/pl111/pl111_versatile.c')
-rw-r--r--drivers/gpu/drm/pl111/pl111_versatile.c53
1 files changed, 27 insertions, 26 deletions
diff --git a/drivers/gpu/drm/pl111/pl111_versatile.c b/drivers/gpu/drm/pl111/pl111_versatile.c
index 5f460b296c0c..0d8331a3909f 100644
--- a/drivers/gpu/drm/pl111/pl111_versatile.c
+++ b/drivers/gpu/drm/pl111/pl111_versatile.c
@@ -20,6 +20,7 @@
#include <linux/vexpress.h>
#include <drm/drm_fourcc.h>
+#include <drm/drm_print.h>
#include "pl111_versatile.h"
#include "pl111_drm.h"
@@ -116,7 +117,7 @@ static void pl111_integrator_enable(struct drm_device *drm, u32 format)
{
u32 val;
- dev_info(drm->dev, "enable Integrator CLCD connectors\n");
+ drm_info(drm, "enable Integrator CLCD connectors\n");
/* FIXME: really needed? */
val = INTEGRATOR_CLCD_LCD_STATIC1 | INTEGRATOR_CLCD_LCD_STATIC2 |
@@ -134,7 +135,7 @@ static void pl111_integrator_enable(struct drm_device *drm, u32 format)
val |= INTEGRATOR_CLCD_LCDMUX_VGA555;
break;
default:
- dev_err(drm->dev, "unhandled format on Integrator 0x%08x\n",
+ drm_err(drm, "unhandled format on Integrator 0x%08x\n",
format);
break;
}
@@ -156,7 +157,7 @@ static void pl111_impd1_enable(struct drm_device *drm, u32 format)
{
u32 val;
- dev_info(drm->dev, "enable IM-PD1 CLCD connectors\n");
+ drm_info(drm, "enable IM-PD1 CLCD connectors\n");
val = IMPD1_CTRL_DISP_VGA | IMPD1_CTRL_DISP_ENABLE;
regmap_update_bits(versatile_syscon_map,
@@ -167,7 +168,7 @@ static void pl111_impd1_enable(struct drm_device *drm, u32 format)
static void pl111_impd1_disable(struct drm_device *drm)
{
- dev_info(drm->dev, "disable IM-PD1 CLCD connectors\n");
+ drm_info(drm, "disable IM-PD1 CLCD connectors\n");
regmap_update_bits(versatile_syscon_map,
IMPD1_CTRL_OFFSET,
@@ -194,7 +195,7 @@ static void pl111_impd1_disable(struct drm_device *drm)
static void pl111_versatile_disable(struct drm_device *drm)
{
- dev_info(drm->dev, "disable Versatile CLCD connectors\n");
+ drm_info(drm, "disable Versatile CLCD connectors\n");
regmap_update_bits(versatile_syscon_map,
SYS_CLCD,
SYS_CLCD_CONNECTOR_MASK,
@@ -205,7 +206,7 @@ static void pl111_versatile_enable(struct drm_device *drm, u32 format)
{
u32 val = 0;
- dev_info(drm->dev, "enable Versatile CLCD connectors\n");
+ drm_info(drm, "enable Versatile CLCD connectors\n");
switch (format) {
case DRM_FORMAT_ABGR8888:
@@ -227,7 +228,7 @@ static void pl111_versatile_enable(struct drm_device *drm, u32 format)
val |= SYS_CLCD_MODE_5551;
break;
default:
- dev_err(drm->dev, "unhandled format on Versatile 0x%08x\n",
+ drm_err(drm, "unhandled format on Versatile 0x%08x\n",
format);
break;
}
@@ -247,7 +248,7 @@ static void pl111_versatile_enable(struct drm_device *drm, u32 format)
static void pl111_realview_clcd_disable(struct drm_device *drm)
{
- dev_info(drm->dev, "disable RealView CLCD connectors\n");
+ drm_info(drm, "disable RealView CLCD connectors\n");
regmap_update_bits(versatile_syscon_map,
SYS_CLCD,
SYS_CLCD_CONNECTOR_MASK,
@@ -256,7 +257,7 @@ static void pl111_realview_clcd_disable(struct drm_device *drm)
static void pl111_realview_clcd_enable(struct drm_device *drm, u32 format)
{
- dev_info(drm->dev, "enable RealView CLCD connectors\n");
+ drm_info(drm, "enable RealView CLCD connectors\n");
regmap_update_bits(versatile_syscon_map,
SYS_CLCD,
SYS_CLCD_CONNECTOR_MASK,
@@ -376,7 +377,7 @@ static const struct pl111_variant_data pl111_vexpress = {
#define VEXPRESS_FPGAMUX_DAUGHTERBOARD_1 0x01
#define VEXPRESS_FPGAMUX_DAUGHTERBOARD_2 0x02
-static int pl111_vexpress_clcd_init(struct device *dev, struct device_node *np,
+static int pl111_vexpress_clcd_init(struct drm_device *dev, struct device_node *np,
struct pl111_drm_dev_private *priv)
{
struct platform_device *pdev;
@@ -433,22 +434,22 @@ static int pl111_vexpress_clcd_init(struct device *dev, struct device_node *np,
mux_motherboard = false;
if (mux_motherboard) {
- dev_info(dev, "DVI muxed to motherboard CLCD\n");
+ drm_info(dev, "DVI muxed to motherboard CLCD\n");
val = VEXPRESS_FPGAMUX_MOTHERBOARD;
- } else if (ct_clcd == dev->of_node) {
- dev_info(dev,
+ } else if (ct_clcd == dev->dev->of_node) {
+ drm_info(dev,
"DVI muxed to daughterboard 1 (core tile) CLCD\n");
val = VEXPRESS_FPGAMUX_DAUGHTERBOARD_1;
} else {
- dev_info(dev, "core tile graphics present\n");
- dev_info(dev, "this device will be deactivated\n");
+ drm_info(dev, "core tile graphics present\n");
+ drm_info(dev, "this device will be deactivated\n");
return -ENODEV;
}
/* Call into deep Vexpress configuration API */
pdev = of_find_device_by_node(np);
if (!pdev) {
- dev_err(dev, "can't find the sysreg device, deferring\n");
+ drm_err(dev, "can't find the sysreg device, deferring\n");
return -EPROBE_DEFER;
}
@@ -461,17 +462,17 @@ static int pl111_vexpress_clcd_init(struct device *dev, struct device_node *np,
ret = regmap_write(map, 0, val);
platform_device_put(pdev);
if (ret) {
- dev_err(dev, "error setting DVI muxmode\n");
+ drm_err(dev, "error setting DVI muxmode\n");
return -ENODEV;
}
priv->variant = &pl111_vexpress;
- dev_info(dev, "initializing Versatile Express PL111\n");
+ drm_info(dev, "initializing Versatile Express PL111\n");
return 0;
}
-int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv)
+int pl111_versatile_init(struct drm_device *dev, struct pl111_drm_dev_private *priv)
{
const struct of_device_id *clcd_id;
enum versatile_clcd versatile_clcd_type;
@@ -492,7 +493,7 @@ int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv)
int ret = pl111_vexpress_clcd_init(dev, np, priv);
of_node_put(np);
if (ret)
- dev_err(dev, "Versatile Express init failed - %d", ret);
+ drm_err(dev, "Versatile Express init failed - %d", ret);
return ret;
}
@@ -511,7 +512,7 @@ int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv)
map = syscon_node_to_regmap(np);
of_node_put(np);
if (IS_ERR(map)) {
- dev_err(dev, "no Versatile syscon regmap\n");
+ drm_err(dev, "no Versatile syscon regmap\n");
return PTR_ERR(map);
}
@@ -520,14 +521,14 @@ int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv)
versatile_syscon_map = map;
priv->variant = &pl110_integrator;
priv->variant_display_enable = pl111_integrator_enable;
- dev_info(dev, "set up callbacks for Integrator PL110\n");
+ drm_info(dev, "set up callbacks for Integrator PL110\n");
break;
case INTEGRATOR_IMPD1:
versatile_syscon_map = map;
priv->variant = &pl110_impd1;
priv->variant_display_enable = pl111_impd1_enable;
priv->variant_display_disable = pl111_impd1_disable;
- dev_info(dev, "set up callbacks for IM-PD1 PL110\n");
+ drm_info(dev, "set up callbacks for IM-PD1 PL110\n");
break;
case VERSATILE_CLCD:
versatile_syscon_map = map;
@@ -542,7 +543,7 @@ int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv)
*/
priv->ienb = CLCD_PL111_IENB;
priv->ctrl = CLCD_PL111_CNTL;
- dev_info(dev, "set up callbacks for Versatile PL110\n");
+ drm_info(dev, "set up callbacks for Versatile PL110\n");
break;
case REALVIEW_CLCD_EB:
case REALVIEW_CLCD_PB1176:
@@ -553,10 +554,10 @@ int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv)
priv->variant = &pl111_realview;
priv->variant_display_enable = pl111_realview_clcd_enable;
priv->variant_display_disable = pl111_realview_clcd_disable;
- dev_info(dev, "set up callbacks for RealView PL111\n");
+ drm_info(dev, "set up callbacks for RealView PL111\n");
break;
default:
- dev_info(dev, "unknown Versatile system controller\n");
+ drm_info(dev, "unknown Versatile system controller\n");
break;
}