arm: ls1021atwr: Convert to driver model and enable serial support

This reverts commit 3e303f748cf57fb23e8ec95ab7eac0074be50e2b.

The fix up in the /aliases node does not work under the following scenarios:
- Not every non-DM serial driver was written to have a driver name that conforms the format of "serial%d" or "eserial%d".
- With driver model serial, the stdio_devices[] stores the serial device node name in the device tree.

Signed-off-by Bin Meng <[email protected]>

---

Changes in v2:
- Rewrite the commit message using 'git revert' format.

 common/fdt_support.c | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

Quoted 13 lines · Bin Meng

This reverts commit 3e303f748cf57fb23e8ec95ab7eac0074be50e2b.

The fix up in the /aliases node does not work under the following scenarios:
- Not every non-DM serial driver was written to have a driver name that conforms the format of "serial%d" or "eserial%d".
- With driver model serial, the stdio_devices[] stores the serial device node name in the device tree.

Signed-off-by Bin Meng <[email protected]>

---

Quoted 5 lines

Changes in v2:
- Rewrite the commit message using 'git revert' format.

 common/fdt_support.c | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

Acked-by Simon Glass <[email protected]>

Convert ls1021atwr_nor to driver model support. As a start, enable ns16550 serial port driver.

Signed-off-by Bin Meng <[email protected]>

---

Changes in v2: None

 arch/arm/dts/ls1021a-twr.dts     | 4 ++++
 arch/arm/dts/ls1021a.dtsi        | 4 ----
 configs/ls1021atwr_nor_defconfig | 4 ++++
 include/configs/ls1021atwr.h     | 2 ++
 4 files changed, 10 insertions(+), 4 deletions(-)

Quoted 8 lines · Bin Meng

Convert ls1021atwr_nor to driver model support. As a start, enable ns16550 serial port driver.

Signed-off-by Bin Meng <[email protected]>

---

Changes in v2: None

Quoted 5 lines

 arch/arm/dts/ls1021a-twr.dts     | 4 ++++
 arch/arm/dts/ls1021a.dtsi        | 4 ----
 configs/ls1021atwr_nor_defconfig | 4 ++++
 include/configs/ls1021atwr.h     | 2 ++
 4 files changed, 10 insertions(+), 4 deletions(-)

Acked-by Simon Glass <[email protected]>

LPUART is seen on Freescale VF610 and QorIQ Layerscape devices. Create a Kconfig option and move it to defconfig for all boards that have this serial driver.

Signed-off-by Bin Meng <[email protected]>

Reviewed-by Simon Glass <[email protected]>

---

Changes in v2: None

 configs/colibri_vf_defconfig                 | 1 +
 configs/colibri_vf_dtb_defconfig             | 1 +
 configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 1 +
 configs/ls1021aqds_nor_lpuart_defconfig      | 1 +
 configs/ls1021atwr_nor_lpuart_defconfig      | 1 +
 configs/pcm052_defconfig                     | 1 +
 configs/vf610twr_defconfig                   | 1 +
 configs/vf610twr_nand_defconfig              | 1 +
 drivers/serial/Kconfig                       | 6 ++++++
 include/configs/colibri_vf.h                 | 1 -
 include/configs/ls1021aqds.h                 | 1 -
 include/configs/ls1021atwr.h                 | 1 -
 include/configs/pcm052.h                     | 1 -
 include/configs/vf610twr.h                   | 1 -
 14 files changed, 14 insertions(+), 5 deletions(-)

configs/colibri_vf_defconfig +1 -0

index f8441e3..45917c8 100644
@@ -8,3 +8,4 @@ CONFIG_CMD_GPIO=y
 CONFIG_DM=y
 CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y
+CONFIG_FSL_LPUART=y

configs/colibri_vf_dtb_defconfig +1 -0

index 3596cec..b1a843a 100644
@@ -11,3 +11,4 @@ CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y
+CONFIG_FSL_LPUART=y

configs/ls1021aqds_ddr4_nor_lpuart_defconfig +1 -0

index 68bd117..44b2a0d 100644
@@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,LPUART"
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
+CONFIG_FSL_LPUART=y

configs/ls1021aqds_nor_lpuart_defconfig +1 -0

