interconnect: qcom: msm8939: Remove snoc_mm specific regmap

Booting tip-of-tree on msm8939 we find the following error caused by our
modelling of snoc and snoc_mm as peer devices with the same address space.

[    1.212340] qnoc-msm8939 580000.interconnect_mm: can't request region for resource [mem 0x00580000-0x0059407f]
[    1.212391] qnoc-msm8939 580000.interconnect_mm: Cannot ioremap interconnect bus resource
[    1.221524] qnoc-msm8939: probe of 580000.interconnect_mm failed with error -16

Declaring snoc_mm as a child device of snoc mitigates the fault and is
consistent with a similar extant implementation in qcm2290.

Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Link: https://lore.kernel.org/r/20220129032735.2410936-3-bryan.odonoghue@linaro.org
Signed-off-by: Georgi Djakov <djakov@kernel.org>

diff --git a/drivers/interconnect/qcom/msm8939.c b/drivers/interconnect/qcom/msm8939.c
index d188f36..f9c2d7d 100644 (file)
--- a/drivers/interconnect/qcom/msm8939.c
+++ b/drivers/interconnect/qcom/msm8939.c
@@ -1301,19 +1301,11 @@ static struct qcom_icc_node *msm8939_snoc_mm_nodes[] = {
        [SNOC_MM_INT_2] = &mm_int_2,
 };
 
-static const struct regmap_config msm8939_snoc_mm_regmap_config = {
-       .reg_bits       = 32,
-       .reg_stride     = 4,
-       .val_bits       = 32,
-       .max_register   = 0x14080,
-       .fast_io        = true,
-};
-
 static struct qcom_icc_desc msm8939_snoc_mm = {
        .type = QCOM_ICC_NOC,
        .nodes = msm8939_snoc_mm_nodes,
        .num_nodes = ARRAY_SIZE(msm8939_snoc_mm_nodes),
-       .regmap_cfg = &msm8939_snoc_mm_regmap_config,
+       .regmap_cfg = &msm8939_snoc_regmap_config,
        .qos_offset = 0x7000,
 };