From c275365258b87d0cb17cd9f3a718d1f961f6fcb0 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Wed, 23 Sep 2026 23:24:44 +0100
Subject: [PATCH] [rp2040_pwm] Use register_apply_action for the set_frequency
 action (#19517)

---
 esphome/components/rp2040_pwm/output.py    | 19 ++-----------------
 esphome/components/rp2040_pwm/rp2040_pwm.h | 14 --------------
 tests/components/rp2040_pwm/common.yaml    | 10 ++++++++++
 3 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/esphome/components/rp2040_pwm/output.py b/esphome/components/rp2040_pwm/output.py
index a0344e8054..49b10f7d20 100644
--- a/esphome/components/rp2040_pwm/output.py
+++ b/esphome/components/rp2040_pwm/output.py
@@ -3,8 +3,6 @@ import esphome.codegen as cg
 from esphome.components import output
 import esphome.config_validation as cv
 from esphome.const import CONF_FREQUENCY, CONF_ID, CONF_PIN
-from esphome.core import ID
-from esphome.cpp_generator import MockObj, TemplateArgsType
 from esphome.types import ConfigType
 
 CODEOWNERS = ["@jesserockz"]
@@ -13,7 +11,6 @@ DEPENDENCIES = ["rp2"]
 
 rp2040_pwm_ns = cg.esphome_ns.namespace("rp2040_pwm")
 RP2040PWM = rp2040_pwm_ns.class_("RP2040PWM", output.FloatOutput, cg.Component)
-SetFrequencyAction = rp2040_pwm_ns.class_("SetFrequencyAction", automation.Action)
 validate_frequency = cv.All(cv.frequency, cv.float_range(min=1.0e-6))
 
 CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
@@ -36,25 +33,13 @@ async def to_code(config: ConfigType) -> None:
     cg.add(var.set_frequency(config[CONF_FREQUENCY]))
 
 
-@automation.register_action(
+automation.register_apply_action(
     "output.rp2040_pwm.set_frequency",
-    SetFrequencyAction,
     cv.Schema(
         {
             cv.Required(CONF_ID): cv.use_id(RP2040PWM),
             cv.Required(CONF_FREQUENCY): cv.templatable(validate_frequency),
         }
     ),
-    synchronous=True,
+    automation.ApplyField(CONF_FREQUENCY, "update_frequency", cg.float_),
 )
-async def rp2040_set_frequency_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
-    paren = await cg.get_variable(config[CONF_ID])
-    var = cg.new_Pvariable(action_id, template_arg, paren)
-    template_ = await cg.templatable(config[CONF_FREQUENCY], args, cg.float_)
-    cg.add(var.set_frequency(template_))
-    return var
diff --git a/esphome/components/rp2040_pwm/rp2040_pwm.h b/esphome/components/rp2040_pwm/rp2040_pwm.h
index 8263113168..7808e2af01 100644
--- a/esphome/components/rp2040_pwm/rp2040_pwm.h
+++ b/esphome/components/rp2040_pwm/rp2040_pwm.h
@@ -3,7 +3,6 @@
 #ifdef USE_RP2
 
 #include "esphome/components/output/float_output.h"
-#include "esphome/core/automation.h"
 #include "esphome/core/component.h"
 #include "esphome/core/hal.h"
 
@@ -39,19 +38,6 @@ class RP2040PWM final : public output::FloatOutput, public Component {
   bool frequency_changed_{false};
 };
 
-template<typename... Ts> class SetFrequencyAction final : public Action<Ts...> {
- public:
-  SetFrequencyAction(RP2040PWM *parent) : parent_(parent) {}
-  TEMPLATABLE_VALUE(float, frequency);
-
-  void play(const Ts &...x) {
-    float freq = this->frequency_.value(x...);
-    this->parent_->update_frequency(freq);
-  }
-
-  RP2040PWM *parent_;
-};
-
 }  // namespace esphome::rp2040_pwm
 
 #endif  // USE_RP2
diff --git a/tests/components/rp2040_pwm/common.yaml b/tests/components/rp2040_pwm/common.yaml
index 2970a48afb..b857a7e76f 100644
--- a/tests/components/rp2040_pwm/common.yaml
+++ b/tests/components/rp2040_pwm/common.yaml
@@ -1,3 +1,13 @@
+esphome:
+  on_boot:
+    then:
+      - output.rp2040_pwm.set_frequency:
+          id: rp2040_pwm_light_output_1
+          frequency: 100Hz
+      - output.rp2040_pwm.set_frequency:
+          id: rp2040_pwm_light_output_2
+          frequency: !lambda return 200.0f;
+
 output:
   - platform: rp2040_pwm
     id: rp2040_pwm_light_output_1