kernel: bump 5.4 to 5.4.45
[openwrt/staging/chunkeey.git] / target / linux / mediatek / patches-5.4 / 0600-3-6-dt-bindings-net-dsa-add-new-MT7531-binding-to-support-MT7531.patch
index 3ca12b9172ae8ca622f50d690f4aa23fa5f2c253..b28f23f573a012b5e300a346111afcd51303a807 100644 (file)
@@ -79,103 +79,101 @@ Signed-off-by: Landen Chao <landen.chao@mediatek.com>
  .../devicetree/bindings/net/dsa/mt7530.txt    | 77 ++++++++++++++++++-
  1 file changed, 74 insertions(+), 3 deletions(-)
 
-diff --git a/Documentation/devicetree/bindings/net/dsa/mt7530.txt b/Documentation/devicetree/bindings/net/dsa/mt7530.txt\r
-index c5ed5d25f642..dc226a4e402a 100644\r
---- a/Documentation/devicetree/bindings/net/dsa/mt7530.txt\r
-+++ b/Documentation/devicetree/bindings/net/dsa/mt7530.txt\r
-@@ -5,6 +5,7 @@ Required properties:\r
\r
- - compatible: may be compatible = "mediatek,mt7530"\r
-       or compatible = "mediatek,mt7621"\r
-+      or compatible = "mediatek,mt7531"\r
- - #address-cells: Must be 1.\r
- - #size-cells: Must be 0.\r
- - mediatek,mcm: Boolean; if defined, indicates that either MT7530 is the part\r
-@@ -32,10 +33,13 @@ Required properties for the child nodes within ports container:\r
\r
- - reg: Port address described must be 6 for CPU port and from 0 to 5 for\r
-       user ports.\r
--- phy-mode: String, must be either "trgmii" or "rgmii" for port labeled\r
--       "cpu".\r
-+- phy-mode: String, the follow value would be acceptable for port labeled "cpu"\r
-+      If compatible mediatek,mt7530 or mediatek,mt7621 is set,\r
-+      must be either "trgmii" or "rgmii"\r
-+      If compatible mediatek,mt7531 is set,\r
-+      must be either "sgmii", "1000base-x" or "2500base-x"\r
\r
--Port 5 of the switch is muxed between:\r
-+Port 5 of mt7530 and mt7621 switch is muxed between:\r
- 1. GMAC5: GMAC5 can interface with another external MAC or PHY.\r
- 2. PHY of port 0 or port 4: PHY interfaces with an external MAC like 2nd GMAC\r
-    of the SOC. Used in many setups where port 0/4 becomes the WAN port.\r
-@@ -308,3 +312,70 @@ Example 3: MT7621: Port 5 is connected to external PHY: Port 5 -> external PHY.\r
-               };\r
-       };\r
- };\r
-+\r
-+Example 4:\r
-+\r
-+&eth {\r
-+      gmac0: mac@0 {\r
-+              compatible = "mediatek,eth-mac";\r
-+              reg = <0>;\r
-+              phy-mode = "2500base-x";\r
-+\r
-+              fixed-link {\r
-+                      speed = <1000>;\r
-+                      full-duplex;\r
-+                      pause;\r
-+              };\r
-+      };\r
-+\r
-+      &mdio0 {\r
-+              switch@0 {\r
-+                      compatible = "mediatek,mt7531";\r
-+                      reg = <0>;\r
-+                      reset-gpios = <&pio 54 0>;\r
-+\r
-+                      ports {\r
-+                              #address-cells = <1>;\r
-+                              #size-cells = <0>;\r
-+                              reg = <0>;\r
-+\r
-+                              port@0 {\r
-+                                      reg = <0>;\r
-+                                      label = "lan0";\r
-+                              };\r
-+\r
-+                              port@1 {\r
-+                                      reg = <1>;\r
-+                                      label = "lan1";\r
-+                              };\r
-+\r
-+                              port@2 {\r
-+                                      reg = <2>;\r
-+                                      label = "lan2";\r
-+                              };\r
-+\r
-+                              port@3 {\r
-+                                      reg = <3>;\r
-+                                      label = "lan3";\r
-+                              };\r
-+\r
-+                              port@4 {\r
-+                                      reg = <4>;\r
-+                                      label = "wan";\r
-+                              };\r
-+\r
-+                              port@6 {\r
-+                                      reg = <6>;\r
-+                                      label = "cpu";\r
-+                                      ethernet = <&gmac0>;\r
-+                                      phy-mode = "2500base-x";\r
-+\r
-+                                      fixed-link {\r
-+                                              speed = <1000>;\r
-+                                              full-duplex;\r
-+                                              pause;\r
-+                                      };\r
-+                              };\r
-+                      };\r
-+              };\r
-+      };\r
+--- a/Documentation/devicetree/bindings/net/dsa/mt7530.txt
++++ b/Documentation/devicetree/bindings/net/dsa/mt7530.txt
+@@ -5,6 +5,7 @@ Required properties:
+ - compatible: may be compatible = "mediatek,mt7530"
+       or compatible = "mediatek,mt7621"
++      or compatible = "mediatek,mt7531"
+ - #address-cells: Must be 1.
+ - #size-cells: Must be 0.
+ - mediatek,mcm: Boolean; if defined, indicates that either MT7530 is the part
+@@ -32,10 +33,13 @@ Required properties for the child nodes
+ - reg: Port address described must be 6 for CPU port and from 0 to 5 for
+       user ports.
+-- phy-mode: String, must be either "trgmii" or "rgmii" for port labeled
+-       "cpu".
++- phy-mode: String, the follow value would be acceptable for port labeled "cpu"
++      If compatible mediatek,mt7530 or mediatek,mt7621 is set,
++      must be either "trgmii" or "rgmii"
++      If compatible mediatek,mt7531 is set,
++      must be either "sgmii", "1000base-x" or "2500base-x"
+-Port 5 of the switch is muxed between:
++Port 5 of mt7530 and mt7621 switch is muxed between:
+ 1. GMAC5: GMAC5 can interface with another external MAC or PHY.
+ 2. PHY of port 0 or port 4: PHY interfaces with an external MAC like 2nd GMAC
+    of the SOC. Used in many setups where port 0/4 becomes the WAN port.
+@@ -308,3 +312,70 @@ Example 3: MT7621: Port 5 is connected t
+               };
+       };
+ };
++
++Example 4:
++
++&eth {
++      gmac0: mac@0 {
++              compatible = "mediatek,eth-mac";
++              reg = <0>;
++              phy-mode = "2500base-x";
++
++              fixed-link {
++                      speed = <1000>;
++                      full-duplex;
++                      pause;
++              };
++      };
++
++      &mdio0 {
++              switch@0 {
++                      compatible = "mediatek,mt7531";
++                      reg = <0>;
++                      reset-gpios = <&pio 54 0>;
++
++                      ports {
++                              #address-cells = <1>;
++                              #size-cells = <0>;
++                              reg = <0>;
++
++                              port@0 {
++                                      reg = <0>;
++                                      label = "lan0";
++                              };
++
++                              port@1 {
++                                      reg = <1>;
++                                      label = "lan1";
++                              };
++
++                              port@2 {
++                                      reg = <2>;
++                                      label = "lan2";
++                              };
++
++                              port@3 {
++                                      reg = <3>;
++                                      label = "lan3";
++                              };
++
++                              port@4 {
++                                      reg = <4>;
++                                      label = "wan";
++                              };
++
++                              port@6 {
++                                      reg = <6>;
++                                      label = "cpu";
++                                      ethernet = <&gmac0>;
++                                      phy-mode = "2500base-x";
++
++                                      fixed-link {
++                                              speed = <1000>;
++                                              full-duplex;
++                                              pause;
++                                      };
++                              };
++                      };
++              };
++      };