SAMSUNG: serial: modify name from s5pc1xx to s5p
PATCH 1/1 SAMSUNG: serial: modify name from s5pc1xx to s5p
Because of other s5p series SoC will use these serial functions, modify function's name and structure's name.
Signed-off-by Minkyu Kang <[email protected]>
--- common/serial.c | 16 ++-- drivers/serial/Makefile | 2 +- drivers/serial/serial_s5p.c | 205 +++++++++++++++++++++++++++++++++++ drivers/serial/serial_s5pc1xx.c | 205 ----------------------------------- include/asm-arm/arch-s5pc1xx/uart.h | 2 +- include/serial.h | 8 +- 6 files changed, 219 insertions(+), 219 deletions(-) create mode 100644 drivers/serial/serial_s5p.c delete mode 100644 drivers/serial/serial_s5pc1xx.c
common/serial.c +8 -8
@@ -71,13 +71,13 @@ struct serial_device *__default_serial_console (void)#endif #elif defined(CONFIG_S5PC1XX)#if defined(CONFIG_SERIAL0 ) -return &s5pc1xx_serial0_device; +return &s5p_serial0_device;#elif defined(CONFIG_SERIAL1 ) -return &s5pc1xx_serial1_device; +return &s5p_serial1_device;#elif defined(CONFIG_SERIAL2 ) -return &s5pc1xx_serial2_device; +return &s5p_serial2_device;#elif defined(CONFIG_SERIAL3 ) -return &s5pc1xx_serial3_device; +return &s5p_serial3_device;#else #error "CONFIG_SERIAL? missing."#endif
@@ -154,10 +154,10 @@ void serial_initialize (void)serial_register (&s3c24xx_serial2_device);#endif #if defined(CONFIG_S5PC1XX ) -serial_register (&s5pc1xx_serial0_device); -serial_register (&s5pc1xx_serial1_device); -serial_register (&s5pc1xx_serial2_device); -serial_register (&s5pc1xx_serial3_device); +serial_register (&s5p_serial0_device); +serial_register (&s5p_serial1_device); +serial_register (&s5p_serial2_device); +serial_register (&s5p_serial3_device);#endif serial_assign (default_serial_console ()->name); }
drivers/serial/Makefile +1 -1
@@ -33,7 +33,7 @@ COBJS-$(CONFIG_NS9750_UART) += ns9750_serial.o COBJS-$(CONFIG_SYS_NS16550) += ns16550.o COBJS-$(CONFIG_DRIVER_S3C4510_UART) += s3c4510b_uart.o COBJS-$(CONFIG_S3C64XX) += s3c64xx.o -COBJS-$(CONFIG_S5PC1XX) += serial_s5pc1xx.o +COBJS-$(CONFIG_S5PC1XX) += serial_s5p.o COBJS-$(CONFIG_SYS_NS16550_SERIAL) += serial.o COBJS-$(CONFIG_CLPS7111_SERIAL) += serial_clps7111.o COBJS-$(CONFIG_IMX_SERIAL) += serial_imx.o
drivers/serial/serial_s5p.c new file +205 -0
205 lines not on this page · raw message
drivers/serial/serial_s5pc1xx.c deleted +0 -205
205 lines not on this page · raw message
include/asm-arm/arch-s5pc1xx/uart.h +1 -1
@@ -24,7 +24,7 @@#define __ASM_ARCH_UART_H_ #ifndef __ASSEMBLY__ -struct s5pc1xx_uart { +struct s5p_uart { unsigned int ulcon; unsigned int ucon; unsigned int ufcon;
include/serial.h +4 -4
@@ -44,10 +44,10 @@ extern struct serial_device s3c24xx_serial2_device;#endif #if defined(CONFIG_S5PC1XX ) -extern struct serial_device s5pc1xx_serial0_device; -extern struct serial_device s5pc1xx_serial1_device; -extern struct serial_device s5pc1xx_serial2_device; -extern struct serial_device s5pc1xx_serial3_device; +extern struct serial_device s5p_serial0_device; +extern struct serial_device s5p_serial1_device; +extern struct serial_device s5p_serial2_device; +extern struct serial_device s5p_serial3_device;#endif #if defined(CONFIG_OMAP3_ZOOM2 )
Signature · 1 line
1.5.4.3
PATCH 1/1 SAMSUNG: serial: modify name from s5pc1xx to s5p
Quoted 11 lines · Minkyu Kang
Because of other s5p series SoC will use these serial functions, modify function's name and structure's name.
Signed-off-by Minkyu Kang <[email protected]>---
?common/serial.c ? ? ? ? ? ? ? ? ? ? | ? 16 ++-- ?drivers/serial/Makefile ? ? ? ? ? ? | ? ?2 +- ?drivers/serial/serial_s5p.c ? ? ? ? | ?205 +++++++++++++++++++++++++++++++++++ ?drivers/serial/serial_s5pc1xx.c ? ? | ?205 ----------------------------------- ?include/asm-arm/arch-s5pc1xx/uart.h | ? ?2 +- ?include/serial.h ? ? ? ? ? ? ? ? ? ?| ? ?8 +-
Quoted 4 lines
?6 files changed, 219 insertions(+), 219 deletions(-) ?create mode 100644
drivers/serial/serial_s5p.c?delete mode 100644drivers/serial/serial_s5pc1xx.c
applied to u-boot-samsung
Minkyu Kang
Signature · 2 lines
from. prom. www.promsoft.net