Merge tag 'armsoc-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / pci / mvebu-pci.txt

diff --git a/Documentation/devicetree/bindings/pci/mvebu-pci.txt b/Documentation/devicetree/bindings/pci/mvebu-pci.txt
index e5af2e8461cff177c1750caa191c4430516ed58b..6173af6885f86731a9e81182737afc0a185cd212 100644 (file)
--- a/Documentation/devicetree/bindings/pci/mvebu-pci.txt
+++ b/Documentation/devicetree/bindings/pci/mvebu-pci.txt
@@ -77,7 +77,7 @@ and the following optional properties:
 - marvell,pcie-lane: the physical PCIe lane number, for ports having
   multiple lanes. If this property is not found, we assume that the
   value is 0.
-- reset-gpios: optional gpio to PERST#
+- reset-gpios: optional GPIO to PERST#
 - reset-delay-us: delay in us to wait after reset de-assertion, if not
   specified will default to 100ms, as required by the PCIe specification.
 
@@ -85,7 +85,6 @@ Example:
 
 pcie-controller {
        compatible = "marvell,armada-xp-pcie";
-       status = "disabled";
        device_type = "pci";
 
        #address-cells = <3>;
@@ -147,7 +146,6 @@ pcie-controller {
                /* wait 20ms for device settle after reset deassertion */
                reset-delay-us = <20000>;
                clocks = <&gateclk 5>;
-               status = "disabled";
        };
 
        pcie@2,0 {
@@ -164,7 +162,6 @@ pcie-controller {
                marvell,pcie-port = <0>;
                marvell,pcie-lane = <1>;
                clocks = <&gateclk 6>;
-               status = "disabled";
        };
 
        pcie@3,0 {
@@ -181,7 +178,6 @@ pcie-controller {
                marvell,pcie-port = <0>;
                marvell,pcie-lane = <2>;
                clocks = <&gateclk 7>;
-               status = "disabled";
        };
 
        pcie@4,0 {
@@ -198,7 +194,6 @@ pcie-controller {
                marvell,pcie-port = <0>;
                marvell,pcie-lane = <3>;
                clocks = <&gateclk 8>;
-               status = "disabled";
        };
 
        pcie@5,0 {
@@ -215,7 +210,6 @@ pcie-controller {
                marvell,pcie-port = <1>;
                marvell,pcie-lane = <0>;
                clocks = <&gateclk 9>;
-               status = "disabled";
        };
 
        pcie@6,0 {
@@ -232,7 +226,6 @@ pcie-controller {
                marvell,pcie-port = <1>;
                marvell,pcie-lane = <1>;
                clocks = <&gateclk 10>;
-               status = "disabled";
        };
 
        pcie@7,0 {
@@ -249,7 +242,6 @@ pcie-controller {
                marvell,pcie-port = <1>;
                marvell,pcie-lane = <2>;
                clocks = <&gateclk 11>;
-               status = "disabled";
        };
 
        pcie@8,0 {
@@ -266,7 +258,6 @@ pcie-controller {
                marvell,pcie-port = <1>;
                marvell,pcie-lane = <3>;
                clocks = <&gateclk 12>;
-               status = "disabled";
        };
 
        pcie@9,0 {
@@ -283,7 +274,6 @@ pcie-controller {
                marvell,pcie-port = <2>;
                marvell,pcie-lane = <0>;
                clocks = <&gateclk 26>;
-               status = "disabled";
        };
 
        pcie@a,0 {
@@ -300,6 +290,5 @@ pcie-controller {
                marvell,pcie-port = <3>;
                marvell,pcie-lane = <0>;
                clocks = <&gateclk 27>;
-               status = "disabled";
        };
 };