Skip to content

Commit 5b489fe

Browse files
committed
Merge branch 'ipa-next'
Alex Elder says: ==================== net: ipa: support two more platforms This series adds IPA support for two more Qualcomm SoCs. The first patch updates the DT binding to add compatible strings. The second temporarily disables checksum offload support for IPA version 4.5 and above. Changes are required to the RMNet driver to support the "inline" checksum offload used for IPA v4.5+, and once those are present this capability will be enabled for IPA. The third and fourth patches add configuration data for IPA versions 4.5 (used for the SDX55 SoC) and 4.11 (used for the SD7280 SoC). ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents 95291ce + 927c504 commit 5b489fe

File tree

8 files changed

+855
-5
lines changed

8 files changed

+855
-5
lines changed

Documentation/devicetree/bindings/net/qcom,ipa.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,11 @@ description:
4343
4444
properties:
4545
compatible:
46-
const: "qcom,sdm845-ipa"
46+
oneOf:
47+
- const: "qcom,sc7180-ipa"
48+
- const: "qcom,sc7280-ipa"
49+
- const: "qcom,sdm845-ipa"
50+
- const: "qcom,sdx55-ipa"
4751

4852
reg:
4953
items:

drivers/net/ipa/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ ipa-y := ipa_main.o ipa_clock.o ipa_reg.o ipa_mem.o \
99
ipa_endpoint.o ipa_cmd.o ipa_modem.o \
1010
ipa_resource.o ipa_qmi.o ipa_qmi_msg.o
1111

12-
ipa-y += ipa_data-v3.5.1.o ipa_data-v4.2.o
12+
ipa-y += ipa_data-v3.5.1.o ipa_data-v4.2.o \
13+
ipa_data-v4.5.o ipa_data-v4.11.o

0 commit comments

Comments
 (0)