[PATCH v2] thermal: tsens: qcom: do not create duplicate regmap debugfs entries

[PATCH v2] thermal: tsens: qcom: do not create duplicate regmap debugfs entries

[Srinivas Kandagatla]

Regmap would use device name to create debugfs entries. If the device
has multiple regmaps it is recommended to use name field in regmap_config.
Fix this by providing name to the regmap configs correctly.

Without this patch we would see below error on DB820c.

qcom-tsens 4a9000.thermal-sensor: Failed to create 4a9000.thermal-sensor
debugfs directory

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Acked-by: Amit Kucheria <amit.kucheria@linaro.org>
Tested-by: Amit Kucheria <amit.kucheria@linaro.org>
---
Changes since v1:
 -rename tsens_config to tsens_tm_config as suggested by Amit.

 drivers/thermal/qcom/tsens-common.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/drivers/thermal/qcom/tsens-common.c b/drivers/thermal/qcom/tsens-common.c
index 3be4be2e0465..ddfdf88ffb4e 100644
--- a/drivers/thermal/qcom/tsens-common.c
+++ b/drivers/thermal/qcom/tsens-common.c
@@ -113,7 +113,15 @@ int get_temp_common(struct tsens_device *tmdev, int id, int *temp)
 	return 0;
 }
 
-static const struct regmap_config tsens_config = {
+static const struct regmap_config tsens_tm_config = {
+	.name		= "tm",
+	.reg_bits	= 32,
+	.val_bits	= 32,
+	.reg_stride	= 4,
+};
+
+static const struct regmap_config tsens_srot_config = {
+	.name		= "srot",
 	.reg_bits	= 32,
 	.val_bits	= 32,
 	.reg_stride	= 4,
@@ -139,8 +147,8 @@ int __init init_common(struct tsens_device *tmdev)
 		if (IS_ERR(srot_base))
 			return PTR_ERR(srot_base);
 
-		tmdev->srot_map = devm_regmap_init_mmio(tmdev->dev,
-							srot_base, &tsens_config);
+		tmdev->srot_map = devm_regmap_init_mmio(tmdev->dev, srot_base,
+							&tsens_srot_config);
 		if (IS_ERR(tmdev->srot_map))
 			return PTR_ERR(tmdev->srot_map);
 
@@ -154,7 +162,8 @@ int __init init_common(struct tsens_device *tmdev)
 	if (IS_ERR(tm_base))
 		return PTR_ERR(tm_base);
 
-	tmdev->tm_map = devm_regmap_init_mmio(tmdev->dev, tm_base, &tsens_config);
+	tmdev->tm_map = devm_regmap_init_mmio(tmdev->dev, tm_base,
+						 &tsens_tm_config);
 	if (IS_ERR(tmdev->tm_map))
 		return PTR_ERR(tmdev->tm_map);
 
-- 
2.19.2

Re: [PATCH v2] thermal: tsens: qcom: do not create duplicate regmap debugfs entries

[Bjorn Andersson]

On Thu 06 Dec 01:39 PST 2018, Srinivas Kandagatla wrote:

> Regmap would use device name to create debugfs entries. If the device
> has multiple regmaps it is recommended to use name field in regmap_config.
> Fix this by providing name to the regmap configs correctly.
> 
> Without this patch we would see below error on DB820c.
> 
> qcom-tsens 4a9000.thermal-sensor: Failed to create 4a9000.thermal-sensor
> debugfs directory
> 
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> Acked-by: Amit Kucheria <amit.kucheria@linaro.org>
> Tested-by: Amit Kucheria <amit.kucheria@linaro.org>

Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>

Regards,
Bjorn

> ---
> Changes since v1:
>  -rename tsens_config to tsens_tm_config as suggested by Amit.
> 
>  drivers/thermal/qcom/tsens-common.c | 17 +++++++++++++----
>  1 file changed, 13 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/thermal/qcom/tsens-common.c b/drivers/thermal/qcom/tsens-common.c
> index 3be4be2e0465..ddfdf88ffb4e 100644
> --- a/drivers/thermal/qcom/tsens-common.c
> +++ b/drivers/thermal/qcom/tsens-common.c
> @@ -113,7 +113,15 @@ int get_temp_common(struct tsens_device *tmdev, int id, int *temp)
>  	return 0;
>  }
>  
> -static const struct regmap_config tsens_config = {
> +static const struct regmap_config tsens_tm_config = {
> +	.name		= "tm",
> +	.reg_bits	= 32,
> +	.val_bits	= 32,
> +	.reg_stride	= 4,
> +};
> +
> +static const struct regmap_config tsens_srot_config = {
> +	.name		= "srot",
>  	.reg_bits	= 32,
>  	.val_bits	= 32,
>  	.reg_stride	= 4,
> @@ -139,8 +147,8 @@ int __init init_common(struct tsens_device *tmdev)
>  		if (IS_ERR(srot_base))
>  			return PTR_ERR(srot_base);
>  
> -		tmdev->srot_map = devm_regmap_init_mmio(tmdev->dev,
> -							srot_base, &tsens_config);
> +		tmdev->srot_map = devm_regmap_init_mmio(tmdev->dev, srot_base,
> +							&tsens_srot_config);
>  		if (IS_ERR(tmdev->srot_map))
>  			return PTR_ERR(tmdev->srot_map);
>  
> @@ -154,7 +162,8 @@ int __init init_common(struct tsens_device *tmdev)
>  	if (IS_ERR(tm_base))
>  		return PTR_ERR(tm_base);
>  
> -	tmdev->tm_map = devm_regmap_init_mmio(tmdev->dev, tm_base, &tsens_config);
> +	tmdev->tm_map = devm_regmap_init_mmio(tmdev->dev, tm_base,
> +						 &tsens_tm_config);
>  	if (IS_ERR(tmdev->tm_map))
>  		return PTR_ERR(tmdev->tm_map);
>  
> -- 
> 2.19.2
>