Skip to content

Commit 90bf661

Browse files
committed
Merge branch 'net-ipa-fully-support-ipa-v5-0'
Alex Elder says: ==================== net: ipa: fully support IPA v5.0 At long last, add the IPA and GSI register definitions, and the configuration data required to support IPA v5.0. This enables IPA support for the Qualcomm SDX65 SoC. The first version of this series had build errors due to a non-existent source file being required. This version addresses that by changing how required files are specified in the Makefile. Note that the second patch has some warnings about lines starting with spaces; those spaces align text with the open parenthesis on the previous line. ==================== Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 6e4a93b + cb7550b commit 90bf661

File tree

11 files changed

+1385
-9
lines changed

11 files changed

+1385
-9
lines changed

drivers/net/ipa/Makefile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
#
33
# Makefile for the Qualcomm IPA driver.
44

5-
IPA_VERSIONS := 3.1 3.5.1 4.2 4.5 4.7 4.9 4.11
5+
IPA_REG_VERSIONS := 3.1 3.5.1 4.2 4.5 4.7 4.9 4.11 5.0
66

77
# Some IPA versions can reuse another set of GSI register definitions.
8-
GSI_IPA_VERSIONS := 3.1 3.5.1 4.0 4.5 4.9 4.11
8+
GSI_REG_VERSIONS := 3.1 3.5.1 4.0 4.5 4.9 4.11 5.0
9+
10+
IPA_DATA_VERSIONS := 3.1 3.5.1 4.2 4.5 4.7 4.9 4.11 5.0
911

1012
obj-$(CONFIG_QCOM_IPA) += ipa.o
1113

@@ -16,8 +18,8 @@ ipa-y := ipa_main.o ipa_power.o ipa_reg.o ipa_mem.o \
1618
ipa_resource.o ipa_qmi.o ipa_qmi_msg.o \
1719
ipa_sysfs.o
1820

19-
ipa-y += $(GSI_IPA_VERSIONS:%=reg/gsi_reg-v%.o)
21+
ipa-y += $(IPA_REG_VERSIONS:%=reg/ipa_reg-v%.o)
2022

21-
ipa-y += $(IPA_VERSIONS:%=reg/ipa_reg-v%.o)
23+
ipa-y += $(GSI_REG_VERSIONS:%=reg/gsi_reg-v%.o)
2224

23-
ipa-y += $(IPA_VERSIONS:%=data/ipa_data-v%.o)
25+
ipa-y += $(IPA_DATA_VERSIONS:%=data/ipa_data-v%.o)

0 commit comments

Comments
 (0)