diff options
Diffstat (limited to 'drivers/serial/serial_stm32.c')
| -rw-r--r-- | drivers/serial/serial_stm32.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/drivers/serial/serial_stm32.c b/drivers/serial/serial_stm32.c index 4bbfb1eef7..3e18a2c152 100644 --- a/drivers/serial/serial_stm32.c +++ b/drivers/serial/serial_stm32.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics. @@ -41,6 +41,8 @@ static int stm32_serial_setbaudrate(struct console_device *cdev, int baudrate) unsigned long clock_rate; clock_rate = clk_get_rate(stm32->clk); + if (!clock_rate) + return -EINVAL; int_div = DIV_ROUND_CLOSEST(clock_rate, baudrate); @@ -136,7 +138,7 @@ static void stm32_serial_init(struct console_device *cdev) writel(cr1, base + CR1_OFFSET(stm32f4)); } -static int stm32_serial_probe(struct device_d *dev) +static int stm32_serial_probe(struct device *dev) { int ret; struct console_device *cdev; @@ -163,7 +165,7 @@ static int stm32_serial_probe(struct device_d *dev) stm32->stm32f4 = info->stm32f4; stm32->uart_enable_bit = info->uart_enable_bit; - stm32->clk = clk_get(dev, NULL); + stm32->clk = clk_get_for_console(dev, NULL); if (IS_ERR(stm32->clk)) { ret = PTR_ERR(stm32->clk); dev_err(dev, "Failed to get UART clock %d\n", ret); @@ -181,11 +183,11 @@ static int stm32_serial_probe(struct device_d *dev) cdev->putc = stm32_serial_putc; cdev->getc = stm32_serial_getc; cdev->flush = stm32_serial_flush; - cdev->setbrg = stm32_serial_setbaudrate; + cdev->setbrg = stm32->clk ? stm32_serial_setbaudrate : NULL; cdev->linux_console_name = "ttySTM"; - if (dev->device_node) { - devname = of_alias_get(dev->device_node); + if (dev->of_node) { + devname = of_alias_get(dev->of_node); if (devname) { cdev->devname = xstrdup(devname); cdev->devid = DEVICE_ID_SINGLE; @@ -238,8 +240,9 @@ static struct of_device_id stm32_serial_dt_ids[] = { }, { } }; +MODULE_DEVICE_TABLE(of, stm32_serial_dt_ids); -static struct driver_d stm32_serial_driver = { +static struct driver stm32_serial_driver = { .name = "stm32-serial", .probe = stm32_serial_probe, .of_compatible = DRV_OF_COMPAT(stm32_serial_dt_ids), |