Merge tag 'thermal-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-microblaze.git] / drivers / net / ethernet / mellanox / mlxsw / core_thermal.c

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
index f1b48d6..5c511e1 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
@@ -44,16 +44,19 @@ static const struct thermal_trip default_thermal_trips[] = {
                .type           = THERMAL_TRIP_ACTIVE,
                .temperature    = MLXSW_THERMAL_ASIC_TEMP_NORM,
                .hysteresis     = MLXSW_THERMAL_HYSTERESIS_TEMP,
+               .flags          = THERMAL_TRIP_FLAG_RW_TEMP,
        },
        {
                /* In range - 40-100% PWM */
                .type           = THERMAL_TRIP_ACTIVE,
                .temperature    = MLXSW_THERMAL_ASIC_TEMP_HIGH,
                .hysteresis     = MLXSW_THERMAL_HYSTERESIS_TEMP,
+               .flags          = THERMAL_TRIP_FLAG_RW_TEMP,
        },
        {       /* Warning */
                .type           = THERMAL_TRIP_HOT,
                .temperature    = MLXSW_THERMAL_ASIC_TEMP_HOT,
+               .flags          = THERMAL_TRIP_FLAG_RW_TEMP,
        },
 };
 
@@ -62,16 +65,19 @@ static const struct thermal_trip default_thermal_module_trips[] = {
                .type           = THERMAL_TRIP_ACTIVE,
                .temperature    = MLXSW_THERMAL_MODULE_TEMP_NORM,
                .hysteresis     = MLXSW_THERMAL_HYSTERESIS_TEMP,
+               .flags          = THERMAL_TRIP_FLAG_RW_TEMP,
        },
        {
                /* In range - 40-100% PWM */
                .type           = THERMAL_TRIP_ACTIVE,
                .temperature    = MLXSW_THERMAL_MODULE_TEMP_HIGH,
                .hysteresis     = MLXSW_THERMAL_HYSTERESIS_TEMP,
+               .flags          = THERMAL_TRIP_FLAG_RW_TEMP,
        },
        {       /* Warning */
                .type           = THERMAL_TRIP_HOT,
                .temperature    = MLXSW_THERMAL_MODULE_TEMP_HOT,
+               .flags          = THERMAL_TRIP_FLAG_RW_TEMP,
        },
 };
 
@@ -92,9 +98,6 @@ static const struct mlxsw_cooling_states default_cooling_states[] = {
 
 #define MLXSW_THERMAL_NUM_TRIPS        ARRAY_SIZE(default_thermal_trips)
 
-/* Make sure all trips are writable */
-#define MLXSW_THERMAL_TRIP_MASK        (BIT(MLXSW_THERMAL_NUM_TRIPS) - 1)
-
 struct mlxsw_thermal;
 
 struct mlxsw_thermal_module {
@@ -420,7 +423,6 @@ mlxsw_thermal_module_tz_init(struct mlxsw_thermal_module *module_tz)
        module_tz->tzdev = thermal_zone_device_register_with_trips(tz_name,
                                                        module_tz->trips,
                                                        MLXSW_THERMAL_NUM_TRIPS,
-                                                       MLXSW_THERMAL_TRIP_MASK,
                                                        module_tz,
                                                        &mlxsw_thermal_module_ops,
                                                        &mlxsw_thermal_params,
@@ -548,7 +550,6 @@ mlxsw_thermal_gearbox_tz_init(struct mlxsw_thermal_module *gearbox_tz)
        gearbox_tz->tzdev = thermal_zone_device_register_with_trips(tz_name,
                                                gearbox_tz->trips,
                                                MLXSW_THERMAL_NUM_TRIPS,
-                                               MLXSW_THERMAL_TRIP_MASK,
                                                gearbox_tz,
                                                &mlxsw_thermal_gearbox_ops,
                                                &mlxsw_thermal_params, 0,
@@ -773,7 +774,6 @@ int mlxsw_thermal_init(struct mlxsw_core *core,
        thermal->tzdev = thermal_zone_device_register_with_trips("mlxsw",
                                                      thermal->trips,
                                                      MLXSW_THERMAL_NUM_TRIPS,
-                                                     MLXSW_THERMAL_TRIP_MASK,
                                                      thermal,
                                                      &mlxsw_thermal_ops,
                                                      &mlxsw_thermal_params, 0,