[PATCH v2] thermal: qcom: tsens: Allow number of sensors to come from DT

[Bjorn Andersson]

For platforms that has multiple copies of the TSENS hardware block it's
convenient to specify the number of sensors per block in DeviceTree.

Reviewed-by: Amit Kucheria <amit.kuche...@linaro.org>
Reviewed-by: Rob Herring <r...@kernel.org> [binding]
Signed-off-by: Bjorn Andersson <bjorn.anders...@linaro.org>
---

Changes since v1:
- Added comment as suggested by Amit
- Picked up Amit and Rob's R-b

 .../devicetree/bindings/thermal/qcom-tsens.txt      |  1 +
 drivers/thermal/qcom/tsens.c                        | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/thermal/qcom-tsens.txt 
b/Documentation/devicetree/bindings/thermal/qcom-tsens.txt
index 292ed89d900b..06195e8f35e2 100644
--- a/Documentation/devicetree/bindings/thermal/qcom-tsens.txt
+++ b/Documentation/devicetree/bindings/thermal/qcom-tsens.txt
@@ -8,6 +8,7 @@ Required properties:
 
 - reg: Address range of the thermal registers
 - #thermal-sensor-cells : Should be 1. See ./thermal.txt for a description.
+- #qcom,sensors: Number of sensors in tsens block
 - Refer to Documentation/devicetree/bindings/nvmem/nvmem.txt to know how to 
specify
 nvmem cells
 
diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
index 3f9fe6aa51cc..b212bebcfc36 100644
--- a/drivers/thermal/qcom/tsens.c
+++ b/drivers/thermal/qcom/tsens.c
@@ -116,6 +116,7 @@ static int tsens_probe(struct platform_device *pdev)
        struct tsens_device *tmdev;
        const struct tsens_data *data;
        const struct of_device_id *id;
+       u32 num_sensors;
 
        if (pdev->dev.of_node)
                dev = &pdev->dev;
@@ -130,18 +131,24 @@ static int tsens_probe(struct platform_device *pdev)
        else
                data = &data_8960;
 
-       if (data->num_sensors <= 0) {
+       num_sensors = data->num_sensors;
+
+       /* Override driver provided num_sensors, if specified in DT */
+       if (np)
+               of_property_read_u32(np, "#qcom,sensors", &num_sensors);
+
+       if (num_sensors <= 0) {
                dev_err(dev, "invalid number of sensors\n");
                return -EINVAL;
        }
 
        tmdev = devm_kzalloc(dev, sizeof(*tmdev) +
-                            data->num_sensors * sizeof(*s), GFP_KERNEL);
+                            num_sensors * sizeof(*s), GFP_KERNEL);
        if (!tmdev)
                return -ENOMEM;
 
        tmdev->dev = dev;
-       tmdev->num_sensors = data->num_sensors;
+       tmdev->num_sensors = num_sensors;
        tmdev->ops = data->ops;
        for (i = 0;  i < tmdev->num_sensors; i++) {
                if (data->hw_ids)
-- 
2.17.0