[v1] drm/tinydrm/ili9341: Support Adafruit 2.8" TFT display

Commit Message

Andy Shevchenko Feb. 25, 2019, 2:45 p.m. UTC

The Adafruit 2.8" TFT display [1] has different dimensions than 2.4" one.
Add support for it.

[1]: https://cdn-shop.adafruit.com/datasheets/MI0283QT-11+V1.1.PDF

Signed-off-by: Andy Shevchenko <[e-mail]>
---

- based on top of drm-tip

 drivers/gpu/drm/tinydrm/ili9341.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

Comments

Andy Shevchenko Feb. 26, 2019, 8:14 a.m. UTC | #1

On Mon, Feb 25, 2019 at 04:07:05PM +0100, Noralf Trønnes wrote:
> 
> 
> Den 25.02.2019 15.45, skrev Andy Shevchenko:
> > The Adafruit 2.8" TFT display [1] has different dimensions than 2.4" one.
> > Add support for it.
> > 
> > [1]: https://cdn-shop.adafruit.com/datasheets/MI0283QT-11+V1.1.PDF
> 
> This one is supported by drivers/gpu/drm/tinydrm/mi0283qt.c. It was the
> first tinydrm driver and was named after the panel. Later we have
> grouped the panels by controller driver.

Yeah, thanks. It works.

> So ideally mi0283qt.c should have been merged with ili9341.c.

Yes, that's would be nice! Though we need still some unified compatible
strings, while leaving old in place.

> I know that this Adafruit display didn't always use a MI0283QT panel, so
> maybe earlier they did use the dt280qv10 panel you mention her.

The datasheet they point me to is for mi0283qt, but on the panel itself it's
written dt280qv10. I dunno if it refers to the same or not.

> The Watterott rpi-display also uses a MI0283QT panel.

Patch

diff --git a/drivers/gpu/drm/tinydrm/ili9341.c b/drivers/gpu/drm/tinydrm/ili9341.c
index 3b7565a6311e..7e20d7f1b25f 100644
--- a/drivers/gpu/drm/tinydrm/ili9341.c
+++ b/drivers/gpu/drm/tinydrm/ili9341.c
@@ -140,6 +140,10 @@  static const struct drm_display_mode yx240qv29_mode = {
 	DRM_SIMPLE_MODE(240, 320, 37, 49),
 };
 
+static const struct drm_display_mode dt280qv10_mode = {
+	DRM_SIMPLE_MODE(240, 320, 43, 58),
+};
+
 DEFINE_DRM_GEM_CMA_FOPS(ili9341_fops);
 
 static struct drm_driver ili9341_driver = {
@@ -155,25 +159,32 @@  static struct drm_driver ili9341_driver = {
 };
 
 static const struct of_device_id ili9341_of_match[] = {
-	{ .compatible = "adafruit,yx240qv29" },
+	{ .compatible = "adafruit,yx240qv29", .data = &yx240qv29_mode },
+	{ .compatible = "adafruit,dt280qv10", .data = &dt280qv10_mode },
 	{ }
 };
 MODULE_DEVICE_TABLE(of, ili9341_of_match);
 
 static const struct spi_device_id ili9341_id[] = {
-	{ "yx240qv29", 0 },
+	{ "yx240qv29", (kernel_ulong_t)&yx240qv29_mode },
+	{ "dt280qv10", (kernel_ulong_t)&dt280qv10_mode },
 	{ }
 };
 MODULE_DEVICE_TABLE(spi, ili9341_id);
 
 static int ili9341_probe(struct spi_device *spi)
 {
+	const struct drm_display_mode *mode;
 	struct device *dev = &spi->dev;
 	struct mipi_dbi *mipi;
 	struct gpio_desc *dc;
 	u32 rotation = 0;
 	int ret;
 
+	mode = device_get_match_data(dev);
+	if (!mode)
+		return -ENODEV;
+
 	mipi = devm_kzalloc(dev, sizeof(*mipi), GFP_KERNEL);
 	if (!mipi)
 		return -ENOMEM;
@@ -201,7 +212,7 @@  static int ili9341_probe(struct spi_device *spi)
 		return ret;
 
 	ret = mipi_dbi_init(&spi->dev, mipi, &ili9341_pipe_funcs,
-			    &ili9341_driver, &yx240qv29_mode, rotation);
+			    &ili9341_driver, mode, rotation);
 	if (ret)
 		return ret;