Enable DM_SERIAL for the LS104xA RDB/FRWY boards
v2 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 v6.3.
Secondly, the serial nodes are tagged with 'bootph-all' to guarantee the drivers are initialized before relocation. New board specific *-u-boot.dtsi files are created to store these properties. We do this in order to keep serial node descriptions in sync with Linux.
Lastly, CONFIG_DM_SERIAL is enabled in the relevant defconfigs.
Changes in v2:
- mention the Linux kernel version the serial nodes are synced with in 1/7 and 4/7
- create *-u-boot.dtsi files to store u-boot specific dts properties in 2/7 and 5/7
- pick up the status properties of the serial nodes from Linux in 4/7
Camelia Groza (7):
arch: arm: dts: ls1043a: sync serial nodes with Linux
arch: arm: dts: ls1043a: tag serial nodes with bootph-all
configs: ls1043ardb: enable DM_SERIAL
arch: arm: dts: ls1046a: sync serial nodes with Linux
arch: arm: dts: ls1046a: tag 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-u-boot.dtsi | 5 ++++ arch/arm/dts/fsl-ls1043a-rdb.dts | 6 +++- arch/arm/dts/fsl-ls1043a-u-boot.dtsi | 19 +++++++++++++ arch/arm/dts/fsl-ls1043a.dtsi | 16 +++++++---- arch/arm/dts/fsl-ls1046a-frwy-u-boot.dtsi | 5 ++++ arch/arm/dts/fsl-ls1046a-frwy.dts | 22 ++++++++++++++- arch/arm/dts/fsl-ls1046a-qds.dtsi | 2 +- arch/arm/dts/fsl-ls1046a-rdb-u-boot.dtsi | 5 ++++ arch/arm/dts/fsl-ls1046a-rdb.dts | 14 +++++++++- arch/arm/dts/fsl-ls1046a-u-boot.dtsi | 19 +++++++++++++ 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 ++- 30 files changed, 173 insertions(+), 37 deletions(-) create mode 100644 arch/arm/dts/fsl-ls1043a-rdb-u-boot.dtsi create mode 100644 arch/arm/dts/fsl-ls1043a-u-boot.dtsi create mode 100644 arch/arm/dts/fsl-ls1046a-frwy-u-boot.dtsi create mode 100644 arch/arm/dts/fsl-ls1046a-rdb-u-boot.dtsi create mode 100644 arch/arm/dts/fsl-ls1046a-u-boot.dtsi
--
2.17.1
PATCH v2 1/7 arch: arm: dts: ls1043a: sync serial nodes with Linux
Pick up the serial node descriptions from Linux v6.3 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.
---
V2:
- mention the Linux kernel version the serial nodes are synced with
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
@@ -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
@@ -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
@@ -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 {
--
2.17.1
PATCH v2 2/7 arch: arm: dts: ls1043a: tag serial nodes with bootph-all
In reply to Camelia GrozaMake sure the serial driver is initialized before relocation by tagging the serial nodes with "bootph-all".
In order to keep the serial nodes in sync with their representation in the Linux dts, add these u-boot specific properties to *-u-boot.dtsi files.
---
V2:
- create *-u-boot.dtsi files to store u-boot specific dts properties instead of adding them to the main board dts
arch/arm/dts/fsl-ls1043a-rdb-u-boot.dtsi | 5 +++++ arch/arm/dts/fsl-ls1043a-u-boot.dtsi | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 arch/arm/dts/fsl-ls1043a-rdb-u-boot.dtsi create mode 100644 arch/arm/dts/fsl-ls1043a-u-boot.dtsi
arch/arm/dts/fsl-ls1043a-rdb-u-boot.dtsi new file +5 -0
@@ -0,0 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* Copyright 2023 NXP */ + +#include "fsl-ls1043a-u-boot.dtsi" +
arch/arm/dts/fsl-ls1043a-u-boot.dtsi new file +19 -0
@@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* Copyright 2023 NXP */ + +&duart0 { + bootph-all; +}; + +&duart1 { + bootph-all; +}; + +&duart2 { + bootph-all; +}; + +&duart3 { + bootph-all; +}; +
--
2.17.1
PATCH v2 3/7 configs: ls1043ardb: enable DM_SERIAL
In reply to Camelia GrozaAs 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
PATCH v2 4/7 arch: arm: dts: ls1046a: sync serial nodes with Linux
In reply to Camelia GrozaPick up the serial node descriptions from Linux v6.3 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.
---
V2:
- mention the Linux kernel version the serial nodes are synced with
- also pick up the status properties of the serial nodes from Linux
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 +++++++++++++++++++--------- 4 files changed, 54 insertions(+), 12 deletions(-)
arch/arm/dts/fsl-ls1046a-frwy.dts +21 -1
@@ -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
@@ -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
@@ -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 +19 -9
@@ -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,37 @@ 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)>; + status = "disabled"; }; 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)>; + status = "disabled"; }; 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)>; + status = "disabled"; }; 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)>; + status = "disabled"; }; lpuart0: serial@2950000 {
--
2.17.1
PATCH v2 5/7 arch: arm: dts: ls1046a: tag serial nodes with bootph-all
In reply to Camelia GrozaMake sure the serial driver is initialized before relocation by tagging the serial nodes with "bootph-all".
In order to keep the serial nodes in sync with their representation in the Linux dts, add these u-boot specific properties to *-u-boot.dtsi files.
---
V2:
- create *-u-boot.dtsi files to store u-boot specific dts properties instead of adding them to the main board dts
arch/arm/dts/fsl-ls1046a-frwy-u-boot.dtsi | 5 +++++ arch/arm/dts/fsl-ls1046a-rdb-u-boot.dtsi | 5 +++++ arch/arm/dts/fsl-ls1046a-u-boot.dtsi | 19 +++++++++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 arch/arm/dts/fsl-ls1046a-frwy-u-boot.dtsi create mode 100644 arch/arm/dts/fsl-ls1046a-rdb-u-boot.dtsi create mode 100644 arch/arm/dts/fsl-ls1046a-u-boot.dtsi
arch/arm/dts/fsl-ls1046a-frwy-u-boot.dtsi new file +5 -0
@@ -0,0 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* Copyright 2023 NXP */ + +#include "fsl-ls1046a-u-boot.dtsi" +
arch/arm/dts/fsl-ls1046a-rdb-u-boot.dtsi new file +5 -0
@@ -0,0 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* Copyright 2023 NXP */ + +#include "fsl-ls1046a-u-boot.dtsi" +
arch/arm/dts/fsl-ls1046a-u-boot.dtsi new file +19 -0
@@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* Copyright 2023 NXP */ + +&duart0 { + bootph-all; +}; + +&duart1 { + bootph-all; +}; + +&duart2 { + bootph-all; +}; + +&duart3 { + bootph-all; +}; +
--
2.17.1
PATCH v2 6/7 configs: ls1046ardb: enable DM_SERIAL
In reply to Camelia GrozaAs 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
PATCH v2 7/7 configs: ls1046afrwy: enable DM_SERIAL
In reply to Camelia GrozaAs 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
@@ -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
@@ -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
Quoted 6 lines · Camelia Groza
This series enables
DM_SERIALfor ls1043ardb, ls1046ardb and ls1046afrwy.First, the device tree serial nodes are synced with their counterpart descriptions in Linux v6.3.
Quoted 6 lines
Secondly, the serial nodes are tagged with 'bootph-all' to guarantee the drivers are initialized before relocation. New board specific *-u-boot.dtsi files are created to store these properties. We do this in order to keep serial node descriptions in sync with Linux.
Lastly,
CONFIG_DM_SERIALis enabled in the relevant defconfigs.
For the patchset,
Quoted 57 lines
Changes in v2:
- mention the Linux kernel version the serial nodes are synced with in 1/7 and 4/7
- create *-u-boot.dtsi files to store u-boot specific dts properties in 2/7 and 5/7
- pick up the status properties of the serial nodes from Linux in 4/7Camelia Groza (7):
arch: arm: dts: ls1043a: sync serial nodes with Linux
arch: arm: dts: ls1043a: tag serial nodes with bootph-all
configs: ls1043ardb: enableDM_SERIAL
arch: arm: dts: ls1046a: sync serial nodes with Linux
arch: arm: dts: ls1046a: tag serial nodes with bootph-all
configs: ls1046ardb: enableDM_SERIAL
configs: ls1046afrwy: enableDM_SERIALarch/arm/dts/fsl-ls1043a-qds.dtsi | 2 +- arch/arm/dts/fsl-ls1043a-rdb-u-boot.dtsi | 5 ++++ arch/arm/dts/fsl-ls1043a-rdb.dts | 6 +++- arch/arm/dts/fsl-ls1043a-u-boot.dtsi | 19 +++++++++++++ arch/arm/dts/fsl-ls1043a.dtsi | 16 +++++++---- arch/arm/dts/fsl-ls1046a-frwy-u-boot.dtsi | 5 ++++ arch/arm/dts/fsl-ls1046a-frwy.dts | 22 ++++++++++++++- arch/arm/dts/fsl-ls1046a-qds.dtsi | 2 +- arch/arm/dts/fsl-ls1046a-rdb-u-boot.dtsi | 5 ++++ arch/arm/dts/fsl-ls1046a-rdb.dts | 14 +++++++++- arch/arm/dts/fsl-ls1046a-u-boot.dtsi | 19 +++++++++++++ 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 ++- 30 files changed, 173 insertions(+), 37 deletions(-)create mode 100644
arch/arm/dts/fsl-ls1043a-rdb-u-boot.dtsicreate mode 100644arch/arm/dts/fsl-ls1043a-u-boot.dtsicreate mode 100644arch/arm/dts/fsl-ls1046a-frwy-u-boot.dtsicreate mode 100644arch/arm/dts/fsl-ls1046a-rdb-u-boot.dtsicreate mode 100644arch/arm/dts/fsl-ls1046a-u-boot.dtsi--
2.17.1