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

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: 9d8f44f02d4a ("arm: mvebu: add PCIe Device Tree informations for Armada XP")
Fixes: 12b69a599745 ("ARM: mvebu: second PCIe unit of Armada XP mv78230 is only x1 capable")
Fixes: 2163e61c92d9 ("ARM: mvebu: fix second and third PCIe unit of Armada XP mv78260")
Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>

diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
index bf9360f41e0a601d80179fc3681d080e113a25db..5ea9d509cd3082f0a7aded77a32319d7c3b39f2c 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
@@ -107,7 +107,7 @@ pcie1_intc: interrupt-controller {
 
                        pcie2: pcie@2,0 {
                                device_type = "pci";
-                               assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
+                               assigned-addresses = <0x82001000 0 0x44000 0 0x2000>;
                                reg = <0x1000 0 0 0 0>;
                                #address-cells = <3>;
                                #size-cells = <2>;
@@ -135,7 +135,7 @@ pcie2_intc: interrupt-controller {
 
                        pcie3: pcie@3,0 {
                                device_type = "pci";
-                               assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
+                               assigned-addresses = <0x82001800 0 0x48000 0 0x2000>;
                                reg = <0x1800 0 0 0 0>;
                                #address-cells = <3>;
                                #size-cells = <2>;
@@ -163,7 +163,7 @@ pcie3_intc: interrupt-controller {
 
                        pcie4: pcie@4,0 {
                                device_type = "pci";
-                               assigned-addresses = <0x82000800 0 0x4c000 0 0x2000>;
+                               assigned-addresses = <0x82002000 0 0x4c000 0 0x2000>;
                                reg = <0x2000 0 0 0 0>;
                                #address-cells = <3>;
                                #size-cells = <2>;
@@ -191,7 +191,7 @@ pcie4_intc: interrupt-controller {
 
                        pcie5: pcie@5,0 {
                                device_type = "pci";
-                               assigned-addresses = <0x82000800 0 0x80000 0 0x2000>;
+                               assigned-addresses = <0x82002800 0 0x80000 0 0x2000>;
                                reg = <0x2800 0 0 0 0>;
                                #address-cells = <3>;
                                #size-cells = <2>;

diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
index 0714af52e607536a794864d1ff5b95dedc663ee5..6c6fbb9faf5acd4108e4142e70d74206ee361de6 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
@@ -122,7 +122,7 @@ pcie1_intc: interrupt-controller {
 
                        pcie2: pcie@2,0 {
                                device_type = "pci";
-                               assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
+                               assigned-addresses = <0x82001000 0 0x44000 0 0x2000>;
                                reg = <0x1000 0 0 0 0>;
                                #address-cells = <3>;
                                #size-cells = <2>;
@@ -150,7 +150,7 @@ pcie2_intc: interrupt-controller {
 
                        pcie3: pcie@3,0 {
                                device_type = "pci";
-                               assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
+                               assigned-addresses = <0x82001800 0 0x48000 0 0x2000>;
                                reg = <0x1800 0 0 0 0>;
                                #address-cells = <3>;
                                #size-cells = <2>;
@@ -178,7 +178,7 @@ pcie3_intc: interrupt-controller {
 
                        pcie4: pcie@4,0 {
                                device_type = "pci";
-                               assigned-addresses = <0x82000800 0 0x4c000 0 0x2000>;
+                               assigned-addresses = <0x82002000 0 0x4c000 0 0x2000>;
                                reg = <0x2000 0 0 0 0>;
                                #address-cells = <3>;
                                #size-cells = <2>;
@@ -206,7 +206,7 @@ pcie4_intc: interrupt-controller {
 
                        pcie5: pcie@5,0 {
                                device_type = "pci";
-                               assigned-addresses = <0x82000800 0 0x80000 0 0x2000>;
+                               assigned-addresses = <0x82002800 0 0x80000 0 0x2000>;
                                reg = <0x2800 0 0 0 0>;
                                #address-cells = <3>;
                                #size-cells = <2>;
@@ -234,7 +234,7 @@ pcie5_intc: interrupt-controller {
 
                        pcie6: pcie@6,0 {
                                device_type = "pci";
-                               assigned-addresses = <0x82000800 0 0x84000 0 0x2000>;
+                               assigned-addresses = <0x82003000 0 0x84000 0 0x2000>;
                                reg = <0x3000 0 0 0 0>;
                                #address-cells = <3>;
                                #size-cells = <2>;
@@ -262,7 +262,7 @@ pcie6_intc: interrupt-controller {
 
                        pcie7: pcie@7,0 {
                                device_type = "pci";
-                               assigned-addresses = <0x82000800 0 0x88000 0 0x2000>;
+                               assigned-addresses = <0x82003800 0 0x88000 0 0x2000>;
                                reg = <0x3800 0 0 0 0>;
                                #address-cells = <3>;
                                #size-cells = <2>;
@@ -290,7 +290,7 @@ pcie7_intc: interrupt-controller {
 
                        pcie8: pcie@8,0 {
                                device_type = "pci";
-                               assigned-addresses = <0x82000800 0 0x8c000 0 0x2000>;
+                               assigned-addresses = <0x82004000 0 0x8c000 0 0x2000>;
                                reg = <0x4000 0 0 0 0>;
                                #address-cells = <3>;
                                #size-cells = <2>;
@@ -318,7 +318,7 @@ pcie8_intc: interrupt-controller {
 
                        pcie9: pcie@9,0 {
                                device_type = "pci";
-                               assigned-addresses = <0x82000800 0 0x42000 0 0x2000>;
+                               assigned-addresses = <0x82004800 0 0x42000 0 0x2000>;
                                reg = <0x4800 0 0 0 0>;
                                #address-cells = <3>;
                                #size-cells = <2>;