]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
thermal/drivers/rockchip: Support dynamic sized sensor array
authorSebastian Reichel <sebastian.reichel@collabora.com>
Wed, 8 Mar 2023 11:22:51 +0000 (12:22 +0100)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Fri, 7 Apr 2023 08:31:33 +0000 (10:31 +0200)
Dynamically allocate the sensors array based on the amount
of platform sensors in preparation for rk3588 support, which
needs 7 sensors.

Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20230308112253.15659-6-sebastian.reichel@collabora.com
drivers/thermal/rockchip_thermal.c

index d3d9a8f9b0557f0c116963c742a52be7eedd455b..dcbc5d22cbc920535ee821069c666779e9c16496 100644 (file)
@@ -51,12 +51,6 @@ enum adc_sort_mode {
 
 #include "thermal_hwmon.h"
 
-/*
- * The max sensors is two in rockchip SoCs.
- * Two sensors: CPU and GPU sensor.
- */
-#define SOC_MAX_SENSORS        2
-
 /**
  * struct chip_tsadc_table - hold information about chip-specific differences
  * @id: conversion table
@@ -147,7 +141,7 @@ struct rockchip_thermal_data {
        struct platform_device *pdev;
        struct reset_control *reset;
 
-       struct rockchip_thermal_sensor sensors[SOC_MAX_SENSORS];
+       struct rockchip_thermal_sensor *sensors;
 
        struct clk *clk;
        struct clk *pclk;
@@ -1363,6 +1357,11 @@ static int rockchip_thermal_probe(struct platform_device *pdev)
        if (!thermal->chip)
                return -EINVAL;
 
+       thermal->sensors = devm_kcalloc(&pdev->dev, thermal->chip->chn_num,
+                                       sizeof(*thermal->sensors), GFP_KERNEL);
+       if (!thermal->sensors)
+               return -ENOMEM;
+
        thermal->regs = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
        if (IS_ERR(thermal->regs))
                return PTR_ERR(thermal->regs);