diff --git a/drivers/lcd/Kconfig b/drivers/lcd/Kconfig
index 0d9d5d639d3..ef271dea186 100644
--- a/drivers/lcd/Kconfig
+++ b/drivers/lcd/Kconfig
@@ -106,21 +106,21 @@ config LCD_APA102
 	default n
 
 if LCD_APA102
-	config LCD_APA102_XRES
-		int "APA102 X Resolution"
-		default 16
-		---help---
-			Specifies the X resolution of the LCD.
+config LCD_APA102_XRES
+	int "APA102 X Resolution"
+	default 16
+	---help---
+		Specifies the X resolution of the LCD.
 
-	config LCD_APA102_YRES
-		int "APA102 Y Resolution"
-		default 16
-		---help---
-			Specifies the Y resolution of the LCD.
+config LCD_APA102_YRES
+	int "APA102 Y Resolution"
+	default 16
+	---help---
+		Specifies the Y resolution of the LCD.
 
-	config LCD_APA102_FREQUENCY
-		int "SPI Frequency"
-		default 1000000
+config LCD_APA102_FREQUENCY
+	int "SPI Frequency"
+	default 1000000
 
 endif # LCD_APA102
 
@@ -174,7 +174,7 @@ config P14201_FRAMEBUFFER
 		LCD framebuffer.  This internal framebuffer support should not be
 		enabled with CONFIG_LCD_FRAMBEBUFFER because this external common
 		framebuffer interface will provide the necessary buffering.
-endif
+endif # LCD_P14201
 
 config LCD_MAX7219
 	bool "Matrix of 8x8 LEDs controlled by MAX7219"
@@ -272,7 +272,7 @@ config UG9664HSWAG01_POWER
 		configuration should be defined.  In this case the system must
 		provide an interface ug_power().
 
-endif
+endif # LCD_UG9664HSWAG01
 
 config LCD_SH1106_OLED_132
 	bool "Generic 0.96'' OLED Display Module (SH1106/SSD1306)"
@@ -463,7 +463,7 @@ config LCD_SSD1351
 if LCD_SSD1351
 
 choice
-	prompt "Interface"
+	prompt "SSD1351 Interface"
 	default SSD1351_SPI4WIRE
 
 config SSD1351_PARALLEL8BIT
@@ -484,7 +484,7 @@ config SSD1351_SPI4WIRE
 	---help---
 		Enables support for the 4-wire SPI interface.
 
-endchoice
+endchoice # SSD1351 Interface
 
 if SSD1351_SPI3WIRE || SSD1351_SPI4WIRE
 
@@ -632,49 +632,49 @@ config SSD1351_MSTRCONTRAST
 	---help---
 		Specifies the master contrast ratio in sixteenths.
 
-endif
+endif # LCD_SSD1351
 
 config LCD_ST7735
 	bool "Sitronix ST7735 TFT Controller"
 	default n
 
 if LCD_ST7735
-	choice
-		prompt "LCD Preset Resolutions"
-		optional
+choice
+	prompt "LCD Preset Resolutions"
+	optional
 
-		config LCD_ST7735_GM11
-			bool "128x160"
+config LCD_ST7735_GM11
+	bool "128x160"
 
-		config LCD_ST7735_GM00
-			bool "132x162"
+config LCD_ST7735_GM00
+	bool "132x162"
 
-		config LCD_ST7735_GM01
-			bool "132x132"
+config LCD_ST7735_GM01
+	bool "132x132"
 
-	endchoice
+endchoice # LCD Preset Resolutions
 
 if !LCD_ST7735_GM00 && !LCD_ST7735_GM01 && !LCD_ST7735_GM11
 
-	config LCD_ST7735_XRES
+config LCD_ST7735_XRES
 	int "ST7735 X Resolution"
 	default 128
 	---help---
 		Specifies the X resolution of the LCD.
 
-	config LCD_ST7735_YRES
+config LCD_ST7735_YRES
 	int "ST7735 Y Resolution"
 	default 160
 	---help---
 		Specifies the Y resolution of the LCD.
 
-	config LCD_ST7735_XOFFSET
+config LCD_ST7735_XOFFSET
 	int "ST7735 X Offset"
 	default 0
 	---help---
 		Specifies the X offset of the LCD.
 
-	config LCD_ST7735_YOFFSET
+config LCD_ST7735_YOFFSET
 	int "ST7735 Y Offset"
 	default 0
 	---help---
