target/linux/layerscape/patches-5.4/302-dts-0040-arm64-dts-ls1012a-reorganize-pfe_mac-nodes.patch

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