From patchwork Tue Oct 18 23:40:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 9383345 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9385760487 for ; Tue, 18 Oct 2016 23:40:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8E4D529833 for ; Tue, 18 Oct 2016 23:40:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 81DD32984B; Tue, 18 Oct 2016 23:40:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E11CF29833 for ; Tue, 18 Oct 2016 23:40:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756789AbcJRXkX (ORCPT ); Tue, 18 Oct 2016 19:40:23 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:52732 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756357AbcJRXkW (ORCPT ); Tue, 18 Oct 2016 19:40:22 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 02AB861AC3; Tue, 18 Oct 2016 23:40:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1476834022; bh=1g8G4amGJKgE6WjZ8XA1RGcwQ5Ghu+wgB7wSvAl8hyI=; h=From:To:Cc:Subject:Date:From; b=GpMYi7BhGyug1awzUYH3swCOCSAsSDr4NCp5KGafey4cAr9vCGBOHTWh/Pmtz+mBg ZCDjz8YPNEuwLIK42GO0z4wykPKUjg6TH70M7Q2OR58uHL6b/PyqZeRL0h/a95MfxG WItXO1eLicKk5wO047L2V10uVCePbsXNk3ZsEnCQ= Received: from sboyd-linux.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sboyd@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id BA78B618B9; Tue, 18 Oct 2016 23:40:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1476834021; bh=1g8G4amGJKgE6WjZ8XA1RGcwQ5Ghu+wgB7wSvAl8hyI=; h=From:To:Cc:Subject:Date:From; b=XtjFjoDq54VpZj18lGG5ViI/Kd/MDK5qioXRoGP2XV+Ml6Qcx22R9mhnSjmkOA/C1 G6u7O0pr+RfLb/8bkxlKtj590rZtxwe4vAiyOKiijZinrRTAfKaIZQ3HTlTh6dfcOT BoJocT2YFrxkXjfqp5BTYdFmNPsKTWq2roxsovpk= DMARC-Filter: OpenDMARC Filter v1.3.1 smtp.codeaurora.org BA78B618B9 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=pass smtp.mailfrom=sboyd@codeaurora.org From: Stephen Boyd To: Zhang Rui , Eduardo Valentin Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org, "Ivan T . Ivanov" Subject: [PATCH/RESEND] thermal: qcom-spmi: Treat reg property as a single cell Date: Tue, 18 Oct 2016 16:40:19 -0700 Message-Id: <20161018234019.5489-1-sboyd@codeaurora.org> X-Mailer: git-send-email 2.10.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Signed-off-by: Stephen Boyd Reviewed-by: Andy Gross --- This was sent in January of this year but hasn't been picked up. drivers/thermal/qcom-spmi-temp-alarm.c | 6 +++--- 1 file 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) {