Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Sasha Levin <Alexander.Levin@microsoft.com>
To:     "stable@vger.kernel.org" <stable@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
CC:     Rosen Penev <rosenp@gmail.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL 4.18 081/136] staging: mt7621-dts: Fix remaining pcie
 warnings
Thread-Topic: [PATCH AUTOSEL 4.18 081/136] staging: mt7621-dts: Fix remaining
 pcie warnings
Thread-Index: AQHUTjKrhPY/medtQUSMn6uekuPJOg==
Date:   Mon, 17 Sep 2018 03:01:02 +0000
Message-ID: <20180917030006.245495-81-alexander.levin@microsoft.com>
References: <20180917030006.245495-1-alexander.levin@microsoft.com>
In-Reply-To: <20180917030006.245495-1-alexander.levin@microsoft.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microsoft.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: a5829200-6633-4e0b-15aa-08d61c49f031
X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Sep 2018 03:01:02.8074
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0790
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Rosen Penev <rosenp@gmail.com>

[ Upstream commit d0233204fbc10f003d1ef077f57341c2feca4002 ]

This currently fixes the remaining dtb warnings:

Node /pcie@1e140000/pcie0 has a reg or ranges property, but no unit name
Node /pcie@1e140000/pcie1 has a reg or ranges property, but no unit name
Node /pcie@1e140000/pcie2 has a reg or ranges property, but no unit name
Node /pcie@1e140000/pcie0 node name is not "pci" or "pcie"
Node /pcie@1e140000/pcie0 missing ranges for PCI bridge (or not a bridge)
Node /pcie@1e140000/pcie0 missing bus-range for PCI bridge
Node /pcie@1e140000/pcie1 node name is not "pci" or "pcie"
Node /pcie@1e140000/pcie1 missing ranges for PCI bridge (or not a bridge)
Node /pcie@1e140000/pcie1 missing bus-range for PCI bridge
Node /pcie@1e140000/pcie2 node name is not "pci" or "pcie"
Node /pcie@1e140000/pcie2 missing ranges for PCI bridge (or not a bridge)
Node /pcie@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'

device_type was removed since according to documentation, it's deprecated
for pci(e) devices.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
 drivers/staging/mt7621-dts/gbpc1.dts   |  2 ++
 drivers/staging/mt7621-dts/mt7621.dtsi | 21 +++++++++------------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/mt7621-dts/gbpc1.dts b/drivers/staging/mt7621-=
dts/gbpc1.dts
index 6b13d85d9d34..87555600195f 100644
--- a/drivers/staging/mt7621-dts/gbpc1.dts
+++ b/drivers/staging/mt7621-dts/gbpc1.dts
@@ -113,6 +113,8 @@
 };
=20
 &pcie {
+	pinctrl-names =3D "default";
+	pinctrl-0 =3D <&pcie_pins>;
 	status =3D "okay";
 };
=20
diff --git a/drivers/staging/mt7621-dts/mt7621.dtsi b/drivers/staging/mt762=
1-dts/mt7621.dtsi
index eb3966b7f033..ce6b43639079 100644
--- a/drivers/staging/mt7621-dts/mt7621.dtsi
+++ b/drivers/staging/mt7621-dts/mt7621.dtsi
@@ -447,31 +447,28 @@
 		clocks =3D <&clkctrl 24 &clkctrl 25 &clkctrl 26>;
 		clock-names =3D "pcie0", "pcie1", "pcie2";
=20
-		pcie0 {
+		pcie@0,0 {
 			reg =3D <0x0000 0 0 0 0>;
-
 			#address-cells =3D <3>;
 			#size-cells =3D <2>;
-
-			device_type =3D "pci";
+			ranges;
+			bus-range =3D <0x00 0xff>;
 		};
=20
-		pcie1 {
+		pcie@1,0 {
 			reg =3D <0x0800 0 0 0 0>;
-
 			#address-cells =3D <3>;
 			#size-cells =3D <2>;
-
-			device_type =3D "pci";
+			ranges;
+			bus-range =3D <0x00 0xff>;
 		};
=20
-		pcie2 {
+		pcie@2,0 {
 			reg =3D <0x1000 0 0 0 0>;
-
 			#address-cells =3D <3>;
 			#size-cells =3D <2>;
-
-			device_type =3D "pci";
+			ranges;
+			bus-range =3D <0x00 0xff>;
 		};
 	};
 };
--=20
2.17.1