net: ipa: Fix v4.7 resource group names

In the downstream IPA driver there's only one group defined for source
and destination, and the destination group doesn't have a _DPL suffix.

Fixes: b310de784bac ("net: ipa: add IPA v4.7 support")
Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
Reviewed-by: Alex Elder <elder@riscstar.com>
Link: https://patch.msgid.link/20250227-ipa-v4-7-fixes-v1-1-a88dd8249d8a@fairphone.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ipa/data/ipa_data-v4.7.c b/drivers/net/ipa/data/ipa_data-v4.7.c
index c8c23d9be961b1b818e8a1592a7f7dd76cdd5468..7e315779e66480c2a3f2473a068278ab5e513a3d 100644 (file)
--- a/drivers/net/ipa/data/ipa_data-v4.7.c
+++ b/drivers/net/ipa/data/ipa_data-v4.7.c
@@ -28,12 +28,10 @@ enum ipa_resource_type {
 enum ipa_rsrc_group_id {
        /* Source resource group identifiers */
        IPA_RSRC_GROUP_SRC_UL_DL                        = 0,
-       IPA_RSRC_GROUP_SRC_UC_RX_Q,
        IPA_RSRC_GROUP_SRC_COUNT,       /* Last in set; not a source group */
 
        /* Destination resource group identifiers */
-       IPA_RSRC_GROUP_DST_UL_DL_DPL                    = 0,
-       IPA_RSRC_GROUP_DST_UNUSED_1,
+       IPA_RSRC_GROUP_DST_UL_DL                        = 0,
        IPA_RSRC_GROUP_DST_COUNT,       /* Last; not a destination group */
 };
 
@@ -81,7 +79,7 @@ static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = {
                },
                .endpoint = {
                        .config = {
-                               .resource_group = IPA_RSRC_GROUP_DST_UL_DL_DPL,
+                               .resource_group = IPA_RSRC_GROUP_DST_UL_DL,
                                .aggregation    = true,
                                .status_enable  = true,
                                .rx = {
@@ -128,7 +126,7 @@ static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = {
                },
                .endpoint = {
                        .config = {
-                               .resource_group = IPA_RSRC_GROUP_DST_UL_DL_DPL,
+                               .resource_group = IPA_RSRC_GROUP_DST_UL_DL,
                                .qmap           = true,
                                .aggregation    = true,
                                .rx = {
@@ -197,12 +195,12 @@ static const struct ipa_resource ipa_resource_src[] = {
 /* Destination resource configuration data for an SoC having IPA v4.7 */
 static const struct ipa_resource ipa_resource_dst[] = {
        [IPA_RESOURCE_TYPE_DST_DATA_SECTORS] = {
-               .limits[IPA_RSRC_GROUP_DST_UL_DL_DPL] = {
+               .limits[IPA_RSRC_GROUP_DST_UL_DL] = {
                        .min = 7,       .max = 7,
                },
        },
        [IPA_RESOURCE_TYPE_DST_DPS_DMARS] = {
-               .limits[IPA_RSRC_GROUP_DST_UL_DL_DPL] = {
+               .limits[IPA_RSRC_GROUP_DST_UL_DL] = {
                        .min = 2,       .max = 2,
                },
        },