From patchwork Sun Sep 26 00:17:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 12517875 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 BD818C433EF for ; Sun, 26 Sep 2021 00:17:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8E04C60F3A for ; Sun, 26 Sep 2021 00:17:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230214AbhIZASt (ORCPT ); Sat, 25 Sep 2021 20:18:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230197AbhIZASt (ORCPT ); Sat, 25 Sep 2021 20:18:49 -0400 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8EC9C061575 for ; Sat, 25 Sep 2021 17:17:13 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id g41so57854109lfv.1 for ; Sat, 25 Sep 2021 17:17:13 -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:mime-version :content-transfer-encoding; bh=rlWdpxs06o6BKntUmFuTyMgh8/xRKIkF0pvChWN0UpU=; b=ZWO6j8xFGrmCeKdk5ZpAvCzINooHu1X7fZjLDjMoTCqb0HBb4NZ3C+vl2ZBPLtG06X ISpF8CHjNViRl9OrTAqfZB6nkKfC0YIPlKdtzfpxEZeaIwILV40wMn6e+YVKM+7/JuKF b/JdxLcv0WcBfJsKQ2PSRBB64Fj47e6DRuPFgCXnaLHJ8iUOmd16IuJffZt0dRTcPU+g K65sIcCXNTmsXDGrB7TIsvhLgII9vgwn6wNXzt08xD27l5x0c62dBzBi79nFCxyiy+XG 5KXdccFz+COwbkDfhoDyOFde6jxAIPV49AAKPehnuo54I0QpEFC+UDZ5l3C1a6AX2jMu uUIA== 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:mime-version :content-transfer-encoding; bh=rlWdpxs06o6BKntUmFuTyMgh8/xRKIkF0pvChWN0UpU=; b=vI92v0+emkko5/3uxZKyrLD7CZpeThhbKIfbug4T7TNgqod2tn9sugFh7lph8Dkf1V +VuZ4bVMEo0a8xU5nywpD+xcdHLSDmffieFt2E6u+yjq0zWbBAQ8n+yalvoGlUpC+XHD Fe8mpO3guMzdkZ0NQwaFfqAHKHjFHDFXHQ3ujRAqgqyr+MMJM8XD/r+tx9Vvj8CBsXSM pyMrX0xKaHg+oWzMcAbE5FIsrYWYwxPfYNQm1VxdfEJ6w+EIlkSSeYDmWwKj4Z7Qs5nt lDaIoYZ3+yPmJ+ydsFoeuVsNJwHGa4GxyVSLtfitJwhBpI9Jmo3NfDYu3LFmrRIrdz3s hQtA== X-Gm-Message-State: AOAM530EfR8yVBRmEFYxL48Le5b9C0hz/4BE92CILuUTQRJtAboZ+lHY 3IH7LLsDg9RKvlBabf9mT1k+BQ== X-Google-Smtp-Source: ABdhPJwKcpeyAFwALJf87wgsixDKV3Ef2fyAzV2eXecAjsWtePf5Ij9FnTLOyU5YXal+6Lwrg9iT/Q== X-Received: by 2002:ac2:5e3b:: with SMTP id o27mr17251316lfg.521.1632615432038; 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.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 17:17:11 -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 1/2] thermal: qcom: tsens: remove data indirection in the debugfs Date: Sun, 26 Sep 2021 03:17:10 +0300 Message-Id: <20210926001711.2431912-1-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org There is no reason to pass platform device to debugfs just to get the tsens_priv from it. Not to mention that for TSENS_V0 the platform device (gcc) might have other device data. Pass the tsens_priv data to debugfs callbacks directly. Signed-off-by: Dmitry Baryshkov --- drivers/thermal/qcom/tsens.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c index 4c7ebd1d3f9c..6aeea74c1bb0 100644 --- a/drivers/thermal/qcom/tsens.c +++ b/drivers/thermal/qcom/tsens.c @@ -657,8 +657,7 @@ int get_temp_common(const struct tsens_sensor *s, int *temp) #ifdef CONFIG_DEBUG_FS static int dbg_sensors_show(struct seq_file *s, void *data) { - struct platform_device *pdev = s->private; - struct tsens_priv *priv = platform_get_drvdata(pdev); + struct tsens_priv *priv = s->private; int i; seq_printf(s, "max: %2d\nnum: %2d\n\n", @@ -675,8 +674,7 @@ static int dbg_sensors_show(struct seq_file *s, void *data) static int dbg_version_show(struct seq_file *s, void *data) { - struct platform_device *pdev = s->private; - struct tsens_priv *priv = platform_get_drvdata(pdev); + struct tsens_priv *priv = s->private; u32 maj_ver, min_ver, step_ver; int ret; @@ -701,9 +699,8 @@ static int dbg_version_show(struct seq_file *s, void *data) DEFINE_SHOW_ATTRIBUTE(dbg_version); DEFINE_SHOW_ATTRIBUTE(dbg_sensors); -static void tsens_debug_init(struct platform_device *pdev) +static void tsens_debug_init(struct platform_device *pdev, struct tsens_priv *priv) { - struct tsens_priv *priv = platform_get_drvdata(pdev); struct dentry *root, *file; root = debugfs_lookup("tsens", NULL); @@ -715,14 +712,14 @@ static void tsens_debug_init(struct platform_device *pdev) file = debugfs_lookup("version", priv->debug_root); if (!file) debugfs_create_file("version", 0444, priv->debug_root, - pdev, &dbg_version_fops); + priv, &dbg_version_fops); /* A directory for each instance of the TSENS IP */ priv->debug = debugfs_create_dir(dev_name(&pdev->dev), priv->debug_root); - debugfs_create_file("sensors", 0444, priv->debug, pdev, &dbg_sensors_fops); + debugfs_create_file("sensors", 0444, priv->debug, priv, &dbg_sensors_fops); } #else -static inline void tsens_debug_init(struct platform_device *pdev) {} +static inline void tsens_debug_init(struct platform_device *pdev, struct tsens_priv *priv) {} #endif static const struct regmap_config tsens_config = { @@ -918,7 +915,7 @@ int __init init_common(struct tsens_priv *priv) if (tsens_version(priv) >= VER_0_1) tsens_enable_irq(priv); - tsens_debug_init(op); + tsens_debug_init(op, priv); err_put_device: put_device(&op->dev); 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: 12517877 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 DD9DDC433FE for ; Sun, 26 Sep 2021 00:17:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B5CCF610CE for ; Sun, 26 Sep 2021 00:17:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230197AbhIZASu (ORCPT ); Sat, 25 Sep 2021 20:18:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230213AbhIZASt (ORCPT ); Sat, 25 Sep 2021 20:18:49 -0400 Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5102FC061714 for ; Sat, 25 Sep 2021 17:17:14 -0700 (PDT) Received: by mail-lf1-x12c.google.com with SMTP id u18so56546933lfd.12 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=o+Xc1K3uQBLbmSsiIP14GOXJbETT4poYbAH2saHUqQPl3R8rFkT9boGH4wJAvTnbiV NNhBwIm+TykJgc28GDDPcy9Byza9I7utW79VBNE43nZwVRdZK6UkJcPmGj9nJU1H/pVp 1FEEdns4yYaYf63D64vFgcmtl5bUkyjt24LaXnHM5i6zVzsgzfd52QskEnZilbjsqG+o JZ2Zfr7rCwIPdUq5HEYKs7oiyLXGEB4IAYJr51grWp1V0sJR5x6SZBxEuip7YTyFXEj2 3xXQ2xdFFb3uQhdQE7zXCCAOYeAkKInwzBzFbO8DDj2C9aGp49ZKmthaRM7oitPEeAfm Ooyg== X-Gm-Message-State: AOAM530GJBjwbgnunwfUwRE9A/9L45Qkqw8jFDSPGYepx0hCHfoCgD0n b6peE6pKZhQpF1ckzqhSqMS3cg== 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-arm-msm@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;