drm/solomon: Move device info from ssd130x-i2c to the core driver

These are declared in the ssd130x-i2c transport driver but the information
is not I2C specific, and could be used by other SSD130x transport drivers.

Move them to the ssd130x core driver and just set the OF device entries to
an ID that could be used to lookup the correct device info from an array.

While being there, also move the SSD130X_DATA and SSD130X_COMMAND control
bytes. Since even though they are used by the I2C interface, they could
also be useful for other transport protocols such as SPI.

Suggested-by: Chen-Yu Tsai <wens@kernel.org>
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-5-javierm@redhat.com

diff --git a/drivers/gpu/drm/solomon/ssd130x-i2c.c b/drivers/gpu/drm/solomon/ssd130x-i2c.c
index 45867ef2bc8b2d54be00acb5b92589049a0f24b7..d6835ec71c39426e0078a89633b07897f9177db1 100644 (file)
--- a/drivers/gpu/drm/solomon/ssd130x-i2c.c
+++ b/drivers/gpu/drm/solomon/ssd130x-i2c.c
@@ -53,76 +53,43 @@ static void ssd130x_i2c_shutdown(struct i2c_client *client)
        ssd130x_shutdown(ssd130x);
 }
 
-static struct ssd130x_deviceinfo ssd130x_sh1106_deviceinfo = {
-       .default_vcomh = 0x40,
-       .default_dclk_div = 1,
-       .default_dclk_frq = 5,
-       .page_mode_only = 1,
-};
-
-static struct ssd130x_deviceinfo ssd130x_ssd1305_deviceinfo = {
-       .default_vcomh = 0x34,
-       .default_dclk_div = 1,
-       .default_dclk_frq = 7,
-};
-
-static struct ssd130x_deviceinfo ssd130x_ssd1306_deviceinfo = {
-       .default_vcomh = 0x20,
-       .default_dclk_div = 1,
-       .default_dclk_frq = 8,
-       .need_chargepump = 1,
-};
-
-static struct ssd130x_deviceinfo ssd130x_ssd1307_deviceinfo = {
-       .default_vcomh = 0x20,
-       .default_dclk_div = 2,
-       .default_dclk_frq = 12,
-       .need_pwm = 1,
-};
-
-static struct ssd130x_deviceinfo ssd130x_ssd1309_deviceinfo = {
-       .default_vcomh = 0x34,
-       .default_dclk_div = 1,
-       .default_dclk_frq = 10,
-};
-
 static const struct of_device_id ssd130x_of_match[] = {
        {
                .compatible = "sinowealth,sh1106",
-               .data = &ssd130x_sh1106_deviceinfo,
+               .data = &ssd130x_variants[SH1106_ID],
        },
        {
                .compatible = "solomon,ssd1305",
-               .data = &ssd130x_ssd1305_deviceinfo,
+               .data = &ssd130x_variants[SSD1305_ID],
        },
        {
                .compatible = "solomon,ssd1306",
-               .data = &ssd130x_ssd1306_deviceinfo,
+               .data = &ssd130x_variants[SSD1306_ID],
        },
        {
                .compatible = "solomon,ssd1307",
-               .data = &ssd130x_ssd1307_deviceinfo,
+               .data = &ssd130x_variants[SSD1307_ID],
        },
        {
                .compatible = "solomon,ssd1309",
-               .data = &ssd130x_ssd1309_deviceinfo,
+               .data = &ssd130x_variants[SSD1309_ID],
        },
        /* Deprecated but kept for backward compatibility */
        {
                .compatible = "solomon,ssd1305fb-i2c",
-               .data = &ssd130x_ssd1305_deviceinfo,
+               .data = &ssd130x_variants[SSD1305_ID],
        },
        {
                .compatible = "solomon,ssd1306fb-i2c",
-               .data = &ssd130x_ssd1306_deviceinfo,
+               .data = &ssd130x_variants[SSD1306_ID],
        },
        {
                .compatible = "solomon,ssd1307fb-i2c",
-               .data = &ssd130x_ssd1307_deviceinfo,
+               .data = &ssd130x_variants[SSD1307_ID],
        },
        {
                .compatible = "solomon,ssd1309fb-i2c",
-               .data = &ssd130x_ssd1309_deviceinfo,
+               .data = &ssd130x_variants[SSD1309_ID],
        },
        { /* sentinel */ }
 };