index b2f6832..1186af2 100644
@@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="LPUART"
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
+CONFIG_FSL_LPUART=y

configs/ls1021atwr_nor_lpuart_defconfig +1 -0

index d7afca9..58cd61f 100644
@@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="LPUART"
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
+CONFIG_FSL_LPUART=y

configs/pcm052_defconfig +1 -0

index 9125645..26ab733 100644
@@ -3,3 +3,4 @@ CONFIG_TARGET_PCM052=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/phytec/pcm052/imximage.cfg,ENV_IS_IN_NAND"
 CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
+CONFIG_FSL_LPUART=y

configs/vf610twr_defconfig +1 -0

index dc8df5c..d51c93b 100644
@@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/vf610twr/imximage.cfg,ENV_I
 CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPI_FLASH=y
+CONFIG_FSL_LPUART=y

configs/vf610twr_nand_defconfig +1 -0

index 98880f3..299fa8f 100644
@@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/vf610twr/imximage.cfg,ENV_I
 CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPI_FLASH=y
+CONFIG_FSL_LPUART=y

drivers/serial/Kconfig +6 -0

index 1fc287e..3b54511 100644
@@ -186,6 +186,12 @@ config ALTERA_UART
 	  Select this to enable an UART for Altera devices. Please find
 	  details on the "Embedded Peripherals IP User Guide" of Altera.
 
+config FSL_LPUART
+	bool "Freescale LPUART support"
+	help
+	  Select this to enable a Low Power UART for Freescale VF610 and
+	  QorIQ Layerscape devices.
+
 config SYS_NS16550
 	bool "NS16550 UART or compatible"
 	help

include/configs/colibri_vf.h +0 -1

index 708c79a..5aed3a5 100644
@@ -36,7 +36,6 @@
 
 #define CONFIG_BOARD_EARLY_INIT_F
 
-#define CONFIG_FSL_LPUART
 #define LPUART_BASE			UART0_BASE
 
 /* Allow to overwrite serial and ethaddr */

include/configs/ls1021aqds.h +0 -1

index 2e8dbc7..e8b1eca 100644
@@ -371,7 +371,6 @@ unsigned long get_board_ddr_clk(void);
  * Serial Port
  */
 #ifdef CONFIG_LPUART
-#define CONFIG_FSL_LPUART
 #define CONFIG_LPUART_32B_REG
 #else
 #define CONFIG_CONS_INDEX		1

include/configs/ls1021atwr.h +0 -1

index bbef2a7..317ba62 100644
@@ -266,7 +266,6 @@
  * Serial Port
  */
 #ifdef CONFIG_LPUART
-#define CONFIG_FSL_LPUART
 #define CONFIG_LPUART_32B_REG
 #else
 #define CONFIG_CONS_INDEX		1

include/configs/pcm052.h +0 -1

index b851bba..891bdb0 100644
@@ -27,7 +27,6 @@
 
 #define CONFIG_BOARD_EARLY_INIT_F
 
-#define CONFIG_FSL_LPUART
 #define LPUART_BASE			UART1_BASE
 
 /* Allow to overwrite serial and ethaddr */

include/configs/vf610twr.h +0 -1

index 34df6f0..dcfafaf 100644
@@ -34,7 +34,6 @@
 
 #define CONFIG_BOARD_EARLY_INIT_F
 
-#define CONFIG_FSL_LPUART
 #define LPUART_BASE			UART1_BASE
 
 /* Allow to overwrite serial and ethaddr */

Looks good to me,

Acked-by Stefan Agner <[email protected]>

Quoted 26 lines · Bin Meng

LPUART is seen on Freescale VF610 and QorIQ Layerscape devices. Create a Kconfig option and move it to defconfig for all boards that have this serial driver.

Signed-off-by Bin Meng <[email protected]>

Reviewed-by Simon Glass <[email protected]>

---

