enable VTM node for all TI's K3 SoCs
Subsystems (3)
PATCH v2 5/11 dt-bindings: thermal: k3-j72xx: elaborate on binding description
In reply to Bryan BrattlofElaborate on the function of this device node as well as some of the properties this node uses.
--- .../bindings/thermal/ti,j72xx-thermal.yaml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/thermal/ti,j72xx-thermal.yaml +18 -1
@@ -9,6 +9,19 @@ title: Texas Instruments J72XX VTM (DTS) binding maintainers: - Keerthy <[email protected]> +description: | + The TI K3 family of SoCs typically have a Voltage & Thermal + Management (VTM) device to control up to 8 temperature diode + sensors to measure silicon junction temperatures from different + hotspots of the chip as well as provide temperature, interrupt + and alerting information. + + The following polynomial equation can then be used to convert + value returned by this device into a temperature in Celsius + + Temp(C) = (-9.2627e-12) * x^4 + (6.0373e-08) * x^3 + \ + (-1.7058e-04) * x^2 + (3.2512e-01) * x + (-4.9003e+01) + properties: compatible: enum:
@@ -19,7 +32,11 @@ properties: items: - description: VTM cfg1 register space - description: VTM cfg2 register space - - description: VTM efuse register space + - description: | + A software trimming method must be applied to some Jacinto + devices to function properly. This eFuse region provides + the information needed for these SoCs to report + temperatures accurately. power-domains: maxItems: 1
Signature · 1 line
2.38.1
v2 cover enable VTM node for all TI's K3 SoCs
Hello again everyone!
This series enabled the VTM nodes for all of Texas Instruments K3 SoCs
Most of this series updates the k3_j72xx_bandgap driver to conditionally map an eFuse region used by the j721e to work around an issue in its VTM implementation and allows us to save the SPARE_FUSE region on other SoCs
We can then update the device tree bindings for the driver and finally define the VTM nodes for each device
Thanks for reviewing!
~Bryan
****
v1 -> v2 changes[0]:
- when removing 'fuse_base' from the 'k3_j72xx_bandgap' structure, I forgot to pass 'fuse_base' to get_efuse_values()
- removed the descriptions to the generic 'power-domains' property
- incorporated Krzysztof's suggestions to the binding description
- refactored binding to use allOf: if: {min,max}Items over what I was doing :) Thanks Krzysztof
[0] https://lore.kernel.org/lkml/[email protected]/
Bryan Brattlof (11):
thermal: k3_j72xx_bandgap: simplify k3_thermal_get_temp() function
thermal: k3_j72xx_bandgap: use bool for i2128 erratum flag
thermal: k3_j72xx_bandgap: remove fuse_base from structure
thermal: k3_j72xx_bandgap: map fuse_base only for erratum workaround
dt-bindings: thermal: k3-j72xx: elaborate on binding description
dt-bindings: thermal: k3-j72xx: conditionally require efuse reg range
arm64: dts: ti: k3-am64-main: add VTM node
arm64: dts: ti: k3-am62-wakeup: add VTM node
arm64: dts: ti: k3-j721e-mcu-wakeup: add VTM node
arm64: dts: ti: k3-j721s2-mcu-wakeup: add VTM node
arm64: dts: ti: k3-j7200-mcu-wakeup: add VTM node
.../bindings/thermal/ti,j72xx-thermal.yaml | 35 +++++- arch/arm64/boot/dts/ti/k3-am62-thermal.dtsi | 33 ++++++ arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi | 8 ++ arch/arm64/boot/dts/ti/k3-am62.dtsi | 7 +- arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 8 ++ arch/arm64/boot/dts/ti/k3-am64-thermal.dtsi | 33 ++++++ arch/arm64/boot/dts/ti/k3-am64.dtsi | 4 + .../boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 8 ++ arch/arm64/boot/dts/ti/k3-j7200-thermal.dtsi | 47 ++++++++ arch/arm64/boot/dts/ti/k3-j7200.dtsi | 3 + .../boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 9 ++ arch/arm64/boot/dts/ti/k3-j721e-thermal.dtsi | 75 +++++++++++++ arch/arm64/boot/dts/ti/k3-j721e.dtsi | 3 + .../boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 8 ++ arch/arm64/boot/dts/ti/k3-j721s2-thermal.dtsi | 103 ++++++++++++++++++ arch/arm64/boot/dts/ti/k3-j721s2.dtsi | 3 + drivers/thermal/k3_j72xx_bandgap.c | 67 ++++++------ 17 files changed, 420 insertions(+), 34 deletions(-) create mode 100644 arch/arm64/boot/dts/ti/k3-am62-thermal.dtsi create mode 100644 arch/arm64/boot/dts/ti/k3-am64-thermal.dtsi create mode 100644 arch/arm64/boot/dts/ti/k3-j7200-thermal.dtsi create mode 100644 arch/arm64/boot/dts/ti/k3-j721e-thermal.dtsi create mode 100644 arch/arm64/boot/dts/ti/k3-j721s2-thermal.dtsi
Signature · 1 line
2.38.1
PATCH v2 4/11 thermal: k3_j72xx_bandgap: map fuse_base only for erratum workaround
Some of TI's J721E SoCs require a software trimming procedure for the temperature monitors to function properly. To determine if a particular J721E is not affected by this erratum, both bits in the WKUP_SPARE_FUSE0 region must be set. Other SoCs, not affected by this erratum, will not need this region.
Map the 'fuse_base' region only when the erratum fix is needed.
--- drivers/thermal/k3_j72xx_bandgap.c | 37 ++++++++++++++++++------------ 1 file changed, 22 insertions(+), 15 deletions(-)
drivers/thermal/k3_j72xx_bandgap.c +22 -15
@@ -386,15 +386,32 @@ static int k3_j72xx_bandgap_probe(struct platform_device *pdev)if (IS_ERR (bgp->cfg2_base))return PTR_ERR (bgp->cfg2_base); - res =platform_get_resource (pdev,IORESOURCE_MEM ,2 ); - fuse_base =devm_ioremap_resource (dev, res); -if (IS_ERR (fuse_base)) -return PTR_ERR (fuse_base); - driver_data =of_device_get_match_data (dev);if (driver_data) workaround_needed = driver_data->has_errata_i2128; +/* +* Some of TI's J721E SoCs require a software trimming procedure +* for the temperature monitors to function properly. To determine +* if this particular SoC is NOT affected, both bits in the +* WKUP_SPARE_FUSE0[31:30] will be set (0xC0000000) indicating +* when software trimming should NOT be applied. +* +* https://www.ti.com/lit/er/sprz455c/sprz455c.pdf +*/ +if (workaround_needed) { + res =platform_get_resource (pdev,IORESOURCE_MEM ,2 ); + fuse_base =devm_ioremap_resource (dev, res); +if (IS_ERR (fuse_base)) +return PTR_ERR (fuse_base); + +if ((readl (fuse_base) &0xc0000000 ) ==0xc0000000 ) + workaround_needed = false; + } + +dev_dbg (bgp->dev,"Work around %sneeded\n" , + workaround_needed ?"" :"not " ); +pm_runtime_enable (dev); ret =pm_runtime_get_sync (dev);if (ret <0 ) {
@@ -427,13 +444,6 @@ static int k3_j72xx_bandgap_probe(struct platform_device *pdev) goto err_free_ref_table; } -/* Workaround not needed if bit30/bit31 is set even for J721e */ -if (workaround_needed && (readl (fuse_base +0x0 ) &0xc0000000 ) ==0xc0000000 ) - workaround_needed = false; - -dev_dbg (bgp->dev,"Work around %sneeded\n" , - workaround_needed ?"" :"not " ); -if (!workaround_needed)init_table (5 , ref_table, golden_factors);else
@@ -501,9 +511,6 @@ static int k3_j72xx_bandgap_probe(struct platform_device *pdev)*/ kfree (ref_table); -if (workaround_needed) -devm_iounmap (dev, fuse_base); -return 0 ; err_free_ref_table:
Signature · 1 line
2.38.1
PATCH v2 10/11 arm64: dts: ti: k3-j721s2-mcu-wakeup: add VTM node
In reply to Bryan BrattlofThe j721s2 supports a single Voltage and Thermal Management (VTM) device located in the wakeup domain with seven associated temperature monitors located in various hot spots on the die.
--- .../boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 8 ++ arch/arm64/boot/dts/ti/k3-j721s2-thermal.dtsi | 103 ++++++++++++++++++ arch/arm64/boot/dts/ti/k3-j721s2.dtsi | 3 + 3 files changed, 114 insertions(+) create mode 100644 arch/arm64/boot/dts/ti/k3-j721s2-thermal.dtsi
arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi +8 -0
@@ -299,4 +299,12 @@ cpts@3d000 { ti,cpts-periodic-outputs = <2>; }; }; + + vtm0: temperature-sensor@42040000 { + compatible = "ti,j7200-vtm"; + reg = <0x0 0x42040000 0x0 0x350>, + <0x0 0x42050000 0x0 0x350>; + power-domains = <&k3_pds 154 TI_SCI_PD_SHARED>; + #thermal-sensor-cells = <1>; + }; };
arch/arm64/boot/dts/ti/k3-j721s2-thermal.dtsi new file +103 -0
103 lines not on this page · raw message
arch/arm64/boot/dts/ti/k3-j721s2.dtsi +3 -0
@@ -161,6 +161,9 @@ cbass_mcu_wakeup: bus@28380000 { }; }; + + #include "k3-j721s2-thermal.dtsi" + }; /* Now include peripherals from each bus segment */
Signature · 1 line
2.38.1
PATCH v2 9/11 arm64: dts: ti: k3-j721e-mcu-wakeup: add VTM node
In reply to Bryan BrattlofThe j721e supports a single Voltage and Thermal Management (VTM) module located in the wakeup domain with five associated temperature monitors located in various hot spots on the die.
--- .../boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 9 +++ arch/arm64/boot/dts/ti/k3-j721e-thermal.dtsi | 75 +++++++++++++++++++ arch/arm64/boot/dts/ti/k3-j721e.dtsi | 3 + 3 files changed, 87 insertions(+) create mode 100644 arch/arm64/boot/dts/ti/k3-j721e-thermal.dtsi
arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi +9 -0
@@ -418,4 +418,13 @@ mcu_mcan1: can@40568000 { interrupt-names = "int0", "int1"; bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; }; + + vtm0: temperature-sensor@42040000 { + compatible = "ti,j721e-vtm"; + reg = <0x00 0x42040000 0x00 0x350>, + <0x00 0x42050000 0x00 0x350>, + <0x00 0x43000300 0x00 0x10>; + power-domains = <&k3_pds 154 TI_SCI_PD_EXCLUSIVE>; + #thermal-sensor-cells = <1>; + }; };
arch/arm64/boot/dts/ti/k3-j721e-thermal.dtsi new file +75 -0
75 lines not on this page · raw message
arch/arm64/boot/dts/ti/k3-j721e.dtsi +3 -0
@@ -181,6 +181,9 @@ cbass_mcu_wakeup: bus@28380000 { <0x07 0x00000000 0x07 0x00000000 0x01 0x00000000>; /* FSS OSPI1 data region 3*/ }; }; + + #include "k3-j721e-thermal.dtsi" + }; /* Now include the peripherals for each bus segments */
Signature · 1 line
2.38.1
PATCH v2 6/11 dt-bindings: thermal: k3-j72xx: conditionally require efuse reg range
In reply to Bryan BrattlofOnly some of TI's J721E SoCs will need a eFuse register range mapped to determine if they're affected by TI's i2128 erratum. All other SoC will not need this eFuse range to function properly
Update the bindings for the k3_j72xx_bandgap thermal driver so other devices will only need two register ranges
--- .../bindings/thermal/ti,j72xx-thermal.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
Documentation/devicetree/bindings/thermal/ti,j72xx-thermal.yaml +16 -0
@@ -37,6 +37,7 @@ properties: devices to function properly. This eFuse region provides the information needed for these SoCs to report temperatures accurately. + minItems: 2 power-domains: maxItems: 1
@@ -44,6 +45,21 @@ properties: "#thermal-sensor-cells": const: 1 +allOf: + - if: + properties: + compatible: + contains: + const: ti,j721e-vtm + then: + properties: + reg: + minItems: 3 + else: + properties: + reg: + maxItems: 2 + required: - compatible - reg
Signature · 1 line
2.38.1
PATCH v2 7/11 arm64: dts: ti: k3-am64-main: add VTM node
In reply to Bryan BrattlofThe am64x supports a single VTM module which is located in the main domain with two associated temperature monitors located at different hot spots on the die.
--- arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 8 +++++ arch/arm64/boot/dts/ti/k3-am64-thermal.dtsi | 33 +++++++++++++++++++++ arch/arm64/boot/dts/ti/k3-am64.dtsi | 4 +++ 3 files changed, 45 insertions(+) create mode 100644 arch/arm64/boot/dts/ti/k3-am64-thermal.dtsi
arch/arm64/boot/dts/ti/k3-am64-main.dtsi +8 -0
@@ -1356,4 +1356,12 @@ elm0: ecc@25010000 { clocks = <&k3_clks 54 0>; clock-names = "fck"; }; + + vtm0: temperature-sensor@b00000 { + compatible = "ti,j7200-vtm"; + reg = <0x00 0xb00000 0x00 0x400>, + <0x00 0xb01000 0x00 0x400>; + power-domains = <&k3_pds 95 TI_SCI_PD_EXCLUSIVE>; + #thermal-sensor-cells = <1>; + }; };
arch/arm64/boot/dts/ti/k3-am64-thermal.dtsi new file +33 -0
@@ -0,0 +1,33 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <dt-bindings/thermal/thermal.h> + +thermal_zones: thermal-zones { + main0_thermal: main0-thermal { + polling-delay-passive = <250>; /* milliSeconds */ + polling-delay = <500>; /* milliSeconds */ + thermal-sensors = <&vtm0 0>; + + trips { + main0_crit: main0-crit { + temperature = <105000>; /* milliCelsius */ + hysteresis = <2000>; /* milliCelsius */ + type = "critical"; + }; + }; + }; + + main1_thermal: main1-thermal { + polling-delay-passive = <250>; /* milliSeconds */ + polling-delay = <500>; /* milliSeconds */ + thermal-sensors = <&vtm0 1>; + + trips { + main1_crit: main1-crit { + temperature = <105000>; /* milliCelsius */ + hysteresis = <2000>; /* milliCelsius */ + type = "critical"; + }; + }; + }; +};
arch/arm64/boot/dts/ti/k3-am64.dtsi +4 -0
@@ -69,6 +69,7 @@ cbass_main: bus@f4000 { <0x00 0x00420000 0x00 0x00420000 0x00 0x00001000>, /* ESM0 */ <0x00 0x00600000 0x00 0x00600000 0x00 0x00001100>, /* GPIO */ <0x00 0x00a40000 0x00 0x00a40000 0x00 0x00000800>, /* Timesync router */ + <0x00 0x00b00000 0x00 0x00b00000 0x00 0x00002400>, /* VTM */ <0x00 0x01000000 0x00 0x01000000 0x00 0x02330400>, /* First peripheral window */ <0x00 0x08000000 0x00 0x08000000 0x00 0x00200000>, /* Main CPSW */ <0x00 0x0d000000 0x00 0x0d000000 0x00 0x00800000>, /* PCIE_CORE */
@@ -105,6 +106,9 @@ cbass_mcu: bus@4000000 { ranges = <0x00 0x04000000 0x00 0x04000000 0x00 0x01ff1400>; /* Peripheral window */ }; }; + + #include "k3-am64-thermal.dtsi" + }; /* Now include the peripherals for each bus segments */
Signature · 1 line
2.38.1
PATCH v2 11/11 arm64: dts: ti: k3-j7200-mcu-wakeup: add VTM node
In reply to Bryan BrattlofThe j7200 supports a single Voltage and Thermal Management (VTM) device located in the wakeup domain with three associated temperature monitors located in various hot spots on the die.
--- .../boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 8 ++++ arch/arm64/boot/dts/ti/k3-j7200-thermal.dtsi | 47 +++++++++++++++++++ arch/arm64/boot/dts/ti/k3-j7200.dtsi | 3 ++ 3 files changed, 58 insertions(+) create mode 100644 arch/arm64/boot/dts/ti/k3-j7200-thermal.dtsi
arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi +8 -0
@@ -395,4 +395,12 @@ rng: rng@40910000 { status = "disabled"; /* Used by OP-TEE */ }; }; + + vtm0: temperature-sensor@42040000 { + compatible = "ti,j7200-vtm"; + reg = <0x00 0x42040000 0x00 0x350>, + <0x00 0x42050000 0x00 0x350>; + power-domains = <&k3_pds 154 TI_SCI_PD_EXCLUSIVE>; + #thermal-sensor-cells = <1>; + }; };
arch/arm64/boot/dts/ti/k3-j7200-thermal.dtsi new file +47 -0
47 lines not on this page · raw message
arch/arm64/boot/dts/ti/k3-j7200.dtsi +3 -0
@@ -168,6 +168,9 @@ cbass_mcu_wakeup: bus@28380000 { <0x07 0x00000000 0x07 0x00000000 0x01 0x00000000>; /* FSS OSPI1 data region 3 */ }; }; + + #include "k3-j7200-thermal.dtsi" + }; /* Now include the peripherals for each bus segments */
Signature · 1 line
2.38.1
PATCH v2 2/11 thermal: k3_j72xx_bandgap: use bool for i2128 erratum flag
In reply to Bryan BrattlofSome of TI's J721E's require a software trimming method to report temperatures accurately. Currently we are using a few different data types to indicate when this device should apply the erratum.
Change the 'workaround_needed' variable's data type to a bool to align with how we are using this variable currently.
--- drivers/thermal/k3_j72xx_bandgap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/thermal/k3_j72xx_bandgap.c +4 -4
@@ -340,7 +340,7 @@ static void print_look_up_table(struct device *dev, int *ref_table) }struct k3_j72xx_bandgap_data { -unsigned int has_errata_i2128; +const bool has_errata_i2128; };static int k3_j72xx_bandgap_probe (struct platform_device *pdev)
@@ -351,7 +351,7 @@ static int k3_j72xx_bandgap_probe(struct platform_device *pdev)struct device *dev = &pdev->dev;struct k3_j72xx_bandgap *bgp;struct k3_thermal_data *data; -int workaround_needed =0 ; +bool workaround_needed = false;const struct k3_j72xx_bandgap_data *driver_data;struct thermal_zone_device *ti_thermal;int *ref_table;
@@ -522,11 +522,11 @@ static int k3_j72xx_bandgap_remove(struct platform_device *pdev) }static const struct k3_j72xx_bandgap_data k3_j72xx_bandgap_j721e_data = { - .has_errata_i2128 =1 , + .has_errata_i2128 = true, };static const struct k3_j72xx_bandgap_data k3_j72xx_bandgap_j7200_data = { - .has_errata_i2128 =0 , + .has_errata_i2128 = false, };static const struct of_device_id of_k3_j72xx_bandgap_match[] = {
Signature · 1 line
2.38.1
PATCH v2 1/11 thermal: k3_j72xx_bandgap: simplify k3_thermal_get_temp() function
In reply to Bryan BrattlofThe k3_thermal_get_temp() function can be simplified to return only the result of k3_bgp_read_temp() without needing the 'ret' variable
--- drivers/thermal/k3_j72xx_bandgap.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/thermal/k3_j72xx_bandgap.c +1 -8
@@ -249,14 +249,7 @@ static inline int k3_bgp_read_temp(struct k3_thermal_data *devdata,/* Get temperature callback function for thermal zone */ static int k3_thermal_get_temp (struct thermal_zone_device *tz,int *temp) { -struct k3_thermal_data *data = tz->devdata; -int ret =0 ; - - ret =k3_bgp_read_temp (data, temp); -if (ret) -return ret; - -return ret; +return k3_bgp_read_temp (tz->devdata, temp); }static const struct thermal_zone_device_ops k3_of_thermal_ops = {
Signature · 1 line
2.38.1
PATCH v2 8/11 arm64: dts: ti: k3-am62-wakeup: add VTM node
In reply to Bryan BrattlofThe am62x supports a single Voltage and Thermal Management (VTM) module located in the wakeup domain with two associated temperature monitors located in hot spots of the die.
--- arch/arm64/boot/dts/ti/k3-am62-thermal.dtsi | 33 +++++++++++++++++++++ arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi | 8 +++++ arch/arm64/boot/dts/ti/k3-am62.dtsi | 7 ++++- 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 arch/arm64/boot/dts/ti/k3-am62-thermal.dtsi
arch/arm64/boot/dts/ti/k3-am62-thermal.dtsi new file +33 -0
@@ -0,0 +1,33 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <dt-bindings/thermal/thermal.h> + +thermal_zones: thermal-zones { + main0_thermal: main0-thermal { + polling-delay-passive = <250>; /* milliSeconds */ + polling-delay = <500>; /* milliSeconds */ + thermal-sensors = <&vtm0 0>; + + trips { + main0_crit: main0-crit { + temperature = <105000>; /* milliCelsius */ + hysteresis = <2000>; /* milliCelsius */ + type = "critical"; + }; + }; + }; + + main1_thermal: main1-thermal { + polling-delay-passive = <250>; /* milliSeconds */ + polling-delay = <500>; /* milliSeconds */ + thermal-sensors = <&vtm0 1>; + + trips { + main1_crit: main1-crit { + temperature = <105000>; /* milliCelsius */ + hysteresis = <2000>; /* milliCelsius */ + type = "critical"; + }; + }; + }; +};
arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi +8 -0
@@ -38,4 +38,12 @@ wkup_i2c0: i2c@2b200000 { clocks = <&k3_clks 107 4>; clock-names = "fck"; }; + + vtm0: temperature-sensor@b00000 { + compatible = "ti,j7200-vtm"; + reg = <0x00 0xb00000 0x00 0x400>, + <0x00 0xb01000 0x00 0x400>; + power-domains = <&k3_pds 95 TI_SCI_PD_EXCLUSIVE>; + #thermal-sensor-cells = <1>; + }; };
arch/arm64/boot/dts/ti/k3-am62.dtsi +6 -1
@@ -80,6 +80,7 @@ cbass_main: bus@f0000 { <0x00 0x04000000 0x00 0x04000000 0x00 0x01ff1400>, /* Wakeup Domain Range */ + <0x00 0x00b00000 0x00 0x00b00000 0x00 0x00002400>, /* VTM */ <0x00 0x2b000000 0x00 0x2b000000 0x00 0x00300400>, <0x00 0x43000000 0x00 0x43000000 0x00 0x00020000>;
@@ -94,10 +95,14 @@ cbass_wakeup: bus@2b000000 { compatible = "simple-bus"; #address-cells = <2>; #size-cells = <2>; - ranges = <0x00 0x2b000000 0x00 0x2b000000 0x00 0x00300400>, /* Peripheral Window */ + ranges = <0x00 0x00b00000 0x00 0x00b00000 0x00 0x00002400>, /* VTM */ + <0x00 0x2b000000 0x00 0x2b000000 0x00 0x00300400>, /* Peripheral Window */ <0x00 0x43000000 0x00 0x43000000 0x00 0x00020000>; }; }; + + #include "k3-am62-thermal.dtsi" + }; /* Now include the peripherals for each bus segments */
Signature · 1 line
2.38.1
PATCH v2 3/11 thermal: k3_j72xx_bandgap: remove fuse_base from structure
In reply to Bryan Brattlof'fuse_base' is only needed during the initial probe function to provide a software trimming method for some devices effected by TI's i2128 erratum. Not all devices that use this hardware device will need to map this eFuse region.
Remove fuse_base from the main k3_j72xx_bandgap structure
--- drivers/thermal/k3_j72xx_bandgap.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-)
drivers/thermal/k3_j72xx_bandgap.c +15 -12
@@ -177,7 +177,6 @@ struct k3_j72xx_bandgap {struct device *dev;void __iomem *base;void __iomem *cfg2_base; -void __iomem *fuse_base;struct k3_thermal_data *ts_data[K3_VTM_MAX_NUM_TS ]; };
@@ -276,7 +275,7 @@ static int k3_j72xx_bandgap_temp_to_adc_code(int temp) }static void get_efuse_values (int id,struct k3_thermal_data *data,int *err, -struct k3_j72xx_bandgap *bgp) +void __iomem *fuse_base) {int i, tmp, pow;int ct_offsets[5 ][K3_VTM_CORRECTION_TEMP_CNT ] = {
@@ -298,16 +297,16 @@ static void get_efuse_values(int id, struct k3_thermal_data *data, int *err,/* Extract the offset value using bit-mask */ if (ct_offsets[id][i] ==-1 && i ==1 ) {/* 25C offset Case of Sensor 2 split between 2 regs */ - tmp = (readl (bgp->fuse_base +0x8 ) &0xE0000000 ) >> (29 ); - tmp |= ((readl (bgp->fuse_base +0xC ) &0x1F ) <<3 ); + tmp = (readl (fuse_base +0x8 ) &0xE0000000 ) >> (29 ); + tmp |= ((readl (fuse_base +0xC ) &0x1F ) <<3 ); pow = tmp &0x80 ; }else if (ct_offsets[id][i] ==-1 && i ==2 ) {/* 125C Case of Sensor 3 split between 2 regs */ - tmp = (readl (bgp->fuse_base +0x4 ) &0xF8000000 ) >> (27 ); - tmp |= ((readl (bgp->fuse_base +0x8 ) &0xF ) <<5 ); + tmp = (readl (fuse_base +0x4 ) &0xF8000000 ) >> (27 ); + tmp |= ((readl (fuse_base +0x8 ) &0xF ) <<5 ); pow = tmp &0x100 ; }else { - tmp =readl (bgp->fuse_base + ct_offsets[id][i]); + tmp =readl (fuse_base + ct_offsets[id][i]); tmp &= ct_bm[id][i]; tmp = tmp >>__ffs (ct_bm[id][i]);
@@ -356,6 +355,7 @@ static int k3_j72xx_bandgap_probe(struct platform_device *pdev)struct thermal_zone_device *ti_thermal;int *ref_table;struct err_values err_vals; +void __iomem *fuse_base;const s64 golden_factors[] = {-490019999999999936 ,
@@ -387,9 +387,9 @@ static int k3_j72xx_bandgap_probe(struct platform_device *pdev)return PTR_ERR (bgp->cfg2_base); res =platform_get_resource (pdev,IORESOURCE_MEM ,2 ); - bgp->fuse_base =devm_ioremap_resource (dev, res); -if (IS_ERR (bgp->fuse_base)) -return PTR_ERR (bgp->fuse_base); + fuse_base =devm_ioremap_resource (dev, res); +if (IS_ERR (fuse_base)) +return PTR_ERR (fuse_base); driver_data =of_device_get_match_data (dev);if (driver_data)
@@ -428,7 +428,7 @@ static int k3_j72xx_bandgap_probe(struct platform_device *pdev) }/* Workaround not needed if bit30/bit31 is set even for J721e */ -if (workaround_needed && (readl (bgp->fuse_base +0x0 ) &0xc0000000 ) ==0xc0000000 ) +if (workaround_needed && (readl (fuse_base +0x0 ) &0xc0000000 ) ==0xc0000000 ) workaround_needed = false; dev_dbg(bgp->dev, "Work around %sneeded\n",
@@ -452,7 +452,7 @@ static int k3_j72xx_bandgap_probe(struct platform_device *pdev) err_vals.refs[1 ] =PLUS30CREF ; err_vals.refs[2 ] =PLUS125CREF ; err_vals.refs[3 ] =PLUS150CREF ; -get_efuse_values (id, &data[id], err_vals.errs, bgp); +get_efuse_values (id, &data[id], err_vals.errs, fuse_base); }if (id ==0 && workaround_needed)
@@ -501,6 +501,9 @@ static int k3_j72xx_bandgap_probe(struct platform_device *pdev)*/ kfree (ref_table); +if (workaround_needed) +devm_iounmap (dev, fuse_base); +return 0 ; err_free_ref_table:
Signature · 1 line
2.38.1
Re: [PATCH v2 04/11] thermal: k3_j72xx_bandgap: map fuse_base only for erratum workaround
In reply to Bryan BrattlofOn October 25, 2022 thus sayeth Bryan Brattlof:
Quoted 13 lines
Some of TI's J721E SoCs require a software trimming procedure for the temperature monitors to function properly. To determine if a particular J721E is not affected by this erratum, both bits in the
WKUP_SPARE_FUSE0region must be set. Other SoCs, not affected by this erratum, will not need this region.Map the '
fuse_base' region only when the erratum fix is needed.Signed-off-by Bryan Brattlof <[email protected]>--- drivers/thermal/k3_j72xx_bandgap.c | 37 ++++++++++++++++++------------ 1 file changed, 22 insertions(+), 15 deletions(-)
...
drivers/thermal/k3_j72xx_bandgap.c static int k3_j72xx_bandgap_probe(struct platform_device *pdev) · line 506
Quoted 4 lines
drivers/thermal/k3_j72xx_bandgap.c +0
-3-if (workaround_needed) -devm_iounmap (dev, fuse_base); -
Ugh... This is wrong.
Of course I will catch it right after I send this out
Sorry for the noise everyone
~Bryan
Re: [PATCH v2 05/11] dt-bindings: thermal: k3-j72xx: elaborate on binding description
In reply to Bryan BrattlofQuoted 5 lines · Bryan Brattlof
Elaborate on the function of this device node as well as some of the properties this node uses.
Signed-off-by Bryan Brattlof <[email protected]>---
Best regards,
Krzysztof
Re: [PATCH v2 06/11] dt-bindings: thermal: k3-j72xx: conditionally require efuse reg range
In reply to Bryan BrattlofQuoted 7 lines · Bryan Brattlof
Only some of TI's J721E SoCs will need a eFuse register range mapped to determine if they're affected by TI's i2128 erratum. All other SoC will not need this eFuse range to function properly
Update the bindings for the
k3_j72xx_bandgapthermal driver so other devices will only need two register ranges
Best regards,
Krzysztof