From 9a00b998845035dfeecf00fe7c3495cec4cc1c21 Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Thu, 27 Jan 2022 22:08:18 +0100 Subject: [PATCH] drivers: display: grove_lcd_rgb: move to misc The driver does not implement a display API, it has a custom API. Having it under display is confusing, since display API consumers may expect they can use it. These sort of custom drivers fit better under drivers/misc. Signed-off-by: Gerard Marull-Paretas --- drivers/display/CMakeLists.txt | 1 - drivers/display/Kconfig | 1 - drivers/misc/CMakeLists.txt | 1 + drivers/misc/Kconfig | 1 + drivers/misc/grove_lcd_rgb/CMakeLists.txt | 5 +++++ .../{display/Kconfig.grove => misc/grove_lcd_rgb/Kconfig} | 1 + drivers/{display => misc/grove_lcd_rgb}/grove_lcd_rgb.c | 4 ++-- include/{display => drivers/misc/grove_lcd}/grove_lcd.h | 0 .../display => drivers/misc}/grove_display/CMakeLists.txt | 0 .../display => drivers/misc}/grove_display/README.rst | 0 .../misc}/grove_display/boards/serpente.overlay | 0 .../{subsys/display => drivers/misc}/grove_display/prj.conf | 1 - .../display => drivers/misc}/grove_display/sample.yaml | 2 +- .../display => drivers/misc}/grove_display/src/main.c | 2 +- samples/sensor/grove_temperature/src/main.c | 2 +- samples/sensor/th02/prj.conf | 1 - samples/sensor/th02/src/main.c | 2 +- 17 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 drivers/misc/grove_lcd_rgb/CMakeLists.txt rename drivers/{display/Kconfig.grove => misc/grove_lcd_rgb/Kconfig} (91%) rename drivers/{display => misc/grove_lcd_rgb}/grove_lcd_rgb.c (98%) rename include/{display => drivers/misc/grove_lcd}/grove_lcd.h (100%) rename samples/{subsys/display => drivers/misc}/grove_display/CMakeLists.txt (100%) rename samples/{subsys/display => drivers/misc}/grove_display/README.rst (100%) rename samples/{subsys/display => drivers/misc}/grove_display/boards/serpente.overlay (100%) rename samples/{subsys/display => drivers/misc}/grove_display/prj.conf (82%) rename samples/{subsys/display => drivers/misc}/grove_display/sample.yaml (77%) rename samples/{subsys/display => drivers/misc}/grove_display/src/main.c (97%) diff --git a/drivers/display/CMakeLists.txt b/drivers/display/CMakeLists.txt index 492ebadb739..a87599542ad 100644 --- a/drivers/display/CMakeLists.txt +++ b/drivers/display/CMakeLists.txt @@ -6,7 +6,6 @@ zephyr_library_sources_ifdef(CONFIG_DISPLAY_NRF_LED_MATRIX display_nrf_led_matri zephyr_library_sources_ifdef(CONFIG_DUMMY_DISPLAY display_dummy.c) zephyr_library_sources_ifdef(CONFIG_FRAMEBUF_DISPLAY display_framebuf.c) zephyr_library_sources_ifdef(CONFIG_GD7965 gd7965.c) -zephyr_library_sources_ifdef(CONFIG_GROVE_LCD_RGB grove_lcd_rgb.c) zephyr_library_sources_ifdef(CONFIG_ILI9XXX display_ili9xxx.c) zephyr_library_sources_ifdef(CONFIG_ILI9340 display_ili9340.c) zephyr_library_sources_ifdef(CONFIG_ILI9341 display_ili9341.c) diff --git a/drivers/display/Kconfig b/drivers/display/Kconfig index c9a9f95562b..3a736644ecc 100644 --- a/drivers/display/Kconfig +++ b/drivers/display/Kconfig @@ -20,7 +20,6 @@ module = DISPLAY module-str = display source "subsys/logging/Kconfig.template.log_config" -source "drivers/display/Kconfig.grove" source "drivers/display/Kconfig.mcux_elcdif" source "drivers/display/Kconfig.microbit" source "drivers/display/Kconfig.nrf_led_matrix" diff --git a/drivers/misc/CMakeLists.txt b/drivers/misc/CMakeLists.txt index 3d53d351dc7..cd0be16d423 100644 --- a/drivers/misc/CMakeLists.txt +++ b/drivers/misc/CMakeLists.txt @@ -1,3 +1,4 @@ # SPDX-License-Identifier: Apache-2.0 add_subdirectory_ifdef(CONFIG_FT800 ft8xx) +add_subdirectory_ifdef(CONFIG_GROVE_LCD_RGB grove_lcd_rgb) diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 33915d8dbe1..e7301ee85d6 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -6,5 +6,6 @@ menu "Miscellaneous Drivers" source "drivers/misc/ft8xx/Kconfig" +source "drivers/misc/grove_lcd_rgb/Kconfig" endmenu diff --git a/drivers/misc/grove_lcd_rgb/CMakeLists.txt b/drivers/misc/grove_lcd_rgb/CMakeLists.txt new file mode 100644 index 00000000000..96024dbde32 --- /dev/null +++ b/drivers/misc/grove_lcd_rgb/CMakeLists.txt @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 + +zephyr_library() + +zephyr_library_sources(grove_lcd_rgb.c) diff --git a/drivers/display/Kconfig.grove b/drivers/misc/grove_lcd_rgb/Kconfig similarity index 91% rename from drivers/display/Kconfig.grove rename to drivers/misc/grove_lcd_rgb/Kconfig index 59118fb95e7..2859292257e 100644 --- a/drivers/display/Kconfig.grove +++ b/drivers/misc/grove_lcd_rgb/Kconfig @@ -1,3 +1,4 @@ +# Copyright (c) 2015 Intel Corporation # SPDX-License-Identifier: Apache-2.0 config GROVE_LCD_RGB diff --git a/drivers/display/grove_lcd_rgb.c b/drivers/misc/grove_lcd_rgb/grove_lcd_rgb.c similarity index 98% rename from drivers/display/grove_lcd_rgb.c rename to drivers/misc/grove_lcd_rgb/grove_lcd_rgb.c index 659ce6f8aea..fade8ce0e76 100644 --- a/drivers/display/grove_lcd_rgb.c +++ b/drivers/misc/grove_lcd_rgb/grove_lcd_rgb.c @@ -10,7 +10,7 @@ #include #include -#include +#include #include #define LOG_LEVEL CONFIG_DISPLAY_LOG_LEVEL @@ -344,5 +344,5 @@ static struct glcd_data grove_lcd_driver = { */ DEVICE_DEFINE(grove_lcd, GROVE_LCD_NAME, glcd_initialize, NULL, &grove_lcd_driver, &grove_lcd_config, - POST_KERNEL, CONFIG_DISPLAY_INIT_PRIORITY, + POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, (void *)&grove_lcd_driver); diff --git a/include/display/grove_lcd.h b/include/drivers/misc/grove_lcd/grove_lcd.h similarity index 100% rename from include/display/grove_lcd.h rename to include/drivers/misc/grove_lcd/grove_lcd.h diff --git a/samples/subsys/display/grove_display/CMakeLists.txt b/samples/drivers/misc/grove_display/CMakeLists.txt similarity index 100% rename from samples/subsys/display/grove_display/CMakeLists.txt rename to samples/drivers/misc/grove_display/CMakeLists.txt diff --git a/samples/subsys/display/grove_display/README.rst b/samples/drivers/misc/grove_display/README.rst similarity index 100% rename from samples/subsys/display/grove_display/README.rst rename to samples/drivers/misc/grove_display/README.rst diff --git a/samples/subsys/display/grove_display/boards/serpente.overlay b/samples/drivers/misc/grove_display/boards/serpente.overlay similarity index 100% rename from samples/subsys/display/grove_display/boards/serpente.overlay rename to samples/drivers/misc/grove_display/boards/serpente.overlay diff --git a/samples/subsys/display/grove_display/prj.conf b/samples/drivers/misc/grove_display/prj.conf similarity index 82% rename from samples/subsys/display/grove_display/prj.conf rename to samples/drivers/misc/grove_display/prj.conf index 3bdd8a81fb3..119ff43d886 100644 --- a/samples/subsys/display/grove_display/prj.conf +++ b/samples/drivers/misc/grove_display/prj.conf @@ -3,5 +3,4 @@ CONFIG_PRINTK=y CONFIG_I2C=y -CONFIG_DISPLAY=y CONFIG_GROVE_LCD_RGB=y diff --git a/samples/subsys/display/grove_display/sample.yaml b/samples/drivers/misc/grove_display/sample.yaml similarity index 77% rename from samples/subsys/display/grove_display/sample.yaml rename to samples/drivers/misc/grove_display/sample.yaml index 4208e93655d..7d28a6dc95f 100644 --- a/samples/subsys/display/grove_display/sample.yaml +++ b/samples/drivers/misc/grove_display/sample.yaml @@ -1,7 +1,7 @@ sample: name: Grove LCD Sample tests: - sample.display.grove_display: + sample.drivers.misc.grove_display: tags: drivers harness: grove depends_on: i2c diff --git a/samples/subsys/display/grove_display/src/main.c b/samples/drivers/misc/grove_display/src/main.c similarity index 97% rename from samples/subsys/display/grove_display/src/main.c rename to samples/drivers/misc/grove_display/src/main.c index f4eff80f9dd..1bd139e9480 100644 --- a/samples/subsys/display/grove_display/src/main.c +++ b/samples/drivers/misc/grove_display/src/main.c @@ -11,7 +11,7 @@ #include #include -#include +#include /** * @file Display a counter through I2C and Grove LCD. diff --git a/samples/sensor/grove_temperature/src/main.c b/samples/sensor/grove_temperature/src/main.c index 13e4b9bc3e7..9bc532c2a6d 100644 --- a/samples/sensor/grove_temperature/src/main.c +++ b/samples/sensor/grove_temperature/src/main.c @@ -10,7 +10,7 @@ #include #ifdef CONFIG_GROVE_LCD_RGB -#include +#include #include #include #endif diff --git a/samples/sensor/th02/prj.conf b/samples/sensor/th02/prj.conf index 7ec5020c37f..cec3d5a1dd0 100644 --- a/samples/sensor/th02/prj.conf +++ b/samples/sensor/th02/prj.conf @@ -5,5 +5,4 @@ CONFIG_TH02=y CONFIG_LOG=n CONFIG_SENSOR_LOG_LEVEL_DBG=y CONFIG_GROVE_LCD_RGB=y -CONFIG_DISPLAY=y CONFIG_CBPRINTF_FP_SUPPORT=y diff --git a/samples/sensor/th02/src/main.c b/samples/sensor/th02/src/main.c index 4d2d6a8ee4f..5c7f586e34b 100644 --- a/samples/sensor/th02/src/main.c +++ b/samples/sensor/th02/src/main.c @@ -11,7 +11,7 @@ #include #ifdef CONFIG_GROVE_LCD_RGB -#include +#include #include #include #endif