vmyklebust · Jun 6, 2025 · Jun 11, 2025 · Jun 11, 2025 · May 29, 2025 · Jun 23, 2025
diff --git a/boards/common/simplelink_toolbox.board.cmake b/boards/common/simplelink_toolbox.board.cmake
@@ -0,0 +1,7 @@
+# Copyright (c) 2025 Conclusive Engineering Sp. z o.o.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+board_set_flasher_ifnset(simplelink_toolbox)
+board_set_debugger_ifnset(simplelink_toolbox)
+board_finalize_runner_args(simplelink_toolbox)
diff --git a/boards/common/ti_openocd.board.cmake b/boards/common/ti_openocd.board.cmake
@@ -0,0 +1,7 @@
+# Copyright (c) 2026 Texas Instruments Incorporated.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# Force TI's openocd
+set(OPENOCD OPENOCD-NOTFOUND)
+find_program(OPENOCD openocd PATHS $ENV{TI_OPENOCD_INSTALL_DIR}/bin NO_DEFAULT_PATH)
diff --git a/boards/deprecated.cmake b/boards/deprecated.cmake
@@ -13,6 +13,10 @@
 # https://docs.zephyrproject.org/latest/develop/api/api_lifecycle.html#deprecated,
 # so these aliases are eventually removed
 
+set(lp_em_cc35x1/_DEPRECATED
+    lp_em_cc35x1/cc3551e
+)
+
 set(arduino_uno_r4_minima_DEPRECATED
     arduino_uno_r4@minima
 )

