serial: qcom-geni: Make UART port count configurable via Kconfig

Replace the hardcoded GENI_UART_PORTS macro with a new Kconfig option
SERIAL_QCOM_GENI_UART_PORTS to allow platforms to configure the maximum
number of UART ports supported by the driver at build time.

This improves flexibility for platforms that require more than the
previously fixed number of UART ports, and avoids unnecessary allocation
for unused ports.

Signed-off-by: Zong Jiang <quic_zongjian@quicinc.com>
Link: https://lore.kernel.org/r/20250812054819.3748649-3-quic_zongjian@quicinc.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 44427415a80d7da63a8f2328b1932bff48500974..e661f5951f558c490da8d9c678be4b752fbca056 100644 (file)
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -928,6 +928,14 @@ config SERIAL_QCOM_GENI_CONSOLE
          Serial console driver for Qualcomm Technologies Inc's GENI based
          QUP hardware.
 
+config SERIAL_QCOM_GENI_UART_PORTS
+       int "Maximum number of GENI UART ports"
+       depends on SERIAL_QCOM_GENI
+       default "8"
+       help
+         Set this to the maximum number of serial ports you want the driver
+         to support.
+
 config SERIAL_VT8500
        bool "VIA VT8500 on-chip serial port support"
        depends on ARCH_VT8500 || COMPILE_TEST

diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c
index 080c18ddbdde16deca484a49d1d4da93f958dfc8..9c7b1cea7cfeb3d1501d4a4715d3efcf50342ccb 100644 (file)
--- a/drivers/tty/serial/qcom_geni_serial.c
+++ b/drivers/tty/serial/qcom_geni_serial.c
@@ -77,7 +77,6 @@
 #define STALE_TIMEOUT                  16
 #define DEFAULT_BITS_PER_CHAR          10
 #define GENI_UART_CONS_PORTS           1
-#define GENI_UART_PORTS                        3
 #define DEF_FIFO_DEPTH_WORDS           16
 #define DEF_TX_WM                      2
 #define DEF_FIFO_WIDTH_BITS            32
@@ -261,7 +260,7 @@ static const char *qcom_geni_serial_get_type(struct uart_port *uport)
 static struct qcom_geni_serial_port *get_port_from_line(int line, bool console, struct device *dev)
 {
        struct qcom_geni_serial_port *port;
-       int nr_ports = console ? GENI_UART_CONS_PORTS : GENI_UART_PORTS;
+       int nr_ports = console ? GENI_UART_CONS_PORTS : CONFIG_SERIAL_QCOM_GENI_UART_PORTS;
 
        if (console) {
                if (line < 0 || line >= nr_ports)
@@ -1652,7 +1651,7 @@ static struct uart_driver qcom_geni_uart_driver = {
        .owner = THIS_MODULE,
        .driver_name = "qcom_geni_uart",
        .dev_name = "ttyHS",
-       .nr =  GENI_UART_PORTS,
+       .nr = CONFIG_SERIAL_QCOM_GENI_UART_PORTS,
 };
 
 static int geni_serial_resources_on(struct uart_port *uport)