2 files changed, 35 insertions, 24 deletions

diff --git a/drivers/soc/qcom/llcc-slice.c b/drivers/soc/qcom/llcc-slice.c
index 54063a31132f..08e3d388e153 100644
--- a/drivers/soc/qcom/llcc-slice.c
+++ b/drivers/soc/qcom/llcc-slice.c
@@ -106,22 +106,24 @@ static int llcc_update_act_ctrl(u32 sid,
         u32 slice_status;
         int ret;
 
-        act_ctrl_reg = drv_data->bcast_off + LLCC_TRP_ACT_CTRLn(sid);
-        status_reg = drv_data->bcast_off + LLCC_TRP_STATUSn(sid);
+        act_ctrl_reg = LLCC_TRP_ACT_CTRLn(sid);
+        status_reg = LLCC_TRP_STATUSn(sid);
 
         /* Set the ACTIVE trigger */
         act_ctrl_reg_val |= ACT_CTRL_ACT_TRIG;
-        ret = regmap_write(drv_data->regmap, act_ctrl_reg, act_ctrl_reg_val);
+        ret = regmap_write(drv_data->bcast_regmap, act_ctrl_reg,
+                                act_ctrl_reg_val);
         if (ret)
                 return ret;
 
         /* Clear the ACTIVE trigger */
         act_ctrl_reg_val &= ~ACT_CTRL_ACT_TRIG;
-        ret = regmap_write(drv_data->regmap, act_ctrl_reg, act_ctrl_reg_val);
+        ret = regmap_write(drv_data->bcast_regmap, act_ctrl_reg,
+                                act_ctrl_reg_val);
         if (ret)
                 return ret;
 
-        ret = regmap_read_poll_timeout(drv_data->regmap, status_reg,
+        ret = regmap_read_poll_timeout(drv_data->bcast_regmap, status_reg,
                                       slice_status, !(slice_status & status),
                                       0, LLCC_STATUS_READ_DELAY);
         return ret;
@@ -226,16 +228,13 @@ static int qcom_llcc_cfg_program(struct platform_device *pdev)
         int ret;
         const struct llcc_slice_config *llcc_table;
         struct llcc_slice_desc desc;
-        u32 bcast_off = drv_data->bcast_off;
 
         sz = drv_data->cfg_size;
         llcc_table = drv_data->cfg;
 
         for (i = 0; i < sz; i++) {
-                attr1_cfg = bcast_off +
-                                LLCC_TRP_ATTR1_CFGn(llcc_table[i].slice_id);
-                attr0_cfg = bcast_off +
-                                LLCC_TRP_ATTR0_CFGn(llcc_table[i].slice_id);
+                attr1_cfg = LLCC_TRP_ATTR1_CFGn(llcc_table[i].slice_id);
+                attr0_cfg = LLCC_TRP_ATTR0_CFGn(llcc_table[i].slice_id);
 
                 attr1_val = llcc_table[i].cache_mode;
                 attr1_val |= llcc_table[i].probe_target_ways <<
@@ -260,10 +259,12 @@ static int qcom_llcc_cfg_program(struct platform_device *pdev)
                 attr0_val = llcc_table[i].res_ways & ATTR0_RES_WAYS_MASK;
                 attr0_val |= llcc_table[i].bonus_ways << ATTR0_BONUS_WAYS_SHIFT;
 
-                ret = regmap_write(drv_data->regmap, attr1_cfg, attr1_val);
+                ret = regmap_write(drv_data->bcast_regmap, attr1_cfg,
+                                        attr1_val);
                 if (ret)
                         return ret;
-                ret = regmap_write(drv_data->regmap, attr0_cfg, attr0_val);
+                ret = regmap_write(drv_data->bcast_regmap, attr0_cfg,
+                                        attr0_val);
                 if (ret)
                         return ret;
                 if (llcc_table[i].activate_on_init) {
@@ -279,24 +280,36 @@ int qcom_llcc_probe(struct platform_device *pdev,
 {
         u32 num_banks;
         struct device *dev = &pdev->dev;
-        struct resource *res;
-        void __iomem *base;
+        struct resource *llcc_banks_res, *llcc_bcast_res;
+        void __iomem *llcc_banks_base, *llcc_bcast_base;
         int ret, i;
 
         drv_data = devm_kzalloc(dev, sizeof(*drv_data), GFP_KERNEL);
         if (!drv_data)
                 return -ENOMEM;
 
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        base = devm_ioremap_resource(&pdev->dev, res);
-        if (IS_ERR(base))
-                return PTR_ERR(base);
+        llcc_banks_res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
+                                                        "llcc_base");
+        llcc_banks_base = devm_ioremap_resource(&pdev->dev, llcc_banks_res);
+        if (IS_ERR(llcc_banks_base))
+                return PTR_ERR(llcc_banks_base);
 
-        drv_data->regmap = devm_regmap_init_mmio(dev, base,
-                                        &llcc_regmap_config);
+        drv_data->regmap = devm_regmap_init_mmio(dev, llcc_banks_base,
+                                                &llcc_regmap_config);
         if (IS_ERR(drv_data->regmap))
                 return PTR_ERR(drv_data->regmap);
 
+        llcc_bcast_res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
+                                                        "llcc_broadcast_base");
+        llcc_bcast_base = devm_ioremap_resource(&pdev->dev, llcc_bcast_res);
+        if (IS_ERR(llcc_bcast_base))
+                return PTR_ERR(llcc_bcast_base);
+
+        drv_data->bcast_regmap = devm_regmap_init_mmio(dev, llcc_bcast_base,
+                                                        &llcc_regmap_config);
+        if (IS_ERR(drv_data->bcast_regmap))
+                return PTR_ERR(drv_data->bcast_regmap);
+
         ret = regmap_read(drv_data->regmap, LLCC_COMMON_STATUS0,
                                                 &num_banks);
         if (ret)
@@ -318,8 +331,6 @@ int qcom_llcc_probe(struct platform_device *pdev,
         for (i = 0; i < num_banks; i++)
                 drv_data->offsets[i] = i * BANK_OFFSET_STRIDE;
 
-        drv_data->bcast_off = num_banks * BANK_OFFSET_STRIDE;
-
         drv_data->bitmap = devm_kcalloc(dev,
         BITS_TO_LONGS(drv_data->max_slices), sizeof(unsigned long),
                                                 GFP_KERNEL);
diff --git a/include/linux/soc/qcom/llcc-qcom.h b/include/linux/soc/qcom/llcc-qcom.h
index 7e3b9c605ab2..c681e795b587 100644
--- a/include/linux/soc/qcom/llcc-qcom.h
+++ b/include/linux/soc/qcom/llcc-qcom.h
@@ -70,22 +70,22 @@ struct llcc_slice_config {
 /**
  * llcc_drv_data - Data associated with the llcc driver
  * @regmap: regmap associated with the llcc device
+ * @bcast_regmap: regmap associated with llcc broadcast offset
  * @cfg: pointer to the data structure for slice configuration
  * @lock: mutex associated with each slice
  * @cfg_size: size of the config data table
  * @max_slices: max slices as read from device tree
- * @bcast_off: Offset of the broadcast bank
  * @num_banks: Number of llcc banks
  * @bitmap: Bit map to track the active slice ids
  * @offsets: Pointer to the bank offsets array
  */
 struct llcc_drv_data {
         struct regmap *regmap;
+        struct regmap *bcast_regmap;
         const struct llcc_slice_config *cfg;
         struct mutex lock;
         u32 cfg_size;
         u32 max_slices;
-        u32 bcast_off;
         u32 num_banks;
         unsigned long *bitmap;
         u32 *offsets;