From f82cb5bdc879103427ade760477d61efdcf942ea Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Mon, 27 Jan 2025 06:02:16 -0800 Subject: [PATCH] Revert "tty: wch: update copyright headers" This reverts commit a9ae1a62f2cc19d3c487f8b5d25e3c1d4be1d3a7. Reason for revert: Modifies original copyright and license Change-Id: I08cfac80a758229a43cec4c22c110af1581656a2 Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3291558 Reviewed-by: Brad Griffis GVS: buildbot_gerritrpt Tested-by: Jon Hunter Reviewed-by: Jon Hunter --- drivers/tty/serial/wch_35x/wch_common.h | 12 +++++-- drivers/tty/serial/wch_35x/wch_main.c | 46 +++++++++++++++++++++++-- drivers/tty/serial/wch_35x/wch_serial.c | 12 +++++-- 3 files changed, 64 insertions(+), 6 deletions(-) diff --git a/drivers/tty/serial/wch_35x/wch_common.h b/drivers/tty/serial/wch_35x/wch_common.h index 97f2208b..9c1fc103 100644 --- a/drivers/tty/serial/wch_35x/wch_common.h +++ b/drivers/tty/serial/wch_35x/wch_common.h @@ -1,6 +1,14 @@ /* - * SPDX-FileCopyrightText: Copyright (c) 2023-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. - * SPDX-License-Identifier: GPL-2.0-only + * Copyright (c) 2021-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope 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. */ #ifndef WCH_COMMON diff --git a/drivers/tty/serial/wch_35x/wch_main.c b/drivers/tty/serial/wch_35x/wch_main.c index bbefd914..e286dbfc 100644 --- a/drivers/tty/serial/wch_35x/wch_main.c +++ b/drivers/tty/serial/wch_35x/wch_main.c @@ -1,8 +1,50 @@ /* - * SPDX-FileCopyrightText: Copyright (c) 2023-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. - * SPDX-License-Identifier: GPL-2.0-only + * PCI/PCIE to serial driver for ch351/352/353/355/356/357/358/359/382/384, etc. + * + * Copyright (C) 2023 Nanjing Qinheng Microelectronics Co., Ltd. + * Web: http://wch.cn + * Author: WCH + * + * 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. + * + * Update Log: + * V1.00 - initial version + * V1.10 - fixed uart send bugs + * V1.11 - fixed the issue of serial ports number creation + * V1.12 - fixed modem signals support + * V1.13 - added automatic frequency multiplication when using baud rates higher than 115200bps + - added mutex protection in uart transmit process + * V1.14 - optimized the processing of serial ports in interruption + * V1.15 - added support for non-standard baud rate + * V1.16 - fixed uart clock frequency multiplication bugs + * V1.17 - modified uart data received process + * V1.18 - changed uart fifo trigger level + - changed uart transmission to half of the fifo size + * V1.19 - fixed ch358 uart0 setting bug + * V1.20 - added pre-load driver + * V1.21 - fixed modem setting when disable hardflow + * V1.22 - added support for rs485 configuration + * V1.23 - added supports for kernel version beyond 5.14.x + * V1.24 - fixed ch351/2/3 uart0 setting bug, merged pre-load driver */ +/* + * Copyright (c) 2021-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope 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 "wch_common.h" extern struct wch_board wch_board_table[WCH_BOARDS_MAX]; diff --git a/drivers/tty/serial/wch_35x/wch_serial.c b/drivers/tty/serial/wch_35x/wch_serial.c index 37d1eb5f..b01b0de7 100644 --- a/drivers/tty/serial/wch_35x/wch_serial.c +++ b/drivers/tty/serial/wch_35x/wch_serial.c @@ -1,6 +1,14 @@ /* - * SPDX-FileCopyrightText: Copyright (c) 2023-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. - * SPDX-License-Identifier: GPL-2.0-only + * Copyright (c) 2021-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope 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