[PATCH 2/2] staging: mt7621-dts: Match pcie format to mt7623.dtsi

[Rosen Penev]

This currently fixes the remaining dtb warnings:

Node /pcie at 1e140000/pcie0 has a reg or ranges property, but no unit name
Node /pcie at 1e140000/pcie1 has a reg or ranges property, but no unit name
Node /pcie at 1e140000/pcie2 has a reg or ranges property, but no unit name
Node /pcie at 1e140000/pcie0 node name is not "pci" or "pcie"
Node /pcie at 1e140000/pcie0 missing ranges for PCI bridge (or not a bridge)
Node /pcie at 1e140000/pcie0 missing bus-range for PCI bridge
Node /pcie at 1e140000/pcie1 node name is not "pci" or "pcie"
Node /pcie at 1e140000/pcie1 missing ranges for PCI bridge (or not a bridge)
Node /pcie at 1e140000/pcie1 missing bus-range for PCI bridge
Node /pcie at 1e140000/pcie2 node name is not "pci" or "pcie"
Node /pcie at 1e140000/pcie2 missing ranges for PCI bridge (or not a bridge)
Node /pcie at 1e140000/pcie2 missing bus-range for PCI bridge
Warning (unit_address_format): Failed prerequisite 'pci_bridge'
Warning (pci_device_reg): Failed prerequisite 'pci_bridge'
Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge'

In addition, it sets each pcie port to disabled in order to allow future
boards to be added that only have 1 or 2 pcie lanes wired up. gbpc1.dts
was changed to accomidate.

Signed-off-by: Rosen Penev <rosenp at gmail.com>
---
 drivers/staging/mt7621-dts/gbpc1.dts   | 15 +++++++++++++++
 drivers/staging/mt7621-dts/mt7621.dtsi | 24 ++++++++++++------------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/mt7621-dts/gbpc1.dts b/drivers/staging/mt7621-dts/gbpc1.dts
index 6b13d85d9d34..cd7f90e4ec6d 100644
--- a/drivers/staging/mt7621-dts/gbpc1.dts
+++ b/drivers/staging/mt7621-dts/gbpc1.dts
@@ -113,7 +113,22 @@
 };
 
 &pcie {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pcie_pins>;
 	status = "okay";
+
+	pcie at 0,0 {
+		status = "okay";
+	};
+
+	pcie at 1,0 {
+		status = "okay";
+	};
+
+	pcie at 2,0 {
+		status = "okay";
+	};
+
 };
 
 &ethernet {
diff --git a/drivers/staging/mt7621-dts/mt7621.dtsi b/drivers/staging/mt7621-dts/mt7621.dtsi
index 5a94fcb96402..16583647797f 100644
--- a/drivers/staging/mt7621-dts/mt7621.dtsi
+++ b/drivers/staging/mt7621-dts/mt7621.dtsi
@@ -452,31 +452,31 @@
 		clocks = <&clkctrl 24 &clkctrl 25 &clkctrl 26>;
 		clock-names = "pcie0", "pcie1", "pcie2";
 
-		pcie0 {
+		pcie at 0,0 {
 			reg = <0x0000 0 0 0 0>;
-
 			#address-cells = <3>;
 			#size-cells = <2>;
-
-			device_type = "pci";
+			ranges;
+			num-lanes = <1>;
+			status = "disabled";
 		};
 
-		pcie1 {
+		pcie at 1,0 {
 			reg = <0x0800 0 0 0 0>;
-
 			#address-cells = <3>;
 			#size-cells = <2>;
-
-			device_type = "pci";
+			ranges;
+			num-lanes = <1>;
+			status = "disabled";
 		};
 
-		pcie2 {
+		pcie at 2,0 {
 			reg = <0x1000 0 0 0 0>;
-
 			#address-cells = <3>;
 			#size-cells = <2>;
-
-			device_type = "pci";
+			ranges;
+			num-lanes = <1>;
+			status = "disabled";
 		};
 	};
 };
-- 
2.17.1