diff --git a/boards/shields/adafruit_2_4_tft/Kconfig.defconfig b/boards/shields/adafruit_2_4_tft/Kconfig.defconfig
@@ -0,0 +1,28 @@
+# Copyright (c) 2026 Conclusive Engineering
+# Copyright (c) 2026 Texas Instruments
+# SPDX-License-Identifier: Apache-2.0
+
+if SHIELD_ADAFRUIT_2_4_TFT
+
+if DISPLAY
+
+if LVGL
+
+config LV_Z_VDB_SIZE
+	default 64
+
+config LV_Z_BITS_PER_PIXEL
+	default 24
+
+choice LV_COLOR_DEPTH
+	default LV_COLOR_DEPTH_32
+endchoice
+
+config INPUT
+	default y
+
+endif # LVGL
+
+endif # DISPLAY
+
+endif # SHIELD_ADAFRUIT_2_4_TFT
diff --git a/boards/shields/adafruit_2_4_tft/Kconfig.shield b/boards/shields/adafruit_2_4_tft/Kconfig.shield
@@ -0,0 +1,6 @@
+# Copyright (c) 2026 Conclusive Engineering
+# Copyright (c) 2026 Texas Instruments
+# SPDX-License-Identifier: Apache-2.0
+
+config SHIELD_ADAFRUIT_2_4_TFT
+	def_bool $(shields_list_contains,adafruit_2_4_tft)
diff --git a/boards/shields/adafruit_2_4_tft/adafruit_2_4_tft.overlay b/boards/shields/adafruit_2_4_tft/adafruit_2_4_tft.overlay
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2026 Conclusive Engineering
+ * Copyright (c) 2026 Texas Instruments
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "adafruit_2_4_tft.dtsi"
diff --git a/boards/shields/adafruit_2_4_tft/boards/lp_em_cc35x1_cc3551e.overlay b/boards/shields/adafruit_2_4_tft/boards/lp_em_cc35x1_cc3551e.overlay
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2026 Conclusive Engineering
+ * Copyright (C) 2026 Texas Instruments
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "adafruit_2_4_tft.dtsi"
+
+display_spi: &spi0 {
+	status = "okay";
+};
+
+&adafruit_2_4_tft_mipi_dbi {
+	spi-dev = <&display_spi>;
+	dc-gpios = <&gpios 31 GPIO_ACTIVE_HIGH>;
+	reset-gpios = <&gpios 17 GPIO_ACTIVE_LOW>;
+};
diff --git a/boards/shields/adafruit_2_4_tft/doc/index.rst b/boards/shields/adafruit_2_4_tft/doc/index.rst
@@ -0,0 +1,81 @@
+.. _adafruit_2_4_tft_v2.1:
+
+Adafruit 2.8" TFT Shield v2.1
+#################################
+
+Overview
+********
+
+The Adafruit 2.4" TFT Shield with a
+resolution of 320x240 pixels, is based on the ILI9341 controller.
+This shield comes with a resistive (STMPE610 controller)
+or capacitive (FT6206 controller) touchscreen. While the
+Zephyr RTOS supports display output to these screens,
+touchscreen input is supported only on Capacitive Touch version.
+More information about the shield can be found at the `Adafruit 2.4" TFT
+website <https://www.adafruit.com/product/1651>`_.
+
+   Adafruit 2.4" TFT (Credit: Adafruit)
+
+Pins Assignment of the Adafruit 2.4" TFT
+========================================================
+
++-----------------------+---------------------------------------------+
+| Shield Connector Pin  | Function                                    |
++=======================+=============================================+
+| D4                    | MicroSD SPI CSn                             |
++-----------------------+---------------------------------------------+
+| D9                    | ILI9341 DC       (Data/Command)             |
++-----------------------+---------------------------------------------+
+| D10                   | ILI9341 SPI CSn                             |
++-----------------------+---------------------------------------------+
+| D11                   | SPI MOSI         (Serial Data Input)        |
++-----------------------+---------------------------------------------+
+| D12                   | SPI MISO         (Serial Data Out)          |
++-----------------------+---------------------------------------------+
+| D13                   | SPI SCK          (Serial Clock Input)       |
++-----------------------+---------------------------------------------+
+
+TI BoosterHeader connector:
++-----------------------+--------------------------------------------+
+| BoosterHeader Pin     | Function                                   |
++=======================+===============+============================+
+| P4                    | ST7789V Reset |                            |
++-----------------------+---------------+----------------------------+
+| P7                    | SPI SCK       | (Serial Clock Input)       |
++-----------------------+---------------+----------------------------+
+| P14                   | SPI MISO      | (Serial Data Out)          |
++-----------------------+---------------+----------------------------+
+| P15                   | SPI MOSI      | (Serial Data Input)        |
++-----------------------+---------------+----------------------------+
+| P18                   | SPI CS LCD    | (LCD Chip Select)          |
++-----------------------+---------------+----------------------------+
+| P30                   | ILI9341 DC    | (Data/Command)             |
++-----------------------+---------------+----------------------------+
+
+
+.. note::
+   Touch controller IRQ line is not connected by default. You will need to
+   solder the ``ICSP_SI1`` jumper to use it. You will also need to adjust
+   driver configuration and its Device Tree entry to make use of it.
+
+Requirements
+************
+
+This shield can only be used with a board which provides a configuration
+for Arduino or Arduino Nano connectors and defines node aliases for SPI and
+GPIO interfaces (see :ref:`shields` for more details).
+
+Programming
+***********
+
+Set ``--shield adafruit_2_4_tft`` when you invoke ``west build``. For example:
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/subsys/display/lvgl
+   :board: lp_em_cc35x1/cc3551e
+   :shield: adafruit_2_4_tft
+   :goals: build
+
+References
+**********
diff --git a/boards/shields/adafruit_2_4_tft/dts/adafruit_2_4_tft.dtsi b/boards/shields/adafruit_2_4_tft/dts/adafruit_2_4_tft.dtsi
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2026 Conclusive Engineering
+ * Copyright (c) 2026 Texas Instruments
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/dt-bindings/display/panel.h>
+#include <zephyr/dt-bindings/gpio/arduino-header-r3.h>
+
+/ {
+	chosen {
+		zephyr,display = &adafruit_2_4_tft_ili9340;
+	};
+
+	adafruit_2_4_tft_mipi_dbi: adafruit_2_4_tft_mipi_dbi {
+		compatible = "zephyr,mipi-dbi-spi";
+		spi-dev = <&arduino_spi>;
+		dc-gpios = <&arduino_header ARDUINO_HEADER_R3_D9 GPIO_ACTIVE_HIGH>;
+		reset-gpios = <&arduino_header ARDUINO_HEADER_R3_D8 GPIO_ACTIVE_LOW>;
+		write-only;
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		adafruit_2_4_tft_ili9340: ili9340@0 {
+			compatible = "ilitek,ili9340";
+			mipi-max-frequency = <15151515>;
+			reg = <0>;
+			width = <320>;
+			height = <240>;
+			pixel-format = <PANEL_PIXEL_FORMAT_RGB_888>;
+			rotation = <90>;
+			frmctr1 = [00 18];
+			pwctrl1 = [23 00];
+			vmctrl1 = [3e 28];
+			vmctrl2 = [86];
+			pgamctrl = [0f 31 2b 0c 0e 08 4e f1 37 07 10 03 0e 09 00];
+			ngamctrl = [00 0e 14 03 11 07 31 c1 48 08 0f 0c 31 36 0f];
+		};
+	};
+};
diff --git a/boards/shields/adafruit_2_4_tft/shield.yml b/boards/shields/adafruit_2_4_tft/shield.yml
@@ -0,0 +1,6 @@
+shields:
+  - name: adafruit_2_4_tft
+    full_name: Adafruit 2.4" TFT Shield
+    vendor: adafruit
+    supported_features:
+      - display
diff --git a/boards/shields/st7789v_generic/Kconfig.defconfig b/boards/shields/st7789v_generic/Kconfig.defconfig
@@ -1,30 +1,35 @@
 # Copyright (c) 2019 Jan Van Winkel <jan.van_winkel@dxplore.eu>
 # SPDX-License-Identifier: Apache-2.0
 
