A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 18:51:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "serial: msm_geni_serial: Cover console under GENI_CONSOLE config"

Browse source
This commit is contained in:
qctecmdr 2020-02-18 18:45:19 -08:00 • committed by Gerrit - the friendly Code Review server
commit 98e83a9de0
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
drivers/tty/serial/msm_geni_serial.c
View file

@ -707,7 +707,7 @@ static void msm_geni_serial_poll_put_char(struct uart_port *uport,
}
#endif
#if defined(CONFIG_SERIAL_CORE_CONSOLE) || defined(CONFIG_CONSOLE_POLL)
#if defined(CONFIG_SERIAL_MSM_GENI_CONSOLE) || defined(CONFIG_CONSOLE_POLL)
static void msm_geni_serial_wr_char(struct uart_port *uport, int ch)
{
geni_write_reg_nolog(ch, uport->membase, SE_GENI_TX_FIFOn);
@ -878,7 +878,7 @@ static int handle_rx_console(struct uart_port *uport,
return -EPERM;
}
#endif /* (CONFIG_SERIAL_CORE_CONSOLE) || defined(CONFIG_CONSOLE_POLL)) */
#endif /* (CONFIG_SERIAL_MSM_GENI_CONSOLE) || defined(CONFIG_CONSOLE_POLL)) */
static int msm_geni_serial_prep_dma_tx(struct uart_port *uport)
{
@ -2213,7 +2213,7 @@ static ssize_t ver_info_show(struct device *dev,
}
static DEVICE_ATTR_RO(ver_info);
#if defined(CONFIG_SERIAL_CORE_CONSOLE) || defined(CONFIG_CONSOLE_POLL)
#if defined(CONFIG_SERIAL_MSM_GENI_CONSOLE) || defined(CONFIG_CONSOLE_POLL)
static int __init msm_geni_console_setup(struct console *co, char *options)
{
struct uart_port *uport;
@ -2396,7 +2396,7 @@ static int console_register(struct uart_driver *drv)
static void console_unregister(struct uart_driver *drv)
{
}
#endif /* defined(CONFIG_SERIAL_CORE_CONSOLE) || defined(CONFIG_CONSOLE_POLL) */
#endif /* (CONFIG_SERIAL_MSM_GENI_CONSOLE) || defined(CONFIG_CONSOLE_POLL) */
static void msm_geni_serial_debug_init(struct uart_port *uport, bool console)
{
@ -2509,7 +2509,7 @@ static const struct uart_ops msm_geni_serial_pops = {
};
static const struct of_device_id msm_geni_device_tbl[] = {
#if defined(CONFIG_SERIAL_CORE_CONSOLE) || defined(CONFIG_CONSOLE_POLL)
#if defined(CONFIG_SERIAL_MSM_GENI_CONSOLE) || defined(CONFIG_CONSOLE_POLL)
{ .compatible = "qcom,msm-geni-console",
.data = (void *)&msm_geni_console_driver},
#endif