drivers/lcd: fix apa102/max7219 object name collision with drivers/leds

.github/CODEOWNERS

@@ -13025,7 +13025,7 @@ drivers/ipcc/ipcc_register.c michal.lyszczek@bofc.pl xiaoxiang@xiaomi.com anjiah
 drivers/ipcc/ipcc_unlink.c michal.lyszczek@bofc.pl devel@sumpfralle.de anjiahao@xiaomi.com alin.jerpelea@sony.com anchao@xiaomi.com
 drivers/ipcc/ipcc_write.c michal.lyszczek@bofc.pl anjiahao@xiaomi.com anchao@xiaomi.com dongjiuzhu1@xiaomi.com xiaoxiang@xiaomi.com
 drivers/lcd/Kconfig 101105604+simbit18@users.noreply.github.com acassis@gmail.com paul-a.patience@polymtl.ca
-drivers/lcd/apa102.c acassis@gmail.com tiago.medicci@espressif.com petro.karashchenko@gmail.com gustavo.nihei@espressif.com raiden00@railab.me
+drivers/lcd/apa102_lcd.c acassis@gmail.com tiago.medicci@espressif.com petro.karashchenko@gmail.com gustavo.nihei@espressif.com raiden00@railab.me
 drivers/lcd/ft80x.c xiaoxiang@xiaomi.com anjiahao@xiaomi.com anchao@xiaomi.com yamamoto@midokura.com
 drivers/lcd/ft80x.h alin.jerpelea@sony.com xiaoxiang@xiaomi.com anjiahao@xiaomi.com petro.karashchenko@gmail.com
 drivers/lcd/ft80x_spi.c alin.jerpelea@sony.com xiaoxiang@xiaomi.com yamamoto@midokura.com
@@ -13041,7 +13041,7 @@ drivers/lcd/lcd_dev.c matias@protobits.dev jianglianfang@xiaomi.com rongyichang@
 drivers/lcd/lcd_framebuffer.c xiaoxiang@xiaomi.com huangqi3@xiaomi.com jianglianfang@xiaomi.com akaliszan@altimetrik.com
 drivers/lcd/lcddrv_spiif.c dave@marples.net alin.jerpelea@sony.com petro.karashchenko@gmail.com raiden00@railab.me
 drivers/lcd/lpm013m091a.c alin.jerpelea@sony.com michael.jung@secore.ly xiaoxiang@xiaomi.com petro.karashchenko@gmail.com
-drivers/lcd/max7219.c acassis@gmail.com alin.jerpelea@sony.com liaoao@xiaomi.com matias@protobits.dev michael.jung@secore.ly
+drivers/lcd/max7219_lcd.c acassis@gmail.com alin.jerpelea@sony.com liaoao@xiaomi.com matias@protobits.dev michael.jung@secore.ly
 drivers/lcd/memlcd.c jernej.turnsek@gmail.com juha.niskanen@haltian.com alin.jerpelea@sony.com liaoao@xiaomi.com
 drivers/lcd/mio283qt2.c alin.jerpelea@sony.com yamamoto@midokura.com michael.jung@secore.ly
 drivers/lcd/mio283qt9a.c alin.jerpelea@sony.com yamamoto@midokura.com michael.jung@secore.ly raiden00@railab.me

drivers/lcd/CMakeLists.txt

@@ -50,7 +50,7 @@ if(CONFIG_LCD)
   endif()
 
   if(CONFIG_LCD_APA102)
-    list(APPEND SRCS apa102.c)
+    list(APPEND SRCS apa102_lcd.c)
   endif()
 
   if(CONFIG_LCD_P14201)
@@ -94,7 +94,7 @@ if(CONFIG_LCD)
   endif()
 
   if(CONFIG_LCD_MAX7219)
-    list(APPEND SRCS max7219.c)
+    list(APPEND SRCS max7219_lcd.c)
   endif()
 
   if(CONFIG_LCD_MIO283QT9A)

