diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-14 14:42:51 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-14 14:42:51 +0100 |
| commit | 05e04245a63efc8054c58ffad1bf8d75357a09e5 (patch) | |
| tree | 78a4b995bb1cc3c9b79409dffccc8c7dfec92dbb /include/linux | |
| parent | 14ae66ec20d20455cd8b6bf02fcc8aeadea75fe6 (diff) | |
| parent | 36844ea19656fb41278799ef3d5cd52120d89149 (diff) | |
| download | linux-next-05e04245a63efc8054c58ffad1bf8d75357a09e5.tar.gz linux-next-05e04245a63efc8054c58ffad1bf8d75357a09e5.zip | |
Merge branch 'tty-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/serial_core.h | 2 | ||||
| -rw-r--r-- | include/linux/soc/qcom/geni-se.h | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 904760876ca8..4eeb8253752a 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -1140,8 +1140,6 @@ int uart_add_one_port(struct uart_driver *reg, struct uart_port *port); void uart_remove_one_port(struct uart_driver *reg, struct uart_port *port); int uart_read_port_properties(struct uart_port *port); int uart_read_and_validate_port_properties(struct uart_port *port); -bool uart_match_port(const struct uart_port *port1, - const struct uart_port *port2); /* * Power Management diff --git a/include/linux/soc/qcom/geni-se.h b/include/linux/soc/qcom/geni-se.h index 645609b57df8..b3372a3147a0 100644 --- a/include/linux/soc/qcom/geni-se.h +++ b/include/linux/soc/qcom/geni-se.h @@ -347,12 +347,18 @@ struct geni_se { #define QUP_SE_VERSION_2_5 0x20050000 /* - * QUP Core 2X clock votes used by GENI clients through the "qup-core" ICC - * path. Values are in Bps and must be converted with Bps_to_icc() before - * setting avg_bw. + * ICC bandwidth values in Bps for the GENI_TO_CORE ("qup-core") path. + * Convert them with Bps_to_icc() before setting avg_bw. The QUP ICC provider + * maps each threshold to the Core 2X rate named by the macro suffix. + * + * These values are core clock votes, not GENI transfer bandwidths. */ #define CORE_2X_19_2_MHZ 9600000 #define CORE_2X_50_MHZ 25000000 +#define CORE_2X_100_MHZ 50000000 +#define CORE_2X_150_MHZ 75000000 +#define CORE_2X_200_MHZ 100000000 +#define CORE_2X_236_MHZ 118000000 #define GENI_DEFAULT_BW Bps_to_icc(1000) |