@@ -142,3 +109,4 @@ module_i2c_driver(ssd130x_i2c_driver);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_AUTHOR("Javier Martinez Canillas <javierm@redhat.com>");
 MODULE_LICENSE("GPL v2");
+MODULE_IMPORT_NS(DRM_SSD130X);

diff --git a/drivers/gpu/drm/solomon/ssd130x.c b/drivers/gpu/drm/solomon/ssd130x.c
index a7e784518c6938c4bb73b9b6102028954ccd281d..ba2de93d00f0a4705d633fa38a1999505972b57f 100644 (file)
--- a/drivers/gpu/drm/solomon/ssd130x.c
+++ b/drivers/gpu/drm/solomon/ssd130x.c
@@ -39,9 +39,6 @@
 #define DRIVER_MAJOR   1
 #define DRIVER_MINOR   0
 
-#define SSD130X_DATA                           0x40
-#define SSD130X_COMMAND                                0x80
-
 #define SSD130X_PAGE_COL_START_LOW             0x00
 #define SSD130X_PAGE_COL_START_HIGH            0x10
 #define SSD130X_SET_ADDRESS_MODE               0x20
@@ -94,6 +91,38 @@
 
 #define MAX_CONTRAST 255
 
+const struct ssd130x_deviceinfo ssd130x_variants[] = {
+       [SH1106_ID] = {
+               .default_vcomh = 0x40,
+               .default_dclk_div = 1,
+               .default_dclk_frq = 5,
+               .page_mode_only = 1,
+       },
+       [SSD1305_ID] = {
+               .default_vcomh = 0x34,
+               .default_dclk_div = 1,
+               .default_dclk_frq = 7,
+       },
+       [SSD1306_ID] = {
+               .default_vcomh = 0x20,
+               .default_dclk_div = 1,
+               .default_dclk_frq = 8,
+               .need_chargepump = 1,
+       },
+       [SSD1307_ID] = {
+               .default_vcomh = 0x20,
+               .default_dclk_div = 2,
+               .default_dclk_frq = 12,
+               .need_pwm = 1,
+       },
+       [SSD1309_ID] = {
+               .default_vcomh = 0x34,
+               .default_dclk_div = 1,
+               .default_dclk_frq = 10,
+       }
+};
+EXPORT_SYMBOL_NS_GPL(ssd130x_variants, DRM_SSD130X);
+
 static inline struct ssd130x_device *drm_to_ssd130x(struct drm_device *drm)
 {
        return container_of(drm, struct ssd130x_device, drm);

diff --git a/drivers/gpu/drm/solomon/ssd130x.h b/drivers/gpu/drm/solomon/ssd130x.h
index f5b062576fdf9bba984824b95134c842c161cce5..d14f78c2eb073af38fc68976c64a62fb678adc64 100644 (file)
--- a/drivers/gpu/drm/solomon/ssd130x.h
+++ b/drivers/gpu/drm/solomon/ssd130x.h
@@ -18,6 +18,18 @@
 
 #include <linux/regmap.h>
 
+#define SSD130X_DATA                           0x40
+#define SSD130X_COMMAND                                0x80
+
+enum ssd130x_variants {
+       SH1106_ID,
+       SSD1305_ID,
+       SSD1306_ID,
+       SSD1307_ID,
+       SSD1309_ID,
+       NR_SSD130X_VARIANTS
+};
+
 struct ssd130x_deviceinfo {
        u32 default_vcomh;
        u32 default_dclk_div;
@@ -71,6 +83,8 @@ struct ssd130x_device {
        u8 page_end;
 };
 
+extern const struct ssd130x_deviceinfo ssd130x_variants[];
+
 struct ssd130x_device *ssd130x_probe(struct device *dev, struct regmap *regmap);
 int ssd130x_remove(struct ssd130x_device *ssd130x);
 void ssd130x_shutdown(struct ssd130x_device *ssd130x);