From patchwork Sun Sep 26 00:17:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 12517873 X-Patchwork-Delegate: daniel.lezcano@linaro.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 61DE3C4332F for ; Sun, 26 Sep 2021 00:17:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4A1A660F3A for ; Sun, 26 Sep 2021 00:17:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230207AbhIZASu (ORCPT ); Sat, 25 Sep 2021 20:18:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230211AbhIZASt (ORCPT ); Sat, 25 Sep 2021 20:18:49 -0400 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48CCBC061604 for ; Sat, 25 Sep 2021 17:17:14 -0700 (PDT) Received: by mail-lf1-x12e.google.com with SMTP id m3so58212534lfu.2 for ; Sat, 25 Sep 2021 17:17:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=55iHUMzFFyoxNfHYv5W5Wm8oMzXKeDg6FrgyetZh2+M=; b=T+VX3ch8D0gBkFU/UV99bm4qwjRtkQttFzQoWYkQfqGpVO+OYRww5KBl6am/YUfMhi 7frE7cVb6JFJPrmVpoJcMK+TE3yFlfbLbhbXFXPAb4ab2widABSEgbpBmNfRzdLrpCDd XSj7eDEYFpijqSk0UdYpdyfCXWgvkqqddl2iHioVTxeYxMIatJms4BQ3OJYWUsqw7R2m ijxiaDlIBj7cZHGlkmab8daDHF/jNGjPLpQcQxwkpB0amL9OhRncOleXB0mNPDeVmmvV tCNxJMZw2O25H5woan6i11qPhB0+xNcLm4zkR70xp+twHnFZX2iJFPhRj4hutPlyomm9 QXMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=55iHUMzFFyoxNfHYv5W5Wm8oMzXKeDg6FrgyetZh2+M=; b=eC1VgAGxR+eTfNEYgaQCIJEmmoo1GslzNKLJrpXbWrhNbt5Oil1yxN2EjNXLyxZhLJ YqvHOqEF87O7qcKadX5yZL2neA7bN2e4Dhxg6XacJekmBQc7Nc5UNPoRF3FdFon9mO9X LHgkj1KmWAG8eO1dtIS/9jDqUHTKcK4eptzGuispXG3kk9foIk7EHPCeCrqZ5yIzh5Qm szR6Vq7oC64FVvCtRQqofV/qnXrUQLuZ+D/gvpPSuN1hwYsd14sT/ygoHaqErtxKhAro ostsB6tXKjbgQdTu0ojZ89s8F+5/Pi41LiStLOooyyZiKvB5TzSVlPZmtl2jnnSnVXfD /lCQ== X-Gm-Message-State: AOAM5305BAI/acFryBx6SDS/qpvXWb++4f6K4pAul2gptyk0lhwOKv86 C8J0leRuvUCGzEmeJy/qoX267P35KqmXCA== X-Google-Smtp-Source: ABdhPJzUHZ3JA2P9yO9fh1lUwUgN4f6tpLFgNxxUICLMfXtyd5nraLhyfd2z9VkBEMECNssdD/Lgjg== X-Received: by 2002:a2e:7f04:: with SMTP id a4mr20879634ljd.308.1632615432668; Sat, 25 Sep 2021 17:17:12 -0700 (PDT) Received: from umbar.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id i10sm1146270lfu.71.2021.09.25.17.17.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 17:17:12 -0700 (PDT) From: Dmitry Baryshkov To: Amit Kucheria , Thara Gopinath , Andy Gross , Bjorn Andersson , Zhang Rui , Daniel Lezcano Cc: linux-pm@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 2/2] thermal: qcom: tsens: fix VER_0 support Date: Sun, 26 Sep 2021 03:17:11 +0300 Message-Id: <20210926001711.2431912-2-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210926001711.2431912-1-dmitry.baryshkov@linaro.org> References: <20210926001711.2431912-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org For VER_0 tsens shares the device with the clock controller, but nevertheless it does not use syscon for these registers. Drop syscon_node_to_regmap() and acquire the regmap on our own. apq8064 has tsens as a part of gcc device tree node, ipq8064 puts tsens node as a child node of gcc. Thus check whether tsens resource can be fetched either from the device itself or from it's parent. Fixes: 53e2a20e4c41 ("thermal/drivers/tsens: Add VER_0 tsens version") Signed-off-by: Dmitry Baryshkov --- drivers/thermal/qcom/tsens.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c index 6aeea74c1bb0..4c3960c188da 100644 --- a/drivers/thermal/qcom/tsens.c +++ b/drivers/thermal/qcom/tsens.c @@ -773,19 +773,19 @@ int __init init_common(struct tsens_priv *priv) if (tsens_version(priv) >= VER_0_1) { res = platform_get_resource(op, IORESOURCE_MEM, 0); tm_base = devm_ioremap_resource(dev, res); - if (IS_ERR(tm_base)) { - ret = PTR_ERR(tm_base); - goto err_put_device; - } - - priv->tm_map = devm_regmap_init_mmio(dev, tm_base, &tsens_config); } else { /* VER_0 share the same gcc regs using a syscon */ - struct device *parent = priv->dev->parent; + res = platform_get_resource(op, IORESOURCE_MEM, 0); + if (!res) + res = platform_get_resource(priv->dev->parent, IORESOURCE_MEM, 0); + tm_base = devm_ioremap(dev, res->start, resource_size(res)); + } - if (parent) - priv->tm_map = syscon_node_to_regmap(parent->of_node); + if (IS_ERR(tm_base)) { + ret = PTR_ERR(tm_base); + goto err_put_device; } + priv->tm_map = devm_regmap_init_mmio(dev, tm_base, &tsens_config); if (IS_ERR_OR_NULL(priv->tm_map)) { if (!priv->tm_map) ret = -ENODEV;