Commit 5f857575 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

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+, or an SPDX tag of GPLv2+.

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 with others when there are contradictions.

Cc: Russell King <rmk+kernel@armlinux.org.uk>
Cc: Jonas Jensen <jonas.jensen@gmail.com>
Cc: Laurent Pinchart <laurentp@cse-semaphore.com>
Cc: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
Cc: Scott Wood <scottwood@freescale.com>
Acked-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: default avatarAndrew F. Davis <afd@ti.com>
Acked-by: default avatarDan Murphy <dmurphy@ti.com>
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7ccbd9b8

drivers/net/phy/dp83822.c

+2 −10
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Driver for the Texas Instruments DP83822 PHY

 *

 * Copyright (C) 2017 Texas Instruments Inc.

 *

 * 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.

 *

 * 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 <linux/ethtool.h>
@@ -338,4 +330,4 @@ MODULE_DEVICE_TABLE(mdio, dp83822_tbl); 


MODULE_DESCRIPTION("Texas Instruments DP83822 PHY driver");

MODULE_AUTHOR("Dan Murphy <dmurphy@ti.com");

MODULE_LICENSE("GPL");
 
MODULE_LICENSE("GPL v2");

drivers/net/phy/dp83848.c

+2 −10
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Driver for the Texas Instruments DP83848 PHY

 *

 * Copyright (C) 2015-2016 Texas Instruments Incorporated - http://www.ti.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.

 *

 * 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 <linux/module.h>
@@ -133,4 +125,4 @@ module_phy_driver(dp83848_driver); 


MODULE_DESCRIPTION("Texas Instruments DP83848 PHY driver");

MODULE_AUTHOR("Andrew F. Davis <afd@ti.com>");

MODULE_LICENSE("GPL");
 
MODULE_LICENSE("GPL v2");

drivers/net/phy/dp83867.c

+2 −10
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Driver for the Texas Instruments DP83867 PHY

 *

 * Copyright (C) 2015 Texas Instruments Inc.

 *

 * 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.

 *

 * 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 <linux/ethtool.h>
@@ -357,4 +349,4 @@ MODULE_DEVICE_TABLE(mdio, dp83867_tbl); 


MODULE_DESCRIPTION("Texas Instruments DP83867 PHY driver");

MODULE_AUTHOR("Dan Murphy <dmurphy@ti.com");

MODULE_LICENSE("GPL");
 
MODULE_LICENSE("GPL v2");

drivers/net/phy/mdio-bitbang.c

+2 −5
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Bitbanged MDIO support.

 *
@@ -11,10 +12,6 @@ 
 *

 * 2005 (c) MontaVista Software, Inc.

 * Vitaly Bordug <vbordug@ru.mvista.com>

 *

 * This file is licensed under the terms of the GNU General Public License

 * version 2. This program is licensed "as is" without any warranty of any

 * kind, whether express or implied.

 */



#include <linux/module.h>
@@ -232,4 +229,4 @@ void free_mdio_bitbang(struct mii_bus *bus) 
}

EXPORT_SYMBOL(free_mdio_bitbang);



MODULE_LICENSE("GPL");
 
MODULE_LICENSE("GPL v2");

drivers/net/phy/mdio-gpio.c

+2 −5
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * GPIO based MDIO bitbang driver.

 * Supports OpenFirmware.
@@ -14,10 +15,6 @@ 
 *

 * 2005 (c) MontaVista Software, Inc.

 * Vitaly Bordug <vbordug@ru.mvista.com>

 *

 * This file is licensed under the terms of the GNU General Public License

 * version 2. This program is licensed "as is" without any warranty of any

 * kind, whether express or implied.

 */



#include <linux/module.h>
@@ -216,5 +213,5 @@ module_platform_driver(mdio_gpio_driver); 


MODULE_ALIAS("platform:mdio-gpio");

MODULE_AUTHOR("Laurent Pinchart, Paulius Zaleckas");

MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL v2");

MODULE_DESCRIPTION("Generic driver for MDIO bus emulation using GPIO");

CRA Git | Maintained and supported by SUSTech CRA and CCSE