IPQ5018 has tsens V1.0 IP with 4 sensors and 1 interrupt.
There is no RPM present in the soc to do tsens early enable.
Adding support for the same here.
[v3]
*) Added the tsens-ipq5018 as new binding without rpm
*) Added Dmitry's Reviewed tag
*) Fixed Dmitry's comments for error checks in init_ipq5018
*) Ordered the qfprom device node properties
[v2]
*) Sorted the compatible and removed example
*) Fixed the name for new tsens_feature
*) Used tsend_calibrate_common instead of legacy
and addressed comments from Dmitry.
*) Squashed patch 3 & 4
*) Fixed node names, order and added qfprom cells
for points seprately
*) Squashed patch 6 & 7
Sricharan Ramabadhran (4):
dt-bindings: thermal: qcom-tsens: Add ipq5018 compatible
thermal/drivers/qcom: Add new feat for soc without rpm
thermal/drivers/tsens: Add support for IPQ5018 tsens
arm64: dts: qcom: ipq5018: Add tsens node
.../bindings/thermal/qcom-tsens.yaml | 4 +
arch/arm64/boot/dts/qcom/ipq5018.dtsi | 169 ++++++++++++++++++
drivers/thermal/qcom/tsens-v1.c | 60 +++++++
drivers/thermal/qcom/tsens.c | 5 +-
drivers/thermal/qcom/tsens.h | 5 +-
5 files changed, 241 insertions(+), 2 deletions(-)
--
2.34.1
From: Sricharan Ramabadhran <[email protected]>
In IPQ5018, Tsens IP doesn't have RPM. Hence the early init to
enable tsens would not be done. So add a flag for that in feat
and skip enable checks. Without this, tsens probe fails.
Reviewed-by: Dmitry Baryshkov <[email protected]>
Signed-off-by: Sricharan Ramabadhran <[email protected]>
---
[v3] Added Dmitry's Reviewed tag
drivers/thermal/qcom/tsens.c | 2 +-
drivers/thermal/qcom/tsens.h | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
index 98c356acfe98..0a43ccf02ec4 100644
--- a/drivers/thermal/qcom/tsens.c
+++ b/drivers/thermal/qcom/tsens.c
@@ -974,7 +974,7 @@ int __init init_common(struct tsens_priv *priv)
ret = regmap_field_read(priv->rf[TSENS_EN], &enabled);
if (ret)
goto err_put_device;
- if (!enabled) {
+ if (!enabled && !(priv->feat->ignore_enable)) {
dev_err(dev, "%s: device not enabled\n", __func__);
ret = -ENODEV;
goto err_put_device;
diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
index 2805de1c6827..e254cd2df904 100644
--- a/drivers/thermal/qcom/tsens.h
+++ b/drivers/thermal/qcom/tsens.h
@@ -505,6 +505,8 @@ enum regfield_ids {
* @srot_split: does the IP neatly splits the register space into SROT and TM,
* with SROT only being available to secure boot firmware?
* @has_watchdog: does this IP support watchdog functionality?
+ * @ignore_enable: does this IP reside in a soc that does not have rpm to
+ * do pre-init.
* @max_sensors: maximum sensors supported by this version of the IP
* @trip_min_temp: minimum trip temperature supported by this version of the IP
* @trip_max_temp: maximum trip temperature supported by this version of the IP
@@ -516,6 +518,7 @@ struct tsens_features {
unsigned int adc:1;
unsigned int srot_split:1;
unsigned int has_watchdog:1;
+ unsigned int ignore_enable:1;
unsigned int max_sensors;
int trip_min_temp;
int trip_max_temp;
--
2.34.1
From: Sricharan Ramabadhran <[email protected]>
IPQ5018 has tsens v1.0 block with 4 sensors and 1 interrupt.
Signed-off-by: Sricharan Ramabadhran <[email protected]>
---
[v3] Added the tsens-ipq5018 as new binding without rpm
Documentation/devicetree/bindings/thermal/qcom-tsens.yaml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml b/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml
index 27e9e16e6455..a02829deeb24 100644
--- a/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml
+++ b/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml
@@ -44,6 +44,10 @@ properties:
- qcom,qcs404-tsens
- const: qcom,tsens-v1
+ - description: v1 of TSENS without rpm
+ enum:
+ - qcom,ipq5018-tsens
+
- description: v2 of TSENS
items:
- enum:
--
2.34.1
From: Sricharan Ramabadhran <[email protected]>
IPQ5018 has tsens IP V1.0, 4 sensors and 1 interrupt.
The soc does not have a RPM, hence tsens has to be reset and
enabled in the driver init. Adding the driver support for same.
Signed-off-by: Sricharan Ramabadhran <[email protected]>
---
[v3] Fixed Dmitry's comments for error checks in init_ipq5018
drivers/thermal/qcom/tsens-v1.c | 60 +++++++++++++++++++++++++++++++++
drivers/thermal/qcom/tsens.c | 3 ++
drivers/thermal/qcom/tsens.h | 2 +-
3 files changed, 64 insertions(+), 1 deletion(-)
diff --git a/drivers/thermal/qcom/tsens-v1.c b/drivers/thermal/qcom/tsens-v1.c
index dc1c4ae2d8b0..acee2064f83e 100644
--- a/drivers/thermal/qcom/tsens-v1.c
+++ b/drivers/thermal/qcom/tsens-v1.c
@@ -79,6 +79,18 @@ static struct tsens_features tsens_v1_feat = {
.trip_max_temp = 120000,
};
+static struct tsens_features tsens_v1_ipq5018_feat = {
+ .ver_major = VER_1_X,
+ .crit_int = 0,
+ .combo_int = 0,
+ .adc = 1,
+ .srot_split = 1,
+ .max_sensors = 11,
+ .trip_min_temp = -40000,
+ .trip_max_temp = 120000,
+ .ignore_enable = 1,
+};
+
static const struct reg_field tsens_v1_regfields[MAX_REGFIELDS] = {
/* ----- SROT ------ */
/* VERSION */
@@ -150,6 +162,41 @@ static int __init init_8956(struct tsens_priv *priv) {
return init_common(priv);
}
+static int init_ipq5018(struct tsens_priv *priv)
+{
+ int ret;
+ u32 mask;
+
+ ret = init_common(priv);
+ if (ret < 0) {
+ dev_err(priv->dev, "Init common failed %d\n", ret);
+ return ret;
+ }
+
+ ret = regmap_field_write(priv->rf[TSENS_SW_RST], 1);
+ if (ret) {
+ dev_err(priv->dev, "Reset failed\n");
+ return ret;
+ }
+
+ mask = GENMASK(priv->num_sensors, 0);
+ ret = regmap_field_update_bits(priv->rf[SENSOR_EN], mask, mask);
+ if (ret) {
+ dev_err(priv->dev, "Sensor Enable failed\n");
+ return ret;
+ }
+
+ ret = regmap_field_write(priv->rf[TSENS_EN], 1);
+ if (ret) {
+ dev_err(priv->dev, "Enable failed\n");
+ return ret;
+ }
+
+ ret = regmap_field_write(priv->rf[TSENS_SW_RST], 0);
+
+ return ret;
+}
+
static const struct tsens_ops ops_generic_v1 = {
.init = init_common,
.calibrate = calibrate_v1,
@@ -187,3 +234,16 @@ struct tsens_plat_data data_8976 = {
.feat = &tsens_v1_feat,
.fields = tsens_v1_regfields,
};
+
+const struct tsens_ops ops_ipq5018 = {
+ .init = init_ipq5018,
+ .calibrate = tsens_calibrate_common,
+ .get_temp = get_temp_tsens_valid,
+};
+
+struct tsens_plat_data data_ipq5018 = {
+ .num_sensors = 5,
+ .ops = &ops_ipq5018,
+ .feat = &tsens_v1_ipq5018_feat,
+ .fields = tsens_v1_regfields,
+};
diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
index 0a43ccf02ec4..c792b9dc6676 100644
--- a/drivers/thermal/qcom/tsens.c
+++ b/drivers/thermal/qcom/tsens.c
@@ -1101,6 +1101,9 @@ static SIMPLE_DEV_PM_OPS(tsens_pm_ops, tsens_suspend, tsens_resume);
static const struct of_device_id tsens_table[] = {
{
+ .compatible = "qcom,ipq5018-tsens",
+ .data = &data_ipq5018,
+ }, {
.compatible = "qcom,ipq8064-tsens",
.data = &data_8960,
}, {
diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
index e254cd2df904..b6594b546d11 100644
--- a/drivers/thermal/qcom/tsens.h
+++ b/drivers/thermal/qcom/tsens.h
@@ -645,7 +645,7 @@ extern struct tsens_plat_data data_8960;
extern struct tsens_plat_data data_8226, data_8909, data_8916, data_8939, data_8974, data_9607;
/* TSENS v1 targets */
-extern struct tsens_plat_data data_tsens_v1, data_8976, data_8956;
+extern struct tsens_plat_data data_tsens_v1, data_8976, data_8956, data_ipq5018;
/* TSENS v2 targets */
extern struct tsens_plat_data data_8996, data_ipq8074, data_tsens_v2;
--
2.34.1
On 22/09/2023 13:51, Sricharan R wrote:
> From: Sricharan Ramabadhran <[email protected]>
>
> IPQ5018 has tsens v1.0 block with 4 sensors and 1 interrupt.
Then why do you allow two interrupts?
>
> Signed-off-by: Sricharan Ramabadhran <[email protected]>
> ---
> [v3] Added the tsens-ipq5018 as new binding without rpm
>
> Documentation/devicetree/bindings/thermal/qcom-tsens.yaml | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml b/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml
> index 27e9e16e6455..a02829deeb24 100644
> --- a/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml
> +++ b/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml
> @@ -44,6 +44,10 @@ properties:
> - qcom,qcs404-tsens
> - const: qcom,tsens-v1
>
> + - description: v1 of TSENS without rpm
> + enum:
> + - qcom,ipq5018-tsens
You miss now description of interrupts, like the other variants have.
Best regards,
Krzysztof
On Fri, 22 Sept 2023 at 14:51, Sricharan R
<[email protected]> wrote:
>
> From: Sricharan Ramabadhran <[email protected]>
>
> IPQ5018 has tsens IP V1.0, 4 sensors and 1 interrupt.
> The soc does not have a RPM, hence tsens has to be reset and
> enabled in the driver init. Adding the driver support for same.
>
> Signed-off-by: Sricharan Ramabadhran <[email protected]>
> ---
> [v3] Fixed Dmitry's comments for error checks in init_ipq5018
>
> drivers/thermal/qcom/tsens-v1.c | 60 +++++++++++++++++++++++++++++++++
> drivers/thermal/qcom/tsens.c | 3 ++
> drivers/thermal/qcom/tsens.h | 2 +-
> 3 files changed, 64 insertions(+), 1 deletion(-)
Reviewed-by: Dmitry Baryshkov <[email protected]>
--
With best wishes
Dmitry
On 9/23/2023 5:14 PM, Krzysztof Kozlowski wrote:
> On 22/09/2023 13:51, Sricharan R wrote:
>> From: Sricharan Ramabadhran <[email protected]>
>>
>> IPQ5018 has tsens v1.0 block with 4 sensors and 1 interrupt.
>
> Then why do you allow two interrupts?
>
infact there is only one interrupt. Will fix in the binding
description.
>>
>> Signed-off-by: Sricharan Ramabadhran <[email protected]>
>> ---
>> [v3] Added the tsens-ipq5018 as new binding without rpm
>>
>> Documentation/devicetree/bindings/thermal/qcom-tsens.yaml | 4 ++++
>> 1 file changed, 4 insertions(+)
>>
>> diff --git a/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml b/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml
>> index 27e9e16e6455..a02829deeb24 100644
>> --- a/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml
>> +++ b/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml
>> @@ -44,6 +44,10 @@ properties:
>> - qcom,qcs404-tsens
>> - const: qcom,tsens-v1
>>
>> + - description: v1 of TSENS without rpm
>> + enum:
>> + - qcom,ipq5018-tsens
>
> You miss now description of interrupts, like the other variants have.
>
ok, will add it.
Regards,
Sricharan
On 25/09/2023 04:06, Sricharan Ramabadhran wrote:
>
>
> On 9/23/2023 5:14 PM, Krzysztof Kozlowski wrote:
>> On 22/09/2023 13:51, Sricharan R wrote:
>>> From: Sricharan Ramabadhran <[email protected]>
>>>
>>> IPQ5018 has tsens v1.0 block with 4 sensors and 1 interrupt.
>>
>> Then why do you allow two interrupts?
>>
> infact there is only one interrupt. Will fix in the binding
> description.
Description? So you still allow two interrupts? No, this must be
constrained in allOf:if:then.
Best regards,
Krzysztof
On 9/25/2023 12:16 PM, Krzysztof Kozlowski wrote:
> On 25/09/2023 04:06, Sricharan Ramabadhran wrote:
>>
>>
>> On 9/23/2023 5:14 PM, Krzysztof Kozlowski wrote:
>>> On 22/09/2023 13:51, Sricharan R wrote:
>>>> From: Sricharan Ramabadhran <[email protected]>
>>>>
>>>> IPQ5018 has tsens v1.0 block with 4 sensors and 1 interrupt.
>>>
>>> Then why do you allow two interrupts?
>>>
>> infact there is only one interrupt. Will fix in the binding
>> description.
>
> Description? So you still allow two interrupts? No, this must be
> constrained in allOf:if:then.
>
ok, it should be fine to add this new compatible to the existing
allof:if:then block of v1 targets ? (Because they also have same
single interrupt (uplow) constraint)
Regards,
Sricharan
On 25/09/2023 12:31, Sricharan Ramabadhran wrote:
>
>
> On 9/25/2023 12:16 PM, Krzysztof Kozlowski wrote:
>> On 25/09/2023 04:06, Sricharan Ramabadhran wrote:
>>>
>>>
>>> On 9/23/2023 5:14 PM, Krzysztof Kozlowski wrote:
>>>> On 22/09/2023 13:51, Sricharan R wrote:
>>>>> From: Sricharan Ramabadhran <[email protected]>
>>>>>
>>>>> IPQ5018 has tsens v1.0 block with 4 sensors and 1 interrupt.
>>>>
>>>> Then why do you allow two interrupts?
>>>>
>>> infact there is only one interrupt. Will fix in the binding
>>> description.
>>
>> Description? So you still allow two interrupts? No, this must be
>> constrained in allOf:if:then.
>>
>
> ok, it should be fine to add this new compatible to the existing
> allof:if:then block of v1 targets ? (Because they also have same
> single interrupt (uplow) constraint)
Yes.
Best regards,
Krzysztof
On 22. 09. 2023. 13:51, Sricharan R wrote:
> From: Sricharan Ramabadhran <[email protected]>
>
> IPQ5018 has tsens IP V1.0, 4 sensors and 1 interrupt.
> The soc does not have a RPM, hence tsens has to be reset and
> enabled in the driver init. Adding the driver support for same.
>
> Signed-off-by: Sricharan Ramabadhran <[email protected]>
> ---
> [v3] Fixed Dmitry's comments for error checks in init_ipq5018
>
> drivers/thermal/qcom/tsens-v1.c | 60 +++++++++++++++++++++++++++++++++
> drivers/thermal/qcom/tsens.c | 3 ++
> drivers/thermal/qcom/tsens.h | 2 +-
> 3 files changed, 64 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/thermal/qcom/tsens-v1.c b/drivers/thermal/qcom/tsens-v1.c
> index dc1c4ae2d8b0..acee2064f83e 100644
> --- a/drivers/thermal/qcom/tsens-v1.c
> +++ b/drivers/thermal/qcom/tsens-v1.c
> @@ -79,6 +79,18 @@ static struct tsens_features tsens_v1_feat = {
> .trip_max_temp = 120000,
> };
>
> +static struct tsens_features tsens_v1_ipq5018_feat = {
> + .ver_major = VER_1_X,
> + .crit_int = 0,
> + .combo_int = 0,
> + .adc = 1,
> + .srot_split = 1,
> + .max_sensors = 11,
> + .trip_min_temp = -40000,
> + .trip_max_temp = 120000,
> + .ignore_enable = 1,
> +};
> +
> static const struct reg_field tsens_v1_regfields[MAX_REGFIELDS] = {
> /* ----- SROT ------ */
> /* VERSION */
> @@ -150,6 +162,41 @@ static int __init init_8956(struct tsens_priv *priv) {
> return init_common(priv);
> }
>
> +static int init_ipq5018(struct tsens_priv *priv)
__init is missing after int, otherwise I get modpost warning while building:
WARNING: modpost: vmlinux: section mismatch in reference:
init_ipq5018+0x14 (section: .text) -> init_common (section: .init.text)
Regards,
Robert
> +{
> + int ret;
> + u32 mask;
> +
> + ret = init_common(priv);
> + if (ret < 0) {
> + dev_err(priv->dev, "Init common failed %d\n", ret);
> + return ret;
> + }
> +
> + ret = regmap_field_write(priv->rf[TSENS_SW_RST], 1);
> + if (ret) {
> + dev_err(priv->dev, "Reset failed\n");
> + return ret;
> + }
> +
> + mask = GENMASK(priv->num_sensors, 0);
> + ret = regmap_field_update_bits(priv->rf[SENSOR_EN], mask, mask);
> + if (ret) {
> + dev_err(priv->dev, "Sensor Enable failed\n");
> + return ret;
> + }
> +
> + ret = regmap_field_write(priv->rf[TSENS_EN], 1);
> + if (ret) {
> + dev_err(priv->dev, "Enable failed\n");
> + return ret;
> + }
> +
> + ret = regmap_field_write(priv->rf[TSENS_SW_RST], 0);
> +
> + return ret;
> +}
> +
> static const struct tsens_ops ops_generic_v1 = {
> .init = init_common,
> .calibrate = calibrate_v1,
> @@ -187,3 +234,16 @@ struct tsens_plat_data data_8976 = {
> .feat = &tsens_v1_feat,
> .fields = tsens_v1_regfields,
> };
> +
> +const struct tsens_ops ops_ipq5018 = {
> + .init = init_ipq5018,
> + .calibrate = tsens_calibrate_common,
> + .get_temp = get_temp_tsens_valid,
> +};
> +
> +struct tsens_plat_data data_ipq5018 = {
> + .num_sensors = 5,
> + .ops = &ops_ipq5018,
> + .feat = &tsens_v1_ipq5018_feat,
> + .fields = tsens_v1_regfields,
> +};
> diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
> index 0a43ccf02ec4..c792b9dc6676 100644
> --- a/drivers/thermal/qcom/tsens.c
> +++ b/drivers/thermal/qcom/tsens.c
> @@ -1101,6 +1101,9 @@ static SIMPLE_DEV_PM_OPS(tsens_pm_ops, tsens_suspend, tsens_resume);
>
> static const struct of_device_id tsens_table[] = {
> {
> + .compatible = "qcom,ipq5018-tsens",
> + .data = &data_ipq5018,
> + }, {
> .compatible = "qcom,ipq8064-tsens",
> .data = &data_8960,
> }, {
> diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
> index e254cd2df904..b6594b546d11 100644
> --- a/drivers/thermal/qcom/tsens.h
> +++ b/drivers/thermal/qcom/tsens.h
> @@ -645,7 +645,7 @@ extern struct tsens_plat_data data_8960;
> extern struct tsens_plat_data data_8226, data_8909, data_8916, data_8939, data_8974, data_9607;
>
> /* TSENS v1 targets */
> -extern struct tsens_plat_data data_tsens_v1, data_8976, data_8956;
> +extern struct tsens_plat_data data_tsens_v1, data_8976, data_8956, data_ipq5018;
>
> /* TSENS v2 targets */
> extern struct tsens_plat_data data_8996, data_ipq8074, data_tsens_v2;
On 10/5/2023 12:37 AM, Robert Marko wrote:
>
> On 22. 09. 2023. 13:51, Sricharan R wrote:
>> From: Sricharan Ramabadhran <[email protected]>
>>
>> IPQ5018 has tsens IP V1.0, 4 sensors and 1 interrupt.
>> The soc does not have a RPM, hence tsens has to be reset and
>> enabled in the driver init. Adding the driver support for same.
>>
>> Signed-off-by: Sricharan Ramabadhran <[email protected]>
>> ---
>> [v3] Fixed Dmitry's comments for error checks in init_ipq5018
>>
>> drivers/thermal/qcom/tsens-v1.c | 60 +++++++++++++++++++++++++++++++++
>> drivers/thermal/qcom/tsens.c | 3 ++
>> drivers/thermal/qcom/tsens.h | 2 +-
>> 3 files changed, 64 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/thermal/qcom/tsens-v1.c
>> b/drivers/thermal/qcom/tsens-v1.c
>> index dc1c4ae2d8b0..acee2064f83e 100644
>> --- a/drivers/thermal/qcom/tsens-v1.c
>> +++ b/drivers/thermal/qcom/tsens-v1.c
>> @@ -79,6 +79,18 @@ static struct tsens_features tsens_v1_feat = {
>> .trip_max_temp = 120000,
>> };
>> +static struct tsens_features tsens_v1_ipq5018_feat = {
>> + .ver_major = VER_1_X,
>> + .crit_int = 0,
>> + .combo_int = 0,
>> + .adc = 1,
>> + .srot_split = 1,
>> + .max_sensors = 11,
>> + .trip_min_temp = -40000,
>> + .trip_max_temp = 120000,
>> + .ignore_enable = 1,
>> +};
>> +
>> static const struct reg_field tsens_v1_regfields[MAX_REGFIELDS] = {
>> /* ----- SROT ------ */
>> /* VERSION */
>> @@ -150,6 +162,41 @@ static int __init init_8956(struct tsens_priv
>> *priv) {
>> return init_common(priv);
>> }
>> +static int init_ipq5018(struct tsens_priv *priv)
>
> __init is missing after int, otherwise I get modpost warning while
> building:
> WARNING: modpost: vmlinux: section mismatch in reference:
> init_ipq5018+0x14 (section: .text) -> init_common (section: .init.text)
ok, will fix it.
Regards,
Sricharan