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 <gerard.marull@nordicsemi.no>
This commit is contained in:
Gerard Marull-Paretas 2022-01-27 22:08:18 +01:00 committed by Marti Bolivar
commit 9a00b99884
17 changed files with 14 additions and 10 deletions

View file

@ -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_DUMMY_DISPLAY display_dummy.c)
zephyr_library_sources_ifdef(CONFIG_FRAMEBUF_DISPLAY display_framebuf.c) zephyr_library_sources_ifdef(CONFIG_FRAMEBUF_DISPLAY display_framebuf.c)
zephyr_library_sources_ifdef(CONFIG_GD7965 gd7965.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_ILI9XXX display_ili9xxx.c)
zephyr_library_sources_ifdef(CONFIG_ILI9340 display_ili9340.c) zephyr_library_sources_ifdef(CONFIG_ILI9340 display_ili9340.c)
zephyr_library_sources_ifdef(CONFIG_ILI9341 display_ili9341.c) zephyr_library_sources_ifdef(CONFIG_ILI9341 display_ili9341.c)

View file

@ -20,7 +20,6 @@ module = DISPLAY
module-str = display module-str = display
source "subsys/logging/Kconfig.template.log_config" source "subsys/logging/Kconfig.template.log_config"
source "drivers/display/Kconfig.grove"
source "drivers/display/Kconfig.mcux_elcdif" source "drivers/display/Kconfig.mcux_elcdif"
source "drivers/display/Kconfig.microbit" source "drivers/display/Kconfig.microbit"
source "drivers/display/Kconfig.nrf_led_matrix" source "drivers/display/Kconfig.nrf_led_matrix"

View file

@ -1,3 +1,4 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
add_subdirectory_ifdef(CONFIG_FT800 ft8xx) add_subdirectory_ifdef(CONFIG_FT800 ft8xx)
add_subdirectory_ifdef(CONFIG_GROVE_LCD_RGB grove_lcd_rgb)

View file

@ -6,5 +6,6 @@
menu "Miscellaneous Drivers" menu "Miscellaneous Drivers"
source "drivers/misc/ft8xx/Kconfig" source "drivers/misc/ft8xx/Kconfig"
source "drivers/misc/grove_lcd_rgb/Kconfig"
endmenu endmenu

View file

@ -0,0 +1,5 @@
# SPDX-License-Identifier: Apache-2.0
zephyr_library()
zephyr_library_sources(grove_lcd_rgb.c)

View file

@ -1,3 +1,4 @@
# Copyright (c) 2015 Intel Corporation
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
config GROVE_LCD_RGB config GROVE_LCD_RGB

View file

@ -10,7 +10,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <drivers/i2c.h> #include <drivers/i2c.h>
#include <display/grove_lcd.h> #include <drivers/misc/grove_lcd/grove_lcd.h>
#include <sys/util.h> #include <sys/util.h>
#define LOG_LEVEL CONFIG_DISPLAY_LOG_LEVEL #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, DEVICE_DEFINE(grove_lcd, GROVE_LCD_NAME, glcd_initialize,
NULL, &grove_lcd_driver, &grove_lcd_config, NULL, &grove_lcd_driver, &grove_lcd_config,
POST_KERNEL, CONFIG_DISPLAY_INIT_PRIORITY, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
(void *)&grove_lcd_driver); (void *)&grove_lcd_driver);

View file

@ -3,5 +3,4 @@ CONFIG_PRINTK=y
CONFIG_I2C=y CONFIG_I2C=y
CONFIG_DISPLAY=y
CONFIG_GROVE_LCD_RGB=y CONFIG_GROVE_LCD_RGB=y

View file

@ -1,7 +1,7 @@
sample: sample:
name: Grove LCD Sample name: Grove LCD Sample
tests: tests:
sample.display.grove_display: sample.drivers.misc.grove_display:
tags: drivers tags: drivers
harness: grove harness: grove
depends_on: i2c depends_on: i2c

View file

@ -11,7 +11,7 @@
#include <device.h> #include <device.h>
#include <drivers/i2c.h> #include <drivers/i2c.h>
#include <display/grove_lcd.h> #include <drivers/misc/grove_lcd/grove_lcd.h>
/** /**
* @file Display a counter through I2C and Grove LCD. * @file Display a counter through I2C and Grove LCD.

View file

@ -10,7 +10,7 @@
#include <drivers/sensor.h> #include <drivers/sensor.h>
#ifdef CONFIG_GROVE_LCD_RGB #ifdef CONFIG_GROVE_LCD_RGB
#include <display/grove_lcd.h> #include <drivers/misc/grove_lcd/grove_lcd.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#endif #endif

View file

@ -5,5 +5,4 @@ CONFIG_TH02=y
CONFIG_LOG=n CONFIG_LOG=n
CONFIG_SENSOR_LOG_LEVEL_DBG=y CONFIG_SENSOR_LOG_LEVEL_DBG=y
CONFIG_GROVE_LCD_RGB=y CONFIG_GROVE_LCD_RGB=y
CONFIG_DISPLAY=y
CONFIG_CBPRINTF_FP_SUPPORT=y CONFIG_CBPRINTF_FP_SUPPORT=y

View file

@ -11,7 +11,7 @@
#include <sys/util.h> #include <sys/util.h>
#ifdef CONFIG_GROVE_LCD_RGB #ifdef CONFIG_GROVE_LCD_RGB
#include <display/grove_lcd.h> #include <drivers/misc/grove_lcd/grove_lcd.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#endif #endif