--- v6
+++ v3
@@ -2,30 +2,19 @@
does not have any bus transport logic. Add a driver to interface over I2C.
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
-Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
-
-(no changes since v5)
-
-Changes in v5:
-- Add Andy Shevchenko's Reviewed-by tag to patch #4.
-
-Changes in v4:
-- Remove unnecessary casting (Geert Uytterhoeven)
-- Remove redundant blank lines (Andy Shevchenko)
-- Remove comma after of_device_id table terminator (Andy Shevchenko)
Changes in v3:
- Add a separate driver for SSD130X chips I2C support (Andy Shevchenko)
drivers/gpu/drm/solomon/Kconfig | 9 ++
drivers/gpu/drm/solomon/Makefile | 1 +
- drivers/gpu/drm/solomon/ssd130x-i2c.c | 116 ++++++++++++++++++++++++++
- 3 files changed, 126 insertions(+)
+ drivers/gpu/drm/solomon/ssd130x-i2c.c | 117 ++++++++++++++++++++++++++
+ 3 files changed, 127 insertions(+)
create mode 100644 drivers/gpu/drm/solomon/ssd130x-i2c.c
diff --git a/drivers/gpu/drm/solomon/Kconfig b/drivers/gpu/drm/solomon/Kconfig
-index 7720a7039e8d..5861c3ab7c45 100644
+index c969c358a4a7..47e16bc20e0d 100644
--- a/drivers/gpu/drm/solomon/Kconfig
+++ b/drivers/gpu/drm/solomon/Kconfig
@@ -10,3 +10,12 @@ config DRM_SSD130X
@@ -34,11 +23,11 @@
If M is selected the module will be called ssd130x.
+
+config DRM_SSD130X_I2C
-+ tristate "DRM support for Solomon SSD130x OLED displays (I2C bus)"
++ tristate "DRM support for Solomon SSD130X OLED displays (I2C bus)"
+ depends on DRM_SSD130X && I2C
+ select REGMAP_I2C
+ help
-+ Say Y here if the SSD130x OLED display is connected via I2C bus.
++ Say Y here if the SSD130X OLED display is connected via I2C bus.
+
+ If M is selected the module will be called ssd130x-i2c.
diff --git a/drivers/gpu/drm/solomon/Makefile b/drivers/gpu/drm/solomon/Makefile
@@ -50,16 +39,16 @@
+obj-$(CONFIG_DRM_SSD130X_I2C) += ssd130x-i2c.o
diff --git a/drivers/gpu/drm/solomon/ssd130x-i2c.c b/drivers/gpu/drm/solomon/ssd130x-i2c.c
new file mode 100644
-index 000000000000..3126aeda4ced
+index 000000000000..ff5f8992b2ff
--- /dev/null
+++ b/drivers/gpu/drm/solomon/ssd130x-i2c.c
-@@ -0,0 +1,116 @@
+@@ -0,0 +1,117 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
-+ * DRM driver for Solomon SSD130x OLED displays (I2C bus)
++ * DRM driver for Solomon SSD130X OLED displays (I2C bus)
+ *
+ * Copyright 2022 Red Hat Inc.
-+ * Author: Javier Martinez Canillas <javierm@redhat.com>
++ * Authors: Javier Martinez Canillas <javierm@redhat.com>
+ *
+ * Based on drivers/video/fbdev/ssd1307fb.c
+ * Copyright 2012 Free Electrons
@@ -70,7 +59,7 @@
+#include "ssd130x.h"
+
+#define DRIVER_NAME "ssd130x-i2c"
-+#define DRIVER_DESC "DRM driver for Solomon SSD130x OLED displays (I2C)"
++#define DRIVER_DESC "DRM driver for Solomon SSD130X OLED displays (I2C)"
+
+static const struct regmap_config ssd130x_i2c_regmap_config = {
+ .reg_bits = 8,
@@ -87,6 +76,7 @@
+ return PTR_ERR(regmap);
+
+ ssd130x = ssd130x_probe(&client->dev, regmap);
++
+ if (IS_ERR(ssd130x))
+ return PTR_ERR(ssd130x);
+
@@ -138,21 +128,21 @@
+static const struct of_device_id ssd130x_of_match[] = {
+ {
+ .compatible = "solomon,ssd1305fb-i2c",
-+ .data = &ssd130x_ssd1305_deviceinfo,
++ .data = (void *)&ssd130x_ssd1305_deviceinfo,
+ },
+ {
+ .compatible = "solomon,ssd1306fb-i2c",
-+ .data = &ssd130x_ssd1306_deviceinfo,
++ .data = (void *)&ssd130x_ssd1306_deviceinfo,
+ },
+ {
+ .compatible = "solomon,ssd1307fb-i2c",
-+ .data = &ssd130x_ssd1307_deviceinfo,
++ .data = (void *)&ssd130x_ssd1307_deviceinfo,
+ },
+ {
+ .compatible = "solomon,ssd1309fb-i2c",
-+ .data = &ssd130x_ssd1309_deviceinfo,
++ .data = (void *)&ssd130x_ssd1309_deviceinfo,
+ },
-+ { /* sentinel */ }
++ { /* sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, ssd130x_of_match);
+