| From 570258d2e7978d4d0b3099cfca5ca7c40fa85a92 Mon Sep 17 00:00:00 2001 |
| From: Stephen Boyd <swboyd@chromium.org> |
| Date: Tue, 8 Oct 2019 16:45:04 -0700 |
| Subject: [PATCH] soc: qcom: llcc: Name regmaps to avoid collisions |
| |
| commit 2bfd3e7651addcaf48f12d4f11ea9d8fca6c3aa8 upstream. |
| |
| We'll end up with debugfs collisions if we don't give names to the |
| regmaps created by this driver. Change the name of the config before |
| registering it so we don't collide in debugfs. |
| |
| Fixes: 7f9c136216c7 ("soc: qcom: Add broadcast base for Last Level Cache Controller (LLCC)") |
| Cc: Venkata Narendra Kumar Gutta <vnkgutta@codeaurora.org> |
| Reviewed-by: Evan Green <evgreen@chromium.org> |
| Signed-off-by: Stephen Boyd <swboyd@chromium.org> |
| Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/soc/qcom/llcc-slice.c b/drivers/soc/qcom/llcc-slice.c |
| index 9090ea12eaf3..4a6111635f82 100644 |
| --- a/drivers/soc/qcom/llcc-slice.c |
| +++ b/drivers/soc/qcom/llcc-slice.c |
| @@ -48,7 +48,7 @@ |
| |
| static struct llcc_drv_data *drv_data = (void *) -EPROBE_DEFER; |
| |
| -static const struct regmap_config llcc_regmap_config = { |
| +static struct regmap_config llcc_regmap_config = { |
| .reg_bits = 32, |
| .reg_stride = 4, |
| .val_bits = 32, |
| @@ -323,6 +323,7 @@ static struct regmap *qcom_llcc_init_mmio(struct platform_device *pdev, |
| if (IS_ERR(base)) |
| return ERR_CAST(base); |
| |
| + llcc_regmap_config.name = name; |
| return devm_regmap_init_mmio(&pdev->dev, base, &llcc_regmap_config); |
| } |
| |
| -- |
| 2.7.4 |
| |
