| Message ID | 20240703025850.2172008-30-quic_tengfan@quicinc.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | arm64: qcom: dts: add QCS9100 support | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/vmtest-fixes-PR | fail | merge-conflict |
On Wed, Jul 03, 2024 at 10:58:32AM GMT, Tengfei Fan wrote: > Add the compatible for the MAC controller on qcs9100 platforms. This MAC > works with a single interrupt so add minItems to the interrupts property. > The fourth clock's name is different here so change it. Enable relevant > PHY properties. Add the relevant compatibles to the binding document for > snps,dwmac as well. This description doesn't match what was done in this patch, its what Bart did when he made changes to add the sa8775 changes. Please consider using a blurb indicating that this is the same SoC as sa8775p, just with different firmware strategies or something along those lines? > > Signed-off-by: Tengfei Fan <quic_tengfan@quicinc.com> > --- > Documentation/devicetree/bindings/net/qcom,ethqos.yaml | 1 + > Documentation/devicetree/bindings/net/snps,dwmac.yaml | 3 +++ > 2 files changed, 4 insertions(+) > > diff --git a/Documentation/devicetree/bindings/net/qcom,ethqos.yaml b/Documentation/devicetree/bindings/net/qcom,ethqos.yaml > index 6672327358bc..8ab11e00668c 100644 > --- a/Documentation/devicetree/bindings/net/qcom,ethqos.yaml > +++ b/Documentation/devicetree/bindings/net/qcom,ethqos.yaml > @@ -20,6 +20,7 @@ properties: > compatible: > enum: > - qcom,qcs404-ethqos > + - qcom,qcs9100-ethqos > - qcom,sa8775p-ethqos > - qcom,sc8280xp-ethqos > - qcom,sm8150-ethqos > diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml > index 3bab4e1f3fbf..269c21779396 100644 > --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml > +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml > @@ -67,6 +67,7 @@ properties: > - loongson,ls2k-dwmac > - loongson,ls7a-dwmac > - qcom,qcs404-ethqos > + - qcom,qcs9100-ethqos > - qcom,sa8775p-ethqos > - qcom,sc8280xp-ethqos > - qcom,sm8150-ethqos > @@ -582,6 +583,7 @@ allOf: > - ingenic,x1600-mac > - ingenic,x1830-mac > - ingenic,x2000-mac > + - qcom,qcs9100-ethqos > - qcom,sa8775p-ethqos > - qcom,sc8280xp-ethqos > - snps,dwmac-3.50a > @@ -639,6 +641,7 @@ allOf: > - ingenic,x1830-mac > - ingenic,x2000-mac > - qcom,qcs404-ethqos > + - qcom,qcs9100-ethqos > - qcom,sa8775p-ethqos > - qcom,sc8280xp-ethqos > - qcom,sm8150-ethqos > -- > 2.25.1 >
diff --git a/Documentation/devicetree/bindings/net/qcom,ethqos.yaml b/Documentation/devicetree/bindings/net/qcom,ethqos.yaml index 6672327358bc..8ab11e00668c 100644 --- a/Documentation/devicetree/bindings/net/qcom,ethqos.yaml +++ b/Documentation/devicetree/bindings/net/qcom,ethqos.yaml @@ -20,6 +20,7 @@ properties: compatible: enum: - qcom,qcs404-ethqos + - qcom,qcs9100-ethqos - qcom,sa8775p-ethqos - qcom,sc8280xp-ethqos - qcom,sm8150-ethqos diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml index 3bab4e1f3fbf..269c21779396 100644 --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml @@ -67,6 +67,7 @@ properties: - loongson,ls2k-dwmac - loongson,ls7a-dwmac - qcom,qcs404-ethqos + - qcom,qcs9100-ethqos - qcom,sa8775p-ethqos - qcom,sc8280xp-ethqos - qcom,sm8150-ethqos @@ -582,6 +583,7 @@ allOf: - ingenic,x1600-mac - ingenic,x1830-mac - ingenic,x2000-mac + - qcom,qcs9100-ethqos - qcom,sa8775p-ethqos - qcom,sc8280xp-ethqos - snps,dwmac-3.50a @@ -639,6 +641,7 @@ allOf: - ingenic,x1830-mac - ingenic,x2000-mac - qcom,qcs404-ethqos + - qcom,qcs9100-ethqos - qcom,sa8775p-ethqos - qcom,sc8280xp-ethqos - qcom,sm8150-ethqos
Add the compatible for the MAC controller on qcs9100 platforms. This MAC works with a single interrupt so add minItems to the interrupts property. The fourth clock's name is different here so change it. Enable relevant PHY properties. Add the relevant compatibles to the binding document for snps,dwmac as well. Signed-off-by: Tengfei Fan <quic_tengfan@quicinc.com> --- Documentation/devicetree/bindings/net/qcom,ethqos.yaml | 1 + Documentation/devicetree/bindings/net/snps,dwmac.yaml | 3 +++ 2 files changed, 4 insertions(+)