| Message ID | 20221210232744.15600-1-pali@kernel.org |
|---|---|
| State | Accepted |
| Commit | 59440d83d38bfed31931d11aa06a3fb56acbd2f0 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | serial: Do not write additional \r before \n for dm_serial drivers | expand |
On 12/11/22 00:27, Pali Rohár wrote: > serial-uclass.c code already puts \r before \n for all dm_serial drivers. > > Signed-off-by: Pali Rohár <pali@kernel.org> Reviewed-by: Stefan Roese <sr@denx.de> Thanks, Stefan > --- > drivers/serial/serial_lpuart.c | 3 --- > drivers/serial/serial_mpc8xx.c | 3 --- > 2 files changed, 6 deletions(-) > > diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c > index ff576da516d4..07941c29ed74 100644 > --- a/drivers/serial/serial_lpuart.c > +++ b/drivers/serial/serial_lpuart.c > @@ -349,9 +349,6 @@ static void _lpuart32_serial_putc(struct lpuart_serial_plat *plat, > struct lpuart_fsl_reg32 *base = plat->reg; > u32 stat; > > - if (c == '\n') > - serial_putc('\r'); > - > while (true) { > lpuart_read32(plat->flags, &base->stat, &stat); > > diff --git a/drivers/serial/serial_mpc8xx.c b/drivers/serial/serial_mpc8xx.c > index aeae6ae6cd25..808a40f503ea 100644 > --- a/drivers/serial/serial_mpc8xx.c > +++ b/drivers/serial/serial_mpc8xx.c > @@ -176,9 +176,6 @@ static int serial_mpc8xx_putc(struct udevice *dev, const char c) > cpm8xx_t __iomem *cpmp = &(im->im_cpm); > struct serialbuffer __iomem *rtx; > > - if (c == '\n') > - serial_mpc8xx_putc(dev, '\r'); > - > rtx = (struct serialbuffer __iomem *)&cpmp->cp_dpmem[CPM_SERIAL_BASE]; > > /* Wait for last character to go. */ Viele Grüße, Stefan Roese
On Sun, 11 Dec 2022 at 12:28, Pali Rohár <pali@kernel.org> wrote: > > serial-uclass.c code already puts \r before \n for all dm_serial drivers. > > Signed-off-by: Pali Rohár <pali@kernel.org> > --- > drivers/serial/serial_lpuart.c | 3 --- > drivers/serial/serial_mpc8xx.c | 3 --- > 2 files changed, 6 deletions(-) > Reviewed-by: Simon Glass <sjg@chromium.org>
On Sun, Dec 11, 2022 at 12:27:44AM +0100, Pali Rohár wrote: > serial-uclass.c code already puts \r before \n for all dm_serial drivers. > > Signed-off-by: Pali Rohár <pali@kernel.org> > Reviewed-by: Stefan Roese <sr@denx.de> > Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot/next, thanks!
diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c index ff576da516d4..07941c29ed74 100644 --- a/drivers/serial/serial_lpuart.c +++ b/drivers/serial/serial_lpuart.c @@ -349,9 +349,6 @@ static void _lpuart32_serial_putc(struct lpuart_serial_plat *plat, struct lpuart_fsl_reg32 *base = plat->reg; u32 stat; - if (c == '\n') - serial_putc('\r'); - while (true) { lpuart_read32(plat->flags, &base->stat, &stat); diff --git a/drivers/serial/serial_mpc8xx.c b/drivers/serial/serial_mpc8xx.c index aeae6ae6cd25..808a40f503ea 100644 --- a/drivers/serial/serial_mpc8xx.c +++ b/drivers/serial/serial_mpc8xx.c @@ -176,9 +176,6 @@ static int serial_mpc8xx_putc(struct udevice *dev, const char c) cpm8xx_t __iomem *cpmp = &(im->im_cpm); struct serialbuffer __iomem *rtx; - if (c == '\n') - serial_mpc8xx_putc(dev, '\r'); - rtx = (struct serialbuffer __iomem *)&cpmp->cp_dpmem[CPM_SERIAL_BASE]; /* Wait for last character to go. */
serial-uclass.c code already puts \r before \n for all dm_serial drivers. Signed-off-by: Pali Rohár <pali@kernel.org> --- drivers/serial/serial_lpuart.c | 3 --- drivers/serial/serial_mpc8xx.c | 3 --- 2 files changed, 6 deletions(-)