1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
|
From 4ed0fefb58b5788368fea2c69d646ee4f2e9e012 Mon Sep 17 00:00:00 2001
From: Calvin Johnson <calvin.johnson@nxp.com>
Date: Mon, 10 Dec 2018 10:03:51 +0530
Subject: [PATCH] arm64: dts: ls1012a: reorganize pfe_mac nodes
To keep platform specific properties in the platform dts files,
remove pfe_mac nodes from dtsi and define them in dts files.
Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
---
arch/arm64/boot/dts/freescale/fsl-ls1012a-2g5rdb.dts | 4 ++--
arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts | 4 ++--
arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts | 4 ++--
arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 4 ++--
arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts | 4 ++--
arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 5 -----
6 files changed, 10 insertions(+), 15 deletions(-)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a-2g5rdb.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-2g5rdb.dts
@@ -52,7 +52,7 @@
#address-cells = <1>;
#size-cells = <0>;
- ethernet@0 {
+ pfe_mac0: ethernet@0 {
compatible = "fsl,pfe-gemac-port";
#address-cells = <1>;
#size-cells = <0>;
@@ -62,7 +62,7 @@
phy-handle = <&sgmii_phy1>;
};
- ethernet@1 {
+ pfe_mac1: ethernet@1 {
compatible = "fsl,pfe-gemac-port";
#address-cells = <1>;
#size-cells = <0>;
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts
@@ -84,7 +84,7 @@
#address-cells = <1>;
#size-cells = <0>;
- ethernet@0 {
+ pfe_mac0: ethernet@0 {
compatible = "fsl,pfe-gemac-port";
#address-cells = <1>;
#size-cells = <0>;
@@ -94,7 +94,7 @@
phy-handle = <&sgmii_phy1>;
};
- ethernet@1 {
+ pfe_mac1: ethernet@1 {
compatible = "fsl,pfe-gemac-port";
#address-cells = <1>;
#size-cells = <0>;
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts
@@ -105,7 +105,7 @@
#address-cells = <1>;
#size-cells = <0>;
- ethernet@0 {
+ pfe_mac0: ethernet@0 {
compatible = "fsl,pfe-gemac-port";
#address-cells = <1>;
#size-cells = <0>;
@@ -116,7 +116,7 @@
phy-handle = <&sgmii_phy1>;
};
- ethernet@1 {
+ pfe_mac1: ethernet@1 {
compatible = "fsl,pfe-gemac-port";
#address-cells = <1>;
#size-cells = <0>;
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts
@@ -142,7 +142,7 @@
#address-cells = <1>;
#size-cells = <0>;
- ethernet@0 {
+ pfe_mac0: ethernet@0 {
compatible = "fsl,pfe-gemac-port";
#address-cells = <1>;
#size-cells = <0>;
@@ -152,7 +152,7 @@
phy-handle = <&sgmii_phy1>;
};
- ethernet@1 {
+ pfe_mac1: ethernet@1 {
compatible = "fsl,pfe-gemac-port";
#address-cells = <1>;
#size-cells = <0>;
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts
@@ -53,7 +53,7 @@
#address-cells = <1>;
#size-cells = <0>;
- ethernet@0 {
+ pfe_mac0: ethernet@0 {
compatible = "fsl,pfe-gemac-port";
#address-cells = <1>;
#size-cells = <0>;
@@ -63,7 +63,7 @@
phy-handle = <&sgmii_phy>;
};
- ethernet@1 {
+ pfe_mac1: ethernet@1 {
compatible = "fsl,pfe-gemac-port";
#address-cells = <1>;
#size-cells = <0>;
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
@@ -530,11 +530,6 @@
clock-names = "pfe";
status = "okay";
- pfe_mac0: ethernet@0 {
- };
-
- pfe_mac1: ethernet@1 {
- };
};
firmware {
|
