[PATCH 1/4] clocksource: timer-imx-gpt: Remove outdated file path

[PATCH 1/4] clocksource: timer-imx-gpt: Remove outdated file path

[Fabio Estevam]

From: Fabio Estevam <fabio.estevam@nxp.com>

imx gpt timer driver has been moved from arch/arm/mach-imx to 
drivers/clocksource/ a long time ago, so remove the reference
to the old file path.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
 drivers/clocksource/timer-imx-gpt.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c
index 6ec6d79..b63b834 100644
--- a/drivers/clocksource/timer-imx-gpt.c
+++ b/drivers/clocksource/timer-imx-gpt.c
@@ -1,6 +1,4 @@
 /*
- *  linux/arch/arm/plat-mxc/time.c
- *
  *  Copyright (C) 2000-2001 Deep Blue Solutions
  *  Copyright (C) 2002 Shane Nay (shane@minirl.com)
  *  Copyright (C) 2006-2007 Pavel Pisa (ppisa@pikron.com)
-- 
2.7.4

[PATCH 2/4] clocksource: timer-imx-gpt: Switch to SPDX identifier

[Fabio Estevam]

From: Fabio Estevam <fabio.estevam@nxp.com>

Adopt the SPDX license identifier headers to ease license compliance
management.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
 drivers/clocksource/timer-imx-gpt.c | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c
index b63b834..165fbbb 100644
--- a/drivers/clocksource/timer-imx-gpt.c
+++ b/drivers/clocksource/timer-imx-gpt.c
@@ -1,23 +1,9 @@
-/*
- *  Copyright (C) 2000-2001 Deep Blue Solutions
- *  Copyright (C) 2002 Shane Nay (shane@minirl.com)
- *  Copyright (C) 2006-2007 Pavel Pisa (ppisa@pikron.com)
- *  Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
+// SPDX-License-Identifier: GPL-2.0+
+//
+//  Copyright (C) 2000-2001 Deep Blue Solutions
+//  Copyright (C) 2002 Shane Nay (shane@minirl.com)
+//  Copyright (C) 2006-2007 Pavel Pisa (ppisa@pikron.com)
+//  Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de)
 
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-- 
2.7.4

Re: [PATCH 2/4] clocksource: timer-imx-gpt: Switch to SPDX identifier

[Daniel Lezcano]

On 23/05/2018 01:05, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@nxp.com>
> 
> Adopt the SPDX license identifier headers to ease license compliance
> management.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
> ---
>  drivers/clocksource/timer-imx-gpt.c | 26 ++++++--------------------
>  1 file changed, 6 insertions(+), 20 deletions(-)
> 
> diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c
> index b63b834..165fbbb 100644
> --- a/drivers/clocksource/timer-imx-gpt.c
> +++ b/drivers/clocksource/timer-imx-gpt.c
> @@ -1,23 +1,9 @@
> -/*
> - *  Copyright (C) 2000-2001 Deep Blue Solutions
> - *  Copyright (C) 2002 Shane Nay (shane@minirl.com)
> - *  Copyright (C) 2006-2007 Pavel Pisa (ppisa@pikron.com)
> - *  Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.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.
> - *
> - * You should have received a copy of the GNU General Public License
> - * along with this program; if not, write to the Free Software
> - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> - * MA 02110-1301, USA.
> - */
> +// SPDX-License-Identifier: GPL-2.0+
> +//
> +//  Copyright (C) 2000-2001 Deep Blue Solutions
> +//  Copyright (C) 2002 Shane Nay (shane@minirl.com)
> +//  Copyright (C) 2006-2007 Pavel Pisa (ppisa@pikron.com)
> +//  Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de)

Hi Philippe,

I went through the code and didn't find any information about the format
of the lines following the SPDX, it seems it is relatively free.

Can you confirm the above changes are ok ?

Thanks

  -- Daniel


-- 
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

Re: [PATCH 2/4] clocksource: timer-imx-gpt: Switch to SPDX identifier

[Fabio Estevam]

Hi Daniel,