@@ -682,21 +682,21 @@ if !LCD_ST7735_GM00 && !LCD_ST7735_GM01 && !LCD_ST7735_GM11
 
 endif
 
-	config LCD_ST7735_BGR
-		bool "Swap R & B channel"
-		default n
+config LCD_ST7735_BGR
+	bool "Swap R & B channel"
+	default n
 
-	config LCD_ST7735_BPP
-		int "Bit Per Pixel (12, 16 or 18)"
-		default 16
+config LCD_ST7735_BPP
+	int "Bit Per Pixel (12, 16 or 18)"
+	default 16
 
-	config LCD_ST7735_SPIMODE
-		int "SPI Mode"
-		default 0
+config LCD_ST7735_SPIMODE
+	int "SPI Mode"
+	default 0
 
-	config LCD_ST7735_FREQUENCY
-		int "SPI Frequency"
-		default 3000000
+config LCD_ST7735_FREQUENCY
+	int "SPI Frequency"
+	default 3000000
 
 endif # LCD_ST7735
 
@@ -705,56 +705,56 @@ config LCD_ST7789
 	default n
 
 if LCD_ST7789
-	config LCD_ST7789_XRES
-		int "ST7789 X Resolution"
-		default 240
-		---help---
-			Specifies the X resolution of the LCD.
+config LCD_ST7789_XRES
+	int "ST7789 X Resolution"
+	default 240
+	---help---
+		Specifies the X resolution of the LCD.
 
-	config LCD_ST7789_YRES
-		int "ST7789 Y Resolution"
-		default 320
-		---help---
-			Specifies the Y resolution of the LCD.
+config LCD_ST7789_YRES
+	int "ST7789 Y Resolution"
+	default 320
+	---help---
+		Specifies the Y resolution of the LCD.
 
-	config LCD_ST7789_XOFFSET
-		int "ST7789 X Offset"
-		default 0
-		---help---
-			Specifies the X offset of the LCD.
+config LCD_ST7789_XOFFSET
+	int "ST7789 X Offset"
+	default 0
+	---help---
+		Specifies the X offset of the LCD.
 
-	config LCD_ST7789_YOFFSET
-		int "ST7789 Y Offset"
-		default 0
-		---help---
-			Specifies the Y offset of the LCD.
+config LCD_ST7789_YOFFSET
+	int "ST7789 Y Offset"
+	default 0
+	---help---
+		Specifies the Y offset of the LCD.
 
-	config LCD_ST7789_MIRRORX
-		bool "ST7789 Mirror X"
-		default n
+config LCD_ST7789_MIRRORX
+	bool "ST7789 Mirror X"
+	default n
 
-	config LCD_ST7789_MIRRORY
-		bool "ST7789 Mirror Y"
-		default n
+config LCD_ST7789_MIRRORY
+	bool "ST7789 Mirror Y"
+	default n
 
-	config LCD_ST7789_INVCOLOR
-		bool "ST7789 Invert Color"
-		default y
-		---help---
-			Invert colors of the LCD display. This is useful for implementations
-			that assume that that colors are inverted by default.
+config LCD_ST7789_INVCOLOR
+	bool "ST7789 Invert Color"
+	default y
+	---help---
+		Invert colors of the LCD display. This is useful for implementations
+		that assume that that colors are inverted by default.
 
-	config LCD_ST7789_BPP
-		int "Bit Per Pixel (12 or 16)"
-		default 16
+config LCD_ST7789_BPP
+	int "Bit Per Pixel (12 or 16)"
+	default 16
 
-	config LCD_ST7789_SPIMODE
-		int "SPI Mode"
-		default 0
+config LCD_ST7789_SPIMODE
+	int "SPI Mode"
+	default 0
 
-	config LCD_ST7789_FREQUENCY
-		int "SPI Frequency"
-		default 1000000
+config LCD_ST7789_FREQUENCY
+	int "SPI Frequency"
+	default 1000000
 
 endif # LCD_ST7789
 
@@ -763,45 +763,45 @@ config LCD_GC9A01
 	default n
 
 if LCD_GC9A01
-	config LCD_GC9A01_XRES
-		int "GC9A01 X Resolution"
-		default 240
-		---help---
-			Specifies the X resolution of the LCD.
+config LCD_GC9A01_XRES
+	int "GC9A01 X Resolution"
+	default 240
+	---help---
+		Specifies the X resolution of the LCD.
 