Changes in v2: None

 configs/colibri_vf_defconfig                 | 1 +
 configs/colibri_vf_dtb_defconfig             | 1 +
 configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 1 +
 configs/ls1021aqds_nor_lpuart_defconfig      | 1 +
 configs/ls1021atwr_nor_lpuart_defconfig      | 1 +
 configs/pcm052_defconfig                     | 1 +
 configs/vf610twr_defconfig                   | 1 +
 configs/vf610twr_nand_defconfig              | 1 +
 drivers/serial/Kconfig                       | 6 ++++++
 include/configs/colibri_vf.h                 | 1 -
 include/configs/ls1021aqds.h                 | 1 -
 include/configs/ls1021atwr.h                 | 1 -
 include/configs/pcm052.h                     | 1 -
 include/configs/vf610twr.h                   | 1 -
 14 files changed, 14 insertions(+), 5 deletions(-)

Quoted 31 lines · Stefan Agner

Looks good to me,

Acked-by Stefan Agner <[email protected]>

Quoted 26 lines · Bin Meng

LPUART is seen on Freescale VF610 and QorIQ Layerscape devices. Create a Kconfig option and move it to defconfig for all boards that have this serial driver.

Signed-off-by Bin Meng <[email protected]>

Reviewed-by Simon Glass <[email protected]>

---

Changes in v2: None

 configs/colibri_vf_defconfig                 | 1 +
 configs/colibri_vf_dtb_defconfig             | 1 +
 configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 1 +
 configs/ls1021aqds_nor_lpuart_defconfig      | 1 +
 configs/ls1021atwr_nor_lpuart_defconfig      | 1 +
 configs/pcm052_defconfig                     | 1 +
 configs/vf610twr_defconfig                   | 1 +
 configs/vf610twr_nand_defconfig              | 1 +
 drivers/serial/Kconfig                       | 6 ++++++
 include/configs/colibri_vf.h                 | 1 -
 include/configs/ls1021aqds.h                 | 1 -
 include/configs/ls1021atwr.h                 | 1 -
 include/configs/pcm052.h                     | 1 -
 include/configs/vf610twr.h                   | 1 -
 14 files changed, 14 insertions(+), 5 deletions(-)

Acked-by Simon Glass <[email protected]>

Clean up the driver codes a little bit, by:
- Use tab instead of space in the macro defines
- Use single line comment whenever possible
- Fix insertion of blank lines

Signed-off-by Bin Meng <[email protected]>

Reviewed-by Simon Glass <[email protected]>

---

Changes in v2: None

 drivers/serial/serial_lpuart.c | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

Quoted 9 lines · Bin Meng

Clean up the driver codes a little bit, by:
- Use tab instead of space in the macro defines
- Use single line comment whenever possible
- Fix insertion of blank lines

Signed-off-by Bin Meng <[email protected]>

Reviewed-by Simon Glass <[email protected]>

---

Quoted 4 lines

Changes in v2: None

 drivers/serial/serial_lpuart.c | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

Acked-by Simon Glass <[email protected]>

There is no need to go through serial driver subsystem, instead call the driver's setbrg and putc routines directly.

Signed-off-by Bin Meng <[email protected]>

Reviewed-by Simon Glass <[email protected]>

---

Changes in v2: None

 drivers/serial/serial_lpuart.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Quoted 7 lines · Bin Meng

There is no need to go through serial driver subsystem, instead call the driver's setbrg and putc routines directly.

Signed-off-by Bin Meng <[email protected]>

Reviewed-by Simon Glass <[email protected]>

---

Quoted 4 lines

Changes in v2: None

 drivers/serial/serial_lpuart.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Acked-by Simon Glass <[email protected]>

Create internal routines which take lpuart's register base as a parameter, in preparation for driver model conversion.

Signed-off-by Bin Meng <[email protected]>

Reviewed-by Simon Glass <[email protected]>

---

Changes in v2:
- Add missing 'base' parameter in the call to _lpuart_serial_tstc()
- Change internal routines' parameter 'reg' to 'base'

 drivers/serial/serial_lpuart.c | 88 +++++++++++++++++++++++++++++++-----------
 1 file changed, 66 insertions(+), 22 deletions(-)

Quoted 12 lines · Bin Meng

Create internal routines which take lpuart's register base as a parameter, in preparation for driver model conversion.

Signed-off-by Bin Meng <[email protected]>

Reviewed-by Simon Glass <[email protected]>

---

Changes in v2:
- Add missing 'base' parameter in the call to _lpuart_serial_tstc()
- Change internal routines' parameter 'reg' to 'base'