On Wed, May 23, 2018 at 5:06 AM, Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:
> On 23/05/2018 01:05, Fabio Estevam wrote:
>> From: Fabio Estevam <fabio.estevam@nxp.com>
>>
>> Adopt the SPDX license identifier headers to ease license compliance
>> management.
>>
>> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
>> ---
>>  drivers/clocksource/timer-imx-gpt.c | 26 ++++++--------------------
>>  1 file changed, 6 insertions(+), 20 deletions(-)
>>
>> diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c
>> index b63b834..165fbbb 100644
>> --- a/drivers/clocksource/timer-imx-gpt.c
>> +++ b/drivers/clocksource/timer-imx-gpt.c
>> @@ -1,23 +1,9 @@
>> -/*
>> - *  Copyright (C) 2000-2001 Deep Blue Solutions
>> - *  Copyright (C) 2002 Shane Nay (shane@minirl.com)
>> - *  Copyright (C) 2006-2007 Pavel Pisa (ppisa@pikron.com)
>> - *  Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.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.
>> - *
>> - * You should have received a copy of the GNU General Public License
>> - * along with this program; if not, write to the Free Software
>> - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
>> - * MA 02110-1301, USA.
>> - */
>> +// SPDX-License-Identifier: GPL-2.0+
>> +//
>> +//  Copyright (C) 2000-2001 Deep Blue Solutions
>> +//  Copyright (C) 2002 Shane Nay (shane@minirl.com)
>> +//  Copyright (C) 2006-2007 Pavel Pisa (ppisa@pikron.com)
>> +//  Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de)
>
> Hi Philippe,
>
> I went through the code and didn't find any information about the format
> of the lines following the SPDX, it seems it is relatively free.
>
> Can you confirm the above changes are ok ?

Putting everything as // is Linus' preferred style:
https://lkml.org/lkml/2017/11/25/133

Regards,

Fabio Estevam

Re: [PATCH 2/4] clocksource: timer-imx-gpt: Switch to SPDX identifier

[Daniel Lezcano]

On 23/05/2018 13:46, Fabio Estevam wrote:
> Hi Daniel,
> 
> On Wed, May 23, 2018 at 5:06 AM, Daniel Lezcano
> <daniel.lezcano@linaro.org> wrote:
>> On 23/05/2018 01:05, Fabio Estevam wrote:
>>> From: Fabio Estevam <fabio.estevam@nxp.com>
>>>
>>> Adopt the SPDX license identifier headers to ease license compliance
>>> management.
>>>
>>> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
>>> ---
>>>  drivers/clocksource/timer-imx-gpt.c | 26 ++++++--------------------
>>>  1 file changed, 6 insertions(+), 20 deletions(-)
>>>
>>> diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c
>>> index b63b834..165fbbb 100644
>>> --- a/drivers/clocksource/timer-imx-gpt.c
>>> +++ b/drivers/clocksource/timer-imx-gpt.c
>>> @@ -1,23 +1,9 @@
>>> -/*
>>> - *  Copyright (C) 2000-2001 Deep Blue Solutions
>>> - *  Copyright (C) 2002 Shane Nay (shane@minirl.com)
>>> - *  Copyright (C) 2006-2007 Pavel Pisa (ppisa@pikron.com)
>>> - *  Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.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.
>>> - *
>>> - * You should have received a copy of the GNU General Public License
>>> - * along with this program; if not, write to the Free Software
>>> - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
>>> - * MA 02110-1301, USA.
>>> - */
>>> +// SPDX-License-Identifier: GPL-2.0+
>>> +//
>>> +//  Copyright (C) 2000-2001 Deep Blue Solutions
>>> +//  Copyright (C) 2002 Shane Nay (shane@minirl.com)
>>> +//  Copyright (C) 2006-2007 Pavel Pisa (ppisa@pikron.com)
>>> +//  Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de)
>>
>> Hi Philippe,
>>
>> I went through the code and didn't find any information about the format
>> of the lines following the SPDX, it seems it is relatively free.
>>
>> Can you confirm the above changes are ok ?
> 
> Putting everything as // is Linus' preferred style:
> https://lkml.org/lkml/2017/11/25/133

Ok, good. Thanks for the pointer.

I've applied the patches for 4.18.

  -- Daniel


-- 
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

Re: [PATCH 2/4] clocksource: timer-imx-gpt: Switch to SPDX identifier

[Philippe Ombredanne]

Hi Daniel,

