Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6a2c7eabfd09ca7986bf96b8958a87ca041a19d8

Authored by Maxime Bizon
Committed by Greg Kroah-Hartman
1 parent a6d07d14bb
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

serial: bcm63xx_uart: allow more than one uart to be registered. 

The bcm6358 CPU has two uarts, make it possible to use the second one.

Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 1 changed file with 3 additions and 2 deletions Side-by-side Diff

drivers/serial/bcm63xx_uart.c
Diff comments   View file @ 6a2c7ea
... ... @@ -35,7 +35,7 @@
35 35 #include <bcm63xx_regs.h>
36 36 #include <bcm63xx_io.h>
37 37  
38   -#define BCM63XX_NR_UARTS 1
  38 +#define BCM63XX_NR_UARTS 2
39 39  
40 40 static struct uart_port ports[BCM63XX_NR_UARTS];
41 41  
... ... @@ -784,7 +784,7 @@
784 784 .dev_name = "ttyS",
785 785 .major = TTY_MAJOR,
786 786 .minor = 64,
787   - .nr = 1,
  787 + .nr = BCM63XX_NR_UARTS,
788 788 .cons = BCM63XX_CONSOLE,
789 789 };
790 790  
... ... @@ -826,6 +826,7 @@
826 826 port->dev = &pdev->dev;
827 827 port->fifosize = 16;
828 828 port->uartclk = clk_get_rate(clk) / 2;
  829 + port->line = pdev->id;
829 830 clk_put(clk);
830 831  
831 832 ret = uart_add_one_port(&bcm_uart_driver, port);