Quoted 3 lines

 drivers/serial/serial_lpuart.c | 88 +++++++++++++++++++++++++++++++-----------
 1 file changed, 66 insertions(+), 22 deletions(-)

Acked-by Simon Glass <[email protected]>

This adds driver model support to lpuart serial driver.

Signed-off-by Bin Meng <[email protected]>

---

Changes in v2:
- Split to use two separate U_BOOT_DRIVER()

  doc/driver-model/serial-howto.txt |   1 -
  drivers/serial/serial_lpuart.c    | 167 ++++++++++++++++++++++++++++++++++++++
  2 files changed, 167 insertions(+), 1 deletion(-)

doc/driver-model/serial-howto.txt +0 -1

index 4706d56..c933b90 100644
@@ -11,7 +11,6 @@ is time for maintainers to start converting over the remaining serial drivers:
     opencores_yanu.c
     serial_bfin.c
     serial_imx.c
-   serial_lpuart.c
     serial_max3100.c
     serial_pxa.c
     serial_s3c24x0.c

drivers/serial/serial_lpuart.c +167 -0

index 5cc1997..3f9c4d1 100644
@@ -5,6 +5,7 @@
   */
 
  #include <common.h>
+#include <dm.h>
  #include <watchdog.h>
  #include <asm/io.h>
  #include <serial.h>

@@ -49,6 +50,10 @@ DECLARE_GLOBAL_DATA_PTR;
 
  struct lpuart_fsl *base = (struct lpuart_fsl *)LPUART_BASE;
 
+struct lpuart_serial_platdata {
+	struct lpuart_fsl *reg;
+};
+
  #ifndef CONFIG_LPUART_32B_REG
  static void _lpuart_serial_setbrg(struct lpuart_fsl *base, int baudrate)
  {

@@ -122,6 +127,7 @@ static int _lpuart_serial_init(struct lpuart_fsl *base)
  	return 0;
  }
 
