When working with this driver while debugging something else, I noticed a typo
in one of the file headers and decided that it could be converted to SPDX while
I am at it anyhow.
These patches were "tested" on a Renesas Lager board (R-Car H2). No regressions
encountered. buildbot was happy, too.
The patches are based on v5.1-rc1. I'd think they can be picked up per
subsystem but am also fine with everything going via MFD. There is no
dependency or merge conflict with my platform_data removal series which I sent
a few minutes ago.
Looking forward to comments!
Wolfram
Wolfram Sang (4):
mfd: da9063: convert headers to SPDX
regulator: da9063: convert header to SPDX
input: da9063_onkey: convert header to SPDX
rtc: da9063: convert header to SPDX
drivers/input/misc/da9063_onkey.c | 11 +----------
drivers/mfd/da9063-core.c | 8 ++------
drivers/mfd/da9063-i2c.c | 9 ++-------
drivers/mfd/da9063-irq.c | 9 ++-------
drivers/regulator/da9063-regulator.c | 8 +-------
drivers/rtc/rtc-da9063.c | 14 +++-----------
include/linux/mfd/da9063/core.h | 7 +------
include/linux/mfd/da9063/registers.h | 7 +------
8 files changed, 13 insertions(+), 60 deletions(-)
--
2.11.0
Covnert the header of the source file to SPDX.
Signed-off-by: Wolfram Sang <[email protected]>
---
drivers/input/misc/da9063_onkey.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/drivers/input/misc/da9063_onkey.c b/drivers/input/misc/da9063_onkey.c
index 3e9c353d82ef..7b8ae905a6fb 100644
--- a/drivers/input/misc/da9063_onkey.c
+++ b/drivers/input/misc/da9063_onkey.c
@@ -1,16 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* OnKey device driver for DA9063, DA9062 and DA9061 PMICs
* Copyright (C) 2015 Dialog Semiconductor 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.
*/
#include <linux/module.h>
--
2.11.0
Covnert the header of the source file to SPDX.
Signed-off-by: Wolfram Sang <[email protected]>
---
drivers/rtc/rtc-da9063.c | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/drivers/rtc/rtc-da9063.c b/drivers/rtc/rtc-da9063.c
index b4e054c64bad..73b38d207d7e 100644
--- a/drivers/rtc/rtc-da9063.c
+++ b/drivers/rtc/rtc-da9063.c
@@ -1,15 +1,7 @@
-/* rtc-da9063.c - Real time clock device driver for DA9063
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Real time clock device driver for DA9063
* Copyright (C) 2013-2015 Dialog Semiconductor 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.
*/
#include <linux/delay.h>
--
2.11.0
Covnert the header of the source file to SPDX.
Signed-off-by: Wolfram Sang <[email protected]>
---
drivers/regulator/da9063-regulator.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/drivers/regulator/da9063-regulator.c b/drivers/regulator/da9063-regulator.c
index 2b0c7a85306a..42dca1cac077 100644
--- a/drivers/regulator/da9063-regulator.c
+++ b/drivers/regulator/da9063-regulator.c
@@ -1,4 +1,4 @@
-
+// SPDX-License-Identifier: GPL-2.0+
/*
* Regulator driver for DA9063 PMIC series
*
@@ -6,12 +6,6 @@
* Copyright 2013 Philipp Zabel, Pengutronix
*
* Author: Krystian Garbaciak <[email protected]>
- *
- * 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/module.h>
--
2.11.0
Covnert the headers of the source and include files to SPDX.
And fix some typos in the descriptions ("interrupt" instead of "I2C").
Signed-off-by: Wolfram Sang <[email protected]>
---
drivers/mfd/da9063-core.c | 8 ++------
drivers/mfd/da9063-i2c.c | 9 ++-------
drivers/mfd/da9063-irq.c | 9 ++-------
include/linux/mfd/da9063/core.h | 7 +------
include/linux/mfd/da9063/registers.h | 7 +------
5 files changed, 8 insertions(+), 32 deletions(-)
diff --git a/drivers/mfd/da9063-core.c b/drivers/mfd/da9063-core.c
index 6e4ce49b4405..4e5ebb7f2ef0 100644
--- a/drivers/mfd/da9063-core.c
+++ b/drivers/mfd/da9063-core.c
@@ -1,5 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
- * da9063-core.c: Device access for Dialog DA9063 modules
+ * Device access for Dialog DA9063 modules
*
* Copyright 2012 Dialog Semiconductors Ltd.
* Copyright 2013 Philipp Zabel, Pengutronix
@@ -7,11 +8,6 @@
* Author: Krystian Garbaciak, Dialog Semiconductor
* Author: Michal Hajduk, Dialog Semiconductor
*
- * 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>
diff --git a/drivers/mfd/da9063-i2c.c b/drivers/mfd/da9063-i2c.c
index 50a24b1921d0..4a97ba0a35bb 100644
--- a/drivers/mfd/da9063-i2c.c
+++ b/drivers/mfd/da9063-i2c.c
@@ -1,15 +1,10 @@
-/* da9063-i2c.c: Interrupt support for Dialog DA9063
+// SPDX-License-Identifier: GPL-2.0+
+/* I2C support for Dialog DA9063
*
* Copyright 2012 Dialog Semiconductor Ltd.
* Copyright 2013 Philipp Zabel, Pengutronix
*
* Author: Krystian Garbaciak, Dialog Semiconductor
- *
- * 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>
diff --git a/drivers/mfd/da9063-irq.c b/drivers/mfd/da9063-irq.c
index ecc0c8ce6c58..e12b3dd0c99b 100644
--- a/drivers/mfd/da9063-irq.c
+++ b/drivers/mfd/da9063-irq.c
@@ -1,15 +1,10 @@
-/* da9063-irq.c: Interrupts support for Dialog DA9063
+// SPDX-License-Identifier: GPL-2.0+
+/* Interrupt support for Dialog DA9063
*
* Copyright 2012 Dialog Semiconductor Ltd.
* Copyright 2013 Philipp Zabel, Pengutronix
*
* Author: Michal Hajduk, Dialog Semiconductor
- *
- * 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>
diff --git a/include/linux/mfd/da9063/core.h b/include/linux/mfd/da9063/core.h
index 71b09154e2db..5cd06ab26352 100644
--- a/include/linux/mfd/da9063/core.h
+++ b/include/linux/mfd/da9063/core.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Definitions for DA9063 MFD driver
*
@@ -5,12 +6,6 @@
*
* Author: Michal Hajduk, Dialog Semiconductor
* Author: Krystian Garbaciak, Dialog Semiconductor
- *
- * 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.
- *
*/
#ifndef __MFD_DA9063_CORE_H__
diff --git a/include/linux/mfd/da9063/registers.h b/include/linux/mfd/da9063/registers.h
index 5d42859cb441..272f984b766d 100644
--- a/include/linux/mfd/da9063/registers.h
+++ b/include/linux/mfd/da9063/registers.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Registers definition for DA9063 modules
*
@@ -5,12 +6,6 @@
*
* Author: Michal Hajduk, Dialog Semiconductor
* Author: Krystian Garbaciak, Dialog Semiconductor
- *
- * 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.
- *
*/
#ifndef _DA9063_REG_H
--
2.11.0
On Mon, Mar 18, 2019 at 04:57:25PM +0100, Wolfram Sang wrote:
> Covnert the header of the source file to SPDX.
>
> Signed-off-by: Wolfram Sang <[email protected]>
Reviewed-by: Simon Horman <[email protected]>
> ---
> drivers/regulator/da9063-regulator.c | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/drivers/regulator/da9063-regulator.c b/drivers/regulator/da9063-regulator.c
> index 2b0c7a85306a..42dca1cac077 100644
> --- a/drivers/regulator/da9063-regulator.c
> +++ b/drivers/regulator/da9063-regulator.c
> @@ -1,4 +1,4 @@
> -
> +// SPDX-License-Identifier: GPL-2.0+
> /*
> * Regulator driver for DA9063 PMIC series
> *
> @@ -6,12 +6,6 @@
> * Copyright 2013 Philipp Zabel, Pengutronix
> *
> * Author: Krystian Garbaciak <[email protected]>
> - *
> - * 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/module.h>
> --
> 2.11.0
>
On Mon, Mar 18, 2019 at 04:57:26PM +0100, Wolfram Sang wrote:
> Covnert the header of the source file to SPDX.
>
> Signed-off-by: Wolfram Sang <[email protected]>
Reviewed-by: Simon Horman <[email protected]>
> ---
> drivers/input/misc/da9063_onkey.c | 11 +----------
> 1 file changed, 1 insertion(+), 10 deletions(-)
>
> diff --git a/drivers/input/misc/da9063_onkey.c b/drivers/input/misc/da9063_onkey.c
> index 3e9c353d82ef..7b8ae905a6fb 100644
> --- a/drivers/input/misc/da9063_onkey.c
> +++ b/drivers/input/misc/da9063_onkey.c
> @@ -1,16 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0+
> /*
> * OnKey device driver for DA9063, DA9062 and DA9061 PMICs
> * Copyright (C) 2015 Dialog Semiconductor 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.
> */
>
> #include <linux/module.h>
> --
> 2.11.0
>
On Mon, Mar 18, 2019 at 04:57:27PM +0100, Wolfram Sang wrote:
> Covnert the header of the source file to SPDX.
>
> Signed-off-by: Wolfram Sang <[email protected]>
Reviewed-by: Simon Horman <[email protected]>
> ---
> drivers/rtc/rtc-da9063.c | 14 +++-----------
> 1 file changed, 3 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/rtc/rtc-da9063.c b/drivers/rtc/rtc-da9063.c
> index b4e054c64bad..73b38d207d7e 100644
> --- a/drivers/rtc/rtc-da9063.c
> +++ b/drivers/rtc/rtc-da9063.c
> @@ -1,15 +1,7 @@
> -/* rtc-da9063.c - Real time clock device driver for DA9063
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Real time clock device driver for DA9063
> * Copyright (C) 2013-2015 Dialog Semiconductor 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.
> */
>
> #include <linux/delay.h>
> --
> 2.11.0
>
On Mon, Mar 18, 2019 at 04:57:24PM +0100, Wolfram Sang wrote:
> Covnert the headers of the source and include files to SPDX.
> And fix some typos in the descriptions ("interrupt" instead of "I2C").
>
> Signed-off-by: Wolfram Sang <[email protected]>
Reviewed-by: Simon Horman <[email protected]>
> ---
> drivers/mfd/da9063-core.c | 8 ++------
> drivers/mfd/da9063-i2c.c | 9 ++-------
> drivers/mfd/da9063-irq.c | 9 ++-------
> include/linux/mfd/da9063/core.h | 7 +------
> include/linux/mfd/da9063/registers.h | 7 +------
> 5 files changed, 8 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/mfd/da9063-core.c b/drivers/mfd/da9063-core.c
> index 6e4ce49b4405..4e5ebb7f2ef0 100644
> --- a/drivers/mfd/da9063-core.c
> +++ b/drivers/mfd/da9063-core.c
> @@ -1,5 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0+
> /*
> - * da9063-core.c: Device access for Dialog DA9063 modules
> + * Device access for Dialog DA9063 modules
> *
> * Copyright 2012 Dialog Semiconductors Ltd.
> * Copyright 2013 Philipp Zabel, Pengutronix
> @@ -7,11 +8,6 @@
> * Author: Krystian Garbaciak, Dialog Semiconductor
> * Author: Michal Hajduk, Dialog Semiconductor
> *
> - * 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>
> diff --git a/drivers/mfd/da9063-i2c.c b/drivers/mfd/da9063-i2c.c
> index 50a24b1921d0..4a97ba0a35bb 100644
> --- a/drivers/mfd/da9063-i2c.c
> +++ b/drivers/mfd/da9063-i2c.c
> @@ -1,15 +1,10 @@
> -/* da9063-i2c.c: Interrupt support for Dialog DA9063
> +// SPDX-License-Identifier: GPL-2.0+
> +/* I2C support for Dialog DA9063
> *
> * Copyright 2012 Dialog Semiconductor Ltd.
> * Copyright 2013 Philipp Zabel, Pengutronix
> *
> * Author: Krystian Garbaciak, Dialog Semiconductor
> - *
> - * 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>
> diff --git a/drivers/mfd/da9063-irq.c b/drivers/mfd/da9063-irq.c
> index ecc0c8ce6c58..e12b3dd0c99b 100644
> --- a/drivers/mfd/da9063-irq.c
> +++ b/drivers/mfd/da9063-irq.c
> @@ -1,15 +1,10 @@
> -/* da9063-irq.c: Interrupts support for Dialog DA9063
> +// SPDX-License-Identifier: GPL-2.0+
> +/* Interrupt support for Dialog DA9063
> *
> * Copyright 2012 Dialog Semiconductor Ltd.
> * Copyright 2013 Philipp Zabel, Pengutronix
> *
> * Author: Michal Hajduk, Dialog Semiconductor
> - *
> - * 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>
> diff --git a/include/linux/mfd/da9063/core.h b/include/linux/mfd/da9063/core.h
> index 71b09154e2db..5cd06ab26352 100644
> --- a/include/linux/mfd/da9063/core.h
> +++ b/include/linux/mfd/da9063/core.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0+ */
> /*
> * Definitions for DA9063 MFD driver
> *
> @@ -5,12 +6,6 @@
> *
> * Author: Michal Hajduk, Dialog Semiconductor
> * Author: Krystian Garbaciak, Dialog Semiconductor
> - *
> - * 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.
> - *
> */
>
> #ifndef __MFD_DA9063_CORE_H__
> diff --git a/include/linux/mfd/da9063/registers.h b/include/linux/mfd/da9063/registers.h
> index 5d42859cb441..272f984b766d 100644
> --- a/include/linux/mfd/da9063/registers.h
> +++ b/include/linux/mfd/da9063/registers.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0+ */
> /*
> * Registers definition for DA9063 modules
> *
> @@ -5,12 +6,6 @@
> *
> * Author: Michal Hajduk, Dialog Semiconductor
> * Author: Krystian Garbaciak, Dialog Semiconductor
> - *
> - * 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.
> - *
> */
>
> #ifndef _DA9063_REG_H
> --
> 2.11.0
>
On Mon, Mar 18, 2019 at 04:57:25PM +0100, Wolfram Sang wrote:
> index 2b0c7a85306a..42dca1cac077 100644
> --- a/drivers/regulator/da9063-regulator.c
> +++ b/drivers/regulator/da9063-regulator.c
> @@ -1,4 +1,4 @@
> -
> +// SPDX-License-Identifier: GPL-2.0+
> /*
> * Regulator driver for DA9063 PMIC series
> *
Please make the entire comment block C++ so this looks more intentional.
On 18/03/2019 16:57:27+0100, Wolfram Sang wrote:
> Covnert the header of the source file to SPDX.
>
> Signed-off-by: Wolfram Sang <[email protected]>
> ---
> drivers/rtc/rtc-da9063.c | 14 +++-----------
> 1 file changed, 3 insertions(+), 11 deletions(-)
>
Applied, thanks.
--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
> > +// SPDX-License-Identifier: GPL-2.0+
> > /*
> > * Regulator driver for DA9063 PMIC series
> > *
>
> Please make the entire comment block C++ so this looks more intentional.
Ok.
On 18 March 2019 15:57, Wolfram Sang wrote:
> Subject: [PATCH 3/4] input: da9063_onkey: convert header to SPDX
> Covnert the header of the source file to SPDX.
[...]
> +// SPDX-License-Identifier: GPL-2.0+
> /*
> * OnKey device driver for DA9063, DA9062 and DA9061 PMICs
> * Copyright (C) 2015 Dialog Semiconductor Ltd.
[...]
> */
Thanks!
Acked-by: Steve Twiss <[email protected]>
Thanks!
Acked-by: Steve Twiss <[email protected]>
On 18 March 2019 15:57, Wolfram Sang wrote:
> Subject: [PATCH 1/4] mfd: da9063: convert headers to SPDX
>
> Covnert the headers of the source and include files to SPDX.
> And fix some typos in the descriptions ("interrupt" instead of "I2C").
[...]
> diff --git a/drivers/mfd/da9063-core.c b/drivers/mfd/da9063-core.c
> +// SPDX-License-Identifier: GPL-2.0+
> + * Device access for Dialog DA9063 modules
[...]
> diff --git a/drivers/mfd/da9063-i2c.c b/drivers/mfd/da9063-i2c.c
> -/* da9063-i2c.c: Interrupt support for Dialog DA9063
> +// SPDX-License-Identifier: GPL-2.0+
> +/* I2C support for Dialog DA9063
Thanks
[...]
> diff --git a/drivers/mfd/da9063-irq.c b/drivers/mfd/da9063-irq.c
> +// SPDX-License-Identifier: GPL-2.0+
> +/* Interrupt support for Dialog DA9063
[...]
> diff --git a/include/linux/mfd/da9063/core.h b/include/linux/mfd/da9063/core.h
> +/* SPDX-License-Identifier: GPL-2.0+ */
[...]
> diff --git a/include/linux/mfd/da9063/registers.h
> +/* SPDX-License-Identifier: GPL-2.0+ */
Regards,
Steve
On Mon, 18 Mar 2019, Wolfram Sang wrote:
> Covnert the headers of the source and include files to SPDX.
> And fix some typos in the descriptions ("interrupt" instead of "I2C").
>
> Signed-off-by: Wolfram Sang <[email protected]>
> ---
> drivers/mfd/da9063-core.c | 8 ++------
> drivers/mfd/da9063-i2c.c | 9 ++-------
> drivers/mfd/da9063-irq.c | 9 ++-------
> include/linux/mfd/da9063/core.h | 7 +------
> include/linux/mfd/da9063/registers.h | 7 +------
> 5 files changed, 8 insertions(+), 32 deletions(-)
Applied, thanks.
--
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog