Re: [U-Boot] [PATCH 3/3] serial: drop useless ctlr field
Dear Mike Frysinger, In message 1304136211-1316-3-git-send-email-vap...@gentoo.org you wrote: The multi serial support has a ctlr field which almost no one uses, but everyone is forced to set to useless strings. So punt it. Funny enough, the only code that actually reads this field (the mpc8xx driver) has a typo where it meant to look for the SCC driver. Fix it while converting the check to use the name field. Signed-off-by: Mike Frysinger vap...@gentoo.org CC: Heiko Schocher h...@denx.de CC: Anatolij Gustschin ag...@denx.de CC: Tom Rix tom@windriver.com CC: Minkyu Kang mk7.k...@samsung.com CC: Craig Nauman cnau...@diagraph.com CC: Marek Vasut marek.va...@gmail.com CC: Prafulla Wadaskar prafu...@marvell.com CC: Mahavir Jain mj...@marvell.com --- note: while i've compiled tested all of these, i obviously can't runtime test them ... i have runtime tested the common code though on a Blackfin part ... arch/powerpc/cpu/mpc512x/serial.c | 11 +-- arch/powerpc/cpu/mpc5xxx/serial.c |2 -- arch/powerpc/cpu/mpc8xx/serial.c |8 +++- board/logicpd/zoom2/zoom2_serial.h |2 -- drivers/serial/serial.c| 11 +-- drivers/serial/serial_pxa.c|3 --- drivers/serial/serial_s3c24x0.c|9 - drivers/serial/serial_s5p.c| 11 +-- include/serial.h |2 -- 9 files changed, 22 insertions(+), 37 deletions(-) Applied, thanks. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de 1 1 was a race-horse, 2 2 was 1 2. When 1 1 1 1 race, 2 2 1 1 2. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 3/3] serial: drop useless ctlr field
The multi serial support has a ctlr field which almost no one uses,
but everyone is forced to set to useless strings. So punt it.
Funny enough, the only code that actually reads this field (the mpc8xx
driver) has a typo where it meant to look for the SCC driver. Fix it
while converting the check to use the name field.
Signed-off-by: Mike Frysinger vap...@gentoo.org
CC: Heiko Schocher h...@denx.de
CC: Anatolij Gustschin ag...@denx.de
CC: Tom Rix tom@windriver.com
CC: Minkyu Kang mk7.k...@samsung.com
CC: Craig Nauman cnau...@diagraph.com
CC: Marek Vasut marek.va...@gmail.com
CC: Prafulla Wadaskar prafu...@marvell.com
CC: Mahavir Jain mj...@marvell.com
---
arch/powerpc/cpu/mpc512x/serial.c | 11 +--
arch/powerpc/cpu/mpc5xxx/serial.c |2 --
arch/powerpc/cpu/mpc8xx/serial.c |8 +++-
board/logicpd/zoom2/zoom2_serial.h |2 --
drivers/serial/serial.c| 11 +--
drivers/serial/serial_pxa.c|3 ---
drivers/serial/serial_s3c24x0.c|9 -
drivers/serial/serial_s5p.c| 11 +--
include/serial.h |2 --
9 files changed, 22 insertions(+), 37 deletions(-)
diff --git a/arch/powerpc/cpu/mpc512x/serial.c
b/arch/powerpc/cpu/mpc512x/serial.c
index 558e4e2..5ee9cef 100644
--- a/arch/powerpc/cpu/mpc512x/serial.c
+++ b/arch/powerpc/cpu/mpc512x/serial.c
@@ -319,9 +319,8 @@ int serial_getcts_dev(unsigned int idx)
serial_puts_dev(port, s); \
}
-#define INIT_PSC_SERIAL_STRUCTURE(port, name, bus) { \
+#define INIT_PSC_SERIAL_STRUCTURE(port, name) { \
name, \
- bus, \
serial##port##_init, \
serial##port##_uninit, \
serial##port##_setbrg, \
@@ -334,25 +333,25 @@ int serial_getcts_dev(unsigned int idx)
#if defined(CONFIG_SYS_PSC1)
DECLARE_PSC_SERIAL_FUNCTIONS(1);
struct serial_device serial1_device =
-INIT_PSC_SERIAL_STRUCTURE(1, psc1, UART1);
+INIT_PSC_SERIAL_STRUCTURE(1, psc1);
#endif
#if defined(CONFIG_SYS_PSC3)
DECLARE_PSC_SERIAL_FUNCTIONS(3);
struct serial_device serial3_device =
-INIT_PSC_SERIAL_STRUCTURE(3, psc3, UART3);
+INIT_PSC_SERIAL_STRUCTURE(3, psc3);
#endif
#if defined(CONFIG_SYS_PSC4)
DECLARE_PSC_SERIAL_FUNCTIONS(4);
struct serial_device serial4_device =
-INIT_PSC_SERIAL_STRUCTURE(4, psc4, UART4);
+INIT_PSC_SERIAL_STRUCTURE(4, psc4);
#endif
#if defined(CONFIG_SYS_PSC6)
DECLARE_PSC_SERIAL_FUNCTIONS(6);
struct serial_device serial6_device =
-INIT_PSC_SERIAL_STRUCTURE(6, psc6, UART6);
+INIT_PSC_SERIAL_STRUCTURE(6, psc6);
#endif
__weak struct serial_device *default_serial_console(void)
diff --git a/arch/powerpc/cpu/mpc5xxx/serial.c
b/arch/powerpc/cpu/mpc5xxx/serial.c
index 0e1a8ec..aa09f67 100644
--- a/arch/powerpc/cpu/mpc5xxx/serial.c
+++ b/arch/powerpc/cpu/mpc5xxx/serial.c
@@ -339,7 +339,6 @@ int serial1_tstc(void)
struct serial_device serial0_device =
{
serial0,
- UART0,
serial0_init,
NULL,
serial0_setbrg,
@@ -357,7 +356,6 @@ __weak struct serial_device *default_serial_console(void)
struct serial_device serial1_device =
{
serial1,
- UART1,
serial1_init,
NULL,
serial1_setbrg,
diff --git a/arch/powerpc/cpu/mpc8xx/serial.c b/arch/powerpc/cpu/mpc8xx/serial.c
index 21803f5..9239b24 100644
--- a/arch/powerpc/cpu/mpc8xx/serial.c
+++ b/arch/powerpc/cpu/mpc8xx/serial.c
@@ -391,7 +391,6 @@ smc_tstc(void)
struct serial_device serial_smc_device =
{
serial_smc,
- SMC,
smc_init,
NULL,
smc_setbrg,
@@ -662,7 +661,6 @@ scc_tstc(void)
struct serial_device serial_scc_device =
{
serial_scc,
- SCC,
scc_init,
NULL,
scc_setbrg,
@@ -702,7 +700,7 @@ kgdb_serial_init(void)
{
int i = -1;
- if (strcmp(default_serial_console()-ctlr, SMC) == 0)
+ if (strcmp(default_serial_console()-name, serial_smc) == 0)
{
#if defined(CONFIG_8xx_CONS_SMC1)
i = 1;
@@ -710,7 +708,7 @@ kgdb_serial_init(void)
i = 2;
#endif
}
- else if (strcmp(default_serial_console()-ctlr, SMC) == 0)
+ else if (strcmp(default_serial_console()-name, serial_scc) == 0)
{
#if defined(CONFIG_8xx_CONS_SCC1)
i = 1;
@@ -725,7 +723,7 @@ kgdb_serial_init(void)
if (i = 0)
{
- serial_printf([on %s%d] , default_serial_console()-ctlr, i);
+ serial_printf([on %s%d] , default_serial_console()-name, i);
}
}
diff --git a/board/logicpd/zoom2/zoom2_serial.h
b/board/logicpd/zoom2/zoom2_serial.h
index a6d2427..4e30587 100644
--- a/board/logicpd/zoom2/zoom2_serial.h
+++ b/board/logicpd/zoom2/zoom2_serial.h
@@ -33,7 +33,6 @@ extern int zoom2_debug_board_connected (void);
#define S(a) #a
#define N(a) S(quad##a)
-#define U(a) S(UART##a)
#define QUAD_INIT(n) \
int quad_init_##n(void)\
@@ -63,7 +62,6 @@ int
[U-Boot] [PATCH 3/3] serial: drop useless ctlr field
The multi serial support has a ctlr field which almost no one uses,
but everyone is forced to set to useless strings. So punt it.
Funny enough, the only code that actually reads this field (the mpc8xx
driver) has a typo where it meant to look for the SCC driver. Fix it
while converting the check to use the name field.
Signed-off-by: Mike Frysinger vap...@gentoo.org
CC: Heiko Schocher h...@denx.de
CC: Anatolij Gustschin ag...@denx.de
CC: Tom Rix tom@windriver.com
CC: Minkyu Kang mk7.k...@samsung.com
CC: Craig Nauman cnau...@diagraph.com
CC: Marek Vasut marek.va...@gmail.com
CC: Prafulla Wadaskar prafu...@marvell.com
CC: Mahavir Jain mj...@marvell.com
---
note: while i've compiled tested all of these, i obviously can't
runtime test them ... i have runtime tested the common code
though on a Blackfin part ...
arch/powerpc/cpu/mpc512x/serial.c | 11 +--
arch/powerpc/cpu/mpc5xxx/serial.c |2 --
arch/powerpc/cpu/mpc8xx/serial.c |8 +++-
board/logicpd/zoom2/zoom2_serial.h |2 --
drivers/serial/serial.c| 11 +--
drivers/serial/serial_pxa.c|3 ---
drivers/serial/serial_s3c24x0.c|9 -
drivers/serial/serial_s5p.c| 11 +--
include/serial.h |2 --
9 files changed, 22 insertions(+), 37 deletions(-)
diff --git a/arch/powerpc/cpu/mpc512x/serial.c
b/arch/powerpc/cpu/mpc512x/serial.c
index 558e4e2..5ee9cef 100644
--- a/arch/powerpc/cpu/mpc512x/serial.c
+++ b/arch/powerpc/cpu/mpc512x/serial.c
@@ -319,9 +319,8 @@ int serial_getcts_dev(unsigned int idx)
serial_puts_dev(port, s); \
}
-#define INIT_PSC_SERIAL_STRUCTURE(port, name, bus) { \
+#define INIT_PSC_SERIAL_STRUCTURE(port, name) { \
name, \
- bus, \
serial##port##_init, \
serial##port##_uninit, \
serial##port##_setbrg, \
@@ -334,25 +333,25 @@ int serial_getcts_dev(unsigned int idx)
#if defined(CONFIG_SYS_PSC1)
DECLARE_PSC_SERIAL_FUNCTIONS(1);
struct serial_device serial1_device =
-INIT_PSC_SERIAL_STRUCTURE(1, psc1, UART1);
+INIT_PSC_SERIAL_STRUCTURE(1, psc1);
#endif
#if defined(CONFIG_SYS_PSC3)
DECLARE_PSC_SERIAL_FUNCTIONS(3);
struct serial_device serial3_device =
-INIT_PSC_SERIAL_STRUCTURE(3, psc3, UART3);
+INIT_PSC_SERIAL_STRUCTURE(3, psc3);
#endif
#if defined(CONFIG_SYS_PSC4)
DECLARE_PSC_SERIAL_FUNCTIONS(4);
struct serial_device serial4_device =
-INIT_PSC_SERIAL_STRUCTURE(4, psc4, UART4);
+INIT_PSC_SERIAL_STRUCTURE(4, psc4);
#endif
#if defined(CONFIG_SYS_PSC6)
DECLARE_PSC_SERIAL_FUNCTIONS(6);
struct serial_device serial6_device =
-INIT_PSC_SERIAL_STRUCTURE(6, psc6, UART6);
+INIT_PSC_SERIAL_STRUCTURE(6, psc6);
#endif
__weak struct serial_device *default_serial_console(void)
diff --git a/arch/powerpc/cpu/mpc5xxx/serial.c
b/arch/powerpc/cpu/mpc5xxx/serial.c
index 0e1a8ec..aa09f67 100644
--- a/arch/powerpc/cpu/mpc5xxx/serial.c
+++ b/arch/powerpc/cpu/mpc5xxx/serial.c
@@ -339,7 +339,6 @@ int serial1_tstc(void)
struct serial_device serial0_device =
{
serial0,
- UART0,
serial0_init,
NULL,
serial0_setbrg,
@@ -357,7 +356,6 @@ __weak struct serial_device *default_serial_console(void)
struct serial_device serial1_device =
{
serial1,
- UART1,
serial1_init,
NULL,
serial1_setbrg,
diff --git a/arch/powerpc/cpu/mpc8xx/serial.c b/arch/powerpc/cpu/mpc8xx/serial.c
index 21803f5..9239b24 100644
--- a/arch/powerpc/cpu/mpc8xx/serial.c
+++ b/arch/powerpc/cpu/mpc8xx/serial.c
@@ -391,7 +391,6 @@ smc_tstc(void)
struct serial_device serial_smc_device =
{
serial_smc,
- SMC,
smc_init,
NULL,
smc_setbrg,
@@ -662,7 +661,6 @@ scc_tstc(void)
struct serial_device serial_scc_device =
{
serial_scc,
- SCC,
scc_init,
NULL,
scc_setbrg,
@@ -702,7 +700,7 @@ kgdb_serial_init(void)
{
int i = -1;
- if (strcmp(default_serial_console()-ctlr, SMC) == 0)
+ if (strcmp(default_serial_console()-name, serial_smc) == 0)
{
#if defined(CONFIG_8xx_CONS_SMC1)
i = 1;
@@ -710,7 +708,7 @@ kgdb_serial_init(void)
i = 2;
#endif
}
- else if (strcmp(default_serial_console()-ctlr, SMC) == 0)
+ else if (strcmp(default_serial_console()-name, serial_scc) == 0)
{
#if defined(CONFIG_8xx_CONS_SCC1)
i = 1;
@@ -725,7 +723,7 @@ kgdb_serial_init(void)
if (i = 0)
{
- serial_printf([on %s%d] , default_serial_console()-ctlr, i);
+ serial_printf([on %s%d] , default_serial_console()-name, i);
}
}
diff --git a/board/logicpd/zoom2/zoom2_serial.h
b/board/logicpd/zoom2/zoom2_serial.h
index a6d2427..4e30587 100644
--- a/board/logicpd/zoom2/zoom2_serial.h
+++ b/board/logicpd/zoom2/zoom2_serial.h
@@ -33,7 +33,6 @@ extern int zoom2_debug_board_connected (void);
#define S(a) #a
#define N(a) S(quad##a)
