grove: lcd: move grove lcd driver to drivers/display

Move to display drivers where it belongs.

Signed-off-by: Anas Nashif <[email protected]>

Author: nashif

drivers/display/CMakeLists.txt

@@ -1,3 +1,5 @@
+
+zephyr_sources_ifdef(CONFIG_GROVE_LCD_RGB grove_lcd_rgb.c)
 zephyr_sources_ifdef(CONFIG_MICROBIT_DISPLAY
 	mb_display.c
 	mb_font.c

drivers/display/Kconfig

@@ -17,6 +17,8 @@ module = DISPLAY
 module-str = display
 source "subsys/logging/Kconfig.template.log_config"
 
+source "drivers/display/Kconfig.grove"
+
 source "drivers/display/Kconfig.microbit"
 
 source "drivers/display/Kconfig.ili9340"

drivers/display/Kconfig.grove

@@ -0,0 +1,14 @@
+
+config GROVE_LCD_RGB
+	bool "Enable the Seeed Grove LCD RGB Backlight"
+	help
+	  Setting this value will enable driver support for the Groove-LCD RGB
+	  Backlight.
+
+config GROVE_LCD_RGB_I2C_MASTER_DEV_NAME
+	string "I2C Master where Grove LCD is connected"
+	depends on GROVE_LCD_RGB
+	default "I2C_0"
+	help
+	  Specify the device name of the I2C master device to which the
+	  Grove LCD is connected.

drivers/grove/lcd_rgb.c renamed to drivers/display/grove_lcd_rgb.c

@@ -13,7 +13,7 @@
 #include <display/grove_lcd.h>
 #include <misc/util.h>
 
-#define LOG_LEVEL CONFIG_GROVE_LOG_LEVEL
+#define LOG_LEVEL CONFIG_DISPLAY_LOG_LEVEL
 #include <logging/log.h>
 LOG_MODULE_REGISTER(grove_lcd);
 

drivers/grove/CMakeLists.txt

@@ -1,3 +1,2 @@
-zephyr_sources_ifdef(CONFIG_GROVE_LCD_RGB		lcd_rgb.c)
 zephyr_sources_ifdef(CONFIG_GROVE_LIGHT_SENSOR		light_sensor.c)
 zephyr_sources_ifdef(CONFIG_GROVE_TEMPERATURE_SENSOR	temperature_sensor.c)

drivers/grove/Kconfig

@@ -7,30 +7,6 @@
 #
 
 
-menuconfig GROVE
-	bool "Grove Device Drivers"
-	help
-	  Check this box to enable the Seeed Grove device drivers
-
-
-module = GROVE
-module-str = grove
-source "subsys/logging/Kconfig.template.log_config"
-
-config GROVE_LCD_RGB
-	bool "Enable the Seeed Grove LCD RGB Backlight"
-	depends on GROVE
-	help
-	  Setting this value will enable driver support for the Groove-LCD RGB
-	  Backlight.
-
-config GROVE_LCD_RGB_I2C_MASTER_DEV_NAME
-	string "I2C Master where Grove LCD is connected"
-	depends on GROVE_LCD_RGB
-	default "I2C_0"
-	help
-	  Specify the device name of the I2C master device to which the
-	  Grove LCD is connected.
 
 config GROVE_LIGHT_SENSOR
 	bool "Enable the Seeed Grove Light Sensor"

samples/boards/arduino_101/environmental_sensing/sensor/prj.conf

@@ -10,7 +10,7 @@ CONFIG_GPIO=y
 CONFIG_SENSOR=y
 
 # remove Grove configs you don't want to use the LCD
-CONFIG_GROVE=y
+CONFIG_DISPLAY=y
 CONFIG_GROVE_LCD_RGB=y
 
 # change these configs if you want to use different sensors

samples/display/grove_display/prj.conf

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

samples/sensor/grove_temperature/prj.conf

@@ -3,6 +3,7 @@ CONFIG_SENSOR=y
 CONFIG_I2C=y
 CONFIG_ADC=y
 CONFIG_NEWLIB_LIBC=y
+CONFIG_DISPLAY=y
 CONFIG_GROVE=y
 CONFIG_GROVE_TEMPERATURE_SENSOR_ADC_CHANNEL=10
 CONFIG_GROVE_TEMPERATURE_SENSOR=y

samples/sensor/th02/prj.conf

@@ -6,3 +6,4 @@ CONFIG_LOG=n
 CONFIG_SENSOR_LOG_LEVEL_DBG=y
 CONFIG_GROVE=y
 CONFIG_GROVE_LCD_RGB=y
+CONFIG_DISPLAY=y