Switch from a generic platform driver to a dedicated MIPI DBI driver.
Signed-off-by: Svyatoslav Ryhel <[email protected]>
---
drivers/gpu/drm/panel/panel-lg-lh400wv3.c | 103 ++++++++++------------
1 file changed, 46 insertions(+), 57 deletions(-)
diff --git a/drivers/gpu/drm/panel/panel-lg-lh400wv3.c
b/drivers/gpu/drm/panel/panel-lg-lh400wv3.c
index 557bcb6f2ca70..ed099f671471e 100644
--- a/drivers/gpu/drm/panel/panel-lg-lh400wv3.c
+++ b/drivers/gpu/drm/panel/panel-lg-lh400wv3.c
@@ -14,6 +14,7 @@
#include <video/mipi_display.h>
#include <drm/drm_mipi_dbi.h>
+#include <drm/drm_mipi_dbi_bus.h>
#include <drm/drm_modes.h>
#include <drm/drm_of.h>
#include <drm/drm_panel.h>
@@ -25,7 +26,7 @@ static const struct regulator_bulk_data
lg_lh400wv3_supplies[] = {
struct lg_lh400wv3 {
struct drm_panel panel;
- struct mipi_dbi *dbi;
+ struct mipi_dbi_device *dbi;
struct regulator_bulk_data *supplies;
struct gpio_desc *reset_gpio;
@@ -36,13 +37,12 @@ static inline struct lg_lh400wv3 *to_lg_lh400wv3(struct
drm_panel *panel)
return container_of(panel, struct lg_lh400wv3, panel);
}
-#define panel_dbi_command(priv, cmd, seq...) \
+#define panel_dbi_command(dbidev, cmd, seq...) \
({ \
const u8 d[] = { seq }; \
- struct drm_panel *panel = &(priv)->panel; \
- struct device *dev = panel->dev; \
+ struct device *dev = &(dbidev)->dev; \
int ret; \
- ret = mipi_dbi_command_stackbuf((priv)->dbi, cmd, d, ARRAY_SIZE(d)); \
+ ret = mipi_dbi_command_stackbuf((dbidev)->dbi, cmd, d, ARRAY_SIZE(d)); \
if (ret) \
dev_err_ratelimited(dev, "error %d when sending command
%#02x\n", ret, cmd); \
ret; \
@@ -54,10 +54,6 @@ static int lg_lh400wv3_prepare(struct drm_panel *panel)
struct device *dev = panel->dev;
int ret;
- priv->dbi = dev_get_drvdata(dev->parent);
- if (!priv->dbi)
- return -ENODEV;
-
gpiod_set_value_cansleep(priv->reset_gpio, 1);
ret = regulator_bulk_enable(ARRAY_SIZE(lg_lh400wv3_supplies),
priv->supplies);
@@ -79,62 +75,55 @@ static int lg_lh400wv3_enable(struct drm_panel *panel)
{
struct lg_lh400wv3 *priv = to_lg_lh400wv3(panel);
- panel_dbi_command(priv, MIPI_DCS_EXIT_INVERT_MODE);
- panel_dbi_command(priv, MIPI_DCS_SET_TEAR_ON);
+ panel_dbi_command(priv->dbi, MIPI_DCS_EXIT_INVERT_MODE);
+ panel_dbi_command(priv->dbi, MIPI_DCS_SET_TEAR_ON);
- panel_dbi_command(priv, MIPI_DCS_SET_PIXEL_FORMAT,
MIPI_DCS_PIXEL_FMT_24BIT |
+ panel_dbi_command(priv->dbi, MIPI_DCS_SET_PIXEL_FORMAT,
MIPI_DCS_PIXEL_FMT_24BIT |
MIPI_DCS_PIXEL_FMT_24BIT << 4);
- panel_dbi_command(priv, 0xb2, 0x00, 0xc8);
- panel_dbi_command(priv, 0xb3, 0x00);
- panel_dbi_command(priv, 0xb4, 0x04);
- panel_dbi_command(priv, 0xb5, 0x42, 0x10, 0x10, 0x00, 0x20);
- panel_dbi_command(priv, 0xb6, 0x0b, 0x0f, 0x3c, 0x13, 0x13, 0xe8);
- panel_dbi_command(priv, 0xb7, 0x4c, 0x06, 0x0c, 0x00, 0x00);
-
- panel_dbi_command(priv, 0xc0, 0x01, 0x11);
- panel_dbi_command(priv, 0xc3, 0x07, 0x03, 0x04, 0x04, 0x04);
- panel_dbi_command(priv, 0xc4, 0x12, 0x24, 0x18, 0x18, 0x02, 0x49);
- panel_dbi_command(priv, 0xc5, 0x65);
- panel_dbi_command(priv, 0xc6, 0x41, 0x63);
-
- panel_dbi_command(priv, 0xd0, 0x00, 0x46, 0x74, 0x32, 0x1d, 0x03, 0x51,
0x15, 0x04);
- panel_dbi_command(priv, 0xd1, 0x00, 0x46, 0x74, 0x32, 0x1d, 0x03, 0x51,
0x15, 0x04);
- panel_dbi_command(priv, 0xd2, 0x00, 0x46, 0x74, 0x32, 0x1f, 0x03, 0x51,
0x15, 0x04);
- panel_dbi_command(priv, 0xd3, 0x00, 0x46, 0x74, 0x32, 0x1f, 0x03, 0x51,
0x15, 0x04);
- panel_dbi_command(priv, 0xd4, 0x01, 0x46, 0x74, 0x25, 0x00, 0x03, 0x51,
0x15, 0x04);
- panel_dbi_command(priv, 0xd5, 0x01, 0x46, 0x74, 0x25, 0x00, 0x03, 0x51,
0x15, 0x04);
-
- panel_dbi_command(priv, MIPI_DCS_SET_COLUMN_ADDRESS, 0x00, 0x00, 0x01,
0xdf);
- panel_dbi_command(priv, MIPI_DCS_SET_PAGE_ADDRESS, 0x00, 0x00, 0x03,
0x1f);
-
- panel_dbi_command(priv, MIPI_DCS_EXIT_SLEEP_MODE);
+ panel_dbi_command(priv->dbi, 0xb2, 0x00, 0xc8);
+ panel_dbi_command(priv->dbi, 0xb3, 0x00);
+ panel_dbi_command(priv->dbi, 0xb4, 0x04);
+ panel_dbi_command(priv->dbi, 0xb5, 0x42, 0x10, 0x10, 0x00, 0x20);
+ panel_dbi_command(priv->dbi, 0xb6, 0x0b, 0x0f, 0x3c, 0x13, 0x13, 0xe8);
+ panel_dbi_command(priv->dbi, 0xb7, 0x4c, 0x06, 0x0c, 0x00, 0x00);
+
+ panel_dbi_command(priv->dbi, 0xc0, 0x01, 0x11);
+ panel_dbi_command(priv->dbi, 0xc3, 0x07, 0x03, 0x04, 0x04, 0x04);
+ panel_dbi_command(priv->dbi, 0xc4, 0x12, 0x24, 0x18, 0x18, 0x02, 0x49);
+ panel_dbi_command(priv->dbi, 0xc5, 0x65);
+ panel_dbi_command(priv->dbi, 0xc6, 0x41, 0x63);
+
+ panel_dbi_command(priv->dbi, 0xd0, 0x00, 0x46, 0x74, 0x32, 0x1d, 0x03,
0x51, 0x15, 0x04);
+ panel_dbi_command(priv->dbi, 0xd1, 0x00, 0x46, 0x74, 0x32, 0x1d, 0x03,
0x51, 0x15, 0x04);
+ panel_dbi_command(priv->dbi, 0xd2, 0x00, 0x46, 0x74, 0x32, 0x1f, 0x03,
0x51, 0x15, 0x04);
+ panel_dbi_command(priv->dbi, 0xd3, 0x00, 0x46, 0x74, 0x32, 0x1f, 0x03,
0x51, 0x15, 0x04);
+ panel_dbi_command(priv->dbi, 0xd4, 0x01, 0x46, 0x74, 0x25, 0x00, 0x03,
0x51, 0x15, 0x04);
+ panel_dbi_command(priv->dbi, 0xd5, 0x01, 0x46, 0x74, 0x25, 0x00, 0x03,
0x51, 0x15, 0x04);
+
+ panel_dbi_command(priv->dbi, MIPI_DCS_SET_COLUMN_ADDRESS, 0x00, 0x00,
0x01, 0xdf);
+ panel_dbi_command(priv->dbi, MIPI_DCS_SET_PAGE_ADDRESS, 0x00, 0x00,
0x03, 0x1f);
+
+ panel_dbi_command(priv->dbi, MIPI_DCS_EXIT_SLEEP_MODE);
msleep(120);
- panel_dbi_command(priv, MIPI_DCS_WRITE_MEMORY_START);
- panel_dbi_command(priv, MIPI_DCS_SET_DISPLAY_ON);
+ panel_dbi_command(priv->dbi, MIPI_DCS_WRITE_MEMORY_START);
+ panel_dbi_command(priv->dbi, MIPI_DCS_SET_DISPLAY_ON);
return 0;
}
-static int lg_lh400wv3_disable(struct drm_panel *panel)
+static int lg_lh400wv3_unprepare(struct drm_panel *panel)
{
struct lg_lh400wv3 *priv = to_lg_lh400wv3(panel);
- panel_dbi_command(priv, MIPI_DCS_SET_DISPLAY_OFF);
- panel_dbi_command(priv, MIPI_DCS_ENTER_SLEEP_MODE);
+ panel_dbi_command(priv->dbi, MIPI_DCS_SET_DISPLAY_OFF);
+ panel_dbi_command(priv->dbi, MIPI_DCS_ENTER_SLEEP_MODE);
msleep(150);
- panel_dbi_command(priv, 0xc1, 0x01);
+ panel_dbi_command(priv->dbi, 0xc1, 0x01);
usleep_range(10000, 11000);
- return 0;
-};
-
-static int lg_lh400wv3_unprepare(struct drm_panel *panel)
-{
- struct lg_lh400wv3 *priv = to_lg_lh400wv3(panel);
-
gpiod_set_value_cansleep(priv->reset_gpio, 1);
regulator_bulk_disable(ARRAY_SIZE(lg_lh400wv3_supplies),
priv->supplies);
@@ -177,14 +166,13 @@ static int lg_lh400wv3_get_modes(struct drm_panel *panel,
static const struct drm_panel_funcs lg_lh400wv3_panel_funcs = {
.prepare = lg_lh400wv3_prepare,
.enable = lg_lh400wv3_enable,
- .disable = lg_lh400wv3_disable,
.unprepare = lg_lh400wv3_unprepare,
.get_modes = lg_lh400wv3_get_modes,
};
-static int lg_lh400wv3_probe(struct platform_device *pdev)
+static int lg_lh400wv3_probe(struct mipi_dbi_device *dbi)
{
- struct device *dev = &pdev->dev;
+ struct device *dev = &dbi->dev;
struct lg_lh400wv3 *priv;
int ret;
@@ -203,6 +191,9 @@ static int lg_lh400wv3_probe(struct platform_device *pdev)
return dev_err_probe(dev, PTR_ERR(priv->reset_gpio),
"Failed to get reset gpio\n");
+ priv->dbi = dbi;
+ mipi_dbi_set_drvdata(dbi, priv);
+
ret = drm_panel_of_backlight(&priv->panel);
if (ret)
return dev_err_probe(dev, ret, "Failed to get backlight\n");
@@ -211,9 +202,7 @@ static int lg_lh400wv3_probe(struct platform_device *pdev)
if (ret)
return dev_err_probe(dev, ret, "Failed to add panel\n");
- platform_set_drvdata(pdev, priv);
-
- return 0;
+ return devm_mipi_dbi_attach(dev, dbi);
}
static const struct of_device_id lg_lh400wv3_of_match[] = {
@@ -222,14 +211,14 @@ static const struct of_device_id lg_lh400wv3_of_match[] =
{
};
MODULE_DEVICE_TABLE(of, lg_lh400wv3_of_match);
-static struct platform_driver lg_lh400wv3_driver = {
+static struct mipi_dbi_driver lg_lh400wv3_driver = {
.driver = {
.name = "panel-lg-lh400wv3",
.of_match_table = lg_lh400wv3_of_match,
},
.probe = lg_lh400wv3_probe,
};
-module_platform_driver(lg_lh400wv3_driver);
+module_mipi_dbi_driver(lg_lh400wv3_driver);
MODULE_AUTHOR("Svyatoslav Ryhel <[email protected]>");
MODULE_DESCRIPTION("LG LH400WV3-SD04 MIPI DBI Type B panel driver");
--
2.53.0