-if SHIELD_ST7789V_TL019FQV01 || SHIELD_ST7789V_WAVESHARE_240X240
+if SHIELD_ST7789V_TL019FQV01 || SHIELD_ST7789V_WAVESHARE_240X240 || SHIELD_ST7789V_WAVESHARE_240X320
 
 if DISPLAY
 
 choice ST7789V_PIXEL_FORMAT
 	default ST7789V_RGB888 if SHIELD_ST7789V_TL019FQV01
 	default ST7789V_RGB565 if SHIELD_ST7789V_WAVESHARE_240X240
+	default ST7789V_RGB565 if SHIELD_ST7789V_WAVESHARE_240X320
 endchoice
 
 if LVGL
 
 config LV_Z_BITS_PER_PIXEL
 	default 24 if SHIELD_ST7789V_TL019FQV01
 	default 16 if SHIELD_ST7789V_WAVESHARE_240X240
+	default 16 if SHIELD_ST7789V_WAVESHARE_240X320
 
 choice LV_COLOR_DEPTH
 	default LV_COLOR_DEPTH_16 if SHIELD_ST7789V_WAVESHARE_240X240
+	default LV_COLOR_DEPTH_16 if SHIELD_ST7789V_WAVESHARE_240X320
 endchoice
 
 configdefault LV_COLOR_16_SWAP
 	default y if SHIELD_ST7789V_WAVESHARE_240X240
+	default y if SHIELD_ST7789V_WAVESHARE_240X320
 
 endif # LVGL
 
 endif # DISPLAY
 
-endif # SHIELD_ST7789V_TL019FQV01 || SHIELD_ST7789V_WAVESHARE_240X240
+endif # SHIELD_ST7789V_TL019FQV01 || SHIELD_ST7789V_WAVESHARE_240X240 ||
+# SHIELD_ST7789V_WAVESHARE_240X320
diff --git a/boards/shields/st7789v_generic/Kconfig.shield b/boards/shields/st7789v_generic/Kconfig.shield
@@ -6,3 +6,6 @@ config SHIELD_ST7789V_TL019FQV01
 
 config SHIELD_ST7789V_WAVESHARE_240X240
 	def_bool $(shields_list_contains,st7789v_waveshare_240x240)
