net: ipa: fix IPA v4.9 interconnects

[ Upstream commit 0fd75f5760b6a7a7f35dff46a6cdc4f6d1a86ee8 ]

Three interconnects are defined for IPA version 4.9, but there
should only be two.  They should also use names that match what's
used for other platforms (and specified in the Device Tree binding).

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ipa/ipa_data-v4.9.c b/drivers/net/ipa/ipa_data-v4.9.c
index e41be790f45e56e31195b9459f8ed4e7841df5a2..75b50a50e3487da0a470cf649507404837b1938e 100644 (file)
--- a/drivers/net/ipa/ipa_data-v4.9.c
+++ b/drivers/net/ipa/ipa_data-v4.9.c
@@ -392,18 +392,13 @@ static const struct ipa_mem_data ipa_mem_data = {
 /* Interconnect rates are in 1000 byte/second units */
 static const struct ipa_interconnect_data ipa_interconnect_data[] = {
        {
-               .name                   = "ipa_to_llcc",
+               .name                   = "memory",
                .peak_bandwidth         = 600000,       /* 600 MBps */
                .average_bandwidth      = 150000,       /* 150 MBps */
        },
-       {
-               .name                   = "llcc_to_ebi1",
-               .peak_bandwidth         = 1804000,      /* 1.804 GBps */
-               .average_bandwidth      = 150000,       /* 150 MBps */
-       },
        /* Average rate is unused for the next interconnect */
        {
-               .name                   = "appss_to_ipa",
+               .name                   = "config",
                .peak_bandwidth         = 74000,        /* 74 MBps */
                .average_bandwidth      = 0,            /* unused */
        },