Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b701721 authored by Pali Rohár's avatar Pali Rohár Committed by Greg Kroah-Hartman
Browse files

ARM: dts: armada-38x: Fix assigned-addresses for every PCIe Root Port 



[ Upstream commit 44f47b7a8fa4678ce4c38ea74837e4996b9df6d6 ]

BDF of resource in DT assigned-addresses property of Marvell PCIe Root Port
(PCI-to-PCI bridge) should match BDF in address part in that DT node name
as specified resource belongs to Marvell PCIe Root Port itself.

Fixes: 0d3d96ab ("ARM: mvebu: add Device Tree description of the Armada 380/385 SoCs")
Signed-off-by: default avatarPali Rohár <pali@kernel.org>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@bootlin.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 87b951b7

arch/arm/boot/dts/armada-380.dtsi

+2 −2
Original line number Original line Diff line number Diff line
@@ -79,7 +79,7 @@ 
			/* x1 port */

			/* x1 port */

			pcie@2,0 {

			pcie@2,0 {

				device_type = "pci";

				device_type = "pci";

				assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;

				assigned-addresses = <0x82001000 0 0x40000 0 0x2000>;

				reg = <0x1000 0 0 0 0>;

				reg = <0x1000 0 0 0 0>;

				#address-cells = <3>;

				#address-cells = <3>;

				#size-cells = <2>;

				#size-cells = <2>;
@@ -98,7 +98,7 @@ 
			/* x1 port */

			/* x1 port */

			pcie@3,0 {

			pcie@3,0 {

				device_type = "pci";

				device_type = "pci";

				assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;

				assigned-addresses = <0x82001800 0 0x44000 0 0x2000>;

				reg = <0x1800 0 0 0 0>;

				reg = <0x1800 0 0 0 0>;

				#address-cells = <3>;

				#address-cells = <3>;

				#size-cells = <2>;

				#size-cells = <2>;

arch/arm/boot/dts/armada-385.dtsi

+3 −3
Original line number Original line Diff line number Diff line
@@ -84,7 +84,7 @@ 
			/* x1 port */

			/* x1 port */

			pcie2: pcie@2,0 {

			pcie2: pcie@2,0 {

				device_type = "pci";

				device_type = "pci";

				assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;

				assigned-addresses = <0x82001000 0 0x40000 0 0x2000>;

				reg = <0x1000 0 0 0 0>;

				reg = <0x1000 0 0 0 0>;

				#address-cells = <3>;

				#address-cells = <3>;

				#size-cells = <2>;

				#size-cells = <2>;
@@ -103,7 +103,7 @@ 
			/* x1 port */

			/* x1 port */

			pcie3: pcie@3,0 {

			pcie3: pcie@3,0 {

				device_type = "pci";

				device_type = "pci";

				assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;

				assigned-addresses = <0x82001800 0 0x44000 0 0x2000>;

				reg = <0x1800 0 0 0 0>;

				reg = <0x1800 0 0 0 0>;

				#address-cells = <3>;

				#address-cells = <3>;

				#size-cells = <2>;

				#size-cells = <2>;
@@ -125,7 +125,7 @@ 
			 */

			 */

			pcie4: pcie@4,0 {

			pcie4: pcie@4,0 {

				device_type = "pci";

				device_type = "pci";

				assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;

				assigned-addresses = <0x82002000 0 0x48000 0 0x2000>;

				reg = <0x2000 0 0 0 0>;

				reg = <0x2000 0 0 0 0>;

				#address-cells = <3>;

				#address-cells = <3>;

				#size-cells = <2>;

				#size-cells = <2>;