projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f095946)
ARM: dts: armada-xp: Fix assigned-addresses for every PCIe Root Port
authorPali Rohár <pali@kernel.org>
Wed, 17 Aug 2022 22:30:50 +0000 (00:30 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 7 Jan 2023 11:07:12 +0000 (12:07 +0100)
[ Upstream commit eab276787f456cbea89fabea110fe0728673d308 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/arm/boot/dts/armada-xp-mv78230.dtsi patch | blob | blame | history
arch/arm/boot/dts/armada-xp-mv78260.dtsi patch | blob | blame | history

diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
index 6e6d0f04bf2b5fe6f5661a75074425b71a3d9fc8..b6e787b994addb98041d774cb5e4c09afb3f607d 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
@@ -133,7 +133,7 @@
 
                        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 @@
 
                        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>;
@@ -167,7 +167,7 @@
 
                        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>;
@@ -184,7 +184,7 @@
 
                        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 c5fdc99f0dbebb47f88e135a4013fdfb9d732772..a4856b05440a8012a8b87d4dea070dbb8fd0720c 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
@@ -148,7 +148,7 @@
 
                        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>;
@@ -165,7 +165,7 @@
 
                        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>;
@@ -182,7 +182,7 @@
 
                        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>;
@@ -199,7 +199,7 @@
 
                        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>;
@@ -216,7 +216,7 @@
 
                        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>;
@@ -233,7 +233,7 @@
 
                        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>;
@@ -250,7 +250,7 @@
 
                        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>;
@@ -267,7 +267,7 @@
 
                        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>;