-	config LCD_GC9A01_YRES
-		int "GC9A01 Y Resolution"
-		default 240
-		---help---
-			Specifies the Y resolution of the LCD.
+config LCD_GC9A01_YRES
+	int "GC9A01 Y Resolution"
+	default 240
+	---help---
+		Specifies the Y resolution of the LCD.
 
-	config LCD_GC9A01_XOFFSET
-		int "GC9A01 X Offset"
-		default 0
-		---help---
-			Specifies the X offset of the LCD.
+config LCD_GC9A01_XOFFSET
+	int "GC9A01 X Offset"
+	default 0
+	---help---
+		Specifies the X offset of the LCD.
 
-	config LCD_GC9A01_YOFFSET
-		int "GC9A01 Y Offset"
-		default 0
-		---help---
-			Specifies the Y offset of the LCD.
+config LCD_GC9A01_YOFFSET
+	int "GC9A01 Y Offset"
+	default 0
+	---help---
+		Specifies the Y offset of the LCD.
 
-	config LCD_GC9A01_BGR
-		bool "Swap R & B channel"
-		default n
+config LCD_GC9A01_BGR
+	bool "Swap R & B channel"
+	default n
 
-	config LCD_GC9A01_BPP
-		int "Bit Per Pixel (12 or 16)"
-		default 16
+config LCD_GC9A01_BPP
+	int "Bit Per Pixel (12 or 16)"
+	default 16
 
-	config LCD_GC9A01_SPIMODE
-		int "SPI Mode"
-		default 0
+config LCD_GC9A01_SPIMODE
+	int "SPI Mode"
+	default 0
 
-	config LCD_GC9A01_FREQUENCY
-		int "SPI Frequency"
-		default 1000000
+config LCD_GC9A01_FREQUENCY
+	int "SPI Frequency"
+	default 1000000
 
 endif # LCD_GC9A01
 
@@ -810,53 +810,53 @@ config LCD_JD9851
 	default n
 
 if LCD_JD9851
-	config LCD_JD9851_XRES
-		int "JD9851 X Resolution"
-		default 240
-		---help---
-			Specifies the X resolution of the LCD.
+config LCD_JD9851_XRES
+	int "JD9851 X Resolution"
+	default 240
+	---help---
+		Specifies the X resolution of the LCD.
 
-	config LCD_JD9851_YRES
-		int "JD9851 Y Resolution"
-		default 320
-		---help---
-			Specifies the Y resolution of the LCD.
+config LCD_JD9851_YRES
+	int "JD9851 Y Resolution"
+	default 320
+	---help---
+		Specifies the Y resolution of the LCD.
 
-	config LCD_JD9851_XOFFSET
-		int "JD9851 X Offset"
-		default 0
-		---help---
-			Specifies the X offset of the LCD.
+config LCD_JD9851_XOFFSET
+	int "JD9851 X Offset"
+	default 0
+	---help---
+		Specifies the X offset of the LCD.
 
-	config LCD_JD9851_YOFFSET
-		int "JD9851 Y Offset"
-		default 0
-		---help---
-			Specifies the Y offset of the LCD.
+config LCD_JD9851_YOFFSET
+	int "JD9851 Y Offset"
+	default 0
+	---help---
+		Specifies the Y offset of the LCD.
 
-	config LCD_JD9851_BGR
-		bool "Swap R & B channel"
-		default n
+config LCD_JD9851_BGR
+	bool "Swap R & B channel"
+	default n
 
-	config LCD_JD9851_BPP
-		int "Bit Per Pixel (16)"
-		default 16
+config LCD_JD9851_BPP
+	int "Bit Per Pixel (16)"
+	default 16
 
-	config LCD_JD9851_SPIMODE
-		int "SPI Mode"
-		default 0
+config LCD_JD9851_SPIMODE
+	int "SPI Mode"
+	default 0
 
-	config LCD_JD9851_FREQUENCY
-		int "SPI Frequency"
-		default 1000000
+config LCD_JD9851_FREQUENCY
+	int "SPI Frequency"
+	default 1000000
 
-	config LCD_JD9851_INVERT
-		bool "Enter into display inversion mode"
-		default n
+config LCD_JD9851_INVERT
+	bool "Enter into display inversion mode"
+	default n
 
-	config LCD_JD9851_TE
-		bool "Tearing effect line on"
-		default n
+config LCD_JD9851_TE
+	bool "Tearing effect line on"
+	default n
 
 endif # LCD_JD9851
 
@@ -1058,7 +1058,7 @@ config UG2864AMBAG01_NINTERFACES
 		Specifies the number of physical UG-9664HSWAG01 devices that will be
 		supported.  NOTE:  At present, this must be undefined or defined to be 1.
 
-endif
+endif # LCD_UG2864AMBAG01
 
 config LCD_SSD1289
 	bool "LCD Based on SSD1289 Controller"
@@ -1084,8 +1084,8 @@ config SSD1289_PROFILE2
 config SSD1289_PROFILE3
 	bool "Profile 3"
 
-endchoice
-endif
+endchoice # SSD1289 Initialization Profile
+endif # LCD_SSD1289
 
 config LCD_SHARP_MEMLCD
 	bool "Sharp Memory LCD Suite"
@@ -1114,7 +1114,7 @@ config MEMLCD_LS027B7DH01A
 	---help---
 		Selects the LS027B7DH01A model
 
-endchoice
+endchoice # Memory LCD Model
 
 config MEMLCD_NINTERFACES
 	int "Number of physical Memory LCD devices"
@@ -1140,7 +1140,7 @@ config MEMLCD_SPI_FREQUENCY
 	---help---
 		Define to use a different bus frequency, FIXME DEFAULT VALUE OK?
 
-endif
+endif # LCD_SHARP_MEMLCD
 
 choice
 	prompt "LCD Orientation"
@@ -1186,7 +1186,7 @@ config LCD_DYN_ORIENTATION
 		have the possibility to switch the orientation while runtime. Orientation
 		is a parameter of lcdinitialize().
 
-endchoice
+endchoice # LCD Orientation
 
 config LCD_LPM013M091A
 	bool "JDI LPM013M091A LCD Driver"
@@ -1204,29 +1204,29 @@ config LCD_ILI9225
 		LCD Single Chip Driver, ILI9225, ILI Technology Corp.
 
 if LCD_ILI9225
-	config LCD_ILI9225_XRES
-		int "ILI9225 X Resolution"
-		default 176
-		---help---
-			Specifies the X resolution of the LCD.
+config LCD_ILI9225_XRES
+	int "ILI9225 X Resolution"
+	default 176
+	---help---
+		Specifies the X resolution of the LCD.
 
-	config LCD_ILI9225_YRES
-		int "ILI9225 Y Resolution"
-		default 220
-		---help---
-			Specifies the Y resolution of the LCD.
+config LCD_ILI9225_YRES
+	int "ILI9225 Y Resolution"
+	default 220
+	---help---
+		Specifies the Y resolution of the LCD.
 
-	config LCD_ILI9225_BPP
-		int "Bit Per Pixel (16)"
-		default 16
+config LCD_ILI9225_BPP
+	int "Bit Per Pixel (16)"
+	default 16
 
-	config LCD_ILI9225_SPIMODE
-		int "SPI Mode"
-		default 0
+config LCD_ILI9225_SPIMODE
+	int "SPI Mode"
+	default 0
 
-	config LCD_ILI9225_FREQUENCY
-		int "SPI Frequency"
-		default 1000000
+config LCD_ILI9225_FREQUENCY
+	int "SPI Frequency"
+	default 1000000
 
 endif # LCD_ILI9225
 
@@ -1282,7 +1282,7 @@ config LCD_ILI9340_IFACE0_RPORTRAIT
 	---help---
 		Define for "reverse portrait" orientation support.
 
-endchoice
+endchoice # LCD Orientation
 
 choice
 	prompt "Color format"
@@ -1295,8 +1295,8 @@ config LCD_ILI9340_IFACE0_RGB565
 	---help---
 	16 bpp RGB565 color format
 
-endchoice
-endif
+endchoice # Color format
+endif # LCD_ILI9340_IFACE0
 
 config LCD_ILI9340_IFACE1
 	bool "(2) LCD Display"
@@ -1633,7 +1633,6 @@ config LCD_SSD1680
 		Required SPI driver settings:
 		SPI_CMDDATA - Include support for cmd/data selection.
 
-
 if LCD_SSD1680
 
 choice
@@ -1668,6 +1667,7 @@ config SSD1680_FREQUENCY
 	---help---
 		Selects the SPI bus frequency used with the SSD1680 device.
 		Max for read mode is 2.5 MHz, for write mode is 20 HHz
+
 endif # LCD_SSD1680