diff mbox series

[13/15] arm: dts: ls1028a-rdb: enable PCIe controllers from U-Boot dtsi

Message ID 20211202145409.2482099-14-vladimir.oltean@nxp.com
State Superseded
Delegated to: Priyanka Jain
Headers show
Series Sync NXP LS1028A-RDB device trees between U-Boot and Linux | expand

Commit Message

Vladimir Oltean Dec. 2, 2021, 2:54 p.m. UTC 
Reuse the scheme implemented by the Kontron SL28 boards in commit
d08011d7f9b4 ("arm: dts: ls1028a: disable the PCIe controller by
default") and move the 'status = "okay"' lines for the PCIe controllers
inside a separate U-Boot dtsi for the LS1028A-RDB board. This way, the
existing Linux device tree can simply be dropped in.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 arch/arm/dts/fsl-ls1028a-rdb-u-boot.dtsi | 14 ++++++++++++++
 arch/arm/dts/fsl-ls1028a-rdb.dts         |  9 +--------
 2 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 arch/arm/dts/fsl-ls1028a-rdb-u-boot.dtsi
diff mbox series

Patch

diff --git a/arch/arm/dts/fsl-ls1028a-rdb-u-boot.dtsi b/arch/arm/dts/fsl-ls1028a-rdb-u-boot.dtsi
new file mode 100644
index 000000000000..34aa87f1ab93
--- /dev/null
+++ b/arch/arm/dts/fsl-ls1028a-rdb-u-boot.dtsi
@@ -0,0 +1,14 @@ 
+// SPDX-License-Identifier: GPL-2.0+
+
+/*
+ * u-boot will enable the device in the linux device tree in place. Because
+ * we are using the linux device tree, we have to enable the PCI controller
+ * ourselves.
+ */
+&pcie1 {
+	status = "okay";
+};
+
+&pcie2 {
+	status = "okay";
+};
diff --git a/arch/arm/dts/fsl-ls1028a-rdb.dts b/arch/arm/dts/fsl-ls1028a-rdb.dts
index c346ad9b881c..9b69c2848331 100644
--- a/arch/arm/dts/fsl-ls1028a-rdb.dts
+++ b/arch/arm/dts/fsl-ls1028a-rdb.dts
@@ -9,6 +9,7 @@ 
 /dts-v1/;
 
 #include "fsl-ls1028a.dtsi"
+#include "fsl-ls1028a-rdb-u-boot.dtsi"
 
 / {
 	model = "NXP Layerscape 1028a RDB Board";
@@ -153,14 +154,6 @@ 
 	status = "okay";
 };
 
-&pcie1 {
-	status = "okay";
-};
-
-&pcie2 {
-	status = "okay";
-};
-
 &sata {
 	status = "okay";
 };