]> git.itanic.dy.fi Git - linux-stable/commitdiff
staging: mt7621-dts: move some properties into root port child nodes
authorSergio Paracuellos <sergio.paracuellos@gmail.com>
Mon, 7 Jun 2021 12:01:51 +0000 (14:01 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 9 Jun 2021 12:19:22 +0000 (14:19 +0200)
After a review of the bindings 'clocks', 'resets' and 'phys' must
be moved into root port child nodes. Hence, move all of them.

Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Link: https://lore.kernel.org/r/20210607120153.24989-5-sergio.paracuellos@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/mt7621-dts/mt7621.dtsi

index 840ba0c3ffed469c36f7b0042d56357f99f1a090..ecfe2f2cf75ab9ce54611c42cf357ce84d9d0237 100644 (file)
@@ -500,15 +500,6 @@ pcie: pcie@1e140000 {
 
                status = "disabled";
 
-               resets = <&rstctrl 24>, <&rstctrl 25>, <&rstctrl 26>;
-               reset-names = "pcie0", "pcie1", "pcie2";
-               clocks = <&sysc MT7621_CLK_PCIE0>,
-                        <&sysc MT7621_CLK_PCIE1>,
-                        <&sysc MT7621_CLK_PCIE2>;
-               clock-names = "pcie0", "pcie1", "pcie2";
-               phys = <&pcie0_phy 1>, <&pcie2_phy 0>;
-               phy-names = "pcie-phy0", "pcie-phy2";
-
                reset-gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 
                pcie@0,0 {
@@ -519,6 +510,10 @@ pcie@0,0 {
                        #interrupt-cells = <1>;
                        interrupt-map-mask = <0 0 0 0>;
                        interrupt-map = <0 0 0 0 &gic GIC_SHARED 4 IRQ_TYPE_LEVEL_HIGH>;
+                       resets = <&rstctrl 24>;
+                       clocks = <&sysc MT7621_CLK_PCIE0>;
+                       phys = <&pcie0_phy 1>;
+                       phy-names = "pcie-phy0";
                        ranges;
                };
 
@@ -530,6 +525,10 @@ pcie@1,0 {
                        #interrupt-cells = <1>;
                        interrupt-map-mask = <0 0 0 0>;
                        interrupt-map = <0 0 0 0 &gic GIC_SHARED 24 IRQ_TYPE_LEVEL_HIGH>;
+                       resets = <&rstctrl 25>;
+                       clocks = <&sysc MT7621_CLK_PCIE1>;
+                       phys = <&pcie0_phy 1>;
+                       phy-names = "pcie-phy1";
                        ranges;
                };
 
@@ -541,6 +540,10 @@ pcie@2,0 {
                        #interrupt-cells = <1>;
                        interrupt-map-mask = <0 0 0 0>;
                        interrupt-map = <0 0 0 0 &gic GIC_SHARED 25 IRQ_TYPE_LEVEL_HIGH>;
+                       resets = <&rstctrl 26>;
+                       clocks = <&sysc MT7621_CLK_PCIE2>;
+                       phys = <&pcie2_phy 0>;
+                       phy-names = "pcie-phy2";
                        ranges;
                };
        };