+
+config SHIELD_ST7789V_WAVESHARE_240X320
+	def_bool $(shields_list_contains,st7789v_waveshare_240x320)
diff --git a/boards/shields/st7789v_generic/doc/index.rst b/boards/shields/st7789v_generic/doc/index.rst
@@ -16,6 +16,12 @@ Pins Assignment of the Generic ST7789V Display Shield
 +-----------------------+--------------------------------------------+
 | Arduino Connector Pin | Function                                   |
 +=======================+===============+============================+
+| D3                    |  TC IRQ       |                            |
++-----------------------+---------------+----------------------------+
+| D5                    | SPI CS SD     | (SD Card Chip Select)      |
++-----------------------+---------------+----------------------------+
+| D6                    | SPI CS TC     | (Touch Screen Chip Select) |
++-----------------------+---------------+----------------------------+
 | D8                    | ST7789V Reset |                            |
 +-----------------------+---------------+----------------------------+
 | D9                    | ST7789V DC    | (Data/Command)             |
@@ -29,19 +35,46 @@ Pins Assignment of the Generic ST7789V Display Shield
 | D13                   | SPI SCK       | (Serial Clock Input)       |
 +-----------------------+---------------+----------------------------+
 
+TI BoosterHeader connector:
++-----------------------+--------------------------------------------+
+| BoosterHeader Pin     | Function                                   |
++=======================+===============+============================+
+| P3                    | SPI CS SD     | (SD Card Chip Select)      |
++-----------------------+---------------+----------------------------+
+| P4                    | ST7789V Reset |                            |
++-----------------------+---------------+----------------------------+
+| P7                    | SPI SCK       | (Serial Clock Input)       |
++-----------------------+---------------+----------------------------+
+| P14                   | SPI MISO      | (Serial Data Out)          |
++-----------------------+---------------+----------------------------+
+| P15                   | SPI MOSI      | (Serial Data Input)        |
++-----------------------+---------------+----------------------------+
+| P18                   | SPI CS LCD    | (LCD Chip Select)          |
++-----------------------+---------------+----------------------------+
+| P30                   | ST7789V DC    | (Data/Command)             |
++-----------------------+---------------+----------------------------+
+| P37                   | SPI CS TC     | (Touch Screen Chip Select) |
++-----------------------+---------------+----------------------------+
+| P38                   | TC IRQ        | (Touch Screen Interrupt)   |
++-----------------------+---------------+----------------------------+
+
+
 Current supported displays
 ==========================
 
-+----------------------+------------------------------+
-| Display              | Shield Designation           |
-|                      |                              |
-+======================+==============================+
-| TL019FQV01           | st7789v_tl019fqv01           |
-|                      |                              |
-+----------------------+------------------------------+
-| Waveshare 240x240    | st7789v_waveshare_240x240    |
-| 1.3inch IPS LCD      |                              |
-+----------------------+------------------------------+
++--------------------------+------------------------------+
+| Display                  | Shield Designation           |
+|                          |                              |
++==========================+==============================+
+| TL019FQV01               | st7789v_tl019fqv01           |
+|                          |                              |
++--------------------------+------------------------------+
+| Waveshare 240x240        | st7789v_waveshare_240x240    |
+| 1.3inch IPS LCD          |                              |
++--------------------------+------------------------------+
+| Waveshare 240x320        | st7789v_waveshare_240x320    |
+| 2.8inch TFT TOUCH SCREEN |                              |
++--------------------------+------------------------------+
 
 Requirements
 ************

diff --git a/boards/shields/st7789v_generic/shield.yml b/boards/shields/st7789v_generic/shield.yml
@@ -10,3 +10,11 @@ shields:
     vendor: waveshare
     supported_features:
       - display
+
+  - name: st7789v_waveshare_240x320
+    full_name: Waveshare 240x320 2.8inch TFT Touch Screen + SD
+    vendor: waveshare
+    supported_features:
+      - display
+      - touch
+      - mmc