From patchwork Mon Oct 9 18:34:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 13414273 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 99ED4CD611F for ; Mon, 9 Oct 2023 18:36:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0A76410E2C0; Mon, 9 Oct 2023 18:36:22 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4273510E2BB for ; Mon, 9 Oct 2023 18:36:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696876573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZQtzxS22vOw1sYR83d0Rh3aDs2Kq0xcl9WK0ryRbJEA=; b=cI2+KjxOpI6b5DZpc04hl8wFJDkwOnsMVF5Ug5JgYvNCkbvcObYi0EuxCGUGMhdzlMRIRN sIpkYM4+sA31dVYM097TL/fvPYIb8nGy2unrZq9fyLn8o6ivUefmpuIC7uU7l0VfJ75cu2 F2fEXdv2pqhQES0VYZ7sMNLhC4NXSg0= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-669-9zKZoKwONCSmVNOiWRaRnQ-1; Mon, 09 Oct 2023 14:36:00 -0400 X-MC-Unique: 9zKZoKwONCSmVNOiWRaRnQ-1 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-323306960e3so3212685f8f.1 for ; Mon, 09 Oct 2023 11:36:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696876559; x=1697481359; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZQtzxS22vOw1sYR83d0Rh3aDs2Kq0xcl9WK0ryRbJEA=; b=q8L8N2PVCrjOXl0SQh9FK7CfLiBrF5FwvLevXFM3wxh0iDIUfwyXQkxLnfumx+Jo4P wuEbDfM6k48+tG5Js/4STtX/gDlZm4hlOEZ9JztYVu+QypBn9dowt0tarhIttnIm4b8K 4nS0M0ERKYvF5Ys1IHivZhBW4bn3dqL0ugWXjvJFswxzF7a0Uj17scuR52xBlIo1WLzO 6yH05XqMtJ4hQkeSIO5segP5rv7wdwL1HqHBtvg34daBPJyyFX5l65+NAVtH0BmN8ix4 GG9CUolvtd2p3G9IaAtpUfO9fo5YkmXltnewA0HdtKWP+aA7Yrc8IjRtQyShmC4uGYp7 IrMQ== X-Gm-Message-State: AOJu0YyH7yDWgjPr7s/ukw/PITrEsi9qJjKOmK06ycS6Ng7FIFtCeLod xpUM4CpYIqTRq9PoXPpYyNxNuxanqzUFGDA8SBY44ExvgphrWFVGeTCsgBATe0Z4aH6ltK80O+T XwcK2s4rzfQfJGc7QKVj9q1jLl4Vz X-Received: by 2002:adf:edce:0:b0:317:58e4:e941 with SMTP id v14-20020adfedce000000b0031758e4e941mr14527335wro.33.1696876559581; Mon, 09 Oct 2023 11:35:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGLxco/wzAWiAo6IzkCN3y+muqM+F9g/NYV5e2UUAr05jilQZ8GgRD3J7WRGsBFHNEOBkwloQ== X-Received: by 2002:adf:edce:0:b0:317:58e4:e941 with SMTP id v14-20020adfedce000000b0031758e4e941mr14527317wro.33.1696876559164; Mon, 09 Oct 2023 11:35:59 -0700 (PDT) Received: from localhost (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id l10-20020a7bc44a000000b004067e905f44sm11968813wmi.9.2023.10.09.11.35.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 11:35:58 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Subject: [PATCH 1/8] drm/solomon: Rename ssd130x driver to ssd13xx Date: Mon, 9 Oct 2023 20:34:15 +0200 Message-ID: <20231009183522.543918-2-javierm@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231009183522.543918-1-javierm@redhat.com> References: <20231009183522.543918-1-javierm@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Zimmermann , Javier Martinez Canillas , Maxime Ripard , Geert Uytterhoeven , dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 --- 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%) diff --git a/MAINTAINERS b/MAINTAINERS index 46ca5c4affdb..8eab0d9dca89 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 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 diff --git a/drivers/gpu/drm/solomon/Kconfig b/drivers/gpu/drm/solomon/Kconfig index e170716d976b..ba9f631402bc 100644 --- a/drivers/gpu/drm/solomon/Kconfig +++ b/drivers/gpu/drm/solomon/Kconfig @@ -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. diff --git a/drivers/gpu/drm/solomon/Makefile b/drivers/gpu/drm/solomon/Makefile index b5fc792257d7..6cec14c4062d 100644 --- a/drivers/gpu/drm/solomon/Makefile +++ b/drivers/gpu/drm/solomon/Makefile @@ -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 diff --git a/drivers/gpu/drm/solomon/ssd130x-i2c.c b/drivers/gpu/drm/solomon/ssd13xx-i2c.c similarity index 92% rename from drivers/gpu/drm/solomon/ssd130x-i2c.c rename to drivers/gpu/drm/solomon/ssd13xx-i2c.c index b4eb2d64bf6e..f4d0feaa8515 100644 --- a/drivers/gpu/drm/solomon/ssd130x-i2c.c +++ b/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 @@ -11,10 +11,10 @@ #include #include -#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 "); MODULE_LICENSE("GPL v2"); -MODULE_IMPORT_NS(DRM_SSD130X); +MODULE_IMPORT_NS(DRM_SSD13XX); diff --git a/drivers/gpu/drm/solomon/ssd130x-spi.c b/drivers/gpu/drm/solomon/ssd13xx-spi.c similarity index 93% rename from drivers/gpu/drm/solomon/ssd130x-spi.c rename to drivers/gpu/drm/solomon/ssd13xx-spi.c index 19ab4942cb33..20d1e3711e2f 100644 --- a/drivers/gpu/drm/solomon/ssd130x-spi.c +++ b/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 @@ -8,10 +8,10 @@ #include #include -#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:", 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 "); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(DRM_SSD130X); +MODULE_IMPORT_NS(DRM_SSD13XX); diff --git a/drivers/gpu/drm/solomon/ssd130x.c b/drivers/gpu/drm/solomon/ssd13xx.c similarity index 99% rename from drivers/gpu/drm/solomon/ssd130x.c rename to drivers/gpu/drm/solomon/ssd13xx.c index 6dcf3e041113..0bf12965719a 100644 --- a/drivers/gpu/drm/solomon/ssd130x.c +++ b/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 @@ -34,10 +34,10 @@ #include #include -#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; diff --git a/drivers/gpu/drm/solomon/ssd130x.h b/drivers/gpu/drm/solomon/ssd13xx.h similarity index 94% rename from drivers/gpu/drm/solomon/ssd130x.h rename to drivers/gpu/drm/solomon/ssd13xx.h index aa39b13615eb..f89ccd11cd29 100644 --- a/drivers/gpu/drm/solomon/ssd130x.h +++ b/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 @@ -10,8 +10,8 @@ * Copyright 2012 Free Electrons */ -#ifndef __SSD130X_H__ -#define __SSD130X_H__ +#ifndef __SSD13XX_H__ +#define __SSD13XX_H__ #include #include @@ -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__ */