Skip to content

Commit

Permalink
Merge branch 'ipa-next'
Browse files Browse the repository at this point in the history
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 <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Apr 11, 2021
2 parents 95291ce + 927c504 commit 5b489fe
Show file tree
Hide file tree
Showing 8 changed files with 855 additions and 5 deletions.
6 changes: 5 additions & 1 deletion Documentation/devicetree/bindings/net/qcom,ipa.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@ description:
properties:
compatible:
const: "qcom,sdm845-ipa"
oneOf:
- const: "qcom,sc7180-ipa"
- const: "qcom,sc7280-ipa"
- const: "qcom,sdm845-ipa"
- const: "qcom,sdx55-ipa"

reg:
items:
Expand Down
3 changes: 2 additions & 1 deletion drivers/net/ipa/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ ipa-y := ipa_main.o ipa_clock.o ipa_reg.o ipa_mem.o \
ipa_endpoint.o ipa_cmd.o ipa_modem.o \
ipa_resource.o ipa_qmi.o ipa_qmi_msg.o

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

0 comments on commit 5b489fe

Please sign in to comment.