diff options
-rw-r--r-- | arch/arm/boot/dts/sama5d31ek.dts | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/sama5d33ek.dts | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/sama5d34ek.dts | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/sama5d35ek.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/sama5d36ek.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/sama5d3xcm.dtsi | 34 | ||||
-rw-r--r-- | arch/arm/boot/dts/sama5d3xmb.dtsi | 12 | ||||
-rw-r--r-- | arch/arm/boot/dts/sama5d3xmb_emac.dtsi | 26 | ||||
-rw-r--r-- | arch/arm/boot/dts/sama5d3xmb_gmac.dtsi | 48 |
9 files changed, 81 insertions, 46 deletions
diff --git a/arch/arm/boot/dts/sama5d31ek.dts b/arch/arm/boot/dts/sama5d31ek.dts index 04eec0dfcf7d..25e4c0b2d786 100644 --- a/arch/arm/boot/dts/sama5d31ek.dts +++ b/arch/arm/boot/dts/sama5d31ek.dts | |||
@@ -9,6 +9,7 @@ | |||
9 | /dts-v1/; | 9 | /dts-v1/; |
10 | #include "sama5d31.dtsi" | 10 | #include "sama5d31.dtsi" |
11 | #include "sama5d3xmb.dtsi" | 11 | #include "sama5d3xmb.dtsi" |
12 | #include "sama5d3xmb_emac.dtsi" | ||
12 | #include "sama5d3xdm.dtsi" | 13 | #include "sama5d3xdm.dtsi" |
13 | 14 | ||
14 | / { | 15 | / { |
diff --git a/arch/arm/boot/dts/sama5d33ek.dts b/arch/arm/boot/dts/sama5d33ek.dts index cbd6a3ff1545..c517b87a1de2 100644 --- a/arch/arm/boot/dts/sama5d33ek.dts +++ b/arch/arm/boot/dts/sama5d33ek.dts | |||
@@ -9,6 +9,7 @@ | |||
9 | /dts-v1/; | 9 | /dts-v1/; |
10 | #include "sama5d33.dtsi" | 10 | #include "sama5d33.dtsi" |
11 | #include "sama5d3xmb.dtsi" | 11 | #include "sama5d3xmb.dtsi" |
12 | #include "sama5d3xmb_gmac.dtsi" | ||
12 | #include "sama5d3xdm.dtsi" | 13 | #include "sama5d3xdm.dtsi" |
13 | 14 | ||
14 | / { | 15 | / { |
diff --git a/arch/arm/boot/dts/sama5d34ek.dts b/arch/arm/boot/dts/sama5d34ek.dts index 878aa164275a..c8b8449fdc3e 100644 --- a/arch/arm/boot/dts/sama5d34ek.dts +++ b/arch/arm/boot/dts/sama5d34ek.dts | |||
@@ -9,6 +9,7 @@ | |||
9 | /dts-v1/; | 9 | /dts-v1/; |
10 | #include "sama5d34.dtsi" | 10 | #include "sama5d34.dtsi" |
11 | #include "sama5d3xmb.dtsi" | 11 | #include "sama5d3xmb.dtsi" |
12 | #include "sama5d3xmb_gmac.dtsi" | ||
12 | #include "sama5d3xdm.dtsi" | 13 | #include "sama5d3xdm.dtsi" |
13 | 14 | ||
14 | / { | 15 | / { |
diff --git a/arch/arm/boot/dts/sama5d35ek.dts b/arch/arm/boot/dts/sama5d35ek.dts index e812f5c1bf70..6e261fcf576c 100644 --- a/arch/arm/boot/dts/sama5d35ek.dts +++ b/arch/arm/boot/dts/sama5d35ek.dts | |||
@@ -9,6 +9,8 @@ | |||
9 | /dts-v1/; | 9 | /dts-v1/; |
10 | #include "sama5d35.dtsi" | 10 | #include "sama5d35.dtsi" |
11 | #include "sama5d3xmb.dtsi" | 11 | #include "sama5d3xmb.dtsi" |
12 | #include "sama5d3xmb_emac.dtsi" | ||
13 | #include "sama5d3xmb_gmac.dtsi" | ||
12 | 14 | ||
13 | / { | 15 | / { |
14 | model = "Atmel SAMA5D35-EK"; | 16 | model = "Atmel SAMA5D35-EK"; |
diff --git a/arch/arm/boot/dts/sama5d36ek.dts b/arch/arm/boot/dts/sama5d36ek.dts index 59576c6f9826..cd458b85a205 100644 --- a/arch/arm/boot/dts/sama5d36ek.dts +++ b/arch/arm/boot/dts/sama5d36ek.dts | |||
@@ -10,6 +10,8 @@ | |||
10 | #include "sama5d36.dtsi" | 10 | #include "sama5d36.dtsi" |
11 | #include "sama5d3xmb.dtsi" | 11 | #include "sama5d3xmb.dtsi" |
12 | #include "sama5d3xdm.dtsi" | 12 | #include "sama5d3xdm.dtsi" |
13 | #include "sama5d3xmb_emac.dtsi" | ||
14 | #include "sama5d3xmb_gmac.dtsi" | ||
13 | 15 | ||
14 | / { | 16 | / { |
15 | model = "Atmel SAMA5D36-EK"; | 17 | model = "Atmel SAMA5D36-EK"; |
diff --git a/arch/arm/boot/dts/sama5d3xcm.dtsi b/arch/arm/boot/dts/sama5d3xcm.dtsi index 2cf9c3611db6..b5e111b29da1 100644 --- a/arch/arm/boot/dts/sama5d3xcm.dtsi +++ b/arch/arm/boot/dts/sama5d3xcm.dtsi | |||
@@ -34,40 +34,6 @@ | |||
34 | spi0: spi@f0004000 { | 34 | spi0: spi@f0004000 { |
35 | cs-gpios = <&pioD 13 0>, <0>, <0>, <0>; | 35 | cs-gpios = <&pioD 13 0>, <0>, <0>, <0>; |
36 | }; | 36 | }; |
37 | |||
38 | macb0: ethernet@f0028000 { | ||
39 | phy-mode = "rgmii"; | ||
40 | #address-cells = <1>; | ||
41 | #size-cells = <0>; | ||
42 | |||
43 | ethernet-phy@1 { | ||
44 | reg = <0x1>; | ||
45 | interrupt-parent = <&pioB>; | ||
46 | interrupts = <25 IRQ_TYPE_EDGE_FALLING>; | ||
47 | txen-skew-ps = <800>; | ||
48 | txc-skew-ps = <3000>; | ||
49 | rxdv-skew-ps = <400>; | ||
50 | rxc-skew-ps = <3000>; | ||
51 | rxd0-skew-ps = <400>; | ||
52 | rxd1-skew-ps = <400>; | ||
53 | rxd2-skew-ps = <400>; | ||
54 | rxd3-skew-ps = <400>; | ||
55 | }; | ||
56 | |||
57 | ethernet-phy@7 { | ||
58 | reg = <0x7>; | ||
59 | interrupt-parent = <&pioB>; | ||
60 | interrupts = <25 IRQ_TYPE_EDGE_FALLING>; | ||
61 | txen-skew-ps = <800>; | ||
62 | txc-skew-ps = <3000>; | ||
63 | rxdv-skew-ps = <400>; | ||
64 | rxc-skew-ps = <3000>; | ||
65 | rxd0-skew-ps = <400>; | ||
66 | rxd1-skew-ps = <400>; | ||
67 | rxd2-skew-ps = <400>; | ||
68 | rxd3-skew-ps = <400>; | ||
69 | }; | ||
70 | }; | ||
71 | }; | 37 | }; |
72 | 38 | ||
73 | nand0: nand@60000000 { | 39 | nand0: nand@60000000 { |
diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi index 89010422812d..6d252ad050f6 100644 --- a/arch/arm/boot/dts/sama5d3xmb.dtsi +++ b/arch/arm/boot/dts/sama5d3xmb.dtsi | |||
@@ -117,18 +117,6 @@ | |||
117 | status = "okay"; | 117 | status = "okay"; |
118 | }; | 118 | }; |
119 | 119 | ||
120 | macb1: ethernet@f802c000 { | ||
121 | phy-mode = "rmii"; | ||
122 | |||
123 | #address-cells = <1>; | ||
124 | #size-cells = <0>; | ||
125 | phy0: ethernet-phy@1 { | ||
126 | interrupt-parent = <&pioE>; | ||
127 | interrupts = <30 IRQ_TYPE_EDGE_FALLING>; | ||
128 | reg = <1>; | ||
129 | }; | ||
130 | }; | ||
131 | |||
132 | pinctrl@fffff200 { | 120 | pinctrl@fffff200 { |
133 | board { | 121 | board { |
134 | pinctrl_mmc0_cd: mmc0_cd { | 122 | pinctrl_mmc0_cd: mmc0_cd { |
diff --git a/arch/arm/boot/dts/sama5d3xmb_emac.dtsi b/arch/arm/boot/dts/sama5d3xmb_emac.dtsi new file mode 100644 index 000000000000..2fd14f371a04 --- /dev/null +++ b/arch/arm/boot/dts/sama5d3xmb_emac.dtsi | |||
@@ -0,0 +1,26 @@ | |||
1 | /* | ||
2 | * sama5d3xmb_emac.dts - Device Tree Include file for SAMA5D3x mother board | ||
3 | * Ethernet | ||
4 | * | ||
5 | * Copyright (C) 2016 Atmel, | ||
6 | * | ||
7 | * Licensed under GPLv2 or later. | ||
8 | */ | ||
9 | |||
10 | / { | ||
11 | ahb { | ||
12 | apb { | ||
13 | macb1: ethernet@f802c000 { | ||
14 | phy-mode = "rmii"; | ||
15 | |||
16 | #address-cells = <1>; | ||
17 | #size-cells = <0>; | ||
18 | phy0: ethernet-phy@1 { | ||
19 | interrupt-parent = <&pioE>; | ||
20 | interrupts = <30 IRQ_TYPE_EDGE_FALLING>; | ||
21 | reg = <1>; | ||
22 | }; | ||
23 | }; | ||
24 | }; | ||
25 | }; | ||
26 | }; | ||
diff --git a/arch/arm/boot/dts/sama5d3xmb_gmac.dtsi b/arch/arm/boot/dts/sama5d3xmb_gmac.dtsi new file mode 100644 index 000000000000..65aea7a75b1d --- /dev/null +++ b/arch/arm/boot/dts/sama5d3xmb_gmac.dtsi | |||
@@ -0,0 +1,48 @@ | |||
1 | /* | ||
2 | * sama5d3xmb_gmac.dtsi - Device Tree Include file for SAMA5D3x motherboard | ||
3 | * Gigabit Ethernet | ||
4 | * | ||
5 | * Copyright (C) 2016 Atmel, | ||
6 | * | ||
7 | * Licensed under GPLv2 or later. | ||
8 | */ | ||
9 | |||
10 | / { | ||
11 | ahb { | ||
12 | apb { | ||
13 | macb0: ethernet@f0028000 { | ||
14 | phy-mode = "rgmii"; | ||
15 | #address-cells = <1>; | ||
16 | #size-cells = <0>; | ||
17 | |||
18 | ethernet-phy@1 { | ||
19 | reg = <0x1>; | ||
20 | interrupt-parent = <&pioB>; | ||
21 | interrupts = <25 IRQ_TYPE_EDGE_FALLING>; | ||
22 | txen-skew-ps = <800>; | ||
23 | txc-skew-ps = <3000>; | ||
24 | rxdv-skew-ps = <400>; | ||
25 | rxc-skew-ps = <3000>; | ||
26 | rxd0-skew-ps = <400>; | ||
27 | rxd1-skew-ps = <400>; | ||
28 | rxd2-skew-ps = <400>; | ||
29 | rxd3-skew-ps = <400>; | ||
30 | }; | ||
31 | |||
32 | ethernet-phy@7 { | ||
33 | reg = <0x7>; | ||
34 | interrupt-parent = <&pioB>; | ||
35 | interrupts = <25 IRQ_TYPE_EDGE_FALLING>; | ||
36 | txen-skew-ps = <800>; | ||
37 | txc-skew-ps = <3000>; | ||
38 | rxdv-skew-ps = <400>; | ||
39 | rxc-skew-ps = <3000>; | ||
40 | rxd0-skew-ps = <400>; | ||
41 | rxd1-skew-ps = <400>; | ||
42 | rxd2-skew-ps = <400>; | ||
43 | rxd3-skew-ps = <400>; | ||
44 | }; | ||
45 | }; | ||
46 | }; | ||
47 | }; | ||
48 | }; | ||