Skip to content

Commit 4cb13ff

Browse files
committed
Merge branch 'net-stmmac-dwmac-qcom-ethqos-add-support-for-emac4'
Bartosz Golaszewski says: ==================== net: stmmac: dwmac-qcom-ethqos: add support for EMAC4 Extend the dwmac-qcom-ethqos driver to support EMAC4. While at it: rework the code somewhat. The bindings have been reviewed by DT maintainers. This is a sub-series of [1] with only the patches targetting the net subsystem as they can go in independently. [1] https://lore.kernel.org/lkml/[email protected]/T/ ==================== Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents f61d2d5 + 8c4d92e commit 4cb13ff

File tree

5 files changed

+226
-76
lines changed

5 files changed

+226
-76
lines changed

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ properties:
2020
compatible:
2121
enum:
2222
- qcom,qcs404-ethqos
23+
- qcom,sa8775p-ethqos
2324
- qcom,sc8280xp-ethqos
2425
- qcom,sm8150-ethqos
2526

@@ -32,11 +33,13 @@ properties:
3233
- const: rgmii
3334

3435
interrupts:
36+
minItems: 1
3537
items:
3638
- description: Combined signal for various interrupt events
3739
- description: The interrupt that occurs when Rx exits the LPI state
3840

3941
interrupt-names:
42+
minItems: 1
4043
items:
4144
- const: macirq
4245
- const: eth_lpi
@@ -49,11 +52,18 @@ properties:
4952
- const: stmmaceth
5053
- const: pclk
5154
- const: ptp_ref
52-
- const: rgmii
55+
- enum:
56+
- rgmii
57+
- phyaux
5358

5459
iommus:
5560
maxItems: 1
5661

62+
phys: true
63+
64+
phy-names:
65+
const: serdes
66+
5767
required:
5868
- compatible
5969
- clocks

Documentation/devicetree/bindings/net/snps,dwmac.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ properties:
6767
- loongson,ls2k-dwmac
6868
- loongson,ls7a-dwmac
6969
- qcom,qcs404-ethqos
70+
- qcom,sa8775p-ethqos
7071
- qcom,sc8280xp-ethqos
7172
- qcom,sm8150-ethqos
7273
- renesas,r9a06g032-gmac
@@ -582,6 +583,7 @@ allOf:
582583
- ingenic,x1600-mac
583584
- ingenic,x1830-mac
584585
- ingenic,x2000-mac
586+
- qcom,sa8775p-ethqos
585587
- qcom,sc8280xp-ethqos
586588
- snps,dwmac-3.50a
587589
- snps,dwmac-4.10a
@@ -638,6 +640,7 @@ allOf:
638640
- ingenic,x1830-mac
639641
- ingenic,x2000-mac
640642
- qcom,qcs404-ethqos
643+
- qcom,sa8775p-ethqos
641644
- qcom,sc8280xp-ethqos
642645
- qcom,sm8150-ethqos
643646
- snps,dwmac-4.00

0 commit comments

Comments
 (0)