OSDN Git Service

drm/solomon: Add ssd130x new compatible strings and deprecate old ones.
authorJavier Martinez Canillas <javierm@redhat.com>
Tue, 19 Apr 2022 21:48:21 +0000 (23:48 +0200)
committerJavier Martinez Canillas <javierm@redhat.com>
Wed, 20 Apr 2022 16:48:17 +0000 (18:48 +0200)
The current compatible strings for SSD130x I2C controllers contain an "fb"
and "-i2c" suffixes. These have been deprecated and more correct ones were
added, that don't encode a subsystem or bus used to interface the devices.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
Acked-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://patchwork.freedesktop.org/patch/msgid/20220419214824.335075-4-javierm@redhat.com
drivers/gpu/drm/solomon/ssd130x-i2c.c

index d099b24..45867ef 100644 (file)
@@ -88,10 +88,27 @@ static struct ssd130x_deviceinfo ssd130x_ssd1309_deviceinfo = {
 
 static const struct of_device_id ssd130x_of_match[] = {
        {
-               .compatible = "sinowealth,sh1106-i2c",
+               .compatible = "sinowealth,sh1106",
                .data = &ssd130x_sh1106_deviceinfo,
        },
        {
+               .compatible = "solomon,ssd1305",
+               .data = &ssd130x_ssd1305_deviceinfo,
+       },
+       {
+               .compatible = "solomon,ssd1306",
+               .data = &ssd130x_ssd1306_deviceinfo,
+       },
+       {
+               .compatible = "solomon,ssd1307",
+               .data = &ssd130x_ssd1307_deviceinfo,
+       },
+       {
+               .compatible = "solomon,ssd1309",
+               .data = &ssd130x_ssd1309_deviceinfo,
+       },
+       /* Deprecated but kept for backward compatibility */
+       {
                .compatible = "solomon,ssd1305fb-i2c",
                .data = &ssd130x_ssd1305_deviceinfo,
        },