On 2016-01-25 09:03, Bhuvanchandra DV wrote:
All boards using this driver are with device tree support, hence drop the legacy code in driver to have a pure DT solution.
Hm, dropping the legacy code at this point probably leads to a broken state (bisectability...)
I would recommend to first move the boards to device tree and then drop legacy stuff... Probably along these lines:
arm: vybrid: Enable lpuart support arm: colibri-vf: Enable serial support arm: vybrid: Drop enabling gpio, uart and spi in legacy mode arm: vf610-twr: Add device tree files arm: pcm052: Add device tree files arm: vybrid: Update defconfig's dm: lpuart: Drop the legacy code dm: vybrid_gpio: Drop legacy code
-- Stefan
Signed-off-by: Bhuvanchandra DV bhuvanchandra.dv@toradex.com Reviewed-by: Bin Meng bmeng.cn@gmail.com
drivers/serial/serial_lpuart.c | 101 +---------------------------------------- 1 file changed, 2 insertions(+), 99 deletions(-)
diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c index 3f9c4d1..fc3321f 100644 --- a/drivers/serial/serial_lpuart.c +++ b/drivers/serial/serial_lpuart.c @@ -48,8 +48,6 @@
DECLARE_GLOBAL_DATA_PTR;
-struct lpuart_fsl *base = (struct lpuart_fsl *)LPUART_BASE;
struct lpuart_serial_platdata { struct lpuart_fsl *reg; }; @@ -127,43 +125,6 @@ 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);
-}
-static int lpuart_serial_getc(void) -{
- return _lpuart_serial_getc(base);
-}
-static void lpuart_serial_putc(const char c) -{
- _lpuart_serial_putc(base, c);
-}
-static int lpuart_serial_tstc(void) -{
- return _lpuart_serial_tstc(base);
-}
-static int lpuart_serial_init(void) -{
- return _lpuart_serial_init(base);
-}
-static struct serial_device lpuart_serial_drv = {
- .name = "lpuart_serial",
- .start = lpuart_serial_init,
- .stop = NULL,
- .setbrg = lpuart_serial_setbrg,
- .putc = lpuart_serial_putc,
- .puts = default_serial_puts,
- .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; @@ -210,8 +171,8 @@ static int lpuart_serial_probe(struct udevice *dev)
return _lpuart_serial_init(reg); } -#endif /* CONFIG_DM_SERIAL */ #else
static void _lpuart32_serial_setbrg(struct lpuart_fsl *base, int baudrate) { u32 clk = CONFIG_SYS_CLK_FREQ; @@ -281,43 +242,6 @@ 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);
-}
-static int lpuart32_serial_getc(void) -{
- return _lpuart32_serial_getc(base);
-}
-static void lpuart32_serial_putc(const char c) -{
- _lpuart32_serial_putc(base, c);
-}
-static int lpuart32_serial_tstc(void) -{
- return _lpuart32_serial_tstc(base);
-}
-static int lpuart32_serial_init(void) -{
- return _lpuart32_serial_init(base);
-}
-static struct serial_device lpuart32_serial_drv = {
- .name = "lpuart32_serial",
- .start = lpuart32_serial_init,
- .stop = NULL,
- .setbrg = lpuart32_serial_setbrg,
- .putc = lpuart32_serial_putc,
- .puts = default_serial_puts,
- .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; @@ -364,28 +288,8 @@ static int lpuart32_serial_probe(struct udevice *dev)
return _lpuart32_serial_init(reg); } -#endif /* CONFIG_DM_SERIAL */ -#endif
-#ifndef CONFIG_DM_SERIAL -void lpuart_serial_initialize(void) -{ -#ifdef CONFIG_LPUART_32B_REG
- serial_register(&lpuart32_serial_drv);
-#else
- serial_register(&lpuart_serial_drv);
-#endif -} +#endif /* CONFIG_LPUART_32B_REG */
-__weak struct serial_device *default_serial_console(void) -{ -#ifdef CONFIG_LPUART_32B_REG
- return &lpuart32_serial_drv;
-#else
- 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; @@ -447,4 +351,3 @@ U_BOOT_DRIVER(serial_lpuart32) = { .flags = DM_FLAG_PRE_RELOC, }; #endif /* CONFIG_LPUART_32B_REG */ -#endif /* CONFIG_DM_SERIAL */