Skip to contentSkip to conversation

Enable DM_SERIAL for the LS104xA RDB/FRWY boards

PATCH Superseded Camelia Groza 2 participants 12 messages Jun 15, 2023 – Jun 16, 2023 Arm (32-bit)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover Enable DM_SERIAL for the LS104xA RDB/FRWY boards

This series enables DM_SERIAL for ls1043ardb, ls1046ardb and ls1046afrwy.

First, the device tree serial nodes are synced with their counterpart descriptions in Linux.

Secondly, the serial nodes are tagged with 'bootph-all' to guarantee the drivers are initialized before relocation.

Lastly, CONFIG_DM_SERIAL is enabled in the relevant defconfigs.

Camelia Groza (7):
arch: arm: dts: ls1043a: sync serial nodes with Linux
arch: arm: dts: ls1043a: tag the serial nodes with bootph-all
configs: ls1043ardb: enable DM_SERIAL
arch: arm: dts: ls1046a: sync serial nodes with Linux
arch: arm: dts: ls1046a: tag the serial nodes with bootph-all
configs: ls1046ardb: enable DM_SERIAL
configs: ls1046afrwy: enable DM_SERIAL

 arch/arm/dts/fsl-ls1043a-qds.dtsi             |  2 +-
 arch/arm/dts/fsl-ls1043a-rdb.dts              |  6 +++-
 arch/arm/dts/fsl-ls1043a.dtsi                 | 20 +++++++++----
 arch/arm/dts/fsl-ls1046a-frwy.dts             | 22 ++++++++++++++-
 arch/arm/dts/fsl-ls1046a-qds.dtsi             |  2 +-
 arch/arm/dts/fsl-ls1046a-rdb.dts              | 14 +++++++++-
 arch/arm/dts/fsl-ls1046a.dtsi                 | 28 +++++++++++++------
 configs/ls1043ardb_SECURE_BOOT_defconfig      |  4 ++-
 configs/ls1043ardb_defconfig                  |  4 ++-
 configs/ls1043ardb_nand_SECURE_BOOT_defconfig |  4 ++-
 configs/ls1043ardb_nand_defconfig             |  3 +-
 .../ls1043ardb_sdcard_SECURE_BOOT_defconfig   |  4 ++-
 configs/ls1043ardb_sdcard_defconfig           |  3 +-
 configs/ls1043ardb_tfa_SECURE_BOOT_defconfig  |  4 ++-
 configs/ls1043ardb_tfa_defconfig              |  4 ++-
 configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig |  4 ++-
 configs/ls1046afrwy_tfa_defconfig             |  4 ++-
 configs/ls1046ardb_emmc_defconfig             |  3 +-
 configs/ls1046ardb_qspi_SECURE_BOOT_defconfig |  4 ++-
 configs/ls1046ardb_qspi_defconfig             |  4 ++-
 configs/ls1046ardb_qspi_spl_defconfig         |  3 +-
 .../ls1046ardb_sdcard_SECURE_BOOT_defconfig   |  4 ++-
 configs/ls1046ardb_sdcard_defconfig           |  3 +-
 configs/ls1046ardb_tfa_SECURE_BOOT_defconfig  |  4 ++-
 configs/ls1046ardb_tfa_defconfig              |  4 ++-
 25 files changed, 124 insertions(+), 37 deletions(-)

--
2.17.1

#1 lore raw

PATCH 1/7 arch: arm: dts: ls1043a: sync serial nodes with Linux

Pick up the serial node descriptions from Linux for the ls1043ardb board and its dependencies. Including the fsl,qoriq-clockgen.h and arm-gic.h headers forces us to change the include directives to explicitly go through the C preprocessor for all boards in the ls1043a SoC family.

---
 arch/arm/dts/fsl-ls1043a-qds.dtsi |  2 +-
 arch/arm/dts/fsl-ls1043a-rdb.dts  |  6 +++++-
 arch/arm/dts/fsl-ls1043a.dtsi     | 16 +++++++++++-----
 3 files changed, 17 insertions(+), 7 deletions(-)
arch/arm/dts/fsl-ls1043a-qds.dtsi +1 -1
index 884bdad196b3..5e02cd91d75f 100644
@@ -7,7 +7,7 @@
  * Mingkai Hu <[email protected]>
  */
 
