Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 51fe52229e3765dc56b8d2dd5df656fbf8a20500

Authored by Thomas Abraham
Committed by Ben Dooks
1 parent bb9b1c7727
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

ARM: SAMSUNG: serial: Modify console initialization. 

This patch modifies s3c24xx_serial_initconsole function to accept multiple
platform UART information structures. This is required on platforms that have
differences among the instances of UART ports. As an example, the FIFO sizes
could be different for each UART instance and hence multiple platform UART
information structures would be needed.

This patch also modifies the s3c24xx_console_init macro since it wraps the
call to the s3c24xx_serial_initconsole function.

Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>

Showing 2 changed files with 15 additions and 10 deletions Side-by-side Diff

drivers/serial/samsung.c
Diff comments   View file @ 51fe522
... ... @@ -1374,7 +1374,7 @@
1374 1374 * data.
1375 1375 */
1376 1376  
1377   -static int s3c24xx_serial_init_ports(struct s3c24xx_uart_info *info)
  1377 +static int s3c24xx_serial_init_ports(struct s3c24xx_uart_info **info)
1378 1378 {
1379 1379 struct s3c24xx_uart_port *ptr = s3c24xx_serial_ports;
1380 1380 struct platform_device **platdev_ptr;
... ... @@ -1385,7 +1385,7 @@
1385 1385 platdev_ptr = s3c24xx_uart_devs;
1386 1386  
1387 1387 for (i = 0; i < CONFIG_SERIAL_SAMSUNG_UARTS; i++, ptr++, platdev_ptr++) {
1388   - s3c24xx_serial_init_port(ptr, info, *platdev_ptr);
  1388 + s3c24xx_serial_init_port(ptr, info[i], *platdev_ptr);
1389 1389 }
1390 1390  
1391 1391 return 0;
... ... @@ -1451,7 +1451,7 @@
1451 1451 };
1452 1452  
1453 1453 int s3c24xx_serial_initconsole(struct platform_driver *drv,
1454   - struct s3c24xx_uart_info *info)
  1454 + struct s3c24xx_uart_info **info)
1455 1455  
1456 1456 {
1457 1457 struct platform_device *dev = s3c24xx_uart_devs[0];
drivers/serial/samsung.h
Diff comments   View file @ 51fe522
... ... @@ -75,19 +75,24 @@
75 75 extern int __devexit s3c24xx_serial_remove(struct platform_device *dev);
76 76  
77 77 extern int s3c24xx_serial_initconsole(struct platform_driver *drv,
78   - struct s3c24xx_uart_info *uart);
  78 + struct s3c24xx_uart_info **uart);
79 79  
80 80 extern int s3c24xx_serial_init(struct platform_driver *drv,
81 81 struct s3c24xx_uart_info *info);
82 82  
83 83 #ifdef CONFIG_SERIAL_SAMSUNG_CONSOLE
84 84  
85   -#define s3c24xx_console_init(__drv, __inf) \
86   -static int __init s3c_serial_console_init(void) \
87   -{ \
88   - return s3c24xx_serial_initconsole(__drv, __inf); \
89   -} \
90   - \
  85 +#define s3c24xx_console_init(__drv, __inf) \
  86 +static int __init s3c_serial_console_init(void) \
  87 +{ \
  88 + struct s3c24xx_uart_info *uinfo[CONFIG_SERIAL_SAMSUNG_UARTS]; \
  89 + int i; \
  90 + \
  91 + for (i = 0; i < CONFIG_SERIAL_SAMSUNG_UARTS; i++) \
  92 + uinfo[i] = __inf; \
  93 + return s3c24xx_serial_initconsole(__drv, uinfo); \
  94 +} \
  95 + \
91 96 console_initcall(s3c_serial_console_init)
92 97  
93 98 #else