diff options
Diffstat (limited to 'drivers/serial/atmel.c')
-rw-r--r-- | drivers/serial/atmel.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/drivers/serial/atmel.c b/drivers/serial/atmel.c index 8394273f9f..b957b75284 100644 --- a/drivers/serial/atmel.c +++ b/drivers/serial/atmel.c @@ -1,17 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) 2004 Sascha Hauer <sascha@saschahauer.de> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * */ #include <common.h> @@ -395,7 +384,7 @@ static int atmel_serial_set_mode(struct console_device *cdev, enum console_mode */ static int atmel_serial_init_port(struct console_device *cdev) { - struct device_d *dev = cdev->dev; + struct device *dev = cdev->dev; struct atmel_uart_port *uart = to_atmel_uart_port(cdev); uart->base = dev_request_mem_region_err_null(dev, 0); @@ -423,10 +412,11 @@ static int atmel_serial_init_port(struct console_device *cdev) return 0; } -static int atmel_serial_probe(struct device_d *dev) +static int atmel_serial_probe(struct device *dev) { struct atmel_uart_port *uart; struct console_device *cdev; + int ret; uart = xzalloc(sizeof(struct atmel_uart_port)); cdev = &uart->uart; @@ -437,8 +427,13 @@ static int atmel_serial_probe(struct device_d *dev) cdev->setbrg = atmel_serial_setbaudrate; cdev->set_mode = atmel_serial_set_mode; cdev->linux_console_name = "ttyAT"; + cdev->linux_earlycon_name = "atmel_serial"; + + ret = atmel_serial_init_port(cdev); + if (ret) + return ret; - atmel_serial_init_port(cdev); + cdev->phys_base = uart->base; /* Enable UART */ @@ -452,8 +447,9 @@ static const struct of_device_id __maybe_unused atmel_serial_dt_ids[] = { { .compatible = "atmel,at91sam9260-usart" }, { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, atmel_serial_dt_ids); -static struct driver_d atmel_serial_driver = { +static struct driver atmel_serial_driver = { .name = "atmel_usart", .probe = atmel_serial_probe, .of_compatible = DRV_OF_COMPAT(atmel_serial_dt_ids), |