[U-Boot] [PATCH v2 0/2] Convert ls1021aqds to use driver model for serial ports
Since a recent merge 5160def "dm: lpuart: Drop the legacy code", ls1021aqds_ddr4_nor_lpuart and ls1021aqds_nor_lpuart failed to compile because they are using legacy driver for lpuart. Following ls1021atwr, ls1021aqds should be converted as well.
Changes in v2: Fix default device tree name for ls1021aqds_ddr4_nor_lpuart_defconfig
York Sun (2): arm: ls1021aqds: Convert to driver model and enable serial support arm: ls1021aqds: Enable driver model lpuart serial driver
arch/arm/dts/Makefile | 3 ++- arch/arm/dts/ls1021a-qds-duart.dts | 16 ++++++++++++++++ arch/arm/dts/ls1021a-qds-lpuart.dts | 16 ++++++++++++++++ arch/arm/dts/{ls1021a-qds.dts => ls1021a-qds.dtsi} | 3 +-- configs/ls1021aqds_ddr4_nor_defconfig | 4 ++++ configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 4 ++++ configs/ls1021aqds_nor_defconfig | 4 ++++ configs/ls1021aqds_nor_lpuart_defconfig | 4 ++++ configs/ls1021aqds_qspi_defconfig | 2 +- configs/ls1021aqds_sdcard_defconfig | 3 +++ include/configs/ls1021aqds.h | 2 ++ 11 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 arch/arm/dts/ls1021a-qds-duart.dts create mode 100644 arch/arm/dts/ls1021a-qds-lpuart.dts rename arch/arm/dts/{ls1021a-qds.dts => ls1021a-qds.dtsi} (98%)
Split duart configuration as device tree file. Move /chosen node out of board commone device tree. Convert ls1021aqds nor and SD configurations to driver model support (qspi already uses DM). Enable ns16550 DM serial driver for nor configurations.
Signed-off-by: York Sun york.sun@nxp.com CC: Alison Wang alison.wang@nxp.com CC: Bin Meng bmeng.cn@gmail.com ---
Changes in v2: None
arch/arm/dts/Makefile | 2 +- arch/arm/dts/ls1021a-qds-duart.dts | 16 ++++++++++++++++ arch/arm/dts/{ls1021a-qds.dts => ls1021a-qds.dtsi} | 3 +-- configs/ls1021aqds_ddr4_nor_defconfig | 4 ++++ configs/ls1021aqds_nor_defconfig | 4 ++++ configs/ls1021aqds_qspi_defconfig | 2 +- configs/ls1021aqds_sdcard_defconfig | 3 +++ include/configs/ls1021aqds.h | 2 ++ 8 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 arch/arm/dts/ls1021a-qds-duart.dts rename arch/arm/dts/{ls1021a-qds.dts => ls1021a-qds.dtsi} (98%)
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 0fa5796..ef58aec 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -94,7 +94,7 @@ dtb-$(CONFIG_TARGET_DRA7XX_EVM) += dra72-evm.dtb dra7-evm.dtb dtb-$(CONFIG_TARGET_BEAGLE_X15) += am57xx-beagle-x15.dtb dtb-$(CONFIG_TARGET_STV0991) += stv0991.dtb
-dtb-$(CONFIG_LS102XA) += ls1021a-qds.dtb \ +dtb-$(CONFIG_LS102XA) += ls1021a-qds-duart.dtb \ ls1021a-twr-duart.dtb ls1021a-twr-lpuart.dtb dtb-$(CONFIG_FSL_LSCH3) += fsl-ls2080a-qds.dtb \ fsl-ls2080a-rdb.dtb diff --git a/arch/arm/dts/ls1021a-qds-duart.dts b/arch/arm/dts/ls1021a-qds-duart.dts new file mode 100644 index 0000000..bc56867 --- /dev/null +++ b/arch/arm/dts/ls1021a-qds-duart.dts @@ -0,0 +1,16 @@ +/* + * Freescale ls1021a QDS board common device tree source + * + * Copyright 2013-2015 Freescale Semiconductor, Inc. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/dts-v1/; +#include "ls1021a-qds.dtsi" + +/ { + chosen { + stdout-path = &uart0; + }; +}; diff --git a/arch/arm/dts/ls1021a-qds.dts b/arch/arm/dts/ls1021a-qds.dtsi similarity index 98% rename from arch/arm/dts/ls1021a-qds.dts rename to arch/arm/dts/ls1021a-qds.dtsi index e634292..ca9e835 100644 --- a/arch/arm/dts/ls1021a-qds.dts +++ b/arch/arm/dts/ls1021a-qds.dtsi @@ -1,12 +1,11 @@ /* - * Freescale ls1021a QDS board device tree source + * Freescale ls1021a QDS board common device tree source * * Copyright 2013-2015 Freescale Semiconductor, Inc. * * SPDX-License-Identifier: GPL-2.0+ */
-/dts-v1/; #include "ls1021a.dtsi"
/ { diff --git a/configs/ls1021aqds_ddr4_nor_defconfig b/configs/ls1021aqds_ddr4_nor_defconfig index 2f16339..842f645 100644 --- a/configs/ls1021aqds_ddr4_nor_defconfig +++ b/configs/ls1021aqds_ddr4_nor_defconfig @@ -1,7 +1,11 @@ CONFIG_ARM=y CONFIG_TARGET_LS1021AQDS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4" +CONFIG_DM_SERIAL=y +CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart" # CONFIG_CMD_SETEXPR is not set +CONFIG_OF_CONTROL=y +CONFIG_DM=y CONFIG_NETDEVICES=y CONFIG_E1000=y CONFIG_SYS_NS16550=y diff --git a/configs/ls1021aqds_nor_defconfig b/configs/ls1021aqds_nor_defconfig index 6878df4..f4c81e2 100644 --- a/configs/ls1021aqds_nor_defconfig +++ b/configs/ls1021aqds_nor_defconfig @@ -1,6 +1,10 @@ CONFIG_ARM=y CONFIG_TARGET_LS1021AQDS=y +CONFIG_DM_SERIAL=y +CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart" # CONFIG_CMD_SETEXPR is not set +CONFIG_OF_CONTROL=y +CONFIG_DM=y CONFIG_NETDEVICES=y CONFIG_E1000=y CONFIG_SYS_NS16550=y diff --git a/configs/ls1021aqds_qspi_defconfig b/configs/ls1021aqds_qspi_defconfig index 0f740fd..2e98d6c 100644 --- a/configs/ls1021aqds_qspi_defconfig +++ b/configs/ls1021aqds_qspi_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_LS1021AQDS=y CONFIG_DM_SPI=y -CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds" +CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart" CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/ls1021aqds_sdcard_defconfig b/configs/ls1021aqds_sdcard_defconfig index 3249b48..e283f69 100644 --- a/configs/ls1021aqds_sdcard_defconfig +++ b/configs/ls1021aqds_sdcard_defconfig @@ -1,8 +1,11 @@ CONFIG_ARM=y CONFIG_TARGET_LS1021AQDS=y +CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart" CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT" # CONFIG_CMD_SETEXPR is not set +CONFIG_OF_CONTROL=y +CONFIG_DM=y CONFIG_NETDEVICES=y CONFIG_E1000=y CONFIG_SYS_NS16550=y diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index f6efc55..5bdc124 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -375,7 +375,9 @@ unsigned long get_board_ddr_clk(void); #else #define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_SERIAL +#ifndef CONFIG_DM_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 +#endif #define CONFIG_SYS_NS16550_CLK get_serial_clock() #endif
On Tue, Feb 23, 2016 at 3:01 AM, York Sun york.sun@nxp.com wrote:
Split duart configuration as device tree file. Move /chosen node out of board commone device tree. Convert ls1021aqds nor and SD configurations to driver model support (qspi already uses DM). Enable ns16550 DM serial driver for nor configurations.
Signed-off-by: York Sun york.sun@nxp.com CC: Alison Wang alison.wang@nxp.com CC: Bin Meng bmeng.cn@gmail.com
Changes in v2: None
arch/arm/dts/Makefile | 2 +- arch/arm/dts/ls1021a-qds-duart.dts | 16 ++++++++++++++++ arch/arm/dts/{ls1021a-qds.dts => ls1021a-qds.dtsi} | 3 +-- configs/ls1021aqds_ddr4_nor_defconfig | 4 ++++ configs/ls1021aqds_nor_defconfig | 4 ++++ configs/ls1021aqds_qspi_defconfig | 2 +- configs/ls1021aqds_sdcard_defconfig | 3 +++ include/configs/ls1021aqds.h | 2 ++ 8 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 arch/arm/dts/ls1021a-qds-duart.dts rename arch/arm/dts/{ls1021a-qds.dts => ls1021a-qds.dtsi} (98%)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
On Tue, Feb 23, 2016 at 3:01 AM, York Sun york.sun@nxp.com wrote:
Split duart configuration as device tree file. Move /chosen node out of board commone device tree. Convert ls1021aqds nor and SD configurations to driver model support (qspi already uses DM). Enable ns16550 DM serial driver for nor configurations.
Signed-off-by: York Sun york.sun@nxp.com CC: Alison Wang alison.wang@nxp.com CC: Bin Meng bmeng.cn@gmail.com
Changes in v2: None
arch/arm/dts/Makefile | 2 +- arch/arm/dts/ls1021a-qds-duart.dts | 16
++++++++++++++++
arch/arm/dts/{ls1021a-qds.dts => ls1021a-qds.dtsi} | 3 +-- configs/ls1021aqds_ddr4_nor_defconfig | 4 ++++ configs/ls1021aqds_nor_defconfig | 4 ++++ configs/ls1021aqds_qspi_defconfig | 2 +- configs/ls1021aqds_sdcard_defconfig | 3 +++ include/configs/ls1021aqds.h | 2 ++ 8 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 arch/arm/dts/ls1021a-qds-duart.dts rename arch/arm/dts/{ls1021a-qds.dts => ls1021a-qds.dtsi} (98%)
Reviewed-by: Alison Wang alison.wang@nxp.com
Best Regards, Alison Wang
On 02/22/2016 11:01 AM, York Sun wrote:
Split duart configuration as device tree file. Move /chosen node out of board commone device tree. Convert ls1021aqds nor and SD configurations to driver model support (qspi already uses DM). Enable ns16550 DM serial driver for nor configurations.
Signed-off-by: York Sun york.sun@nxp.com CC: Alison Wang alison.wang@nxp.com CC: Bin Meng bmeng.cn@gmail.com
Changes in v2: None
Applied to fsl-qoriq master. Awaiting upstream.
York
Convert ls1021aqds_nor_lpuart and ls1021aqds_ddr4_nor_lpuart to driver model suport. Enable lpuart port driver.
Signed-off-by: York Sun york.sun@nxp.com CC: Alison Wang alison.wang@nxp.com CC: Bin Meng bmeng.cn@gmail.com
---
Changes in v2: Fix default device tree name for ls1021aqds_ddr4_nor_lpuart_defconfig
arch/arm/dts/Makefile | 1 + arch/arm/dts/ls1021a-qds-lpuart.dts | 16 ++++++++++++++++ configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 4 ++++ configs/ls1021aqds_nor_lpuart_defconfig | 4 ++++ 4 files changed, 25 insertions(+) create mode 100644 arch/arm/dts/ls1021a-qds-lpuart.dts
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index ef58aec..c27b80c 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -95,6 +95,7 @@ dtb-$(CONFIG_TARGET_BEAGLE_X15) += am57xx-beagle-x15.dtb dtb-$(CONFIG_TARGET_STV0991) += stv0991.dtb
dtb-$(CONFIG_LS102XA) += ls1021a-qds-duart.dtb \ + ls1021a-qds-lpuart.dtb \ ls1021a-twr-duart.dtb ls1021a-twr-lpuart.dtb dtb-$(CONFIG_FSL_LSCH3) += fsl-ls2080a-qds.dtb \ fsl-ls2080a-rdb.dtb diff --git a/arch/arm/dts/ls1021a-qds-lpuart.dts b/arch/arm/dts/ls1021a-qds-lpuart.dts new file mode 100644 index 0000000..1d16ffd --- /dev/null +++ b/arch/arm/dts/ls1021a-qds-lpuart.dts @@ -0,0 +1,16 @@ +/* + * Freescale ls1021a QDS board common device tree source + * + * Copyright 2013-2015 Freescale Semiconductor, Inc. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/dts-v1/; +#include "ls1021a-qds.dtsi" + +/ { + chosen { + stdout-path = &lpuart0; + }; +}; diff --git a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig index 44b2a0d..0e1a59d 100644 --- a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig +++ b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig @@ -1,7 +1,11 @@ CONFIG_ARM=y CONFIG_TARGET_LS1021AQDS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,LPUART" +CONFIG_DM_SERIAL=y +CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-lpuart" # CONFIG_CMD_SETEXPR is not set +CONFIG_OF_CONTROL=y +CONFIG_DM=y CONFIG_NETDEVICES=y CONFIG_E1000=y CONFIG_FSL_LPUART=y diff --git a/configs/ls1021aqds_nor_lpuart_defconfig b/configs/ls1021aqds_nor_lpuart_defconfig index 1186af2..e81448d 100644 --- a/configs/ls1021aqds_nor_lpuart_defconfig +++ b/configs/ls1021aqds_nor_lpuart_defconfig @@ -1,7 +1,11 @@ CONFIG_ARM=y CONFIG_TARGET_LS1021AQDS=y +CONFIG_DM_SERIAL=y +CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-lpuart" CONFIG_SYS_EXTRA_OPTIONS="LPUART" # CONFIG_CMD_SETEXPR is not set +CONFIG_OF_CONTROL=y +CONFIG_DM=y CONFIG_NETDEVICES=y CONFIG_E1000=y CONFIG_FSL_LPUART=y
On Tue, Feb 23, 2016 at 3:01 AM, York Sun york.sun@nxp.com wrote:
Convert ls1021aqds_nor_lpuart and ls1021aqds_ddr4_nor_lpuart to driver model suport. Enable lpuart port driver.
Signed-off-by: York Sun york.sun@nxp.com CC: Alison Wang alison.wang@nxp.com CC: Bin Meng bmeng.cn@gmail.com
Changes in v2: Fix default device tree name for ls1021aqds_ddr4_nor_lpuart_defconfig
arch/arm/dts/Makefile | 1 + arch/arm/dts/ls1021a-qds-lpuart.dts | 16 ++++++++++++++++ configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 4 ++++ configs/ls1021aqds_nor_lpuart_defconfig | 4 ++++ 4 files changed, 25 insertions(+) create mode 100644 arch/arm/dts/ls1021a-qds-lpuart.dts
Reviewed-by: Bin Meng bmeng.cn@gmail.com
On Tue, Feb 23, 2016 at 3:01 AM, York Sun york.sun@nxp.com wrote:
Convert ls1021aqds_nor_lpuart and ls1021aqds_ddr4_nor_lpuart to driver model suport. Enable lpuart port driver.
Signed-off-by: York Sun york.sun@nxp.com CC: Alison Wang alison.wang@nxp.com CC: Bin Meng bmeng.cn@gmail.com
Changes in v2: Fix default device tree name for ls1021aqds_ddr4_nor_lpuart_defconfig
arch/arm/dts/Makefile | 1 + arch/arm/dts/ls1021a-qds-lpuart.dts | 16 ++++++++++++++++ configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 4 ++++ configs/ls1021aqds_nor_lpuart_defconfig | 4 ++++ 4 files changed, 25 insertions(+) create mode 100644 arch/arm/dts/ls1021a-qds-lpuart.dts
Reviewed-by: Alison Wang alison.wang@nxp.com
Best Regards, Alison Wang
On 02/22/2016 11:01 AM, York Sun wrote:
Convert ls1021aqds_nor_lpuart and ls1021aqds_ddr4_nor_lpuart to driver model suport. Enable lpuart port driver.
Signed-off-by: York Sun york.sun@nxp.com CC: Alison Wang alison.wang@nxp.com CC: Bin Meng bmeng.cn@gmail.com
Changes in v2: Fix default device tree name for ls1021aqds_ddr4_nor_lpuart_defconfig
Applied to fsl-qoriq master. Awaiting upstream.
York
participants (4)
-
Bin Meng -
Huan Wang -
York Sun -
york sun