]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob - releases/4.4.162/arm-dts-at91-add-new-compatibility-string-for-macb-on-sama5d3.patch
Linux 4.4.162
[thirdparty/kernel/stable-queue.git] / releases / 4.4.162 / arm-dts-at91-add-new-compatibility-string-for-macb-on-sama5d3.patch
1 From foo@baz Tue Oct 16 12:20:44 CEST 2018
2 From: Nicolas Ferre <nicolas.ferre@microchip.com>
3 Date: Fri, 14 Sep 2018 17:48:11 +0200
4 Subject: ARM: dts: at91: add new compatibility string for macb on sama5d3
5
6 From: Nicolas Ferre <nicolas.ferre@microchip.com>
7
8 [ Upstream commit 321cc359d899a8e988f3725d87c18a628e1cc624 ]
9
10 We need this new compatibility string as we experienced different behavior
11 for this 10/100Mbits/s macb interface on this particular SoC.
12 Backward compatibility is preserved as we keep the alternative strings.
13
14 Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
15 Signed-off-by: David S. Miller <davem@davemloft.net>
16 Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
17 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
18 ---
19 Documentation/devicetree/bindings/net/macb.txt | 1 +
20 arch/arm/boot/dts/sama5d3_emac.dtsi | 2 +-
21 2 files changed, 2 insertions(+), 1 deletion(-)
22
23 --- a/Documentation/devicetree/bindings/net/macb.txt
24 +++ b/Documentation/devicetree/bindings/net/macb.txt
25 @@ -8,6 +8,7 @@ Required properties:
26 Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on
27 the Cadence GEM, or the generic form: "cdns,gem".
28 Use "atmel,sama5d2-gem" for the GEM IP (10/100) available on Atmel sama5d2 SoCs.
29 + Use "atmel,sama5d3-macb" for the 10/100Mbit IP available on Atmel sama5d3 SoCs.
30 Use "atmel,sama5d3-gem" for the Gigabit IP available on Atmel sama5d3 SoCs.
31 Use "atmel,sama5d4-gem" for the GEM IP (10/100) available on Atmel sama5d4 SoCs.
32 Use "cdns,zynqmp-gem" for Zynq Ultrascale+ MPSoC.
33 --- a/arch/arm/boot/dts/sama5d3_emac.dtsi
34 +++ b/arch/arm/boot/dts/sama5d3_emac.dtsi
35 @@ -41,7 +41,7 @@
36 };
37
38 macb1: ethernet@f802c000 {
39 - compatible = "cdns,at91sam9260-macb", "cdns,macb";
40 + compatible = "atmel,sama5d3-macb", "cdns,at91sam9260-macb", "cdns,macb";
41 reg = <0xf802c000 0x100>;
42 interrupts = <35 IRQ_TYPE_LEVEL_HIGH 3>;
43 pinctrl-names = "default";