-/include/ "fsl-ls1043a.dtsi"
+#include "fsl-ls1043a.dtsi"
 
 / {
 	model = "LS1043A QDS Board";
arch/arm/dts/fsl-ls1043a-rdb.dts +5 -1
index 9e7c79fd2b98..f5b3bb68b3db 100644
@@ -9,13 +9,17 @@
  */
 
 /dts-v1/;
-/include/ "fsl-ls1043a.dtsi"
+#include "fsl-ls1043a.dtsi"
 
 / {
 	model = "LS1043A RDB Board";
 
         aliases {
 		spi1 = &dspi0;
+		serial0 = &duart0;
+		serial1 = &duart1;
+		serial2 = &duart2;
+		serial3 = &duart3;
         };
 
 };
arch/arm/dts/fsl-ls1043a.dtsi +11 -5
index 4960973a6035..21643a1d951f 100644
@@ -8,7 +8,9 @@
  * Mingkai Hu <[email protected]>
  */
 
-/include/ "skeleton64.dtsi"
+#include "skeleton64.dtsi"
+#include <dt-bindings/clock/fsl,qoriq-clockgen.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
 
 / {
 	compatible = "fsl,ls1043a";
@@ -223,28 +225,32 @@
 			compatible = "fsl,ns16550", "ns16550a";
 			reg = <0x00 0x21c0500 0x0 0x100>;
 			interrupts = <0 54 0x4>;
-			clocks = <&clockgen 4 0>;
+			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
+					    QORIQ_CLK_PLL_DIV(1)>;
 		};
 
 		duart1: serial@21c0600 {
 			compatible = "fsl,ns16550", "ns16550a";
 			reg = <0x00 0x21c0600 0x0 0x100>;
 			interrupts = <0 54 0x4>;
-			clocks = <&clockgen 4 0>;
+			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
+					    QORIQ_CLK_PLL_DIV(1)>;
 		};
 
 		duart2: serial@21d0500 {
 			compatible = "fsl,ns16550", "ns16550a";
 			reg = <0x0 0x21d0500 0x0 0x100>;
 			interrupts = <0 55 0x4>;
-			clocks = <&clockgen 4 0>;
+			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
+					    QORIQ_CLK_PLL_DIV(1)>;
 		};
 
 		duart3: serial@21d0600 {
 			compatible = "fsl,ns16550", "ns16550a";
 			reg = <0x0 0x21d0600 0x0 0x100>;
 			interrupts = <0 55 0x4>;
-			clocks = <&clockgen 4 0>;
+			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
+					    QORIQ_CLK_PLL_DIV(1)>;
 		};
 
 		lpuart0: serial@2950000 {
Signature · 1 line
2.17.1
#2 lore raw

Re: [PATCH 1/7] arch: arm: dts: ls1043a: sync serial nodes with Linux

Quoted 4 lines · Camelia Groza

Pick up the serial node descriptions from Linux for the ls1043ardb board and its dependencies. Including the fsl,qoriq-clockgen.h and arm-gic.h headers forces us to change the include directives to explicitly go through the C preprocessor for all boards in the ls1043a SoC family.

Better add the tag or commit of linux kernel that you sync from.

Other than that, Acked-by: Peng Fan <[email protected]>

Quoted 96 lines
---
  arch/arm/dts/fsl-ls1043a-qds.dtsi |  2 +-
  arch/arm/dts/fsl-ls1043a-rdb.dts  |  6 +++++-
  arch/arm/dts/fsl-ls1043a.dtsi     | 16 +++++++++++-----
  3 files changed, 17 insertions(+), 7 deletions(-)
arch/arm/dts/fsl-ls1043a-qds.dtsi +1 -1
index 884bdad196b3..5e02cd91d75f 100644
@@ -7,7 +7,7 @@
   * Mingkai Hu <[email protected]>
   */
 
-/include/ "fsl-ls1043a.dtsi"
+#include "fsl-ls1043a.dtsi"
 
  / {
  	model = "LS1043A QDS Board";
arch/arm/dts/fsl-ls1043a-rdb.dts +5 -1
index 9e7c79fd2b98..f5b3bb68b3db 100644
@@ -9,13 +9,17 @@
   */
 
  /dts-v1/;
-/include/ "fsl-ls1043a.dtsi"
+#include "fsl-ls1043a.dtsi"
 
  / {
  	model = "LS1043A RDB Board";
 
          aliases {
  		spi1 = &dspi0;
+		serial0 = &duart0;
+		serial1 = &duart1;
+		serial2 = &duart2;
+		serial3 = &duart3;
          };
 
  };
arch/arm/dts/fsl-ls1043a.dtsi +11 -5
index 4960973a6035..21643a1d951f 100644
@@ -8,7 +8,9 @@
   * Mingkai Hu <[email protected]>
   */
 
-/include/ "skeleton64.dtsi"
+#include "skeleton64.dtsi"
+#include <dt-bindings/clock/fsl,qoriq-clockgen.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
 
  / {
  	compatible = "fsl,ls1043a";
@@ -223,28 +225,32 @@
  			compatible = "fsl,ns16550", "ns16550a";
  			reg = <0x00 0x21c0500 0x0 0x100>;
  			interrupts = <0 54 0x4>;
-			clocks = <&clockgen 4 0>;
+			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
+					    QORIQ_CLK_PLL_DIV(1)>;
  		};
 
  		duart1: serial@21c0600 {
  			compatible = "fsl,ns16550", "ns16550a";
  			reg = <0x00 0x21c0600 0x0 0x100>;
  			interrupts = <0 54 0x4>;
-			clocks = <&clockgen 4 0>;
+			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
+					    QORIQ_CLK_PLL_DIV(1)>;
  		};
 
  		duart2: serial@21d0500 {
  			compatible = "fsl,ns16550", "ns16550a";
  			reg = <0x0 0x21d0500 0x0 0x100>;
  			interrupts = <0 55 0x4>;
-			clocks = <&clockgen 4 0>;
+			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
+					    QORIQ_CLK_PLL_DIV(1)>;
  		};
 
  		duart3: serial@21d0600 {
  			compatible = "fsl,ns16550", "ns16550a";
  			reg = <0x0 0x21d0600 0x0 0x100>;
  			interrupts = <0 55 0x4>;
-			clocks = <&clockgen 4 0>;
+			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
+					    QORIQ_CLK_PLL_DIV(1)>;
  		};
 
  		lpuart0: serial@2950000 {
#3 lore raw

PATCH 2/7 arch: arm: dts: ls1043a: tag serial nodes with bootph-all

In reply to Camelia Groza

Make sure the serial driver is initialized before relocation by tagging the serial nodes with "bootph-all".

---
 arch/arm/dts/fsl-ls1043a.dtsi | 4 ++++
 1 file changed, 4 insertions(+)
arch/arm/dts/fsl-ls1043a.dtsi +4 -0
index 21643a1d951f..79f67e7183c3 100644
@@ -227,6 +227,7 @@
 			interrupts = <0 54 0x4>;
 			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
 					    QORIQ_CLK_PLL_DIV(1)>;
+			bootph-all;
 		};
 
 		duart1: serial@21c0600 {
@@ -235,6 +236,7 @@
 			interrupts = <0 54 0x4>;
 			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
 					    QORIQ_CLK_PLL_DIV(1)>;
+			bootph-all;
 		};
 
 		duart2: serial@21d0500 {
@@ -243,6 +245,7 @@
 			interrupts = <0 55 0x4>;
 			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
 					    QORIQ_CLK_PLL_DIV(1)>;
+			bootph-all;
 		};
 
 		duart3: serial@21d0600 {
@@ -251,6 +254,7 @@
 			interrupts = <0 55 0x4>;
 			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
 					    QORIQ_CLK_PLL_DIV(1)>;
+			bootph-all;
 		};
 
 		lpuart0: serial@2950000 {

--
2.17.1

#4 lore raw

Re: [PATCH 2/7] arch: arm: dts: ls1043a: tag serial nodes with bootph-all

Quoted 2 lines · Camelia Groza

Make sure the serial driver is initialized before relocation by tagging the serial nodes with "bootph-all".

Please add fsl-ls1043a-u-boot.dtsi for U-Boot specific changes.

Regards,
Peng.

Quoted 45 lines
---
  arch/arm/dts/fsl-ls1043a.dtsi | 4 ++++
  1 file changed, 4 insertions(+)
arch/arm/dts/fsl-ls1043a.dtsi +4 -1
index 21643a1d951f..79f67e7183c3 100644
@@ -227,6 +227,7 @@
  			interrupts = <0 54 0x4>;
  			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
  					    QORIQ_CLK_PLL_DIV(1)>;
+			bootph-all;
  		};
 
  		duart1: serial@21c0600 {
@@ -235,6 +236,7 @@
  			interrupts = <0 54 0x4>;
  			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
  					    QORIQ_CLK_PLL_DIV(1)>;
+			bootph-all;
  		};
 
  		duart2: serial@21d0500 {
@@ -243,6 +245,7 @@
  			interrupts = <0 55 0x4>;
  			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
  					    QORIQ_CLK_PLL_DIV(1)>;
+			bootph-all;
  		};
 
  		duart3: serial@21d0600 {
@@ -251,6 +254,7 @@
  			interrupts = <0 55 0x4>;
  			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
  					    QORIQ_CLK_PLL_DIV(1)>;
+			bootph-all;
  		};
 
  		lpuart0: serial@2950000 {
--

2.17.1

#5 lore raw

PATCH 3/7 configs: ls1043ardb: enable DM_SERIAL

In reply to Camelia Groza

As the serial devices are configured in the device tree, enable DM_SERIAL in the ls1043ardb defconfigs.

---
 configs/ls1043ardb_SECURE_BOOT_defconfig        | 4 +++-
 configs/ls1043ardb_defconfig                    | 4 +++-
 configs/ls1043ardb_nand_SECURE_BOOT_defconfig   | 4 +++-
 configs/ls1043ardb_nand_defconfig               | 3 ++-
 configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig | 4 +++-
 configs/ls1043ardb_sdcard_defconfig             | 3 ++-
 configs/ls1043ardb_tfa_SECURE_BOOT_defconfig    | 4 +++-
 configs/ls1043ardb_tfa_defconfig                | 4 +++-
 8 files changed, 22 insertions(+), 8 deletions(-)
configs/ls1043ardb_SECURE_BOOT_defconfig +3 -1
index 069a8dc0c3ce..ea195d7c5041 100644
@@ -86,7 +86,9 @@ CONFIG_NVME_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_SYS_QE_FW_ADDR=0x60940000
 CONFIG_SYS_QE_FMAN_FW_IN_NOR=y
-CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
+CONFIG_DM_SERIAL=y
+CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
configs/ls1043ardb_defconfig +3 -1
index e796c0a9a2e0..ae8600ffd958 100644
@@ -89,7 +89,9 @@ CONFIG_NVME_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_SYS_QE_FW_ADDR=0x60940000
 CONFIG_SYS_QE_FMAN_FW_IN_NOR=y
-CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
+CONFIG_DM_SERIAL=y
+CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
configs/ls1043ardb_nand_SECURE_BOOT_defconfig +3 -1
index f5faa02e5920..d9ff0fd16a58 100644
@@ -110,7 +110,9 @@ CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_SYS_QE_FMAN_FW_IN_NAND=y
-CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
+CONFIG_DM_SERIAL=y
+CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
configs/ls1043ardb_nand_defconfig +2 -1
index b75550b2d3ad..ad118187432e 100644
@@ -117,7 +117,8 @@ CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_SYS_QE_FMAN_FW_IN_NAND=y
-CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_DM_SERIAL=y
+CONFIG_SPL_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig +3 -1
index 3e0d16430e04..fe0dd04f1f90 100644
@@ -110,7 +110,9 @@ CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_SYS_QE_FW_ADDR=0x940000
 CONFIG_SYS_QE_FMAN_FW_IN_MMC=y
-CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
+CONFIG_DM_SERIAL=y
+CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
configs/ls1043ardb_sdcard_defconfig +2 -1
index 04e66f1e6ca2..aa5404cbb50e 100644
@@ -115,7 +115,8 @@ CONFIG_NVME_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_SYS_QE_FW_ADDR=0x940000
 CONFIG_SYS_QE_FMAN_FW_IN_MMC=y
-CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_DM_SERIAL=y
+CONFIG_SPL_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
configs/ls1043ardb_tfa_SECURE_BOOT_defconfig +3 -1
index cf4623eb631d..480e928936a9 100644
@@ -84,7 +84,9 @@ CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_SYS_QE_FW_ADDR=0x940000
-CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
+CONFIG_DM_SERIAL=y
+CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
configs/ls1043ardb_tfa_defconfig +3 -1
index 15e2916538a1..e25904170858 100644
@@ -90,7 +90,9 @@ CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_NVME_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_SYS_QE_FW_ADDR=0x940000
-CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
+CONFIG_DM_SERIAL=y
+CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y

--
2.17.1

#6 lore raw

PATCH 4/7 arch: arm: dts: ls1046a: sync serial nodes with Linux

In reply to Camelia Groza

Pick up the serial node descriptions from Linux for the ls1046ardb and ls1046afrwy boards and their dependencies. Including the fsl,qoriq-clockgen.h and arm-gic.h headers forces us to change the include directives to explicitly go through the C preprocessor for all boards in the ls1046a SoC family.

---
 arch/arm/dts/fsl-ls1046a-frwy.dts | 22 +++++++++++++++++++++-
 arch/arm/dts/fsl-ls1046a-qds.dtsi |  2 +-
 arch/arm/dts/fsl-ls1046a-rdb.dts  | 14 +++++++++++++-
 arch/arm/dts/fsl-ls1046a.dtsi     | 24 +++++++++++++++---------
 4 files changed, 50 insertions(+), 12 deletions(-)
arch/arm/dts/fsl-ls1046a-frwy.dts +21 -1
index cda05411d881..f3ba2acd6d51 100644
@@ -7,17 +7,37 @@
  */
 
 /dts-v1/;
-/include/ "fsl-ls1046a.dtsi"
+#include "fsl-ls1046a.dtsi"
 
 / {
 	model = "LS1046A FRWY Board";
 
 	aliases {
 		spi0 = &qspi;
+		serial0 = &duart0;
+		serial1 = &duart1;
+		serial2 = &duart2;
+		serial3 = &duart3;
 	};
 
 };
 
+&duart0 {
+	status = "okay";
+};
+
+&duart1 {
+	status = "okay";
+};
+
+&duart2 {
+	status = "okay";
+};
+
+&duart3 {
+	status = "okay";
+};
+
 &qspi {
 	status = "okay";
 
arch/arm/dts/fsl-ls1046a-qds.dtsi +1 -1
index fec5c8ddb23a..d66824975c5e 100644
@@ -7,7 +7,7 @@
  * Mingkai Hu <[email protected]>
  */
 
-/include/ "fsl-ls1046a.dtsi"
+#include "fsl-ls1046a.dtsi"
 
 / {
 	model = "LS1046A QDS Board";
arch/arm/dts/fsl-ls1046a-rdb.dts +13 -1
index 464129291c91..66d718905c7d 100644
@@ -9,17 +9,29 @@
  */
 
 /dts-v1/;
-/include/ "fsl-ls1046a.dtsi"
+#include "fsl-ls1046a.dtsi"
 
 / {
 	model = "LS1046A RDB Board";
 
 	aliases {
 		spi0 = &qspi;
+		serial0 = &duart0;
+		serial1 = &duart1;
+		serial2 = &duart2;
+		serial3 = &duart3;
 	};
 
 };
 
+&duart0 {
+	status = "okay";
+};
+
+&duart1 {
+	status = "okay";
+};
+
 &qspi {
 	status = "okay";
 
arch/arm/dts/fsl-ls1046a.dtsi +15 -9
index 060dc399c2f6..9fdd398e2c4c 100644
@@ -8,7 +8,9 @@
  * Mingkai Hu <[email protected]>
  */
 
-/include/ "skeleton64.dtsi"
+#include "skeleton64.dtsi"
+#include <dt-bindings/clock/fsl,qoriq-clockgen.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
 
 / {
 	compatible = "fsl,ls1046a";
@@ -222,29 +224,33 @@
 		duart0: serial@21c0500 {
 			compatible = "fsl,ns16550", "ns16550a";
 			reg = <0x00 0x21c0500 0x0 0x100>;
-			interrupts = <0 54 0x4>;
-			clocks = <&clockgen 4 0>;
+			interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
+					    QORIQ_CLK_PLL_DIV(2)>;
 		};
 
 		duart1: serial@21c0600 {
 			compatible = "fsl,ns16550", "ns16550a";
 			reg = <0x00 0x21c0600 0x0 0x100>;
-			interrupts = <0 54 0x4>;
-			clocks = <&clockgen 4 0>;
+			interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
+					    QORIQ_CLK_PLL_DIV(2)>;
 		};
 
 		duart2: serial@21d0500 {
 			compatible = "fsl,ns16550", "ns16550a";
 			reg = <0x0 0x21d0500 0x0 0x100>;
-			interrupts = <0 55 0x4>;
-			clocks = <&clockgen 4 0>;
+			interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
+					    QORIQ_CLK_PLL_DIV(2)>;
 		};
 
 		duart3: serial@21d0600 {
 			compatible = "fsl,ns16550", "ns16550a";
 			reg = <0x0 0x21d0600 0x0 0x100>;
-			interrupts = <0 55 0x4>;
-			clocks = <&clockgen 4 0>;
+			interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
+					    QORIQ_CLK_PLL_DIV(2)>;
 		};
 
 		lpuart0: serial@2950000 {
Signature · 1 line
2.17.1
#7 lore raw

Re: [PATCH 4/7] arch: arm: dts: ls1046a: sync serial nodes with Linux

Quoted 5 lines · Camelia Groza

Pick up the serial node descriptions from Linux for the ls1046ardb and ls1046afrwy boards and their dependencies. Including the fsl,qoriq-clockgen.h and arm-gic.h headers forces us to change the include directives to explicitly go through the C preprocessor for all boards in the ls1046a SoC family.

Add the tag or commit of linux kernel.

Regards,
Peng.

Quoted 157 lines
---
  arch/arm/dts/fsl-ls1046a-frwy.dts | 22 +++++++++++++++++++++-
  arch/arm/dts/fsl-ls1046a-qds.dtsi |  2 +-
  arch/arm/dts/fsl-ls1046a-rdb.dts  | 14 +++++++++++++-
  arch/arm/dts/fsl-ls1046a.dtsi     | 24 +++++++++++++++---------
  4 files changed, 50 insertions(+), 12 deletions(-)
arch/arm/dts/fsl-ls1046a-frwy.dts +21 -1
index cda05411d881..f3ba2acd6d51 100644
@@ -7,17 +7,37 @@
   */
 
  /dts-v1/;
-/include/ "fsl-ls1046a.dtsi"
+#include "fsl-ls1046a.dtsi"
 
  / {
  	model = "LS1046A FRWY Board";
 
  	aliases {
  		spi0 = &qspi;
+		serial0 = &duart0;
+		serial1 = &duart1;
+		serial2 = &duart2;
+		serial3 = &duart3;
  	};
 
  };
 
+&duart0 {
+	status = "okay";
+};
+
+&duart1 {
+	status = "okay";
+};
+
+&duart2 {
+	status = "okay";
+};
+
+&duart3 {
+	status = "okay";
+};
+
  &qspi {
  	status = "okay";
 
arch/arm/dts/fsl-ls1046a-qds.dtsi +1 -1
index fec5c8ddb23a..d66824975c5e 100644
@@ -7,7 +7,7 @@
   * Mingkai Hu <[email protected]>
   */
 
-/include/ "fsl-ls1046a.dtsi"
+#include "fsl-ls1046a.dtsi"
 
  / {
  	model = "LS1046A QDS Board";
arch/arm/dts/fsl-ls1046a-rdb.dts +13 -1
index 464129291c91..66d718905c7d 100644
@@ -9,17 +9,29 @@
   */
 
  /dts-v1/;
-/include/ "fsl-ls1046a.dtsi"
+#include "fsl-ls1046a.dtsi"
 
  / {
  	model = "LS1046A RDB Board";
 
  	aliases {
  		spi0 = &qspi;
+		serial0 = &duart0;
+		serial1 = &duart1;
+		serial2 = &duart2;
+		serial3 = &duart3;
  	};
 
  };
 
+&duart0 {
+	status = "okay";
+};
+
+&duart1 {
+	status = "okay";
+};
+
  &qspi {
  	status = "okay";
 
arch/arm/dts/fsl-ls1046a.dtsi +15 -9
index 060dc399c2f6..9fdd398e2c4c 100644
@@ -8,7 +8,9 @@
   * Mingkai Hu <[email protected]>
   */
 
-/include/ "skeleton64.dtsi"
+#include "skeleton64.dtsi"
+#include <dt-bindings/clock/fsl,qoriq-clockgen.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
 
  / {
  	compatible = "fsl,ls1046a";
@@ -222,29 +224,33 @@
  		duart0: serial@21c0500 {
  			compatible = "fsl,ns16550", "ns16550a";
  			reg = <0x00 0x21c0500 0x0 0x100>;
-			interrupts = <0 54 0x4>;
-			clocks = <&clockgen 4 0>;
+			interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
+					    QORIQ_CLK_PLL_DIV(2)>;
  		};
 
  		duart1: serial@21c0600 {
  			compatible = "fsl,ns16550", "ns16550a";
  			reg = <0x00 0x21c0600 0x0 0x100>;
-			interrupts = <0 54 0x4>;
-			clocks = <&clockgen 4 0>;
+			interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
+					    QORIQ_CLK_PLL_DIV(2)>;
  		};
 
  		duart2: serial@21d0500 {
  			compatible = "fsl,ns16550", "ns16550a";
  			reg = <0x0 0x21d0500 0x0 0x100>;
-			interrupts = <0 55 0x4>;
-			clocks = <&clockgen 4 0>;
+			interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
+					    QORIQ_CLK_PLL_DIV(2)>;
  		};
 
  		duart3: serial@21d0600 {
  			compatible = "fsl,ns16550", "ns16550a";
  			reg = <0x0 0x21d0600 0x0 0x100>;
-			interrupts = <0 55 0x4>;
-			clocks = <&clockgen 4 0>;
+			interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
+					    QORIQ_CLK_PLL_DIV(2)>;
  		};
 
  		lpuart0: serial@2950000 {
#8 lore raw

PATCH 5/7 arch: arm: dts: ls1046a: tag serial nodes with bootph-all

In reply to Camelia Groza

Make sure the serial driver is initialized before relocation by tagging the serial nodes with "bootph-all".

---
 arch/arm/dts/fsl-ls1046a.dtsi | 4 ++++
 1 file changed, 4 insertions(+)
arch/arm/dts/fsl-ls1046a.dtsi +4 -0
index 9fdd398e2c4c..3986360c0c93 100644
@@ -227,6 +227,7 @@
 			interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
 					    QORIQ_CLK_PLL_DIV(2)>;
+			bootph-all;
 		};
 
 		duart1: serial@21c0600 {
@@ -235,6 +236,7 @@
 			interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
 					    QORIQ_CLK_PLL_DIV(2)>;
+			bootph-all;
 		};
 
 		duart2: serial@21d0500 {
@@ -243,6 +245,7 @@
 			interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
 					    QORIQ_CLK_PLL_DIV(2)>;
+			bootph-all;
 		};
 
 		duart3: serial@21d0600 {
@@ -251,6 +254,7 @@
 			interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
 					    QORIQ_CLK_PLL_DIV(2)>;
+			bootph-all;
 		};
 
 		lpuart0: serial@2950000 {

--
2.17.1

#9 lore raw

Re: [PATCH 5/7] arch: arm: dts: ls1046a: tag serial nodes with bootph-all

Quoted 2 lines · Camelia Groza

Make sure the serial driver is initialized before relocation by tagging the serial nodes with "bootph-all".

Add fsl-ls1046a-u-boot.dtsi for U-Boot specific changes.

Thanks,
Peng.

Quoted 45 lines
---
  arch/arm/dts/fsl-ls1046a.dtsi | 4 ++++
  1 file changed, 4 insertions(+)
arch/arm/dts/fsl-ls1046a.dtsi +4 -1
index 9fdd398e2c4c..3986360c0c93 100644
@@ -227,6 +227,7 @@
  			interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
  			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
  					    QORIQ_CLK_PLL_DIV(2)>;
+			bootph-all;
  		};
 
  		duart1: serial@21c0600 {
@@ -235,6 +236,7 @@
  			interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
  			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
  					    QORIQ_CLK_PLL_DIV(2)>;
+			bootph-all;
  		};
 
  		duart2: serial@21d0500 {
@@ -243,6 +245,7 @@
  			interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
  			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
  					    QORIQ_CLK_PLL_DIV(2)>;
+			bootph-all;
  		};
 
  		duart3: serial@21d0600 {
@@ -251,6 +254,7 @@
  			interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
  			clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
  					    QORIQ_CLK_PLL_DIV(2)>;
+			bootph-all;
  		};
 
  		lpuart0: serial@2950000 {
--

2.17.1

#10 lore raw

PATCH 6/7 configs: ls1046ardb: enable DM_SERIAL

In reply to Camelia Groza

As the serial devices are configured in the device tree, enable DM_SERIAL in the ls1046ardb defconfigs.

---
 configs/ls1046ardb_emmc_defconfig               | 3 ++-
 configs/ls1046ardb_qspi_SECURE_BOOT_defconfig   | 4 +++-
 configs/ls1046ardb_qspi_defconfig               | 4 +++-
 configs/ls1046ardb_qspi_spl_defconfig           | 3 ++-
 configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig | 4 +++-
 configs/ls1046ardb_sdcard_defconfig             | 3 ++-
 configs/ls1046ardb_tfa_SECURE_BOOT_defconfig    | 4 +++-
 configs/ls1046ardb_tfa_defconfig                | 4 +++-
 8 files changed, 21 insertions(+), 8 deletions(-)
configs/ls1046ardb_emmc_defconfig +2 -1
index 7be98df566fc..924ff78b4593 100644
@@ -111,7 +111,8 @@ CONFIG_POWER_LEGACY=y
 CONFIG_POWER_I2C=y
 CONFIG_SYS_QE_FMAN_FW_IN_MMC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_DM_SERIAL=y
+CONFIG_SPL_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1046ardb_qspi_SECURE_BOOT_defconfig +3 -1
index 3cefae092f34..bb278845e069 100644
@@ -86,7 +86,9 @@ CONFIG_POWER_LEGACY=y
 CONFIG_POWER_I2C=y
 CONFIG_SYS_QE_FMAN_FW_IN_SPIFLASH=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
+CONFIG_DM_SERIAL=y
+CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1046ardb_qspi_defconfig +3 -1
index 02979dd2ff01..0fb1a6c281e5 100644
@@ -90,7 +90,9 @@ CONFIG_POWER_LEGACY=y
 CONFIG_POWER_I2C=y
 CONFIG_SYS_QE_FMAN_FW_IN_SPIFLASH=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
+CONFIG_DM_SERIAL=y
+CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1046ardb_qspi_spl_defconfig +2 -1
index 8f7d05fab976..eb0184c59276 100644
@@ -118,7 +118,8 @@ CONFIG_POWER_LEGACY=y
 CONFIG_POWER_I2C=y
 CONFIG_SYS_QE_FMAN_FW_IN_SPIFLASH=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_DM_SERIAL=y
+CONFIG_SPL_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig +3 -1
index 900e26be3be0..2813c79f5975 100644
@@ -109,7 +109,9 @@ CONFIG_POWER_LEGACY=y
 CONFIG_POWER_I2C=y
 CONFIG_SYS_QE_FMAN_FW_IN_MMC=y
 CONFIG_SCSI_AHCI_PLAT=y
-CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
+CONFIG_DM_SERIAL=y
+CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1046ardb_sdcard_defconfig +2 -1
index ded6be50a3f6..a621859aa792 100644
@@ -111,7 +111,8 @@ CONFIG_POWER_LEGACY=y
 CONFIG_POWER_I2C=y
 CONFIG_SYS_QE_FMAN_FW_IN_MMC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_DM_SERIAL=y
+CONFIG_SPL_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1046ardb_tfa_SECURE_BOOT_defconfig +3 -1
index 3eaa985ec79b..fbcf294eb534 100644
@@ -79,7 +79,9 @@ CONFIG_PCIE_LAYERSCAPE_EP=y
 CONFIG_POWER_LEGACY=y
 CONFIG_POWER_I2C=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
+CONFIG_DM_SERIAL=y
+CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1046ardb_tfa_defconfig +3 -1
index 7e8d86d03c4c..24a54230f8ee 100644
@@ -85,7 +85,9 @@ CONFIG_PCIE_LAYERSCAPE_EP=y
 CONFIG_POWER_LEGACY=y
 CONFIG_POWER_I2C=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
+CONFIG_DM_SERIAL=y
+CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y

--
2.17.1

#11 lore raw

PATCH 7/7 configs: ls1046afrwy: enable DM_SERIAL

In reply to Camelia Groza

As the serial devices are configured in the device tree, enable DM_SERIAL in the ls1046afrwy defconfigs.

---
 configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig | 4 +++-
 configs/ls1046afrwy_tfa_defconfig             | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)
configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig +3 -1
index 8d6a1371acb7..e97092f2c9b7 100644
@@ -67,7 +67,9 @@ CONFIG_FMAN_ENET=y
 CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
+CONFIG_DM_SERIAL=y
+CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1046afrwy_tfa_defconfig +3 -1
index e5d2b556f783..fdf08ad3c63c 100644
@@ -76,7 +76,9 @@ CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_PCIE_LAYERSCAPE_EP=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
+CONFIG_DM_SERIAL=y
+CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y

--
2.17.1