From patchwork Fri Jan 3 17:23:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 213118 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 612A7C3F68F for ; Fri, 3 Jan 2020 17:24:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3269A215A4 for ; Fri, 3 Jan 2020 17:24:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=gmx.net header.i=@gmx.net header.b="e1YwBqwI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728137AbgACRYs (ORCPT ); Fri, 3 Jan 2020 12:24:48 -0500 Received: from mout.gmx.net ([212.227.17.22]:33617 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727952AbgACRYs (ORCPT ); Fri, 3 Jan 2020 12:24:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1578072274; bh=r09Xj+78lYwDfvj01i5hNYjP7fkU9rpgonPkcnvu9JM=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=e1YwBqwIUc9ivQMXB5REV187qxtJqWPCci+0c1R8vTyVfrzVKRcJyqOXd4WDcYSQY mDhxvFhAjwYP5NCCvuadYPql8gGG83Djsu6AnvxlUwk27EwfeAe11Ubp0oWIcR0GPI iwG5I0Xu/pevzld13w6J56ECm1UW8qHhnjNQY/p4= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.154]) by mail.gmx.com (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MYeR1-1jHHkI3uVf-00Vjmh; Fri, 03 Jan 2020 18:24:34 +0100 From: Stefan Wahren To: Zhang Rui , Daniel Lezcano , Amit Kucheria , Rob Herring , Mark Rutland , Nicolas Saenz Julienne , Florian Fainelli , Catalin Marinas , Will Deacon Cc: linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, Stefan Wahren Subject: [PATCH V2 2/4] thermal: Add BCM2711 thermal driver Date: Fri, 3 Jan 2020 18:23:54 +0100 Message-Id: <1578072236-31820-3-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1578072236-31820-1-git-send-email-wahrenst@gmx.net> References: <1578072236-31820-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:6ePOyJUrk5JV2zTq4BfKQAKGAA0YxTo9xsTJFdzdoWQAz8BBFnF nqMhCq7DhXM4/ZlN0bW9fs4HMf8A2f7M6UB9omliavyfYQFmIPEDm4dALM9IELPKuv7KzE3 BtnN/6iQuO6aHCRXQLK9UCEj0vK4WIsPRfmYYwzORcTWc+36vYVwdWqpWe72yyBM7+i4vrZ bGntXCfkbo1q0hJKhzWXA== X-UI-Out-Filterresults: notjunk:1; V03:K0:Vu0uosQJcvE=:7eCosITtZG9uOitnLMPvAA 1h2zzLW+qqRR+OwREWel6+wP/1N5pJoTcaORJ4wGArLgeI3TGo0k30xbN5snoDZfIMGQehJfK okT89NttTsgAN1ug6+ZS3/3S1c+dyEfbKZcAbrC/P9NTvhAwXfAtR5+dvYLJbmvBEQu5kWkoh ZxPIrijmLt6mPO6VrXfCr0LcWTStXacJxGyvpP00Z5er/GGeIGWKkUtwQ6H5o+5yDRqKXtQRI V0rBRbHPkihP7JuG4TGj1B949y8ZhgwwOL5GRKkKt33UdLUTK9UJUZxUJgG5yxQgiO6mIX9Dv KQtKs0BjRQ2/NEhjeL9PjS7bqDwurk4ROamO1ENP9PFZ55aK4wqA8OqvWfq0NUWiMgw5ZD42O YeO9ULNWe810jUWJjRFqNIXkuvxgJmtzULTtrOIj1id4OvFfx9/7+fmaxe50aDAddfw0cc6hx KLjqTH8XMQg0v8czGwWaLWrf8u/vidRsDolTngXf3ieYXCs4k4ngfpwHWE9wjTwAw6kIdzeHQ 1DQirkV03pHuO9bJiroo5h5eugLZ52thOukzqIH8kGSJedppIRH6or0dysLGHKbL0CAWYZSai Xe0SUDchrD3Bo+mVXlXMF6+cLQdmAwd2vEaQWo4DSz1YEa1XPeaNxepQy6cIW62RxWxF3IRCS 1QQintREEUomOrojsUjxU1GRiBY1cF0fdkG5V1v1dX1UH+RC8Yxt7lWYZftdCI5a1utVbugfD Nfi0ZrX2JOzTk2Kk+r4r2f16tvgTZxa6WZzzoCN2HnCMMkwXxRuZdgK99tuyqv+vG84q5pJhT gYDrZqGErb2Kt7tIYSfQQowNrJdXt2xFTLpn3voo85mDjzih7+XrZpDGqT4F5ucOiYKzd+044 sK1K0jt7Y1nFOkfRwcCMVkg25A0BJs4nFU8Eb2u3OG/C7v1fs39b7dSqfT3tGj2aAAwvYZRdu EvG5LPwLG7Zvn+jGRKrGbERylVmKSRiu1f1essi9wsVNgDpNZIFY6g9a3/d8ylPapogkr5D46 nS/Skw7iUpC/TKuvL338tjHDAE2Elqsu/3f60w7ez4o/71Z65MCj3G5gSg3Icr/DqNK/j3tse v/7XWunqoEQQpnfN9WKsxrZolpiGhy6gIibXg0NiQG4GzqvOeuh7U0yBmH2GSjQIpbE8XHh5W 3BN/7Tuiur6mgtjc6j8n6mwyQxTWnGmlaQGY8XVpg/JYDHdB26EAoQRKbflYOojXAYBw5S8Rm r+dAfPxGxhLCYxfjQwqCNVce0b7K4Qo2Y9bgzXg== Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org This adds the thermal sensor driver for the Broadcom BCM2711 SoC, which is placed on the Raspberry Pi 4. The driver only provides SoC temperature reading so far. Signed-off-by: Stefan Wahren --- drivers/thermal/broadcom/Kconfig | 7 ++ drivers/thermal/broadcom/Makefile | 1 + drivers/thermal/broadcom/bcm2711_thermal.c | 129 +++++++++++++++++++++++++++++ 3 files changed, 137 insertions(+) create mode 100644 drivers/thermal/broadcom/bcm2711_thermal.c -- 2.7.4 diff --git a/drivers/thermal/broadcom/Kconfig b/drivers/thermal/broadcom/Kconfig index cf43e15..061f1db 100644 --- a/drivers/thermal/broadcom/Kconfig +++ b/drivers/thermal/broadcom/Kconfig @@ -1,4 +1,11 @@ # SPDX-License-Identifier: GPL-2.0-only +config BCM2711_THERMAL + tristate "Broadcom AVS RO thermal sensor driver" + depends on ARCH_BCM2835 || COMPILE_TEST + depends on THERMAL_OF && MFD_SYSCON + help + Support for thermal sensors on Broadcom BCM2711 SoCs. + config BCM2835_THERMAL tristate "Thermal sensors on bcm2835 SoC" depends on ARCH_BCM2835 || COMPILE_TEST diff --git a/drivers/thermal/broadcom/Makefile b/drivers/thermal/broadcom/Makefile index 490ab1f..c917b24 100644 --- a/drivers/thermal/broadcom/Makefile +++ b/drivers/thermal/broadcom/Makefile @@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_BCM2711_THERMAL) += bcm2711_thermal.o obj-$(CONFIG_BCM2835_THERMAL) += bcm2835_thermal.o obj-$(CONFIG_BRCMSTB_THERMAL) += brcmstb_thermal.o obj-$(CONFIG_BCM_NS_THERMAL) += ns-thermal.o diff --git a/drivers/thermal/broadcom/bcm2711_thermal.c b/drivers/thermal/broadcom/bcm2711_thermal.c new file mode 100644 index 0000000..1d55b87 --- /dev/null +++ b/drivers/thermal/broadcom/bcm2711_thermal.c @@ -0,0 +1,129 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Broadcom AVS RO thermal sensor driver + * + * based on brcmstb_thermal + * + * Copyright (C) 2020 Stefan Wahren + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "../thermal_hwmon.h" + +#define AVS_RO_TEMP_STATUS 0x200 + #define AVS_RO_TEMP_STATUS_valid_msk (BIT(16) | BIT(10)) + #define AVS_RO_TEMP_STATUS_data_msk GENMASK(9, 0) + +struct bcm2711_thermal_priv { + struct regmap *regmap; + struct device *dev; + struct thermal_zone_device *thermal; +}; + +static int bcm2711_get_temp(void *data, int *temp) +{ + struct bcm2711_thermal_priv *priv = data; + int slope = thermal_zone_get_slope(priv->thermal); + int offset = thermal_zone_get_offset(priv->thermal); + u32 val; + int ret; + long t; + + ret = regmap_read(priv->regmap, AVS_RO_TEMP_STATUS, &val); + if (ret) + return ret; + + if (!(val & AVS_RO_TEMP_STATUS_valid_msk)) { + dev_err(priv->dev, "reading not valid\n"); + return -EIO; + } + + val &= AVS_RO_TEMP_STATUS_data_msk; + + /* Convert a HW code to a temperature reading (millidegree celsius) */ + t = slope * val + offset; + if (t < 0) + *temp = 0; + else + *temp = t; + + return 0; +} + +static const struct thermal_zone_of_device_ops bcm2711_thermal_of_ops = { + .get_temp = bcm2711_get_temp, +}; + +static const struct of_device_id bcm2711_thermal_id_table[] = { + { .compatible = "brcm,bcm2711-thermal" }, + {}, +}; +MODULE_DEVICE_TABLE(of, bcm2711_thermal_id_table); + +static int bcm2711_thermal_probe(struct platform_device *pdev) +{ + struct thermal_zone_device *thermal; + struct bcm2711_thermal_priv *priv; + struct device *dev = &pdev->dev; + struct device_node *parent; + struct regmap *regmap; + int ret; + + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + /* get regmap from syscon node */ + parent = of_get_parent(dev->of_node); /* parent should be syscon node */ + regmap = syscon_node_to_regmap(parent); + of_node_put(parent); + if (IS_ERR(regmap)) { + dev_err(dev, "failed to get regmap (error %ld)\n", + PTR_ERR(regmap)); + return PTR_ERR(regmap); + } + priv->regmap = regmap; + priv->dev = dev; + + thermal = devm_thermal_zone_of_sensor_register(dev, 0, priv, + &bcm2711_thermal_of_ops); + if (IS_ERR(thermal)) { + ret = PTR_ERR(thermal); + dev_err(dev, "could not register sensor: %d\n", ret); + return ret; + } + + priv->thermal = thermal; + + thermal->tzp->no_hwmon = false; + ret = thermal_add_hwmon_sysfs(thermal); + if (ret) + return ret; + + return 0; +} + +static struct platform_driver bcm2711_thermal_driver = { + .probe = bcm2711_thermal_probe, + .driver = { + .name = "bcm2711_thermal", + .of_match_table = bcm2711_thermal_id_table, + }, +}; +module_platform_driver(bcm2711_thermal_driver); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Stefan Wahren"); +MODULE_DESCRIPTION("Broadcom AVS RO thermal sensor driver"); From patchwork Fri Jan 3 17:23:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 213117 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E2ECC33C8C for ; Fri, 3 Jan 2020 17:24:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 31D1D215A4 for ; Fri, 3 Jan 2020 17:24:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=gmx.net header.i=@gmx.net header.b="jntuTEtf" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728150AbgACRYu (ORCPT ); Fri, 3 Jan 2020 12:24:50 -0500 Received: from mout.gmx.net ([212.227.17.20]:54849 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728113AbgACRYt (ORCPT ); Fri, 3 Jan 2020 12:24:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1578072274; bh=BZwbvnjIkKy51z9cUu4HZ4g7pOB2mlq9DzuAGQ9CZwA=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=jntuTEtf/ZSMb7V0+1xMNDsSiGiJc2+G7ijZL2vYwwKrVj9lfIlJOS77kUNGD40cL EqaRqeqdesM8MDLzaUHvrNunt6gcrXVZRQWk6TNPk/GUsfclMODtmHlALLe/3hZ3mw Da5KlbqR313+0Tvj5azlJvMD+1wfElRPBlHEphDo= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.154]) by mail.gmx.com (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MMGNC-1j3Je02aW6-00JLjG; Fri, 03 Jan 2020 18:24:34 +0100 From: Stefan Wahren To: Zhang Rui , Daniel Lezcano , Amit Kucheria , Rob Herring , Mark Rutland , Nicolas Saenz Julienne , Florian Fainelli , Catalin Marinas , Will Deacon Cc: linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, Stefan Wahren Subject: [PATCH V2 3/4] ARM: dts: bcm2711: Enable thermal Date: Fri, 3 Jan 2020 18:23:55 +0100 Message-Id: <1578072236-31820-4-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1578072236-31820-1-git-send-email-wahrenst@gmx.net> References: <1578072236-31820-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:VHkLP3wAXoJeCqgSYpKkHHl9KWD7U8WneNkXn6EF+49joTjnbLx Lrzy+jtF50qY8o1EA7jxzcODuW9wZtwUmb/GemrekFYswZwtqdyMEhY3n/kwzKpAlbmpnIi nyylX+O+CPTru6+8MhDiJRuLo02HcYzljN/UZpjBU79q9/TpmR3aUcwQ4jqhl7d/6XJgbih tEEJ4RfOykTwEIAlS/nTw== X-UI-Out-Filterresults: notjunk:1; V03:K0:GicZFVX/nNo=:lf5QKtzxZBdS9dk6SXWhBz a/56cP58oiRIrUBxND8vjuB0ynBFWvQoH0+wQtiCwUryGm8fyFPb5L5ffcxwgt5GqMVuYor+c l4f6VOssXogvuOIZo4un0BZ8oZWSu4DuOA2e1+SQiSlymgwBJvPmqF4bKOk/VgizfxnAajLd+ NsNULw7+1GfxdwvW0b01Ycb3PkI4A6xBa3DfSivbushAfCTwdlfLfNZ24goHhNvNM+sQLFxzd 4UTxgQtN2u7Mwa/EGZWFCYVzX0AHwqTFd2Pj5C7mEGrnpEZyiWqF116n5UGPIzPdC7oh7sJm8 yT8+BkOE4BTugAvpwz87B5tUrb+Sw4GWRAOBMJp7ewOTb8DTNKaBdvDXXJfceQXk4Resx9EGC iODQ0ZuhezBul/FWOYekqYHJBzGurZ5r+VHi2uxAcJCewoFxtgzSOJWgOIN4expOnh26i9Wuk MViPpP6JFZaC/NAGrWmnaijeUYC2r5fepKGrQNyCN010V5ZJxj1CVW5wK0ViA2qLafx1TN1u9 Po4li8L0viS1nBINe0Pk461tZorW5gypk0CHYl8B2YAccN8J2MSOXS0WkefDPnpwph+iubP6S GhYcfiZpd1vMbhJgoArDPYeP0K1amb9q++9EGfqEN2bgl3rpKPcuXQ3JGSfTcwFGPp3D/fh27 cWQ0tX/aqedgJS3u5puS/zH+FLEi3GV7yzA+Tr9WkHKWcgd/eKHt9Ww7iADIf5N7OpKc3tTwI IyzyLBSmsypG07NrMVHazQykZHRwhdNcMg6AZ21/JMV6lbrPQj8Qvw+vfdiCmzBdnsNDKzk4q nhRu2Y8e5F0BLCsqp0ZD+3BdfZMAQ6u9FqVNMU1iE1OKrQ+No/ZVwkpPDT56q9wkrEYSwSSJ0 oGo0cXiy/Pzr2Fdd33sEWG364LxFUAH99liutVn0doirzVFzoVHG8CQtsDrp4Zx7FPSNOIr2F kfyf0zpmWPf8o+xLh75A/NaFzCNMbpBwQ0A/Yg5t2UVzjQYrPSdhJpKctdWHvWchzyZkt3dBN e+6Brd0BzW2jrnlIl0Ydi8ys+JmKzYf4UnRXc6Q7yaVz4rB93lzbcgs5qPx+TRbTSd7uE+tTa Y/dGlFFG3bb45ere30CYEz1xKCaezehhCM7LqDf2NXXhBWZmKCJzbz/jHE388vMKEzt4QxOno kdfyb62S4CQJZL/fUwE5IRG6jDW6gex9fyfKvE+WNuSfX8pMT/JhKCQpbxIThWFCserzn1MI0 hPjW6oXlQx1toBsxgXRkwAW67F5akJzIpgcL4lQ== Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org This enables thermal for the BCM2711 (used on Raspberry Pi 4) by adding the AVS monitor and a subnode for the thermal part. Signed-off-by: Stefan Wahren --- arch/arm/boot/dts/bcm2711.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+) -- 2.7.4 diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi index 961bed8..96f341d 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -66,6 +66,17 @@ IRQ_TYPE_LEVEL_HIGH)>; }; + avs_monitor: avs-monitor@7d5d2000 { + compatible = "brcm,bcm2711-avs-monitor", + "syscon", "simple-mfd"; + reg = <0x7d5d2000 0xf00>; + + thermal: thermal { + compatible = "brcm,bcm2711-thermal"; + #thermal-sensor-cells = <0>; + }; + }; + dma: dma@7e007000 { compatible = "brcm,bcm2835-dma"; reg = <0x7e007000 0xb00>; @@ -363,6 +374,7 @@ &cpu_thermal { coefficients = <(-487) 410040>; + thermal-sensors = <&thermal>; }; &dsi0 {