From f59fe2d1bd056af117eb512bb0e9210a943c6d47 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 1 Sep 2023 12:17:38 +0100 Subject: [PATCH] drm/ili9486: Resolve clash in spi_device_id names For "Really Good Reasons" [1] the SPI core requires a match between compatible device strings and the name in spi_device_id. The ili9486 driver uses compatible strings "waveshare,rpi-lcd-35" and "ozzmaker,piscreen", but "rpi-lcd-35" and "piscreen" are missing, so add them. Compatible string "ilitek,ili9486" is already used by staging/fbtft/fb_ili9486, therefore leaving it present in ili9486 as an spi_device_id causes the incorrect module to be loaded, therefore remove this id. [1] https://elixir.bootlin.com/linux/latest/source/drivers/spi/spi.c#L487 Signed-off-by: Dave Stevenson --- drivers/gpu/drm/tiny/ili9486.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/tiny/ili9486.c +++ b/drivers/gpu/drm/tiny/ili9486.c @@ -187,7 +187,8 @@ static const struct of_device_id ili9486 MODULE_DEVICE_TABLE(of, ili9486_of_match); static const struct spi_device_id ili9486_id[] = { - { "ili9486", 0 }, + { "rpi-lcd-35", 0 }, + { "piscreen", 0 }, { } }; MODULE_DEVICE_TABLE(spi, ili9486_id);