Enable DM_SERIAL for the LS104xA RDB/FRWY boards
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
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
@@ -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 {
Signature · 1 line
2.17.1
PATCH 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".
--- arch/arm/dts/fsl-ls1043a.dtsi | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/dts/fsl-ls1043a.dtsi +4 -0
@@ -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
PATCH 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 4/7 arch: arm: dts: ls1046a: sync serial nodes with Linux
In reply to Camelia GrozaPick 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
@@ -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 +15 -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,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
PATCH 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".
--- arch/arm/dts/fsl-ls1046a.dtsi | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/dts/fsl-ls1046a.dtsi +4 -0
@@ -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
PATCH 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
PATCH 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
Re: [PATCH 1/7] arch: arm: dts: ls1043a: sync serial nodes with Linux
In reply to Camelia GrozaQuoted 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.hheaders 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
Signed-off-by Camelia Groza <[email protected]>--- 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 {
Re: [PATCH 2/7] arch: arm: dts: ls1043a: tag serial nodes with bootph-all
In reply to Camelia GrozaQuoted 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
Signed-off-by Camelia Groza <[email protected]>--- arch/arm/dts/fsl-ls1043a.dtsi | 4 ++++ 1 file changed, 4 insertions(+)arch/arm/dts/fsl-ls1043a.dtsi +4
-1@@ -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
Re: [PATCH 4/7] arch: arm: dts: ls1046a: sync serial nodes with Linux
In reply to Camelia GrozaQuoted 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.hheaders 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
Signed-off-by Camelia Groza <[email protected]>--- 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@@ -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 +15
-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,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 {
Re: [PATCH 5/7] arch: arm: dts: ls1046a: tag serial nodes with bootph-all
In reply to Camelia GrozaQuoted 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
Signed-off-by Camelia Groza <[email protected]>--- arch/arm/dts/fsl-ls1046a.dtsi | 4 ++++ 1 file changed, 4 insertions(+)arch/arm/dts/fsl-ls1046a.dtsi +4
-1@@ -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