The embedded and gearvm variants of the ethernet MAC use different compatibles so move the one for sa8775p into lemans-embedded.dtsi and make place for the gearvm variant to be placed in lemans-gearvm.dtsi. Signed-off-by: Bartosz Golaszewski --- arch/arm64/boot/dts/qcom/lemans-embedded.dtsi | 2 ++ arch/arm64/boot/dts/qcom/lemans.dtsi | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/lemans-embedded.dtsi b/arch/arm64/boot/dts/qcom/lemans-embedded.dtsi index 3733c0b7bace10cad656144b31d02bd8b4dbf3ed..630c40d21ecdab40ec59135cc667e4eccfd23554 100644 --- a/arch/arm64/boot/dts/qcom/lemans-embedded.dtsi +++ b/arch/arm64/boot/dts/qcom/lemans-embedded.dtsi @@ -458,6 +458,7 @@ &cpufreq_hw { }; ðernet1 { + compatible = "qcom,sa8775p-ethqos"; clocks = <&gcc GCC_EMAC1_AXI_CLK>, <&gcc GCC_EMAC1_SLV_AHB_CLK>, <&gcc GCC_EMAC1_PTP_CLK>, @@ -481,6 +482,7 @@ &config_noc SLAVE_EMAC1_CFG QCOM_ICC_TAG_ALWAYS>, }; ðernet0 { + compatible = "qcom,sa8775p-ethqos"; clocks = <&gcc GCC_EMAC0_AXI_CLK>, <&gcc GCC_EMAC0_SLV_AHB_CLK>, <&gcc GCC_EMAC0_PTP_CLK>, diff --git a/arch/arm64/boot/dts/qcom/lemans.dtsi b/arch/arm64/boot/dts/qcom/lemans.dtsi index da740a0876d4adcff0bb9458564c868a6f406b0d..77e4f57778fd54e414c86a32f5b068239bee6d24 100644 --- a/arch/arm64/boot/dts/qcom/lemans.dtsi +++ b/arch/arm64/boot/dts/qcom/lemans.dtsi @@ -4386,7 +4386,6 @@ port@1 { }; ethernet1: ethernet@23000000 { - compatible = "qcom,sa8775p-ethqos"; reg = <0x0 0x23000000 0x0 0x10000>, <0x0 0x23016000 0x0 0x100>; reg-names = "stmmaceth", "rgmii"; @@ -4407,7 +4406,6 @@ ethernet1: ethernet@23000000 { }; ethernet0: ethernet@23040000 { - compatible = "qcom,sa8775p-ethqos"; reg = <0x0 0x23040000 0x0 0x10000>, <0x0 0x23056000 0x0 0x100>; reg-names = "stmmaceth", "rgmii"; -- 2.47.3