diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2017-04-12 13:27:02 +1000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-12 10:17:01 -0400 |
| commit | 78d28543a6093fad8f1b00a5debbde02f392ebb4 (patch) | |
| tree | 10a6239679f2a61a576870e3e554c1e8ec22daa6 /arch/arm | |
| parent | 05690d633f309d7369176754f7362e979c5710a6 (diff) | |
| download | linux-78d28543a6093fad8f1b00a5debbde02f392ebb4.tar.gz linux-78d28543a6093fad8f1b00a5debbde02f392ebb4.tar.bz2 linux-78d28543a6093fad8f1b00a5debbde02f392ebb4.zip | |
ftgmac100: Use device "compatible" property, not machine.
We test for aspeed chips to handle a couple of special cases,
but we do that by checking the machine type which isn't right.
Instead check the actual device compatible property. This also
updates the dtsi files for the aspeed SoC to match.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/aspeed-g4.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/aspeed-g5.dtsi | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index 0b4932cc02a8..6068e79fb651 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -42,7 +42,7 @@ }; mac0: ethernet@1e660000 { - compatible = "faraday,ftgmac100"; + compatible = "aspeed,ast2400-mac", "faraday,ftgmac100"; reg = <0x1e660000 0x180>; interrupts = <2>; no-hw-checksum; @@ -50,7 +50,7 @@ }; mac1: ethernet@1e680000 { - compatible = "faraday,ftgmac100"; + compatible = "aspeed,ast2400-mac", "faraday,ftgmac100"; reg = <0x1e680000 0x180>; interrupts = <3>; no-hw-checksum; diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index b664fe380936..4dbe91a02792 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -33,7 +33,7 @@ }; mac0: ethernet@1e660000 { - compatible = "faraday,ftgmac100"; + compatible = "aspeed,ast2500-mac", "faraday,ftgmac100"; reg = <0x1e660000 0x180>; interrupts = <2>; no-hw-checksum; @@ -41,7 +41,7 @@ }; mac1: ethernet@1e680000 { - compatible = "faraday,ftgmac100"; + compatible = "aspeed,ast2500-mac", "faraday,ftgmac100"; reg = <0x1e680000 0x180>; interrupts = <3>; no-hw-checksum; |