aboutsummaryrefslogtreecommitdiff
path: root/drivers/thermal
diff options
context:
space:
mode:
authorGravatar Stephen Boyd <sboyd@codeaurora.org> 2016-10-18 16:40:19 -0700
committerGravatar Zhang Rui <rui.zhang@intel.com> 2016-11-23 10:07:35 +0800
commitcd323b2b5aba0d9920b116866efc7ebfd2d2052c (patch)
tree2958a195e78ec92931f8010fe4bcca929d1aaedb /drivers/thermal
parentthermal: hisilicon: fix for dependency (diff)
downloadlinux-cd323b2b5aba0d9920b116866efc7ebfd2d2052c.tar.gz
linux-cd323b2b5aba0d9920b116866efc7ebfd2d2052c.tar.bz2
linux-cd323b2b5aba0d9920b116866efc7ebfd2d2052c.zip
thermal: qcom-spmi: Treat reg property as a single cell
We only read the first element of the reg property to figure out the offset of the temperature sensor inside the PMIC. Furthermore, we want to remove the second element in DT, so just don't read the second element so that probe keeps working if we change the DT in the future. Cc: Ivan T. Ivanov <iivanov.xz@gmail.com> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
Diffstat (limited to 'drivers/thermal')
-rw-r--r--drivers/thermal/qcom-spmi-temp-alarm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/thermal/qcom-spmi-temp-alarm.c b/drivers/thermal/qcom-spmi-temp-alarm.c
index 819c6d5d7aa7..f50241962ad2 100644
--- a/drivers/thermal/qcom-spmi-temp-alarm.c
+++ b/drivers/thermal/qcom-spmi-temp-alarm.c
@@ -200,7 +200,7 @@ static int qpnp_tm_probe(struct platform_device *pdev)
struct qpnp_tm_chip *chip;
struct device_node *node;
u8 type, subtype;
- u32 res[2];
+ u32 res;
int ret, irq;
node = pdev->dev.of_node;
@@ -215,7 +215,7 @@ static int qpnp_tm_probe(struct platform_device *pdev)
if (!chip->map)
return -ENXIO;
- ret = of_property_read_u32_array(node, "reg", res, 2);
+ ret = of_property_read_u32(node, "reg", &res);
if (ret < 0)
return ret;
@@ -228,7 +228,7 @@ static int qpnp_tm_probe(struct platform_device *pdev)
if (PTR_ERR(chip->adc) == -EPROBE_DEFER)
return PTR_ERR(chip->adc);
- chip->base = res[0];
+ chip->base = res;
ret = qpnp_tm_read(chip, QPNP_TM_REG_TYPE, &type);
if (ret < 0) {