@@ -6728,12 +6728,12 @@ T: git git://anongit.freedesktop.org/drm/drm-misc
F: Documentation/devicetree/bindings/display/sitronix,st7735r.yaml
F: drivers/gpu/drm/tiny/st7735r.c
-DRM DRIVER FOR SOLOMON SSD130X OLED DISPLAYS
+DRM DRIVER FOR SOLOMON SSD13XX OLED DISPLAYS
M: Javier Martinez Canillas <javierm@redhat.com>
S: Maintained
T: git git://anongit.freedesktop.org/drm/drm-misc
-F: Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml
-F: drivers/gpu/drm/solomon/ssd130x*
+F: Documentation/devicetree/bindings/display/solomon,ssd13*.yaml
+F: drivers/gpu/drm/solomon/ssd13*
DRM DRIVER FOR ST-ERICSSON MCDE
M: Linus Walleij <linus.walleij@linaro.org>
@@ -1,31 +1,31 @@
-config DRM_SSD130X
- tristate "DRM support for Solomon SSD130x OLED displays"
+config DRM_SSD13XX
+ tristate "DRM support for Solomon SSD13xx OLED displays"
depends on DRM && MMU
select BACKLIGHT_CLASS_DEVICE
select DRM_GEM_SHMEM_HELPER
select DRM_KMS_HELPER
help
- DRM driver for the SSD130x Solomon and SINO WEALTH SH110x OLED
+ DRM driver for the SSD13xx Solomon and SINO WEALTH SH110x OLED
controllers. This is only for the core driver, a driver for the
appropriate bus transport in your chip also must be selected.
- If M is selected the module will be called ssd130x.
+ If M is selected the module will be called ssd13xx.
-config DRM_SSD130X_I2C
- tristate "DRM support for Solomon SSD130x OLED displays (I2C bus)"
- depends on DRM_SSD130X && I2C
+config DRM_SSD13XX_I2C
+ tristate "DRM support for Solomon SSD13xx OLED displays (I2C bus)"
+ depends on DRM_SSD13XX && I2C
select REGMAP_I2C
help
- Say Y here if the SSD130x or SH110x OLED display is connected via
+ Say Y here if the SSD13xx or SH110x OLED display is connected via
I2C bus.
- If M is selected the module will be called ssd130x-i2c.
+ If M is selected the module will be called ssd13xx-i2c.
-config DRM_SSD130X_SPI
- tristate "DRM support for Solomon SSD130X OLED displays (SPI bus)"
- depends on DRM_SSD130X && SPI
+config DRM_SSD13XX_SPI
+ tristate "DRM support for Solomon SSD13xx OLED displays (SPI bus)"
+ depends on DRM_SSD13XX && SPI
select REGMAP
help
- Say Y here if the SSD130x OLED display is connected via SPI bus.
+ Say Y here if the SSD13xx OLED display is connected via SPI bus.
- If M is selected the module will be called ssd130x-spi.
+ If M is selected the module will be called ssd13xx-spi.
@@ -1,3 +1,3 @@
-obj-$(CONFIG_DRM_SSD130X) += ssd130x.o
-obj-$(CONFIG_DRM_SSD130X_I2C) += ssd130x-i2c.o
-obj-$(CONFIG_DRM_SSD130X_SPI) += ssd130x-spi.o
+obj-$(CONFIG_DRM_SSD13XX) += ssd13xx.o
+obj-$(CONFIG_DRM_SSD13XX_I2C) += ssd13xx-i2c.o
+obj-$(CONFIG_DRM_SSD13XX_SPI) += ssd13xx-spi.o
similarity index 92%
rename from drivers/gpu/drm/solomon/ssd130x-i2c.c
rename to drivers/gpu/drm/solomon/ssd13xx-i2c.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
- * DRM driver for Solomon SSD130x OLED displays (I2C bus)
+ * DRM driver for Solomon SSD13xx OLED displays (I2C bus)
*
* Copyright 2022 Red Hat Inc.
* Author: Javier Martinez Canillas <javierm@redhat.com>
@@ -11,10 +11,10 @@
#include <linux/i2c.h>
#include <linux/module.h>
-#include "ssd130x.h"
+#include "ssd13xx.h"
-#define DRIVER_NAME "ssd130x-i2c"
-#define DRIVER_DESC "DRM driver for Solomon SSD130x OLED displays (I2C)"
+#define DRIVER_NAME "ssd13xx-i2c"
+#define DRIVER_DESC "DRM driver for Solomon SSD13xx OLED displays (I2C)"
static const struct regmap_config ssd130x_i2c_regmap_config = {
.reg_bits = 8,
@@ -109,4 +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);
+MODULE_IMPORT_NS(DRM_SSD13XX);
similarity index 93%
rename from drivers/gpu/drm/solomon/ssd130x-spi.c
rename to drivers/gpu/drm/solomon/ssd13xx-spi.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
- * DRM driver for Solomon SSD130X OLED displays (SPI bus)
+ * DRM driver for Solomon SSD13xx OLED displays (SPI bus)
*
* Copyright 2022 Red Hat Inc.
* Authors: Javier Martinez Canillas <javierm@redhat.com>
@@ -8,10 +8,10 @@
#include <linux/spi/spi.h>
#include <linux/module.h>
-#include "ssd130x.h"
+#include "ssd13xx.h"
-#define DRIVER_NAME "ssd130x-spi"
-#define DRIVER_DESC "DRM driver for Solomon SSD130X OLED displays (SPI)"
+#define DRIVER_NAME "ssd13xx-spi"
+#define DRIVER_DESC "DRM driver for Solomon SSD13xx OLED displays (SPI)"
struct ssd130x_spi_transport {
struct spi_device *spi;
@@ -25,7 +25,7 @@ struct ssd130x_spi_transport {
* prior to every data byte, that contains a bit with the D/C# value.
*
* These control bytes are considered registers by the ssd130x core driver
- * and can be used by the ssd130x SPI driver to determine if the data sent
+ * and can be used by the ssd13xx SPI driver to determine if the data sent
* is for a command register or for the Graphic Display Data RAM (GDDRAM).
*/
static int ssd130x_spi_write(void *context, const void *data, size_t count)
@@ -132,7 +132,7 @@ static const struct of_device_id ssd130x_of_match[] = {
};
MODULE_DEVICE_TABLE(of, ssd130x_of_match);
-#if IS_MODULE(CONFIG_DRM_SSD130X_SPI)
+#if IS_MODULE(CONFIG_DRM_SSD13XX_SPI)
/*
* The SPI core always reports a MODALIAS uevent of the form "spi:<dev>", even
* if the device was registered via OF. This means that the module will not be
@@ -166,4 +166,4 @@ module_spi_driver(ssd130x_spi_driver);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_AUTHOR("Javier Martinez Canillas <javierm@redhat.com>");
MODULE_LICENSE("GPL");
-MODULE_IMPORT_NS(DRM_SSD130X);
+MODULE_IMPORT_NS(DRM_SSD13XX);
similarity index 99%
rename from drivers/gpu/drm/solomon/ssd130x.c
rename to drivers/gpu/drm/solomon/ssd13xx.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
- * DRM driver for Solomon SSD130x OLED displays
+ * DRM driver for Solomon SSD13xx OLED displays
*
* Copyright 2022 Red Hat Inc.
* Author: Javier Martinez Canillas <javierm@redhat.com>
@@ -34,10 +34,10 @@
#include <drm/drm_rect.h>
#include <drm/drm_probe_helper.h>
-#include "ssd130x.h"
+#include "ssd13xx.h"
-#define DRIVER_NAME "ssd130x"
-#define DRIVER_DESC "DRM driver for Solomon SSD130x OLED displays"
+#define DRIVER_NAME "ssd13xx"
+#define DRIVER_DESC "DRM driver for Solomon SSD13xx OLED displays"
#define DRIVER_DATE "20220131"
#define DRIVER_MAJOR 1
#define DRIVER_MINOR 0
@@ -139,7 +139,7 @@ const struct ssd130x_deviceinfo ssd130x_variants[] = {
.page_height = 8,
}
};
-EXPORT_SYMBOL_NS_GPL(ssd130x_variants, DRM_SSD130X);
+EXPORT_SYMBOL_NS_GPL(ssd130x_variants, DRM_SSD13XX);
struct ssd130x_crtc_state {
struct drm_crtc_state base;
similarity index 94%
rename from drivers/gpu/drm/solomon/ssd130x.h
rename to drivers/gpu/drm/solomon/ssd13xx.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Header file for:
- * DRM driver for Solomon SSD130x OLED displays
+ * DRM driver for Solomon SSD13xx OLED displays
*
* Copyright 2022 Red Hat Inc.
* Author: Javier Martinez Canillas <javierm@redhat.com>
@@ -10,8 +10,8 @@
* Copyright 2012 Free Electrons
*/
-#ifndef __SSD130X_H__
-#define __SSD130X_H__
+#ifndef __SSD13XX_H__
+#define __SSD13XX_H__
#include <drm/drm_connector.h>
#include <drm/drm_crtc.h>
@@ -97,4 +97,4 @@ struct ssd130x_device *ssd130x_probe(struct device *dev, struct regmap *regmap);
void ssd130x_remove(struct ssd130x_device *ssd130x);
void ssd130x_shutdown(struct ssd130x_device *ssd130x);
-#endif /* __SSD130X_H__ */
+#endif /* __SSD13XX_H__ */
The driver only supports the SSD130x family of Solomon OLED controllers now, but will be extended to also support the SSD132x (4-bit grayscale) and SSD133x (16-bit RGB) controller families. Rename driver to ssd13xx. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> --- MAINTAINERS | 6 ++-- drivers/gpu/drm/solomon/Kconfig | 28 +++++++++---------- drivers/gpu/drm/solomon/Makefile | 6 ++-- .../solomon/{ssd130x-i2c.c => ssd13xx-i2c.c} | 10 +++---- .../solomon/{ssd130x-spi.c => ssd13xx-spi.c} | 14 +++++----- .../gpu/drm/solomon/{ssd130x.c => ssd13xx.c} | 10 +++---- .../gpu/drm/solomon/{ssd130x.h => ssd13xx.h} | 8 +++--- 7 files changed, 41 insertions(+), 41 deletions(-) rename drivers/gpu/drm/solomon/{ssd130x-i2c.c => ssd13xx-i2c.c} (92%) rename drivers/gpu/drm/solomon/{ssd130x-spi.c => ssd13xx-spi.c} (93%) rename drivers/gpu/drm/solomon/{ssd130x.c => ssd13xx.c} (99%) rename drivers/gpu/drm/solomon/{ssd130x.h => ssd13xx.h} (94%)