Merge tag 'scmi-voltage-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep...

[linux-2.6-microblaze.git] / drivers / firmware / arm_scmi / driver.c

diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index c5dea87..5392e1f 100644 (file)
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c
@@ -402,6 +402,14 @@ int scmi_do_xfer(const struct scmi_handle *handle, struct scmi_xfer *xfer)
        return ret;
 }
 
+void scmi_reset_rx_to_maxsz(const struct scmi_handle *handle,
+                           struct scmi_xfer *xfer)
+{
+       struct scmi_info *info = handle_to_scmi_info(handle);
+
+       xfer->rx.len = info->desc->max_msg_size;
+}
+
 #define SCMI_MAX_RESPONSE_TIMEOUT      (2 * MSEC_PER_SEC)
 
 /**
@@ -735,6 +743,7 @@ static struct scmi_prot_devnames devnames[] = {
        { SCMI_PROTOCOL_CLOCK,  { "clocks" },},
        { SCMI_PROTOCOL_SENSOR, { "hwmon" },},
        { SCMI_PROTOCOL_RESET,  { "reset" },},
+       { SCMI_PROTOCOL_VOLTAGE,  { "regulator" },},
 };
 
 static inline void
@@ -938,6 +947,7 @@ static int __init scmi_driver_init(void)
        scmi_power_register();
        scmi_reset_register();
        scmi_sensors_register();
+       scmi_voltage_register();
        scmi_system_register();
 
        return platform_driver_register(&scmi_driver);
@@ -953,6 +963,7 @@ static void __exit scmi_driver_exit(void)
        scmi_power_unregister();
        scmi_reset_unregister();
        scmi_sensors_unregister();
+       scmi_voltage_unregister();
        scmi_system_unregister();
 
        platform_driver_unregister(&scmi_driver);