drivers/lcd/Make.defs

@@ -48,7 +48,7 @@ ifeq ($(CONFIG_LCD_LPM013M091A),y)
 endif
 
 ifeq ($(CONFIG_LCD_APA102),y)
-  CSRCS += apa102.c
+  CSRCS += apa102_lcd.c
 endif
 
 ifeq ($(CONFIG_LCD_P14201),y)
@@ -92,7 +92,7 @@ ifeq ($(CONFIG_LCD_MIO283QT2),y)
 endif
 
 ifeq ($(CONFIG_LCD_MAX7219),y)
-  CSRCS += max7219.c
+  CSRCS += max7219_lcd.c
 endif
 
 ifeq ($(CONFIG_LCD_MIO283QT9A),y)

drivers/lcd/apa102.c → drivers/lcd/apa102_lcd.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * drivers/lcd/apa102.c
+ * drivers/lcd/apa102_lcd.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -51,12 +51,14 @@
 
 /* APA102 Configuration Settings:
  *
- * CONFIG_APA102_XRES - Specifies the number of physical
+ * CONFIG_LCD_APA102_XRES - Specifies the number of physical
  *   APA102 devices that are connected together horizontally.
  *
- * CONFIG_APA102_YRES - Specifies the number of physical
+ * CONFIG_LCD_APA102_YRES - Specifies the number of physical
  *   APA102 devices that are connected together vertically.
  *
+ * CONFIG_LCD_APA102_FREQUENCY - SPI frequency used to drive the chain.
+ *
  * CONFIG_LCD_INTENSITY - Defines the default bright of LEDs.
  *
  * Required LCD driver settings:
@@ -68,24 +70,24 @@
 
 /* SPI frequency */
 
-#ifndef CONFIG_APA102_FREQUENCY
-#  define CONFIG_APA102_FREQUENCY 10000000
+#ifndef CONFIG_LCD_APA102_FREQUENCY
+#  define CONFIG_LCD_APA102_FREQUENCY 1000000
 #endif
 
 /* APA102_COLUMNS determines the number of physical LEDs
  * matrices that are used connected horizontally.
  */
 
-#ifndef CONFIG_APA102_XRES
-#  define CONFIG_APA102_XRES 16
+#ifndef CONFIG_LCD_APA102_XRES
+#  define CONFIG_LCD_APA102_XRES 16
 #endif
 
 /* APA102_LINES determines the number of physical LEDs
  * matrices that are used connected vertically.
  */
 
-#ifndef CONFIG_APA102_YRES
-#  define CONFIG_APA102_YRES 16
+#ifndef CONFIG_LCD_APA102_YRES
+#  define CONFIG_LCD_APA102_YRES 16
 #endif
 
 /* Check contrast selection */
@@ -98,8 +100,8 @@
 
 /* Display Resolution */
 
-#define APA102_XRES         CONFIG_APA102_XRES
-#define APA102_YRES         CONFIG_APA102_YRES
+#define APA102_XRES         CONFIG_LCD_APA102_XRES
+#define APA102_YRES         CONFIG_LCD_APA102_YRES
 
 /* Color depth and format */
 
@@ -318,7 +320,7 @@ static inline void apa102_configspi(FAR struct spi_dev_s *spi)
   SPI_SETMODE(spi, SPIDEV_MODE0);
   SPI_SETBITS(spi, 8);
   SPI_HWFEATURES(spi, 0);
-  SPI_SETFREQUENCY(spi, APA102_SPI_MAXFREQUENCY);
+  SPI_SETFREQUENCY(spi, CONFIG_LCD_APA102_FREQUENCY);
 }
 
 /****************************************************************************

drivers/lcd/max7219.c → drivers/lcd/max7219_lcd.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * drivers/lcd/max7219.c
+ * drivers/lcd/max7219_lcd.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *