mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-24 15:01:13 +07:00
net: phy: Fixup GPLv2+ SPDX tags based on license text
A few PHY drivers have the GPLv2+ license text. They then either have a MODULE_LICENSE() of GPLv2 only, or an SPDX tag of GPLv2 only. Since the license text is much easier to understand than either the SPDX tag or the MODULE_LICENSE, use it as the definitive source of the licence, and fixup the others when there are contradictions. Cc: David Wu <david.wu@rock-chips.com> Cc: Dongpo Li <lidongpo@hisilicon.com> Cc: Michael Schmitz <schmitzmic@gmail.com> Signed-off-by: Andrew Lunn <andrew@lunn.ch> Acked-by: Michael Schmitz <schmitzmic@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
25974d8af1
commit
ab06418b7f
@ -1,13 +1,7 @@
|
|||||||
// SPDX-License-Identifier: GPL-2.0
|
// SPDX-License-Identifier: GPL-2.0+
|
||||||
/* Driver for Asix PHYs
|
/* Driver for Asix PHYs
|
||||||
*
|
*
|
||||||
* Author: Michael Schmitz <schmitzmic@gmail.com>
|
* Author: Michael Schmitz <schmitzmic@gmail.com>
|
||||||
*
|
|
||||||
* 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.
|
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/errno.h>
|
#include <linux/errno.h>
|
||||||
|
@ -1,20 +1,8 @@
|
|||||||
|
// SPDX-License-Identifier: GPL-2.0+
|
||||||
/*
|
/*
|
||||||
* Hisilicon Fast Ethernet MDIO Bus Driver
|
* Hisilicon Fast Ethernet MDIO Bus Driver
|
||||||
*
|
*
|
||||||
* Copyright (c) 2016 HiSilicon Technologies Co., Ltd.
|
* Copyright (c) 2016 HiSilicon Technologies Co., Ltd.
|
||||||
*
|
|
||||||
* 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.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/clk.h>
|
#include <linux/clk.h>
|
||||||
@ -163,4 +151,4 @@ module_platform_driver(hisi_femac_mdio_driver);
|
|||||||
|
|
||||||
MODULE_DESCRIPTION("Hisilicon Fast Ethernet MAC MDIO interface driver");
|
MODULE_DESCRIPTION("Hisilicon Fast Ethernet MAC MDIO interface driver");
|
||||||
MODULE_AUTHOR("Dongpo Li <lidongpo@hisilicon.com>");
|
MODULE_AUTHOR("Dongpo Li <lidongpo@hisilicon.com>");
|
||||||
MODULE_LICENSE("GPL v2");
|
MODULE_LICENSE("GPL");
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// SPDX-License-Identifier: GPL-2.0+
|
||||||
/**
|
/**
|
||||||
* drivers/net/phy/rockchip.c
|
* drivers/net/phy/rockchip.c
|
||||||
*
|
*
|
||||||
@ -6,12 +7,6 @@
|
|||||||
* Copyright (c) 2017, Fuzhou Rockchip Electronics Co., Ltd
|
* Copyright (c) 2017, Fuzhou Rockchip Electronics Co., Ltd
|
||||||
*
|
*
|
||||||
* David Wu <david.wu@rock-chips.com>
|
* David Wu <david.wu@rock-chips.com>
|
||||||
*
|
|
||||||
* 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.
|
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/ethtool.h>
|
#include <linux/ethtool.h>
|
||||||
@ -229,4 +224,4 @@ MODULE_DEVICE_TABLE(mdio, rockchip_phy_tbl);
|
|||||||
|
|
||||||
MODULE_AUTHOR("David Wu <david.wu@rock-chips.com>");
|
MODULE_AUTHOR("David Wu <david.wu@rock-chips.com>");
|
||||||
MODULE_DESCRIPTION("Rockchip Ethernet PHY driver");
|
MODULE_DESCRIPTION("Rockchip Ethernet PHY driver");
|
||||||
MODULE_LICENSE("GPL v2");
|
MODULE_LICENSE("GPL");
|
||||||
|
Loading…
Reference in New Issue
Block a user