On Wed, May 23, 2018 at 10:06 AM, Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:
> On 23/05/2018 01:05, Fabio Estevam wrote:
>> From: Fabio Estevam <fabio.estevam@nxp.com>
>>
>> Adopt the SPDX license identifier headers to ease license compliance
>> management.
>>
>> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
>> ---
>>  drivers/clocksource/timer-imx-gpt.c | 26 ++++++--------------------
>>  1 file changed, 6 insertions(+), 20 deletions(-)
>>
>> diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c
>> index b63b834..165fbbb 100644
>> --- a/drivers/clocksource/timer-imx-gpt.c
>> +++ b/drivers/clocksource/timer-imx-gpt.c
>> @@ -1,23 +1,9 @@
>> -/*
>> - *  Copyright (C) 2000-2001 Deep Blue Solutions
>> - *  Copyright (C) 2002 Shane Nay (shane@minirl.com)
>> - *  Copyright (C) 2006-2007 Pavel Pisa (ppisa@pikron.com)
>> - *  Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.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.
>> - *
>> - * You should have received a copy of the GNU General Public License
>> - * along with this program; if not, write to the Free Software
>> - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
>> - * MA 02110-1301, USA.
>> - */
>> +// SPDX-License-Identifier: GPL-2.0+
>> +//
>> +//  Copyright (C) 2000-2001 Deep Blue Solutions
>> +//  Copyright (C) 2002 Shane Nay (shane@minirl.com)
>> +//  Copyright (C) 2006-2007 Pavel Pisa (ppisa@pikron.com)
>> +//  Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de)
>
> Hi Philippe,
>
> I went through the code and didn't find any information about the format
> of the lines following the SPDX, it seems it is relatively free.
>
> Can you confirm the above changes are ok ?

This looks fine to me especially if this all you have in terms of top
level comment. (e.g. license then copyrights)
Some may not agree with me on using C++ style comments beyond the SPDX
license line though ;)
-- 
Cordially
Philippe Ombredanne

[PATCH 3/4] clocksource: timer-imx-tpm: Switch to SPDX identifier

[Fabio Estevam]

From: Fabio Estevam <fabio.estevam@nxp.com>

Adopt the SPDX license identifier headers to ease license compliance
management.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
 drivers/clocksource/timer-imx-tpm.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/clocksource/timer-imx-tpm.c b/drivers/clocksource/timer-imx-tpm.c
index 6c83184..b7aa2b8 100644
--- a/drivers/clocksource/timer-imx-tpm.c
+++ b/drivers/clocksource/timer-imx-tpm.c
@@ -1,12 +1,7 @@
-/*
- * Copyright 2016 Freescale Semiconductor, Inc.
- * Copyright 2017 NXP
- *
- * 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.
- */
+// SPDX-License-Identifier: GPL-2.0+
+//
+// Copyright 2016 Freescale Semiconductor, Inc.
+// Copyright 2017 NXP
 
 #include <linux/clk.h>
 #include <linux/clockchips.h>
-- 
2.7.4

[PATCH 4/4] clocksource: mxs_timer: Switch to SPDX identifier

[Fabio Estevam]

From: Fabio Estevam <fabio.estevam@nxp.com>

Adopt the SPDX license identifier headers to ease license compliance
management.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
 drivers/clocksource/mxs_timer.c | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/drivers/clocksource/mxs_timer.c b/drivers/clocksource/mxs_timer.c
index a03434e..f6ddae3 100644
--- a/drivers/clocksource/mxs_timer.c
+++ b/drivers/clocksource/mxs_timer.c
@@ -1,24 +1,10 @@
-/*
- *  Copyright (C) 2000-2001 Deep Blue Solutions
- *  Copyright (C) 2002 Shane Nay (shane@minirl.com)
- *  Copyright (C) 2006-2007 Pavel Pisa (ppisa@pikron.com)
- *  Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de)
- *  Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
+// SPDX-License-Identifier: GPL-2.0+
+//
+//  Copyright (C) 2000-2001 Deep Blue Solutions
+//  Copyright (C) 2002 Shane Nay (shane@minirl.com)
+//  Copyright (C) 2006-2007 Pavel Pisa (ppisa@pikron.com)
+//  Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de)
+//  Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.
 
 #include <linux/err.h>
 #include <linux/interrupt.h>
-- 
2.7.4