From: Andre Przywara <andre.przywara@arm.com> To: Vasily Khoruzhick <anarsoul@gmail.com>, Yangtao Li <tiny.windzz@gmail.com>, Chen-Yu Tsai <wens@csie.org>, Jernej Skrabec <jernej.skrabec@gmail.com>, Samuel Holland <samuel@sholland.org> Cc: "Rafael J . Wysocki" <rafael@kernel.org>, Daniel Lezcano <daniel.lezcano@linaro.org>, Zhang Rui <rui.zhang@intel.com>, Lukasz Luba <lukasz.luba@arm.com>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, Conor Dooley <conor+dt@kernel.org>, Martin Botka <martin.botka@somainline.org>, Bob McChesney <bob@electricworry.net>, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev Subject: [PATCH v3 4/6] thermal: sun8i: add syscon register access code Date: Tue, 28 Nov 2023 00:58:47 +0000 [thread overview] Message-ID: <20231128005849.19044-5-andre.przywara@arm.com> (raw) In-Reply-To: <20231128005849.19044-1-andre.przywara@arm.com> The Allwinner H616 SoC needs to clear a bit in one register in the SRAM controller (exported as a syscon), to report reasonable temperature values. On reset, bit 16 in register 0x3000000 is set, which leads to the driver reporting temperatures around 200C. Clearing this bit brings the values down to the expected range. The BSP code does a one-time write in U-Boot, with a comment just mentioning the effect on the THS, but offering no further explanation. To not rely on firmware to set things up for us, add code that queries the syscon device via a DT phandle link, then clear just this single bit. Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- drivers/thermal/sun8i_thermal.c | 50 +++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/drivers/thermal/sun8i_thermal.c b/drivers/thermal/sun8i_thermal.c index 44554c3efc96c..920e419ce7343 100644 --- a/drivers/thermal/sun8i_thermal.c +++ b/drivers/thermal/sun8i_thermal.c @@ -15,6 +15,7 @@ #include <linux/module.h> #include <linux/nvmem-consumer.h> #include <linux/of.h> +#include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/reset.h> @@ -66,6 +67,7 @@ struct tsensor { struct ths_thermal_chip { bool has_mod_clk; bool has_bus_clk_reset; + bool needs_syscon; int sensor_num; int offset; int scale; @@ -83,6 +85,7 @@ struct ths_device { const struct ths_thermal_chip *chip; struct device *dev; struct regmap *regmap; + struct regmap_field *syscon_regmap_field; struct reset_control *reset; struct clk *bus_clk; struct clk *mod_clk; @@ -325,6 +328,34 @@ static void sun8i_ths_reset_control_assert(void *data) reset_control_assert(data); } +static struct regmap *sun8i_ths_get_syscon_regmap(struct device_node *node) +{ + struct device_node *syscon_node; + struct platform_device *syscon_pdev; + struct regmap *regmap = NULL; + + syscon_node = of_parse_phandle(node, "syscon", 0); + if (!syscon_node) + return ERR_PTR(-ENODEV); + + syscon_pdev = of_find_device_by_node(syscon_node); + if (!syscon_pdev) { + /* platform device might not be probed yet */ + regmap = ERR_PTR(-EPROBE_DEFER); + goto out_put_node; + } + + /* If no regmap is found then the other device driver is at fault */ + regmap = dev_get_regmap(&syscon_pdev->dev, NULL); + if (!regmap) + regmap = ERR_PTR(-EINVAL); + + platform_device_put(syscon_pdev); +out_put_node: + of_node_put(syscon_node); + return regmap; +} + static int sun8i_ths_resource_init(struct ths_device *tmdev) { struct device *dev = tmdev->dev; @@ -369,6 +400,21 @@ static int sun8i_ths_resource_init(struct ths_device *tmdev) if (ret) return ret; + if (tmdev->chip->needs_syscon) { + const struct reg_field sun8i_syscon_reg_field = + REG_FIELD(0x0, 16, 16); + struct regmap *regmap; + + regmap = sun8i_ths_get_syscon_regmap(dev->of_node); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); + tmdev->syscon_regmap_field = devm_regmap_field_alloc(dev, + regmap, + sun8i_syscon_reg_field); + if (IS_ERR(tmdev->syscon_regmap_field)) + return PTR_ERR(tmdev->syscon_regmap_field); + } + ret = sun8i_ths_calibrate(tmdev); if (ret) return ret; @@ -415,6 +461,10 @@ static int sun50i_h6_thermal_init(struct ths_device *tmdev) { int val; + /* The H616 needs to have a bit in the SRAM control register cleared. */ + if (tmdev->syscon_regmap_field) + regmap_field_write(tmdev->syscon_regmap_field, 0); + /* * The manual recommends an overall sample frequency of 50 KHz (20us, * 480 cycles at 24 MHz), which provides plenty of time for both the -- 2.35.8
WARNING: multiple messages have this Message-ID (diff)
From: Andre Przywara <andre.przywara@arm.com> To: Vasily Khoruzhick <anarsoul@gmail.com>, Yangtao Li <tiny.windzz@gmail.com>, Chen-Yu Tsai <wens@csie.org>, Jernej Skrabec <jernej.skrabec@gmail.com>, Samuel Holland <samuel@sholland.org> Cc: "Rafael J . Wysocki" <rafael@kernel.org>, Daniel Lezcano <daniel.lezcano@linaro.org>, Zhang Rui <rui.zhang@intel.com>, Lukasz Luba <lukasz.luba@arm.com>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, Conor Dooley <conor+dt@kernel.org>, Martin Botka <martin.botka@somainline.org>, Bob McChesney <bob@electricworry.net>, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev Subject: [PATCH v3 4/6] thermal: sun8i: add syscon register access code Date: Tue, 28 Nov 2023 00:58:47 +0000 [thread overview] Message-ID: <20231128005849.19044-5-andre.przywara@arm.com> (raw) In-Reply-To: <20231128005849.19044-1-andre.przywara@arm.com> The Allwinner H616 SoC needs to clear a bit in one register in the SRAM controller (exported as a syscon), to report reasonable temperature values. On reset, bit 16 in register 0x3000000 is set, which leads to the driver reporting temperatures around 200C. Clearing this bit brings the values down to the expected range. The BSP code does a one-time write in U-Boot, with a comment just mentioning the effect on the THS, but offering no further explanation. To not rely on firmware to set things up for us, add code that queries the syscon device via a DT phandle link, then clear just this single bit. Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- drivers/thermal/sun8i_thermal.c | 50 +++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/drivers/thermal/sun8i_thermal.c b/drivers/thermal/sun8i_thermal.c index 44554c3efc96c..920e419ce7343 100644 --- a/drivers/thermal/sun8i_thermal.c +++ b/drivers/thermal/sun8i_thermal.c @@ -15,6 +15,7 @@ #include <linux/module.h> #include <linux/nvmem-consumer.h> #include <linux/of.h> +#include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/reset.h> @@ -66,6 +67,7 @@ struct tsensor { struct ths_thermal_chip { bool has_mod_clk; bool has_bus_clk_reset; + bool needs_syscon; int sensor_num; int offset; int scale; @@ -83,6 +85,7 @@ struct ths_device { const struct ths_thermal_chip *chip; struct device *dev; struct regmap *regmap; + struct regmap_field *syscon_regmap_field; struct reset_control *reset; struct clk *bus_clk; struct clk *mod_clk; @@ -325,6 +328,34 @@ static void sun8i_ths_reset_control_assert(void *data) reset_control_assert(data); } +static struct regmap *sun8i_ths_get_syscon_regmap(struct device_node *node) +{ + struct device_node *syscon_node; + struct platform_device *syscon_pdev; + struct regmap *regmap = NULL; + + syscon_node = of_parse_phandle(node, "syscon", 0); + if (!syscon_node) + return ERR_PTR(-ENODEV); + + syscon_pdev = of_find_device_by_node(syscon_node); + if (!syscon_pdev) { + /* platform device might not be probed yet */ + regmap = ERR_PTR(-EPROBE_DEFER); + goto out_put_node; + } + + /* If no regmap is found then the other device driver is at fault */ + regmap = dev_get_regmap(&syscon_pdev->dev, NULL); + if (!regmap) + regmap = ERR_PTR(-EINVAL); + + platform_device_put(syscon_pdev); +out_put_node: + of_node_put(syscon_node); + return regmap; +} + static int sun8i_ths_resource_init(struct ths_device *tmdev) { struct device *dev = tmdev->dev; @@ -369,6 +400,21 @@ static int sun8i_ths_resource_init(struct ths_device *tmdev) if (ret) return ret; + if (tmdev->chip->needs_syscon) { + const struct reg_field sun8i_syscon_reg_field = + REG_FIELD(0x0, 16, 16); + struct regmap *regmap; + + regmap = sun8i_ths_get_syscon_regmap(dev->of_node); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); + tmdev->syscon_regmap_field = devm_regmap_field_alloc(dev, + regmap, + sun8i_syscon_reg_field); + if (IS_ERR(tmdev->syscon_regmap_field)) + return PTR_ERR(tmdev->syscon_regmap_field); + } + ret = sun8i_ths_calibrate(tmdev); if (ret) return ret; @@ -415,6 +461,10 @@ static int sun50i_h6_thermal_init(struct ths_device *tmdev) { int val; + /* The H616 needs to have a bit in the SRAM control register cleared. */ + if (tmdev->syscon_regmap_field) + regmap_field_write(tmdev->syscon_regmap_field, 0); + /* * The manual recommends an overall sample frequency of 50 KHz (20us, * 480 cycles at 24 MHz), which provides plenty of time for both the -- 2.35.8 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-11-28 1:00 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-11-28 0:58 [PATCH v3 0/6] Add support for H616 Thermal system Andre Przywara 2023-11-28 0:58 ` Andre Przywara 2023-11-28 0:58 ` [PATCH v3 1/6] soc: sunxi: sram: export register 0 for THS on H616 Andre Przywara 2023-11-28 0:58 ` Andre Przywara 2023-11-28 0:58 ` [PATCH v3 2/6] dt-bindings: thermal: sun8i: Add H616 THS controller Andre Przywara 2023-11-28 0:58 ` Andre Przywara 2023-11-28 7:41 ` Krzysztof Kozlowski 2023-11-28 7:41 ` Krzysztof Kozlowski 2023-11-28 0:58 ` [PATCH v3 3/6] thermal: sun8i: explain unknown H6 register value Andre Przywara 2023-11-28 0:58 ` Andre Przywara 2023-11-28 0:58 ` Andre Przywara [this message] 2023-11-28 0:58 ` [PATCH v3 4/6] thermal: sun8i: add syscon register access code Andre Przywara 2023-11-28 7:43 ` Krzysztof Kozlowski 2023-11-28 7:43 ` Krzysztof Kozlowski 2023-11-28 7:50 ` Chen-Yu Tsai 2023-11-28 7:50 ` Chen-Yu Tsai 2023-11-28 8:29 ` Krzysztof Kozlowski 2023-11-28 8:29 ` Krzysztof Kozlowski 2023-11-28 8:59 ` Chen-Yu Tsai 2023-11-28 8:59 ` Chen-Yu Tsai 2023-11-28 9:02 ` Chen-Yu Tsai 2023-11-28 9:02 ` Chen-Yu Tsai 2023-11-28 9:09 ` Chen-Yu Tsai 2023-11-28 9:09 ` Chen-Yu Tsai 2023-11-28 9:13 ` Krzysztof Kozlowski 2023-11-28 9:13 ` Krzysztof Kozlowski 2023-11-28 14:11 ` Krzysztof Kozlowski 2023-11-28 14:11 ` Krzysztof Kozlowski 2023-11-28 14:33 ` Andre Przywara 2023-11-28 14:33 ` Andre Przywara 2023-11-28 14:48 ` Krzysztof Kozlowski 2023-11-28 14:48 ` Krzysztof Kozlowski 2023-11-28 16:10 ` Andre Przywara 2023-11-28 16:10 ` Andre Przywara 2023-11-28 16:39 ` Chen-Yu Tsai 2023-11-28 16:39 ` Chen-Yu Tsai 2023-11-28 16:50 ` Rob Herring 2023-11-28 16:50 ` Rob Herring 2023-11-29 17:03 ` Andre Przywara 2023-11-29 17:03 ` Andre Przywara 2023-11-29 17:09 ` Chen-Yu Tsai 2023-11-29 17:09 ` Chen-Yu Tsai 2023-11-28 0:58 ` [PATCH v3 5/6] thermal: sun8i: add support for H616 THS controller Andre Przywara 2023-11-28 0:58 ` Andre Przywara 2023-12-09 10:44 ` Maksim Kiselev 2023-12-09 10:44 ` Maksim Kiselev 2023-12-11 0:05 ` Andre Przywara 2023-12-11 0:05 ` Andre Przywara 2023-12-12 18:09 ` Maxim Kiselev 2023-12-12 18:09 ` Maxim Kiselev 2023-12-14 9:59 ` Andre Przywara 2023-12-14 9:59 ` Andre Przywara 2023-12-17 14:16 ` Maxim Kiselev 2023-12-17 14:16 ` Maxim Kiselev 2023-11-28 0:58 ` [PATCH v3 6/6] arm64: dts: allwinner: h616: Add thermal sensor and zones Andre Przywara 2023-11-28 0:58 ` Andre Przywara
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20231128005849.19044-5-andre.przywara@arm.com \ --to=andre.przywara@arm.com \ --cc=anarsoul@gmail.com \ --cc=bob@electricworry.net \ --cc=conor+dt@kernel.org \ --cc=daniel.lezcano@linaro.org \ --cc=devicetree@vger.kernel.org \ --cc=jernej.skrabec@gmail.com \ --cc=krzysztof.kozlowski+dt@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-pm@vger.kernel.org \ --cc=linux-sunxi@lists.linux.dev \ --cc=lukasz.luba@arm.com \ --cc=martin.botka@somainline.org \ --cc=rafael@kernel.org \ --cc=robh+dt@kernel.org \ --cc=rui.zhang@intel.com \ --cc=samuel@sholland.org \ --cc=tiny.windzz@gmail.com \ --cc=wens@csie.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.