diff options
author | Dongpo Li <lidongpo@hisilicon.com> | 2016-12-19 21:09:29 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-12-20 14:12:29 -0500 |
commit | 48fed73ab6d2ef59d266e362afaabb73d9b1a2d6 (patch) | |
tree | c89486ef22581a6bde693e519b27895d2787fca2 | |
parent | f7ca8e3b945366259e82ed50961809ad4262933f (diff) |
ARM: dts: hix5hd2: don't change the existing compatible string
The SoC hix5hd2 compatible string has the suffix "-gmac" and
we should not change it.
We should only add the generic compatible string "hisi-gmac-v1".
Fixes: 0855950ba580 ("ARM: dts: hix5hd2: add gmac generic compatible and clock names")
Signed-off-by: Dongpo Li <lidongpo@hisilicon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/arm/boot/dts/hisi-x5hd2.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/hisi-x5hd2.dtsi b/arch/arm/boot/dts/hisi-x5hd2.dtsi index c02e092fad8b..6c712a97e1fe 100644 --- a/arch/arm/boot/dts/hisi-x5hd2.dtsi +++ b/arch/arm/boot/dts/hisi-x5hd2.dtsi | |||
@@ -438,7 +438,7 @@ | |||
438 | }; | 438 | }; |
439 | 439 | ||
440 | gmac0: ethernet@1840000 { | 440 | gmac0: ethernet@1840000 { |
441 | compatible = "hisilicon,hix5hd2-gemac", "hisilicon,hisi-gemac-v1"; | 441 | compatible = "hisilicon,hix5hd2-gmac", "hisilicon,hisi-gmac-v1"; |
442 | reg = <0x1840000 0x1000>,<0x184300c 0x4>; | 442 | reg = <0x1840000 0x1000>,<0x184300c 0x4>; |
443 | interrupts = <0 71 4>; | 443 | interrupts = <0 71 4>; |
444 | clocks = <&clock HIX5HD2_MAC0_CLK>; | 444 | clocks = <&clock HIX5HD2_MAC0_CLK>; |
@@ -447,7 +447,7 @@ | |||
447 | }; | 447 | }; |
448 | 448 | ||
449 | gmac1: ethernet@1841000 { | 449 | gmac1: ethernet@1841000 { |
450 | compatible = "hisilicon,hix5hd2-gemac", "hisilicon,hisi-gemac-v1"; | 450 | compatible = "hisilicon,hix5hd2-gmac", "hisilicon,hisi-gmac-v1"; |
451 | reg = <0x1841000 0x1000>,<0x1843010 0x4>; | 451 | reg = <0x1841000 0x1000>,<0x1843010 0x4>; |
452 | interrupts = <0 72 4>; | 452 | interrupts = <0 72 4>; |
453 | clocks = <&clock HIX5HD2_MAC1_CLK>; | 453 | clocks = <&clock HIX5HD2_MAC1_CLK>; |