+#ifndef CONFIG_DM_SERIAL
  static void lpuart_serial_setbrg(void)
  {
  	_lpuart_serial_setbrg(base, gd->baudrate);

@@ -157,6 +163,54 @@ static struct serial_device lpuart_serial_drv = {
  	.getc = lpuart_serial_getc,
  	.tstc = lpuart_serial_tstc,
  };
+#else /* CONFIG_DM_SERIAL */
+static int lpuart_serial_setbrg(struct udevice *dev, int baudrate)
+{
+	struct lpuart_serial_platdata *plat = dev->platdata;
+	struct lpuart_fsl *reg = plat->reg;
+
+	_lpuart_serial_setbrg(reg, baudrate);
+
+	return 0;
+}
+
+static int lpuart_serial_getc(struct udevice *dev)
+{
+	struct lpuart_serial_platdata *plat = dev->platdata;
+	struct lpuart_fsl *reg = plat->reg;
+
+	return _lpuart_serial_getc(reg);
+}
+
+static int lpuart_serial_putc(struct udevice *dev, const char c)
+{
+	struct lpuart_serial_platdata *plat = dev->platdata;
+	struct lpuart_fsl *reg = plat->reg;
+
+	_lpuart_serial_putc(reg, c);
+
+	return 0;
+}
+
+static int lpuart_serial_pending(struct udevice *dev, bool input)
+{
+	struct lpuart_serial_platdata *plat = dev->platdata;
+	struct lpuart_fsl *reg = plat->reg;
+
+	if (input)
+		return _lpuart_serial_tstc(reg);
+	else
+		return __raw_readb(&reg->us1) & US1_TDRE ? 0 : 1;
+}
+
+static int lpuart_serial_probe(struct udevice *dev)
+{
+	struct lpuart_serial_platdata *plat = dev->platdata;
+	struct lpuart_fsl *reg = plat->reg;
+
+	return _lpuart_serial_init(reg);
+}
+#endif /* CONFIG_DM_SERIAL */
  #else
  static void _lpuart32_serial_setbrg(struct lpuart_fsl *base, int baudrate)
  {

@@ -227,6 +281,7 @@ static int _lpuart32_serial_init(struct lpuart_fsl *base)
  	return 0;
  }
 
+#ifndef CONFIG_DM_SERIAL
  static void lpuart32_serial_setbrg(void)
  {
  	_lpuart32_serial_setbrg(base, gd->baudrate);

@@ -262,8 +317,57 @@ static struct serial_device lpuart32_serial_drv = {
  	.getc = lpuart32_serial_getc,
  	.tstc = lpuart32_serial_tstc,
  };
+#else /* CONFIG_DM_SERIAL */
+static int lpuart32_serial_setbrg(struct udevice *dev, int baudrate)
+{
+	struct lpuart_serial_platdata *plat = dev->platdata;
+	struct lpuart_fsl *reg = plat->reg;
+
+	_lpuart32_serial_setbrg(reg, baudrate);
+
+	return 0;
+}
+
+static int lpuart32_serial_getc(struct udevice *dev)
+{
+	struct lpuart_serial_platdata *plat = dev->platdata;
+	struct lpuart_fsl *reg = plat->reg;
+
+	return _lpuart32_serial_getc(reg);
+}
+
+static int lpuart32_serial_putc(struct udevice *dev, const char c)
+{
+	struct lpuart_serial_platdata *plat = dev->platdata;
+	struct lpuart_fsl *reg = plat->reg;
+
+	_lpuart32_serial_putc(reg, c);
+
+	return 0;
+}
+
+static int lpuart32_serial_pending(struct udevice *dev, bool input)
+{
+	struct lpuart_serial_platdata *plat = dev->platdata;
+	struct lpuart_fsl *reg = plat->reg;
+
+	if (input)
+		return _lpuart32_serial_tstc(reg);
+	else
+		return in_be32(&reg->stat) & STAT_TDRE ? 0 : 1;
+}
+
+static int lpuart32_serial_probe(struct udevice *dev)
+{
+	struct lpuart_serial_platdata *plat = dev->platdata;
+	struct lpuart_fsl *reg = plat->reg;
+
+	return _lpuart32_serial_init(reg);
+}
+#endif /* CONFIG_DM_SERIAL */
  #endif
 
+#ifndef CONFIG_DM_SERIAL
  void lpuart_serial_initialize(void)
  {
  #ifdef CONFIG_LPUART_32B_REG

@@ -281,3 +385,66 @@ __weak struct serial_device *default_serial_console(void)
  	return &lpuart_serial_drv;
  #endif
  }
+#else /* CONFIG_DM_SERIAL */
+static int lpuart_serial_ofdata_to_platdata(struct udevice *dev)
+{
+	struct lpuart_serial_platdata *plat = dev->platdata;
+	fdt_addr_t addr;
+
+	addr = dev_get_addr(dev);
+	if (addr == FDT_ADDR_T_NONE)
+		return -EINVAL;
+
+	plat->reg = (struct lpuart_fsl *)addr;
+
+	return 0;
+}
+
+#ifndef CONFIG_LPUART_32B_REG
+static const struct dm_serial_ops lpuart_serial_ops = {
+	.putc = lpuart_serial_putc,
+	.pending = lpuart_serial_pending,
+	.getc = lpuart_serial_getc,
+	.setbrg = lpuart_serial_setbrg,
+};
+
+static const struct udevice_id lpuart_serial_ids[] = {
+	{ .compatible = "fsl,vf610-lpuart" },
+	{ }
+};
+
+U_BOOT_DRIVER(serial_lpuart) = {
+	.name	= "serial_lpuart",
+	.id	= UCLASS_SERIAL,
+	.of_match = lpuart_serial_ids,
+	.ofdata_to_platdata = lpuart_serial_ofdata_to_platdata,
+	.platdata_auto_alloc_size = sizeof(struct lpuart_serial_platdata),
+	.probe = lpuart_serial_probe,
+	.ops	= &lpuart_serial_ops,
+	.flags = DM_FLAG_PRE_RELOC,
+};
+#else /* CONFIG_LPUART_32B_REG */
+static const struct dm_serial_ops lpuart32_serial_ops = {
+	.putc = lpuart32_serial_putc,
+	.pending = lpuart32_serial_pending,
+	.getc = lpuart32_serial_getc,
+	.setbrg = lpuart32_serial_setbrg,
+};
+
+static const struct udevice_id lpuart32_serial_ids[] = {
+	{ .compatible = "fsl,ls1021a-lpuart" },
+	{ }
+};
+
+U_BOOT_DRIVER(serial_lpuart32) = {
+	.name	= "serial_lpuart32",
+	.id	= UCLASS_SERIAL,
+	.of_match = lpuart32_serial_ids,
+	.ofdata_to_platdata = lpuart_serial_ofdata_to_platdata,
+	.platdata_auto_alloc_size = sizeof(struct lpuart_serial_platdata),
+	.probe = lpuart32_serial_probe,
+	.ops	= &lpuart32_serial_ops,
+	.flags = DM_FLAG_PRE_RELOC,
+};
+#endif /* CONFIG_LPUART_32B_REG */
+#endif /* CONFIG_DM_SERIAL */

This adds driver model support to lpuart serial driver.

Signed-off-by Bin Meng <[email protected]>

---

Changes in v2:
- Split to use two separate U_BOOT_DRIVER()

 doc/driver-model/serial-howto.txt |   1 -
 drivers/serial/serial_lpuart.c    | 167 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 167 insertions(+), 1 deletion(-)

Quoted 6 lines · Bin Meng

This adds driver model support to lpuart serial driver.

Signed-off-by Bin Meng <[email protected]>

---

Quoted 6 lines

Changes in v2:
- Split to use two separate U_BOOT_DRIVER()

 doc/driver-model/serial-howto.txt |   1 -
 drivers/serial/serial_lpuart.c    | 167 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 167 insertions(+), 1 deletion(-)

Acked-by Simon Glass <[email protected]>

Move /chosen node out of the board device tree.

Signed-off-by Bin Meng <[email protected]>

---

Changes in v2:
- New patch to split off board device tree

 arch/arm/dts/Makefile                              |  2 +-
 arch/arm/dts/ls1021a-twr-duart.dts                 | 16 ++++++++++++++++
 arch/arm/dts/{ls1021a-twr.dts => ls1021a-twr.dtsi} |  3 +--
 configs/ls1021atwr_nor_defconfig                   |  2 +-
 configs/ls1021atwr_qspi_defconfig                  |  2 +-
 configs/ls1021atwr_sdcard_qspi_defconfig           |  2 +-
 6 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 arch/arm/dts/ls1021a-twr-duart.dts
 rename arch/arm/dts/{ls1021a-twr.dts => ls1021a-twr.dtsi} (96%)

Quoted 9 lines · Bin Meng

Move /chosen node out of the board device tree.

Signed-off-by Bin Meng <[email protected]>

---

Changes in v2:
- New patch to split off board device tree

Quoted 9 lines

 arch/arm/dts/Makefile                              |  2 +-
 arch/arm/dts/ls1021a-twr-duart.dts                 | 16 ++++++++++++++++
 arch/arm/dts/{ls1021a-twr.dts => ls1021a-twr.dtsi} |  3 +--
 configs/ls1021atwr_nor_defconfig                   |  2 +-
 configs/ls1021atwr_qspi_defconfig                  |  2 +-
 configs/ls1021atwr_sdcard_qspi_defconfig           |  2 +-
 6 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 arch/arm/dts/ls1021a-twr-duart.dts
 rename arch/arm/dts/{ls1021a-twr.dts => ls1021a-twr.dtsi} (96%)

Acked-by Simon Glass <[email protected]>

-----Original Message-----
From: Bin Meng [mailto:bmeng.cn at gmail.com]
Sent: Thursday, January 14, 2016 11:39 AM
To: Simon Glass; Stefan Agner; Bhuvanchandra DV; Albert ARIBAUD (3ADEV); York Sun; Alison Wang; U-Boot Mailing List
Subject: [PATCH v2 9/9] arm: ls1021atwr: Enable driver model lpuart serial driver

Convert ls1021atwr_nor_lpuart to driver model support. As a start, enable lpuart serial port driver.

Signed-off-by Bin Meng <[email protected]>

Reviewed-by Simon Glass <[email protected]>

---

Changes in v2:
- Create a ls1021a-twr-lpuart.dts for ls1021atwr_nor_lpuart_defconfig

 arch/arm/dts/Makefile                   |  2 +-
 arch/arm/dts/ls1021a-twr-lpuart.dts     | 16 ++++++++++++++++
 configs/ls1021atwr_nor_lpuart_defconfig |  4 ++++
 3 files changed, 21 insertions(+), 1 deletion(-)  create mode 100644

arch/arm/dts/ls1021a-twr-lpuart.dts

arch/arm/dts/Makefile index renamed from arch/arm/dts/Makefile +0 -0

02b031e..4bbf661 100644

arch/arm/dts/Makefile +0 -0

@@ -89,7 +89,7 @@ dtb-$(CONFIG_TARGET_BEAGLE_X15) += am57xx-beagle-

x15.dtb
dtb-$(CONFIG_TARGET_STV0991) += stv0991.dtb

dtb-$(CONFIG_LS102XA) += ls1021a-qds.dtb \

arch/arm/dts/Makefile +1 -1

-	ls1021a-twr-duart.dtb
+	ls1021a-twr-duart.dtb ls1021a-twr-lpuart.dtb
 dtb-$(CONFIG_FSL_LSCH3) += fsl-ls2080a-qds.dtb \
 	fsl-ls2080a-rdb.dtb
 dtb-$(CONFIG_FSL_LSCH2) += fsl-ls1043a-qds.dtb \ diff --git

a/arch/arm/dts/ls1021a-twr-lpuart.dts b/arch/arm/dts/ls1021a-twr- lpuart.dts
new file mode 100644
index 0000000..2941ec0

arch/arm/dts/ls1021a-twr-lpuart.dts new file +16 -0

@@ -0,0 +1,16 @@
+/*
+ * Freescale ls1021a TWR board device tree source
+ *
+ * Copyright 2013-2015 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/dts-v1/;
+#include "ls1021a-twr.dtsi"
+
+/ {
+	chosen {
+		stdout-path = &lpuart0;
+	};
+};

configs/ls1021atwr_nor_lpuart_defconfig +4 -1

index 58cd61f..599342f 100644
@@ -1,7 +1,11 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021ATWR=y
+CONFIG_DM_SERIAL=y
+CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-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
--

1.8.2.1

Hi,

Quoted 80 lines

-----Original Message-----
From: Bin Meng [mailto:bmeng.cn at gmail.com]
Sent: Thursday, January 14, 2016 11:39 AM
To: Simon Glass; Stefan Agner; Bhuvanchandra DV; Albert ARIBAUD (3ADEV); York Sun; Alison Wang; U-Boot Mailing List
Subject: [PATCH v2 9/9] arm: ls1021atwr: Enable driver model lpuart serial driver

Convert ls1021atwr_nor_lpuart to driver model support. As a start, enable lpuart serial port driver.

Signed-off-by Bin Meng <[email protected]>

Reviewed-by Simon Glass <[email protected]>

---

Changes in v2:
- Create a ls1021a-twr-lpuart.dts for ls1021atwr_nor_lpuart_defconfig

 arch/arm/dts/Makefile                   |  2 +-
 arch/arm/dts/ls1021a-twr-lpuart.dts     | 16 ++++++++++++++++
 configs/ls1021atwr_nor_lpuart_defconfig |  4 ++++
 3 files changed, 21 insertions(+), 1 deletion(-)  create mode 100644

arch/arm/dts/ls1021a-twr-lpuart.dts

arch/arm/dts/Makefile index renamed from arch/arm/dts/Makefile +0 -0

02b031e..4bbf661 100644

arch/arm/dts/Makefile +0 -0

@@ -89,7 +89,7 @@ dtb-$(CONFIG_TARGET_BEAGLE_X15) += am57xx-beagle-

x15.dtb
dtb-$(CONFIG_TARGET_STV0991) += stv0991.dtb

dtb-$(CONFIG_LS102XA) += ls1021a-qds.dtb \

arch/arm/dts/Makefile +1 -1

-     ls1021a-twr-duart.dtb
+     ls1021a-twr-duart.dtb ls1021a-twr-lpuart.dtb
 dtb-$(CONFIG_FSL_LSCH3) += fsl-ls2080a-qds.dtb \
      fsl-ls2080a-rdb.dtb
 dtb-$(CONFIG_FSL_LSCH2) += fsl-ls1043a-qds.dtb \ diff --git

a/arch/arm/dts/ls1021a-twr-lpuart.dts b/arch/arm/dts/ls1021a-twr- lpuart.dts
new file mode 100644
index 0000000..2941ec0

arch/arm/dts/ls1021a-twr-lpuart.dts new file +16 -0

@@ -0,0 +1,16 @@
+/*
+ * Freescale ls1021a TWR board device tree source
+ *
+ * Copyright 2013-2015 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:  GPL-2.0+
+ */
+
+/dts-v1/;
+#include "ls1021a-twr.dtsi"
+
+/ {
+     chosen {
+             stdout-path = &lpuart0;
+     };
+};

configs/ls1021atwr_nor_lpuart_defconfig +4 -1

index 58cd61f..599342f 100644
@@ -1,7 +1,11 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021ATWR=y
+CONFIG_DM_SERIAL=y
+CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-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
--

Quoted 1 line

1.8.2.1

Reviewed-by Alison Wang <[email protected]>

Tested-by Alison Wang <[email protected]>

Best Regards,
Alison Wang

Quoted 88 lines · Huan Wang

Hi,

Quoted 80 lines

-----Original Message-----
From: Bin Meng [mailto:bmeng.cn at gmail.com]
Sent: Thursday, January 14, 2016 11:39 AM
To: Simon Glass; Stefan Agner; Bhuvanchandra DV; Albert ARIBAUD (3ADEV); York Sun; Alison Wang; U-Boot Mailing List
Subject: [PATCH v2 9/9] arm: ls1021atwr: Enable driver model lpuart serial driver

Convert ls1021atwr_nor_lpuart to driver model support. As a start, enable lpuart serial port driver.

Signed-off-by Bin Meng <[email protected]>

Reviewed-by Simon Glass <[email protected]>

---

Changes in v2:
- Create a ls1021a-twr-lpuart.dts for ls1021atwr_nor_lpuart_defconfig

 arch/arm/dts/Makefile                   |  2 +-
 arch/arm/dts/ls1021a-twr-lpuart.dts     | 16 ++++++++++++++++
 configs/ls1021atwr_nor_lpuart_defconfig |  4 ++++
 3 files changed, 21 insertions(+), 1 deletion(-)  create mode 100644

arch/arm/dts/ls1021a-twr-lpuart.dts

arch/arm/dts/Makefile index renamed from arch/arm/dts/Makefile +0 -0

02b031e..4bbf661 100644

arch/arm/dts/Makefile +0 -0

@@ -89,7 +89,7 @@ dtb-$(CONFIG_TARGET_BEAGLE_X15) += am57xx-beagle-

x15.dtb
dtb-$(CONFIG_TARGET_STV0991) += stv0991.dtb

dtb-$(CONFIG_LS102XA) += ls1021a-qds.dtb \

arch/arm/dts/Makefile +1 -1

-     ls1021a-twr-duart.dtb
+     ls1021a-twr-duart.dtb ls1021a-twr-lpuart.dtb
 dtb-$(CONFIG_FSL_LSCH3) += fsl-ls2080a-qds.dtb \
      fsl-ls2080a-rdb.dtb
 dtb-$(CONFIG_FSL_LSCH2) += fsl-ls1043a-qds.dtb \ diff --git

a/arch/arm/dts/ls1021a-twr-lpuart.dts b/arch/arm/dts/ls1021a-twr- lpuart.dts
new file mode 100644
index 0000000..2941ec0

arch/arm/dts/ls1021a-twr-lpuart.dts new file +16 -0

@@ -0,0 +1,16 @@
+/*
+ * Freescale ls1021a TWR board device tree source
+ *
+ * Copyright 2013-2015 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:  GPL-2.0+
+ */
+
+/dts-v1/;
+#include "ls1021a-twr.dtsi"
+
+/ {
+     chosen {
+             stdout-path = &lpuart0;
+     };
+};

configs/ls1021atwr_nor_lpuart_defconfig +4 -1

index 58cd61f..599342f 100644
@@ -1,7 +1,11 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021ATWR=y
+CONFIG_DM_SERIAL=y
+CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-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
--

Quoted 1 line

1.8.2.1

Reviewed-by Alison Wang <[email protected]>

Tested-by Alison Wang <[email protected]>

Quoted 2 lines

Best Regards,
Alison Wang

Acked-by Simon Glass <[email protected]>