On 1/15/19 10:27 AM, Andrew Lunn wrote:
> 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+ker...@armlinux.org.uk>
> Cc: Maxime Ripard <maxime.rip...@free-electrons.com>
> Cc: Jonas Jensen <jonas.jen...@gmail.com>
> Cc: Laurent Pinchart <laure...@cse-semaphore.com>
> Cc: Paulius Zaleckas <paulius.zalec...@teltonika.lt>
> Cc: Scott Wood <scottw...@freescale.com>
> Cc: Andrew F. Davis <a...@ti.com>
Acked-by: Andrew F. Davis <a...@ti.com>
> Cc: Dan Murphy <dmur...@ti.com>
> Signed-off-by: Andrew Lunn <and...@lunn.ch>
> ---
> drivers/net/phy/dp83822.c | 12 ++----------
> drivers/net/phy/dp83848.c | 12 ++----------
> drivers/net/phy/dp83867.c | 12 ++----------
> drivers/net/phy/mdio-bitbang.c | 7 ++-----
> drivers/net/phy/mdio-gpio.c | 7 ++-----
> drivers/net/phy/mdio-moxart.c | 7 ++-----
> drivers/net/phy/mdio-sun4i.c | 7 ++-----
> drivers/net/phy/phylink.c | 7 ++-----
> 8 files changed, 16 insertions(+), 55 deletions(-)
>
> diff --git a/drivers/net/phy/dp83822.c b/drivers/net/phy/dp83822.c
> index 24c7f149f3e6..bbd8c22067f3 100644
> --- a/drivers/net/phy/dp83822.c
> +++ b/drivers/net/phy/dp83822.c
> @@ -1,16 +1,8 @@
> +// 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 <dmur...@ti.com");
> -MODULE_LICENSE("GPL");
> +MODULE_LICENSE("GPL v2");
> diff --git a/drivers/net/phy/dp83848.c b/drivers/net/phy/dp83848.c
> index a6b55909d1dc..f55dc907c2f3 100644
> --- a/drivers/net/phy/dp83848.c
> +++ b/drivers/net/phy/dp83848.c
> @@ -1,16 +1,8 @@
> +// 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 <a...@ti.com>");
> -MODULE_LICENSE("GPL");
> +MODULE_LICENSE("GPL v2");
> diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c
> index da6a67d47ce9..8a8d9f606b3e 100644
> --- a/drivers/net/phy/dp83867.c
> +++ b/drivers/net/phy/dp83867.c
> @@ -1,16 +1,8 @@
> +// 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 <dmur...@ti.com");
> -MODULE_LICENSE("GPL");
> +MODULE_LICENSE("GPL v2");
> diff --git a/drivers/net/phy/mdio-bitbang.c b/drivers/net/phy/mdio-bitbang.c
> index 15352f987bdf..5136275c8e73 100644
> --- a/drivers/net/phy/mdio-bitbang.c
> +++ b/drivers/net/phy/mdio-bitbang.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * Bitbanged MDIO support.
> *
> @@ -11,10 +12,6 @@
> *
> * 2005 (c) MontaVista Software, Inc.
> * Vitaly Bordug <vbor...@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");
> diff --git a/drivers/net/phy/mdio-gpio.c b/drivers/net/phy/mdio-gpio.c
> index ea9a0e339778..1b00235d7dc5 100644
> --- a/drivers/net/phy/mdio-gpio.c
> +++ b/drivers/net/phy/mdio-gpio.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * GPIO based MDIO bitbang driver.
> * Supports OpenFirmware.
> @@ -14,10 +15,6 @@
> *
> * 2005 (c) MontaVista Software, Inc.
> * Vitaly Bordug <vbor...@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");
> diff --git a/drivers/net/phy/mdio-moxart.c b/drivers/net/phy/mdio-moxart.c
> index 5bb56d126693..af3910fe8ec7 100644
> --- a/drivers/net/phy/mdio-moxart.c
> +++ b/drivers/net/phy/mdio-moxart.c
> @@ -1,10 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0
> /* MOXA ART Ethernet (RTL8201CP) MDIO interface driver
> *
> * Copyright (C) 2013 Jonas Jensen <jonas.jen...@gmail.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/delay.h>
> @@ -190,4 +187,4 @@ module_platform_driver(moxart_mdio_driver);
>
> MODULE_DESCRIPTION("MOXA ART MDIO interface driver");
> MODULE_AUTHOR("Jonas Jensen <jonas.jen...@gmail.com>");
> -MODULE_LICENSE("GPL");
> +MODULE_LICENSE("GPL v2");
> diff --git a/drivers/net/phy/mdio-sun4i.c b/drivers/net/phy/mdio-sun4i.c
> index 6425ce04d3f9..20ffd8fb79ce 100644
> --- a/drivers/net/phy/mdio-sun4i.c
> +++ b/drivers/net/phy/mdio-sun4i.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * Allwinner EMAC MDIO interface driver
> *
> @@ -6,10 +7,6 @@
> *
> * Based on the Linux driver provided by Allwinner:
> * Copyright (C) 1997 Sten Wang
> - *
> - * 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/delay.h>
> @@ -179,4 +176,4 @@ module_platform_driver(sun4i_mdio_driver);
>
> MODULE_DESCRIPTION("Allwinner EMAC MDIO interface driver");
> MODULE_AUTHOR("Maxime Ripard <maxime.rip...@free-electrons.com>");
> -MODULE_LICENSE("GPL");
> +MODULE_LICENSE("GPL v2");
> diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
> index e7becc7379d7..7d9910da5018 100644
> --- a/drivers/net/phy/phylink.c
> +++ b/drivers/net/phy/phylink.c
> @@ -1,12 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * phylink models the MAC to optional PHY connection, supporting
> * technologies such as SFP cages where the PHY is hot-pluggable.
> *
> * Copyright (C) 2015 Russell King
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 as
> - * published by the Free Software Foundation.
> */
> #include <linux/ethtool.h>
> #include <linux/export.h>
> @@ -1697,4 +1694,4 @@ void phylink_helper_basex_speed(struct
> phylink_link_state *state)
> }
> EXPORT_SYMBOL_GPL(phylink_helper_basex_speed);
>
> -MODULE_LICENSE("GPL");
> +MODULE_LICENSE("GPL v2");
>
