From 640d677913de685169d0d4dc0def96d14dd35a3c Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Fri, 9 Oct 2026 15:51:55 -1000
Subject: [PATCH] [st7735][st7789v][waveshare_epaper] Declare log tags with
 ESPHOME_LOG_TAG (#20295)

---
 esphome/components/st7735/st7735.cpp                     | 2 +-
 esphome/components/st7789v/st7789v.cpp                   | 2 +-
 esphome/components/waveshare_epaper/waveshare_213v3.cpp  | 2 +-
 esphome/components/waveshare_epaper/waveshare_epaper.cpp | 2 +-
 script/ci-custom.py                                      | 6 ------
 5 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/esphome/components/st7735/st7735.cpp b/esphome/components/st7735/st7735.cpp
index 7eb70c5c23..94b94d17a9 100644
--- a/esphome/components/st7735/st7735.cpp
+++ b/esphome/components/st7735/st7735.cpp
@@ -218,7 +218,7 @@ static constexpr uint8_t PROGMEM
       100 };                        //     100 ms delay
 
 // clang-format on
-static const char *const TAG = "st7735";
+ESPHOME_LOG_TAG(TAG, "st7735");
 
 ST7735::ST7735(ST7735Model model, int width, int height, int colstart, int rowstart, bool eightbitcolor, bool usebgr,
                bool invert_colors)
diff --git a/esphome/components/st7789v/st7789v.cpp b/esphome/components/st7789v/st7789v.cpp
index 2e07e24522..343d196b50 100644
--- a/esphome/components/st7789v/st7789v.cpp
+++ b/esphome/components/st7789v/st7789v.cpp
@@ -4,7 +4,7 @@
 
 namespace esphome::st7789v {
 
-static const char *const TAG = "st7789v";
+ESPHOME_LOG_TAG(TAG, "st7789v");
 #ifdef USE_ESP32
 static constexpr size_t TEMP_BUFFER_SIZE = 1024;
 #else
diff --git a/esphome/components/waveshare_epaper/waveshare_213v3.cpp b/esphome/components/waveshare_epaper/waveshare_213v3.cpp
index cc9c34cb42..5e19782f6d 100644
--- a/esphome/components/waveshare_epaper/waveshare_213v3.cpp
+++ b/esphome/components/waveshare_epaper/waveshare_213v3.cpp
@@ -4,7 +4,7 @@
 
 namespace esphome::waveshare_epaper {
 
-static const char *const TAG = "waveshare_2.13v3";
+ESPHOME_LOG_TAG(TAG, "waveshare_2.13v3");
 
 static const uint8_t PARTIAL_LUT[] = {
     0x32,  // cmd
diff --git a/esphome/components/waveshare_epaper/waveshare_epaper.cpp b/esphome/components/waveshare_epaper/waveshare_epaper.cpp
index 93f23424c0..60d711d1cd 100644
--- a/esphome/components/waveshare_epaper/waveshare_epaper.cpp
+++ b/esphome/components/waveshare_epaper/waveshare_epaper.cpp
@@ -7,7 +7,7 @@
 
 namespace esphome::waveshare_epaper {
 
-static const char *const TAG = "waveshare_epaper";
+ESPHOME_LOG_TAG(TAG, "waveshare_epaper");
 
 static const uint8_t LUT_SIZE_WAVESHARE = 30;
 
diff --git a/script/ci-custom.py b/script/ci-custom.py
index 1b3abc40f2..7839038a8c 100755
--- a/script/ci-custom.py
+++ b/script/ci-custom.py
@@ -1273,12 +1273,6 @@ def lint_no_std_nothrow(fname, match):
     r"\s*(?:=\s*\{?|[{(])\s*\"",
     prefilter="TAG",
     include=["esphome/components/*.cpp", "esphome/components/**/*.cpp"],
-    # Deprecated components, converted in a follow-up PR
-    exclude=[
-        "esphome/components/st7735/*",
-        "esphome/components/st7789v/*",
-        "esphome/components/waveshare_epaper/*",
-    ],
 )
 def lint_log_tag_macro(fname, match):
     return (