diff mbox series

[08/18] arm: dts: fsl-ls1088a: match Linux FDT by disabling PCIe by default

Message ID 20230412073830.13928-9-matt@traverse.com.au
State Accepted
Commit 843f60b4e8b6bd31e4a2ece3eb028f5e04cae9c9
Delegated to: Peng Fan
Headers show
Series Synchronise LS1088A/Ten64 device tree with Linux | expand

Commit Message

Mathew McBride April 12, 2023, 7:38 a.m. UTC
The Linux kernel fsl-ls1088a.dtsi disables (status="disabled")
all PCIe controllers by default, with the bootloader (i.e U-Boot)
enabling the appropriate controllers (specified by the board
reset control word/RCW) by FDT fixup.

However, U-Boot needs these controllers to be enabled
to be usable, which we can add in the u-boot only dtsi.

Signed-off-by: Mathew McBride <matt@traverse.com.au>
---
 arch/arm/dts/fsl-ls1088a-u-boot.dtsi | 13 +++++++++++++
 arch/arm/dts/fsl-ls1088a.dtsi        |  3 +++
 2 files changed, 16 insertions(+)

Comments

Peng Fan (OSS) April 28, 2023, 3:27 a.m. UTC | #1
On 4/12/2023 3:38 PM, Mathew McBride wrote:
> The Linux kernel fsl-ls1088a.dtsi disables (status="disabled")
> all PCIe controllers by default, with the bootloader (i.e U-Boot)
> enabling the appropriate controllers (specified by the board
> reset control word/RCW) by FDT fixup.
> 
> However, U-Boot needs these controllers to be enabled
> to be usable, which we can add in the u-boot only dtsi.
> 
> Signed-off-by: Mathew McBride<matt@traverse.com.au>

Reviewed-by: Peng Fan <peng.fan@nxp.com>
diff mbox series

Patch

diff --git a/arch/arm/dts/fsl-ls1088a-u-boot.dtsi b/arch/arm/dts/fsl-ls1088a-u-boot.dtsi
index 3eb45d47cd..ac30b813ff 100644
--- a/arch/arm/dts/fsl-ls1088a-u-boot.dtsi
+++ b/arch/arm/dts/fsl-ls1088a-u-boot.dtsi
@@ -16,3 +16,16 @@ 
 &duart1 {
 	bootph-all;
 };
+
+&pcie1 {
+	status = "okay";
+};
+
+&pcie2 {
+	status = "okay";
+};
+
+&pcie3 {
+	status = "okay";
+};
+
diff --git a/arch/arm/dts/fsl-ls1088a.dtsi b/arch/arm/dts/fsl-ls1088a.dtsi
index 71d652c818..85316ddb66 100644
--- a/arch/arm/dts/fsl-ls1088a.dtsi
+++ b/arch/arm/dts/fsl-ls1088a.dtsi
@@ -104,6 +104,7 @@ 
 					<0000 0 0 3 &gic 0 0 0 111 IRQ_TYPE_LEVEL_HIGH>,
 					<0000 0 0 4 &gic 0 0 0 112 IRQ_TYPE_LEVEL_HIGH>;
 			iommu-map = <0 &smmu 0 1>; /* Fixed-up by bootloader */
+			status = "disabled";
 		};
 
 		pcie_ep1: pcie-ep@3400000 {
@@ -140,6 +141,7 @@ 
 					<0000 0 0 3 &gic 0 0 0 116 IRQ_TYPE_LEVEL_HIGH>,
 					<0000 0 0 4 &gic 0 0 0 117 IRQ_TYPE_LEVEL_HIGH>;
 			iommu-map = <0 &smmu 0 1>; /* Fixed-up by bootloader */
+			status = "disabled";
 		};
 
 		pcie_ep2: pcie-ep@3500000 {
@@ -175,6 +177,7 @@ 
 					<0000 0 0 3 &gic 0 0 0 121 IRQ_TYPE_LEVEL_HIGH>,
 					<0000 0 0 4 &gic 0 0 0 122 IRQ_TYPE_LEVEL_HIGH>;
 			iommu-map = <0 &smmu 0 1>; /* Fixed-up by bootloader */
+			status = "disabled";
 		};
 
 		pcie_ep3: pcie-ep@3600000 {