linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v3 00/12] cros_ec: Match licenses and switch to SPDX identifier.
@ 2018-06-06 15:08 Enric Balletbo i Serra
  2018-06-06 15:08 ` [PATCH v3 01/12] platform/chrome: Make license text and module license match Enric Balletbo i Serra
                   ` (12 more replies)
  0 siblings, 13 replies; 25+ messages in thread
From: Enric Balletbo i Serra @ 2018-06-06 15:08 UTC (permalink / raw)
  To: linux-kernel
  Cc: Gwendal Grignou, kernel, Dmitry Torokhov, Tony Luck,
	Alessandro Zummo, Paolo Cretaro, linux-iio, Alexandre Belloni,
	linux-i2c, Olof Johansson, linux-rtc, Anton Vorontsov,
	Chanwoo Choi, Benson Leung, linux-input, Lars-Peter Clausen,
	Jonathan Cameron, Peter Meerwald-Stadler, MyungJoo Ham,
	Lee Jones, Hartmut Knaack, Colin Cross, Kees Cook

Dear all,

This patchset is just to adopt the SPDX license identifier for all
ChromeOS Embedded Controller related drivers. The patches touches
different subsystems but every patch can be picked from their respective
maintainer independently.

This third version takes the license note as the valid license (I did
the contrary in the second version) so apart from add the SPDX tags it
also introduces new patches to match the license.

Best regards,
    Enric

Changes in v3:
- Add new patches to match license text with MODULE_LICENSE (Dmitry)
- If there is a conflict between the license notice and MODULE_LICENSE
  go by license notice not MODULE_LICENSE. (Dmitry)
- Reintroduced again the patch for the rtc-cros-ec driver as license
  should be GPL v2-only.
- Removed '[PATCH 7/9] pwm: cros-ec: Switch to SPDX identifier.' as
  maintainer told me that I don't need to resend.

Changes in v2:
- Removed '[PATCH 5/9] rtc: cros-ec: Switch to SPDX identifier' from
  series as it was applied.
- s/Chrome OS/ChromeOS/
- [1/9] Fixed wrong copyright year.
- [6/9] Do not remove last paragraph.
- [8/9] Fixed wrong copyright year.

Enric Balletbo i Serra (12):
  platform/chrome: Make license text and module license match.
  platform/chrome: Switch to SPDX identifier.
  mfd: cros_ec: Make license text and module license match.
  mfd: cros_ec: Switch to SPDX identifier.
  rtc: cros-ec: Make license text and module license match.
  rtc: cros-ec: Switch to SPDX identifier.
  extcon: usbc-cros-ec: Make license text and module license match.
  extcon: usbc-cros-ec: Switch to SPDX identifier.
  Input: cros_ec_keyb - Make license text and module license match.
  Input: cros_ec_keyb - Switch to SPDX identifier.
  iio: cros_ec: Switch to SPDX identifier.
  i2c: i2c-cros-ec-tunnel: Switch to SPDX identifier.

 drivers/extcon/extcon-usbc-cros-ec.c          | 22 ++++--------
 drivers/i2c/busses/i2c-cros-ec-tunnel.c       | 14 +++-----
 drivers/iio/accel/cros_ec_accel_legacy.c      | 27 +++++---------
 .../common/cros_ec_sensors/cros_ec_sensors.c  | 24 ++++---------
 .../cros_ec_sensors/cros_ec_sensors_core.c    | 18 +++-------
 .../cros_ec_sensors/cros_ec_sensors_core.h    | 12 ++-----
 drivers/iio/light/cros_ec_light_prox.c        | 18 +++-------
 drivers/iio/pressure/cros_ec_baro.c           | 18 +++-------
 drivers/input/keyboard/cros_ec_keyb.c         | 36 +++++++------------
 drivers/mfd/cros_ec.c                         | 28 +++++----------
 drivers/mfd/cros_ec_dev.c                     | 23 +++---------
 drivers/mfd/cros_ec_dev.h                     | 16 ++-------
 drivers/mfd/cros_ec_i2c.c                     | 20 +++--------
 drivers/mfd/cros_ec_spi.c                     | 18 +++-------
 drivers/platform/chrome/chromeos_pstore.c     | 15 +++-----
 drivers/platform/chrome/cros_ec_debugfs.c     | 22 +++---------
 drivers/platform/chrome/cros_ec_lightbar.c    | 22 +++---------
 drivers/platform/chrome/cros_ec_lpc.c         | 36 +++++++------------
 drivers/platform/chrome/cros_ec_lpc_mec.c     | 34 +++++++-----------
 drivers/platform/chrome/cros_ec_lpc_reg.c     | 34 +++++++-----------
 drivers/platform/chrome/cros_ec_proto.c       | 19 +++-------
 drivers/platform/chrome/cros_ec_sysfs.c       | 22 +++---------
 drivers/platform/chrome/cros_ec_vbc.c         | 24 +++----------
 .../platform/chrome/cros_kbd_led_backlight.c  | 19 +++-------
 drivers/rtc/rtc-cros-ec.c                     | 23 ++++--------
 include/linux/mfd/cros_ec.h                   | 10 +-----
 include/linux/mfd/cros_ec_commands.h          | 10 +-----
 include/linux/mfd/cros_ec_lpc_mec.h           | 14 ++------
 include/linux/mfd/cros_ec_lpc_reg.h           | 14 ++------
 29 files changed, 159 insertions(+), 453 deletions(-)

-- 
2.17.1

^ permalink raw reply	[flat|nested] 25+ messages in thread

* [PATCH v3 01/12] platform/chrome: Make license text and module license match.
  2018-06-06 15:08 [PATCH v3 00/12] cros_ec: Match licenses and switch to SPDX identifier Enric Balletbo i Serra
@ 2018-06-06 15:08 ` Enric Balletbo i Serra
  2018-06-06 15:08 ` [PATCH v3 02/12] platform/chrome: Switch to SPDX identifier Enric Balletbo i Serra
                   ` (11 subsequent siblings)
  12 siblings, 0 replies; 25+ messages in thread
From: Enric Balletbo i Serra @ 2018-06-06 15:08 UTC (permalink / raw)
  To: linux-kernel
  Cc: Gwendal Grignou, kernel, Dmitry Torokhov, Olof Johansson, Benson Leung

The license text is specifying "GPLv2" but the MODULE_LICENSE is set to
GPL which means GNU Public License v2 or later. When MODULE_LICENSE and
boiler plate does not match, go for boiler plate license.

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---

Changes in v3:
- Add new patches to match license text with MODULE_LICENSE (Dmitry)
- If there is a conflict between the license notice and MODULE_LICENSE
  go by license notice not MODULE_LICENSE. (Dmitry)
- Reintroduced again the patch for the rtc-cros-ec driver as license
  should be GPL v2-only.
- Removed '[PATCH 7/9] pwm: cros-ec: Switch to SPDX identifier.' as
  maintainer told me that I don't need to resend.

Changes in v2:
- Removed '[PATCH 5/9] rtc: cros-ec: Switch to SPDX identifier' from
  series as it was applied.
- s/Chrome OS/ChromeOS/
- [1/9] Fixed wrong copyright year.
- [6/9] Do not remove last paragraph.
- [8/9] Fixed wrong copyright year.

 drivers/platform/chrome/chromeos_pstore.c | 2 +-
 drivers/platform/chrome/cros_ec_lpc.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/platform/chrome/chromeos_pstore.c b/drivers/platform/chrome/chromeos_pstore.c
index b0693fdec8c6..57138ced4ca7 100644
--- a/drivers/platform/chrome/chromeos_pstore.c
+++ b/drivers/platform/chrome/chromeos_pstore.c
@@ -139,4 +139,4 @@ module_init(chromeos_pstore_init);
 module_exit(chromeos_pstore_exit);
 
 MODULE_DESCRIPTION("Chrome OS pstore module");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/platform/chrome/cros_ec_lpc.c b/drivers/platform/chrome/cros_ec_lpc.c
index 3682e1539251..26f4fe6e9b04 100644
--- a/drivers/platform/chrome/cros_ec_lpc.c
+++ b/drivers/platform/chrome/cros_ec_lpc.c
@@ -479,5 +479,5 @@ static void __exit cros_ec_lpc_exit(void)
 module_init(cros_ec_lpc_init);
 module_exit(cros_ec_lpc_exit);
 
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("ChromeOS EC LPC driver");
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [PATCH v3 02/12] platform/chrome: Switch to SPDX identifier.
  2018-06-06 15:08 [PATCH v3 00/12] cros_ec: Match licenses and switch to SPDX identifier Enric Balletbo i Serra
  2018-06-06 15:08 ` [PATCH v3 01/12] platform/chrome: Make license text and module license match Enric Balletbo i Serra
@ 2018-06-06 15:08 ` Enric Balletbo i Serra
  2018-06-06 15:08 ` [PATCH v3 03/12] mfd: cros_ec: Make license text and module license match Enric Balletbo i Serra
                   ` (10 subsequent siblings)
  12 siblings, 0 replies; 25+ messages in thread
From: Enric Balletbo i Serra @ 2018-06-06 15:08 UTC (permalink / raw)
  To: linux-kernel
  Cc: Gwendal Grignou, kernel, Dmitry Torokhov, Colin Cross, Tony Luck,
	Anton Vorontsov, Kees Cook, Benson Leung, Olof Johansson

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

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---

Changes in v3: None
Changes in v2: None

 drivers/platform/chrome/chromeos_pstore.c     | 13 +++----
 drivers/platform/chrome/cros_ec_debugfs.c     | 22 +++---------
 drivers/platform/chrome/cros_ec_lightbar.c    | 22 +++---------
 drivers/platform/chrome/cros_ec_lpc.c         | 34 +++++++------------
 drivers/platform/chrome/cros_ec_lpc_mec.c     | 34 +++++++------------
 drivers/platform/chrome/cros_ec_lpc_reg.c     | 34 +++++++------------
 drivers/platform/chrome/cros_ec_proto.c       | 19 +++--------
 drivers/platform/chrome/cros_ec_sysfs.c       | 22 +++---------
 drivers/platform/chrome/cros_ec_vbc.c         | 24 +++----------
 .../platform/chrome/cros_kbd_led_backlight.c  | 19 +++--------
 10 files changed, 65 insertions(+), 178 deletions(-)

diff --git a/drivers/platform/chrome/chromeos_pstore.c b/drivers/platform/chrome/chromeos_pstore.c
index 57138ced4ca7..721400fcf14a 100644
--- a/drivers/platform/chrome/chromeos_pstore.c
+++ b/drivers/platform/chrome/chromeos_pstore.c
@@ -1,12 +1,7 @@
-/*
- *  chromeos_pstore.c - Driver to instantiate Chromebook ramoops device
- *
- *  Copyright (C) 2013 Google, 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, version 2 of the License.
- */
+// SPDX-License-Identifier: GPL-2.0
+// Driver to instantiate Chromebook ramoops device.
+//
+// Copyright (C) 2013 Google, Inc.
 
 #include <linux/acpi.h>
 #include <linux/dmi.h>
diff --git a/drivers/platform/chrome/cros_ec_debugfs.c b/drivers/platform/chrome/cros_ec_debugfs.c
index c62ee8e610a0..450dac3996ff 100644
--- a/drivers/platform/chrome/cros_ec_debugfs.c
+++ b/drivers/platform/chrome/cros_ec_debugfs.c
@@ -1,21 +1,7 @@
-/*
- * cros_ec_debugfs - debug logs for Chrome OS EC
- *
- * Copyright 2015 Google, 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, 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/>.
- */
+// SPDX-License-Identifier: GPL-2.0+
+// Debug logs for ChromeOS EC.
+//
+// Copyright (C) 2015 Google, Inc.
 
 #include <linux/circ_buf.h>
 #include <linux/debugfs.h>
diff --git a/drivers/platform/chrome/cros_ec_lightbar.c b/drivers/platform/chrome/cros_ec_lightbar.c
index 68193bb53383..c5a6dd4ffa01 100644
--- a/drivers/platform/chrome/cros_ec_lightbar.c
+++ b/drivers/platform/chrome/cros_ec_lightbar.c
@@ -1,21 +1,7 @@
-/*
- * cros_ec_lightbar - expose the Chromebook Pixel lightbar to userspace
- *
- * Copyright (C) 2014 Google, 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, 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/>.
- */
+// SPDX-License-Identifier: GPL-2.0+
+// Expose the Chromebook Pixel lightbar to userspace.
+//
+// Copyright (C) 2014 Google, Inc.
 
 #define pr_fmt(fmt) "cros_ec_lightbar: " fmt
 
diff --git a/drivers/platform/chrome/cros_ec_lpc.c b/drivers/platform/chrome/cros_ec_lpc.c
index 26f4fe6e9b04..19c7deab1e3b 100644
--- a/drivers/platform/chrome/cros_ec_lpc.c
+++ b/drivers/platform/chrome/cros_ec_lpc.c
@@ -1,25 +1,15 @@
-/*
- * cros_ec_lpc - LPC access to the Chrome OS Embedded Controller
- *
- * Copyright (C) 2012-2015 Google, Inc
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- *
- * This driver uses the Chrome OS EC byte-level message-based protocol for
- * communicating the keyboard state (which keys are pressed) from a keyboard EC
- * to the AP over some bus (such as i2c, lpc, spi).  The EC does debouncing,
- * but everything else (including deghosting) is done here.  The main
- * motivation for this is to keep the EC firmware as simple as possible, since
- * it cannot be easily upgraded and EC flash/IRAM space is relatively
- * expensive.
- */
+// SPDX-License-Identifier: GPL-2.0
+// LPC access to the ChromeOS Embedded Controller.
+//
+// Copyright (C) 2012-2015 Google, Inc.
+//
+// This driver uses the ChromeOS EC byte-level message-based protocol for
+// communicating the keyboard state (which keys are pressed) from a keyboard EC
+// to the AP over some bus (such as i2c, lpc, spi).  The EC does debouncing,
+// but everything else (including deghosting) is done here.  The main
+// motivation for this is to keep the EC firmware as simple as possible, since
+// it cannot be easily upgraded and EC flash/IRAM space is relatively
+// expensive.
 
 #include <linux/acpi.h>
 #include <linux/dmi.h>
diff --git a/drivers/platform/chrome/cros_ec_lpc_mec.c b/drivers/platform/chrome/cros_ec_lpc_mec.c
index 2eda2c2fc210..b37ac077cd3b 100644
--- a/drivers/platform/chrome/cros_ec_lpc_mec.c
+++ b/drivers/platform/chrome/cros_ec_lpc_mec.c
@@ -1,25 +1,15 @@
-/*
- * cros_ec_lpc_mec - LPC variant I/O for Microchip EC
- *
- * Copyright (C) 2016 Google, Inc
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- *
- * This driver uses the Chrome OS EC byte-level message-based protocol for
- * communicating the keyboard state (which keys are pressed) from a keyboard EC
- * to the AP over some bus (such as i2c, lpc, spi).  The EC does debouncing,
- * but everything else (including deghosting) is done here.  The main
- * motivation for this is to keep the EC firmware as simple as possible, since
- * it cannot be easily upgraded and EC flash/IRAM space is relatively
- * expensive.
- */
+// SPDX-License-Identifier: GPL-2.0
+// LPC variant I/O for Microchip EC.
+//
+// Copyright (C) 2016 Google, Inc.
+//
+// This driver uses the ChromeOS EC byte-level message-based protocol for
+// communicating the keyboard state (which keys are pressed) from a keyboard EC
+// to the AP over some bus (such as i2c, lpc, spi).  The EC does debouncing,
+// but everything else (including deghosting) is done here.  The main
+// motivation for this is to keep the EC firmware as simple as possible, since
+// it cannot be easily upgraded and EC flash/IRAM space is relatively
+// expensive
 
 #include <linux/delay.h>
 #include <linux/io.h>
diff --git a/drivers/platform/chrome/cros_ec_lpc_reg.c b/drivers/platform/chrome/cros_ec_lpc_reg.c
index dcc7a3e30604..69d622e51da9 100644
--- a/drivers/platform/chrome/cros_ec_lpc_reg.c
+++ b/drivers/platform/chrome/cros_ec_lpc_reg.c
@@ -1,25 +1,15 @@
-/*
- * cros_ec_lpc_reg - LPC access to the Chrome OS Embedded Controller
- *
- * Copyright (C) 2016 Google, Inc
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- *
- * This driver uses the Chrome OS EC byte-level message-based protocol for
- * communicating the keyboard state (which keys are pressed) from a keyboard EC
- * to the AP over some bus (such as i2c, lpc, spi).  The EC does debouncing,
- * but everything else (including deghosting) is done here.  The main
- * motivation for this is to keep the EC firmware as simple as possible, since
- * it cannot be easily upgraded and EC flash/IRAM space is relatively
- * expensive.
- */
+// SPDX-License-Identifier: GPL-2.0
+// LPC access to the ChromeOS Embedded Controller.
+//
+// Copyright (C) 2016 Google, Inc.
+//
+// This driver uses the ChromeOS EC byte-level message-based protocol for
+// communicating the keyboard state (which keys are pressed) from a keyboard EC
+// to the AP over some bus (such as i2c, lpc, spi).  The EC does debouncing,
+// but everything else (including deghosting) is done here.  The main
+// motivation for this is to keep the EC firmware as simple as possible, since
+// it cannot be easily upgraded and EC flash/IRAM space is relatively
+// expensive.
 
 #include <linux/io.h>
 #include <linux/mfd/cros_ec.h>
diff --git a/drivers/platform/chrome/cros_ec_proto.c b/drivers/platform/chrome/cros_ec_proto.c
index 8350ca2311c7..6ec006d6ff58 100644
--- a/drivers/platform/chrome/cros_ec_proto.c
+++ b/drivers/platform/chrome/cros_ec_proto.c
@@ -1,18 +1,7 @@
-/*
- * ChromeOS EC communication protocol helper functions
- *
- * Copyright (C) 2015 Google, Inc
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- *
- */
+// SPDX-License-Identifier: GPL-2.0
+// ChromeOS EC communication protocol helper functions.
+//
+// Copyright (C) 2015 Google, Inc.
 
 #include <linux/mfd/cros_ec.h>
 #include <linux/delay.h>
diff --git a/drivers/platform/chrome/cros_ec_sysfs.c b/drivers/platform/chrome/cros_ec_sysfs.c
index f34a50121064..68979cebb2c8 100644
--- a/drivers/platform/chrome/cros_ec_sysfs.c
+++ b/drivers/platform/chrome/cros_ec_sysfs.c
@@ -1,21 +1,7 @@
-/*
- * cros_ec_sysfs - expose the Chrome OS EC through sysfs
- *
- * Copyright (C) 2014 Google, 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, 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/>.
- */
+// SPDX-License-Identifier: GPL-2.0+
+// Expose the ChromeOS EC through sysfs.
+//
+// Copyright (C) 2014 Google, Inc.
 
 #define pr_fmt(fmt) "cros_ec_sysfs: " fmt
 
diff --git a/drivers/platform/chrome/cros_ec_vbc.c b/drivers/platform/chrome/cros_ec_vbc.c
index 5356f26bc022..a4934f41f462 100644
--- a/drivers/platform/chrome/cros_ec_vbc.c
+++ b/drivers/platform/chrome/cros_ec_vbc.c
@@ -1,22 +1,8 @@
-/*
- * cros_ec_vbc - Expose the vboot context nvram to userspace
- *
- * Copyright (C) 2015 Collabora Ltd.
- *
- * based on vendor driver,
- *
- * Copyright (C) 2012 The Chromium OS Authors
- *
- * 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.
- */
+// SPDX-License-Identifier: GPL-2.0+
+// Expose the vboot context nvram to userspace.
+//
+// Copyright (C) 2012 Google, Inc.
+// Copyright (C) 2015 Collabora Ltd.
 
 #include <linux/of.h>
 #include <linux/platform_device.h>
diff --git a/drivers/platform/chrome/cros_kbd_led_backlight.c b/drivers/platform/chrome/cros_kbd_led_backlight.c
index ca3e4da852b4..bd4aa9331806 100644
--- a/drivers/platform/chrome/cros_kbd_led_backlight.c
+++ b/drivers/platform/chrome/cros_kbd_led_backlight.c
@@ -1,18 +1,7 @@
-/*
- *  Keyboard backlight LED driver for Chrome OS.
- *
- *  Copyright (C) 2012 Google, 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, 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.
- */
+// SPDX-License-Identifier: GPL-2.0+
+// Keyboard backlight LED driver for ChromeOS.
+//
+// Copyright (C) 2012 Google, Inc.
 
 #include <linux/acpi.h>
 #include <linux/leds.h>
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [PATCH v3 03/12] mfd: cros_ec: Make license text and module license match.
  2018-06-06 15:08 [PATCH v3 00/12] cros_ec: Match licenses and switch to SPDX identifier Enric Balletbo i Serra
  2018-06-06 15:08 ` [PATCH v3 01/12] platform/chrome: Make license text and module license match Enric Balletbo i Serra
  2018-06-06 15:08 ` [PATCH v3 02/12] platform/chrome: Switch to SPDX identifier Enric Balletbo i Serra
@ 2018-06-06 15:08 ` Enric Balletbo i Serra
  2018-06-18  7:18   ` Lee Jones
  2018-06-06 15:08 ` [PATCH v3 04/12] mfd: cros_ec: Switch to SPDX identifier Enric Balletbo i Serra
                   ` (9 subsequent siblings)
  12 siblings, 1 reply; 25+ messages in thread
From: Enric Balletbo i Serra @ 2018-06-06 15:08 UTC (permalink / raw)
  To: linux-kernel; +Cc: Gwendal Grignou, kernel, Dmitry Torokhov, Lee Jones

The license text is specifying "GPLv2" but the MODULE_LICENSE is set to
GPL which means GNU Public License v2 or later. When MODULE_LICENSE and
boiler plate does not match, go for boiler plate license.

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---

Changes in v3: None
Changes in v2: None

 drivers/mfd/cros_ec.c     | 2 +-
 drivers/mfd/cros_ec_i2c.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mfd/cros_ec.c b/drivers/mfd/cros_ec.c
index 58e05069163e..0da7c785cb18 100644
--- a/drivers/mfd/cros_ec.c
+++ b/drivers/mfd/cros_ec.c
@@ -262,5 +262,5 @@ EXPORT_SYMBOL(cros_ec_resume);
 
 #endif
 
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("ChromeOS EC core driver");
diff --git a/drivers/mfd/cros_ec_i2c.c b/drivers/mfd/cros_ec_i2c.c
index ef9b4763356f..606157076e7f 100644
--- a/drivers/mfd/cros_ec_i2c.c
+++ b/drivers/mfd/cros_ec_i2c.c
@@ -382,5 +382,5 @@ static struct i2c_driver cros_ec_driver = {
 
 module_i2c_driver(cros_ec_driver);
 
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("ChromeOS EC multi function device");
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [PATCH v3 04/12] mfd: cros_ec: Switch to SPDX identifier.
  2018-06-06 15:08 [PATCH v3 00/12] cros_ec: Match licenses and switch to SPDX identifier Enric Balletbo i Serra
                   ` (2 preceding siblings ...)
  2018-06-06 15:08 ` [PATCH v3 03/12] mfd: cros_ec: Make license text and module license match Enric Balletbo i Serra
@ 2018-06-06 15:08 ` Enric Balletbo i Serra
  2018-06-06 15:08 ` [PATCH v3 05/12] rtc: cros-ec: Make license text and module license match Enric Balletbo i Serra
                   ` (8 subsequent siblings)
  12 siblings, 0 replies; 25+ messages in thread
From: Enric Balletbo i Serra @ 2018-06-06 15:08 UTC (permalink / raw)
  To: linux-kernel; +Cc: Gwendal Grignou, kernel, Dmitry Torokhov, Lee Jones

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

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---

Changes in v3: None
Changes in v2: None

 drivers/mfd/cros_ec.c                | 26 ++++++++------------------
 drivers/mfd/cros_ec_dev.c            | 23 +++++------------------
 drivers/mfd/cros_ec_dev.h            | 16 ++--------------
 drivers/mfd/cros_ec_i2c.c            | 18 ++++--------------
 drivers/mfd/cros_ec_spi.c            | 18 ++++--------------
 include/linux/mfd/cros_ec.h          | 10 +---------
 include/linux/mfd/cros_ec_commands.h | 10 +---------
 include/linux/mfd/cros_ec_lpc_mec.h  | 14 +++-----------
 include/linux/mfd/cros_ec_lpc_reg.h  | 14 +++-----------
 9 files changed, 31 insertions(+), 118 deletions(-)

diff --git a/drivers/mfd/cros_ec.c b/drivers/mfd/cros_ec.c
index 0da7c785cb18..3b564a00bee5 100644
--- a/drivers/mfd/cros_ec.c
+++ b/drivers/mfd/cros_ec.c
@@ -1,21 +1,11 @@
-/*
- * ChromeOS EC multi-function device
- *
- * Copyright (C) 2012 Google, Inc
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- *
- * The ChromeOS EC multi function device is used to mux all the requests
- * to the EC device for its multiple features: keyboard controller,
- * battery charging and regulator control, firmware update.
- */
+// SPDX-License-Identifier: GPL-2.0
+// ChromeOS EC multi-function device.
+//
+// Copyright (C) 2012 Google, Inc
+//
+// The ChromeOS EC multi function device is used to mux all the requests
+// to the EC device for its multiple features: keyboard controller,
+// battery charging and regulator control, firmware update.
 
 #include <linux/of_platform.h>
 #include <linux/interrupt.h>
diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c
index d37c79426c87..0ce7be132a09 100644
--- a/drivers/mfd/cros_ec_dev.c
+++ b/drivers/mfd/cros_ec_dev.c
@@ -1,21 +1,8 @@
-/*
- * cros_ec_dev - expose the Chrome OS Embedded Controller to user-space
- *
- * Copyright (C) 2014 Google, 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, 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/>.
- */
+// SPDX-License-Identifier: GPL-2.0+
+// Expose the ChromeOS Embedded Controller to user-space.
+//
+// Copyright (C) 2014 Google, Inc.
+// Author: Bill Richardson <wfrichar@chromium.org>
 
 #include <linux/fs.h>
 #include <linux/mfd/core.h>
diff --git a/drivers/mfd/cros_ec_dev.h b/drivers/mfd/cros_ec_dev.h
index 45e9453608c5..a63cf80234c7 100644
--- a/drivers/mfd/cros_ec_dev.h
+++ b/drivers/mfd/cros_ec_dev.h
@@ -1,20 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * cros_ec_dev - expose the Chrome OS Embedded Controller to userspace
+ * Expose the ChromeOS Embedded Controller to userspace
  *
  * Copyright (C) 2014 Google, 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, 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/>.
  */
 
 #ifndef _CROS_EC_DEV_H_
diff --git a/drivers/mfd/cros_ec_i2c.c b/drivers/mfd/cros_ec_i2c.c
index 606157076e7f..689635b81f6a 100644
--- a/drivers/mfd/cros_ec_i2c.c
+++ b/drivers/mfd/cros_ec_i2c.c
@@ -1,17 +1,7 @@
-/*
- * ChromeOS EC multi-function device (I2C)
- *
- * Copyright (C) 2012 Google, Inc
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- */
+// SPDX-License-Identifier: GPL-2.0
+// ChromeOS EC multi-function device (I2C).
+//
+// Copyright (C) 2012 Google, Inc
 
 #include <linux/acpi.h>
 #include <linux/delay.h>
diff --git a/drivers/mfd/cros_ec_spi.c b/drivers/mfd/cros_ec_spi.c
index 2060d1483043..dcb9b2cf2db5 100644
--- a/drivers/mfd/cros_ec_spi.c
+++ b/drivers/mfd/cros_ec_spi.c
@@ -1,17 +1,7 @@
-/*
- * ChromeOS EC multi-function device (SPI)
- *
- * Copyright (C) 2012 Google, Inc
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- */
+// SPDX-License-Identifier: GPL-2.0
+// ChromeOS EC multi-function device (SPI).
+//
+// Copyright (C) 2012 Google, Inc
 
 #include <linux/delay.h>
 #include <linux/kernel.h>
diff --git a/include/linux/mfd/cros_ec.h b/include/linux/mfd/cros_ec.h
index 32421dfeb996..57995418c305 100644
--- a/include/linux/mfd/cros_ec.h
+++ b/include/linux/mfd/cros_ec.h
@@ -1,16 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ChromeOS EC multi-function device
  *
  * Copyright (C) 2012 Google, Inc
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
  */
 
 #ifndef __LINUX_MFD_CROS_EC_H
diff --git a/include/linux/mfd/cros_ec_commands.h b/include/linux/mfd/cros_ec_commands.h
index f2edd9969b40..007f9ded445c 100644
--- a/include/linux/mfd/cros_ec_commands.h
+++ b/include/linux/mfd/cros_ec_commands.h
@@ -1,17 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Host communication command constants for ChromeOS EC
  *
  * Copyright (C) 2012 Google, Inc
  *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- *
  * The ChromeOS EC multi function device is used to mux all the requests
  * to the EC device for its multiple features: keyboard controller,
  * battery charging and regulator control, firmware update.
diff --git a/include/linux/mfd/cros_ec_lpc_mec.h b/include/linux/mfd/cros_ec_lpc_mec.h
index 176496ddc66c..0badd24ab4b5 100644
--- a/include/linux/mfd/cros_ec_lpc_mec.h
+++ b/include/linux/mfd/cros_ec_lpc_mec.h
@@ -1,18 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
- * cros_ec_lpc_mec - LPC variant I/O for Microchip EC
+ * LPC variant I/O for Microchip EC
  *
  * Copyright (C) 2016 Google, Inc
  *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- *
- * This driver uses the Chrome OS EC byte-level message-based protocol for
+ * This driver uses the ChromeOS EC byte-level message-based protocol for
  * communicating the keyboard state (which keys are pressed) from a keyboard EC
  * to the AP over some bus (such as i2c, lpc, spi).  The EC does debouncing,
  * but everything else (including deghosting) is done here.  The main
diff --git a/include/linux/mfd/cros_ec_lpc_reg.h b/include/linux/mfd/cros_ec_lpc_reg.h
index 5560bef63c2b..011071b87457 100644
--- a/include/linux/mfd/cros_ec_lpc_reg.h
+++ b/include/linux/mfd/cros_ec_lpc_reg.h
@@ -1,18 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
- * cros_ec_lpc_reg - LPC access to the Chrome OS Embedded Controller
+ * LPC register access to the ChromeOS Embedded Controller
  *
  * Copyright (C) 2016 Google, Inc
  *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- *
- * This driver uses the Chrome OS EC byte-level message-based protocol for
+ * This driver uses the ChromeOS EC byte-level message-based protocol for
  * communicating the keyboard state (which keys are pressed) from a keyboard EC
  * to the AP over some bus (such as i2c, lpc, spi).  The EC does debouncing,
  * but everything else (including deghosting) is done here.  The main
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [PATCH v3 05/12] rtc: cros-ec: Make license text and module license match.
  2018-06-06 15:08 [PATCH v3 00/12] cros_ec: Match licenses and switch to SPDX identifier Enric Balletbo i Serra
                   ` (3 preceding siblings ...)
  2018-06-06 15:08 ` [PATCH v3 04/12] mfd: cros_ec: Switch to SPDX identifier Enric Balletbo i Serra
@ 2018-06-06 15:08 ` Enric Balletbo i Serra
  2018-06-06 15:51   ` Alexandre Belloni
  2018-06-06 15:08 ` [PATCH v3 06/12] rtc: cros-ec: Switch to SPDX identifier Enric Balletbo i Serra
                   ` (7 subsequent siblings)
  12 siblings, 1 reply; 25+ messages in thread
From: Enric Balletbo i Serra @ 2018-06-06 15:08 UTC (permalink / raw)
  To: linux-kernel
  Cc: Gwendal Grignou, kernel, Dmitry Torokhov, linux-rtc,
	Alexandre Belloni, Alessandro Zummo

The license text is specifying "GPLv2" but the MODULE_LICENSE is set to
GPL which means GNU Public License v2 or later. When MODULE_LICENSE and
boiler plate does not match, go for boiler plate license.

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---

Changes in v3: None
Changes in v2: None

 drivers/rtc/rtc-cros-ec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/rtc/rtc-cros-ec.c b/drivers/rtc/rtc-cros-ec.c
index bf7ced095c94..f2b87f9159c1 100644
--- a/drivers/rtc/rtc-cros-ec.c
+++ b/drivers/rtc/rtc-cros-ec.c
@@ -409,5 +409,5 @@ module_platform_driver(cros_ec_rtc_driver);
 
 MODULE_DESCRIPTION("RTC driver for Chrome OS ECs");
 MODULE_AUTHOR("Stephen Barber <smbarber@chromium.org>");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("platform:" DRV_NAME);
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [PATCH v3 06/12] rtc: cros-ec: Switch to SPDX identifier.
  2018-06-06 15:08 [PATCH v3 00/12] cros_ec: Match licenses and switch to SPDX identifier Enric Balletbo i Serra
                   ` (4 preceding siblings ...)
  2018-06-06 15:08 ` [PATCH v3 05/12] rtc: cros-ec: Make license text and module license match Enric Balletbo i Serra
@ 2018-06-06 15:08 ` Enric Balletbo i Serra
  2018-06-06 15:52   ` Alexandre Belloni
  2018-06-06 15:08 ` [PATCH v3 07/12] extcon: usbc-cros-ec: Make license text and module license match Enric Balletbo i Serra
                   ` (6 subsequent siblings)
  12 siblings, 1 reply; 25+ messages in thread
From: Enric Balletbo i Serra @ 2018-06-06 15:08 UTC (permalink / raw)
  To: linux-kernel
  Cc: Gwendal Grignou, kernel, Dmitry Torokhov, linux-rtc,
	Alexandre Belloni, Alessandro Zummo

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

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---

Changes in v3: None
Changes in v2: None

 drivers/rtc/rtc-cros-ec.c | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/drivers/rtc/rtc-cros-ec.c b/drivers/rtc/rtc-cros-ec.c
index f2b87f9159c1..e5444296075e 100644
--- a/drivers/rtc/rtc-cros-ec.c
+++ b/drivers/rtc/rtc-cros-ec.c
@@ -1,19 +1,8 @@
-/*
- * RTC driver for Chrome OS Embedded Controller
- *
- * Copyright (c) 2017, Google, Inc
- *
- * Author: Stephen Barber <smbarber@chromium.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.
- */
+// SPDX-License-Identifier: GPL-2.0
+// RTC driver for ChromeOS Embedded Controller.
+//
+// Copyright (C) 2017 Google, Inc.
+// Author: Stephen Barber <smbarber@chromium.org>
 
 #include <linux/kernel.h>
 #include <linux/mfd/cros_ec.h>
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [PATCH v3 07/12] extcon: usbc-cros-ec: Make license text and module license match.
  2018-06-06 15:08 [PATCH v3 00/12] cros_ec: Match licenses and switch to SPDX identifier Enric Balletbo i Serra
                   ` (5 preceding siblings ...)
  2018-06-06 15:08 ` [PATCH v3 06/12] rtc: cros-ec: Switch to SPDX identifier Enric Balletbo i Serra
@ 2018-06-06 15:08 ` Enric Balletbo i Serra
  2018-06-06 15:08 ` [PATCH v3 08/12] extcon: usbc-cros-ec: Switch to SPDX identifier Enric Balletbo i Serra
                   ` (5 subsequent siblings)
  12 siblings, 0 replies; 25+ messages in thread
From: Enric Balletbo i Serra @ 2018-06-06 15:08 UTC (permalink / raw)
  To: linux-kernel
  Cc: Gwendal Grignou, kernel, Dmitry Torokhov, Chanwoo Choi, MyungJoo Ham

The license text is specifying "GPLv2" but the MODULE_LICENSE is set to
GPL which means GNU Public License v2 or later. When MODULE_LICENSE and
boiler plate does not match, go for boiler plate license.

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---

Changes in v3: None
Changes in v2: None

 drivers/extcon/extcon-usbc-cros-ec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/extcon/extcon-usbc-cros-ec.c b/drivers/extcon/extcon-usbc-cros-ec.c
index 6721ab01fe7d..a5b75a12cfc9 100644
--- a/drivers/extcon/extcon-usbc-cros-ec.c
+++ b/drivers/extcon/extcon-usbc-cros-ec.c
@@ -548,4 +548,4 @@ module_platform_driver(extcon_cros_ec_driver);
 
 MODULE_DESCRIPTION("ChromeOS Embedded Controller extcon driver");
 MODULE_AUTHOR("Benson Leung <bleung@chromium.org>");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [PATCH v3 08/12] extcon: usbc-cros-ec: Switch to SPDX identifier.
  2018-06-06 15:08 [PATCH v3 00/12] cros_ec: Match licenses and switch to SPDX identifier Enric Balletbo i Serra
                   ` (6 preceding siblings ...)
  2018-06-06 15:08 ` [PATCH v3 07/12] extcon: usbc-cros-ec: Make license text and module license match Enric Balletbo i Serra
@ 2018-06-06 15:08 ` Enric Balletbo i Serra
  2018-06-06 15:08 ` [PATCH v3 09/12] Input: cros_ec_keyb - Make license text and module license match Enric Balletbo i Serra
                   ` (4 subsequent siblings)
  12 siblings, 0 replies; 25+ messages in thread
From: Enric Balletbo i Serra @ 2018-06-06 15:08 UTC (permalink / raw)
  To: linux-kernel
  Cc: Gwendal Grignou, kernel, Dmitry Torokhov, Chanwoo Choi, MyungJoo Ham

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

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---

Changes in v3: None
Changes in v2: None

 drivers/extcon/extcon-usbc-cros-ec.c | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/drivers/extcon/extcon-usbc-cros-ec.c b/drivers/extcon/extcon-usbc-cros-ec.c
index a5b75a12cfc9..43c0a936ab82 100644
--- a/drivers/extcon/extcon-usbc-cros-ec.c
+++ b/drivers/extcon/extcon-usbc-cros-ec.c
@@ -1,18 +1,8 @@
-/**
- * drivers/extcon/extcon-usbc-cros-ec - ChromeOS Embedded Controller extcon
- *
- * Copyright (C) 2017 Google, Inc
- * Author: Benson Leung <bleung@chromium.org>
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- */
+// SPDX-License-Identifier: GPL-2.0
+// ChromeOS Embedded Controller extcon
+//
+// Copyright (C) 2017 Google, Inc.
+// Author: Benson Leung <bleung@chromium.org>
 
 #include <linux/extcon-provider.h>
 #include <linux/kernel.h>
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [PATCH v3 09/12] Input: cros_ec_keyb - Make license text and module license match.
  2018-06-06 15:08 [PATCH v3 00/12] cros_ec: Match licenses and switch to SPDX identifier Enric Balletbo i Serra
                   ` (7 preceding siblings ...)
  2018-06-06 15:08 ` [PATCH v3 08/12] extcon: usbc-cros-ec: Switch to SPDX identifier Enric Balletbo i Serra
@ 2018-06-06 15:08 ` Enric Balletbo i Serra
  2018-06-12 23:30   ` Dmitry Torokhov
  2018-06-06 15:08 ` [PATCH v3 10/12] Input: cros_ec_keyb - Switch to SPDX identifier Enric Balletbo i Serra
                   ` (3 subsequent siblings)
  12 siblings, 1 reply; 25+ messages in thread
From: Enric Balletbo i Serra @ 2018-06-06 15:08 UTC (permalink / raw)
  To: linux-kernel; +Cc: Gwendal Grignou, kernel, Dmitry Torokhov, linux-input

The license text is specifying "GPLv2" but the MODULE_LICENSE is set to
GPL which means GNU Public License v2 or later. When MODULE_LICENSE and
boiler plate does not match, go for boiler plate license.

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---

Changes in v3: None
Changes in v2: None

 drivers/input/keyboard/cros_ec_keyb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c
index 79eb29550c34..9dd8c146699f 100644
--- a/drivers/input/keyboard/cros_ec_keyb.c
+++ b/drivers/input/keyboard/cros_ec_keyb.c
@@ -674,6 +674,6 @@ static struct platform_driver cros_ec_keyb_driver = {
 
 module_platform_driver(cros_ec_keyb_driver);
 
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("ChromeOS EC keyboard driver");
 MODULE_ALIAS("platform:cros-ec-keyb");
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [PATCH v3 10/12] Input: cros_ec_keyb - Switch to SPDX identifier.
  2018-06-06 15:08 [PATCH v3 00/12] cros_ec: Match licenses and switch to SPDX identifier Enric Balletbo i Serra
                   ` (8 preceding siblings ...)
  2018-06-06 15:08 ` [PATCH v3 09/12] Input: cros_ec_keyb - Make license text and module license match Enric Balletbo i Serra
@ 2018-06-06 15:08 ` Enric Balletbo i Serra
  2018-06-12 23:30   ` Dmitry Torokhov
  2018-06-06 15:08 ` [PATCH v3 11/12] iio: cros_ec: " Enric Balletbo i Serra
                   ` (2 subsequent siblings)
  12 siblings, 1 reply; 25+ messages in thread
From: Enric Balletbo i Serra @ 2018-06-06 15:08 UTC (permalink / raw)
  To: linux-kernel; +Cc: Gwendal Grignou, kernel, Dmitry Torokhov, linux-input

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

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---

Changes in v3: None
Changes in v2: None

 drivers/input/keyboard/cros_ec_keyb.c | 34 ++++++++++-----------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c
index 9dd8c146699f..dd1b356d0004 100644
--- a/drivers/input/keyboard/cros_ec_keyb.c
+++ b/drivers/input/keyboard/cros_ec_keyb.c
@@ -1,25 +1,15 @@
-/*
- * ChromeOS EC keyboard driver
- *
- * Copyright (C) 2012 Google, Inc
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- *
- * This driver uses the Chrome OS EC byte-level message-based protocol for
- * communicating the keyboard state (which keys are pressed) from a keyboard EC
- * to the AP over some bus (such as i2c, lpc, spi).  The EC does debouncing,
- * but everything else (including deghosting) is done here.  The main
- * motivation for this is to keep the EC firmware as simple as possible, since
- * it cannot be easily upgraded and EC flash/IRAM space is relatively
- * expensive.
- */
+// SPDX-License-Identifier: GPL-2.0
+// ChromeOS EC keyboard driver
+//
+// Copyright (C) 2012 Google, Inc.
+//
+// This driver uses the ChromeOS EC byte-level message-based protocol for
+// communicating the keyboard state (which keys are pressed) from a keyboard EC
+// to the AP over some bus (such as i2c, lpc, spi).  The EC does debouncing,
+// but everything else (including deghosting) is done here.  The main
+// motivation for this is to keep the EC firmware as simple as possible, since
+// it cannot be easily upgraded and EC flash/IRAM space is relatively
+// expensive.
 
 #include <linux/module.h>
 #include <linux/bitops.h>
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [PATCH v3 11/12] iio: cros_ec: Switch to SPDX identifier.
  2018-06-06 15:08 [PATCH v3 00/12] cros_ec: Match licenses and switch to SPDX identifier Enric Balletbo i Serra
                   ` (9 preceding siblings ...)
  2018-06-06 15:08 ` [PATCH v3 10/12] Input: cros_ec_keyb - Switch to SPDX identifier Enric Balletbo i Serra
@ 2018-06-06 15:08 ` Enric Balletbo i Serra
  2018-06-06 15:09 ` [PATCH v3 12/12] i2c: i2c-cros-ec-tunnel: " Enric Balletbo i Serra
  2018-06-06 15:42 ` [PATCH v3 00/12] cros_ec: Match licenses and switch " Joe Perches
  12 siblings, 0 replies; 25+ messages in thread
From: Enric Balletbo i Serra @ 2018-06-06 15:08 UTC (permalink / raw)
  To: linux-kernel
  Cc: Gwendal Grignou, kernel, Dmitry Torokhov, Paolo Cretaro,
	linux-iio, Hartmut Knaack, Lars-Peter Clausen, Jonathan Cameron,
	Peter Meerwald-Stadler

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

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---

Changes in v3: None
Changes in v2: None

 drivers/iio/accel/cros_ec_accel_legacy.c      | 27 +++++++------------
 .../common/cros_ec_sensors/cros_ec_sensors.c  | 24 +++++------------
 .../cros_ec_sensors/cros_ec_sensors_core.c    | 18 +++----------
 .../cros_ec_sensors/cros_ec_sensors_core.h    | 12 ++-------
 drivers/iio/light/cros_ec_light_prox.c        | 18 +++----------
 drivers/iio/pressure/cros_ec_baro.c           | 18 +++----------
 6 files changed, 30 insertions(+), 87 deletions(-)

diff --git a/drivers/iio/accel/cros_ec_accel_legacy.c b/drivers/iio/accel/cros_ec_accel_legacy.c
index 063e89eff791..1fc59984216b 100644
--- a/drivers/iio/accel/cros_ec_accel_legacy.c
+++ b/drivers/iio/accel/cros_ec_accel_legacy.c
@@ -1,21 +1,12 @@
-/*
- * Driver for older Chrome OS EC accelerometer
- *
- * Copyright 2017 Google, Inc
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- *
- * This driver uses the memory mapper cros-ec interface to communicate
- * with the Chrome OS EC about accelerometer data.
- * Accelerometer access is presented through iio sysfs.
- */
+// SPDX-License-Identifier: GPL-2.0
+// Driver for older ChromeOS EC accelerometer
+//
+// Copyright (C) 2017 Google, Inc.
+// Author: Gwendal Grignou <gwendal@chromium.org>
+//
+// This driver uses the memory mapper cros-ec interface to communicate
+// with the ChromeOS EC about accelerometer data.
+// Accelerometer access is presented through iio sysfs.
 
 #include <linux/delay.h>
 #include <linux/device.h>
diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
index 705cb3e72663..39d4eecc97ea 100644
--- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
+++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
@@ -1,20 +1,10 @@
-/*
- * cros_ec_sensors - Driver for Chrome OS Embedded Controller sensors.
- *
- * Copyright (C) 2016 Google, Inc
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- *
- * This driver uses the cros-ec interface to communicate with the Chrome OS
- * EC about sensors data. Data access is presented through iio sysfs.
- */
+// SPDX-License-Identifier: GPL-2.0
+// Driver for ChromeOS Embedded Controller sensors.
+//
+// Copyright (C) 2016 Google, Inc.
+//
+// This driver uses the cros-ec interface to communicate with the ChromeOS
+// EC about sensors data. Data access is presented through iio sysfs.
 
 #include <linux/delay.h>
 #include <linux/device.h>
diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
index a620eb5ce202..05221994197c 100644
--- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
+++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
@@ -1,17 +1,7 @@
-/*
- * cros_ec_sensors_core - Common function for Chrome OS EC sensor driver.
- *
- * Copyright (C) 2016 Google, Inc
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- */
+// SPDX-License-Identifier: GPL-2.0
+// Common functions for ChromeOS EC sensor driver.
+//
+// Copyright (C) 2016 Google, Inc.
 
 #include <linux/delay.h>
 #include <linux/device.h>
diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.h b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.h
index 2edf68dc7336..a9935489030e 100644
--- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.h
+++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.h
@@ -1,16 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ChromeOS EC sensor hub
  *
- * Copyright (C) 2016 Google, Inc
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
+ * Copyright (C) 2016 Google, Inc.
  */
 
 #ifndef __CROS_EC_SENSORS_CORE_H
diff --git a/drivers/iio/light/cros_ec_light_prox.c b/drivers/iio/light/cros_ec_light_prox.c
index 8e8a0e7f78d1..8635e1c18cd5 100644
--- a/drivers/iio/light/cros_ec_light_prox.c
+++ b/drivers/iio/light/cros_ec_light_prox.c
@@ -1,17 +1,7 @@
-/*
- * cros_ec_light_prox - Driver for light and prox sensors behing CrosEC.
- *
- * Copyright (C) 2017 Google, Inc
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- */
+// SPDX-License-Identifier: GPL-2.0
+// Driver for light and prox sensors behind ChromeOS EC.
+//
+// Copyright (C) 2017 Google, Inc.
 
 #include <linux/delay.h>
 #include <linux/device.h>
diff --git a/drivers/iio/pressure/cros_ec_baro.c b/drivers/iio/pressure/cros_ec_baro.c
index 4599fde4dd25..8e134d65d18d 100644
--- a/drivers/iio/pressure/cros_ec_baro.c
+++ b/drivers/iio/pressure/cros_ec_baro.c
@@ -1,17 +1,7 @@
-/*
- * cros_ec_baro - Driver for barometer sensor behind CrosEC.
- *
- * Copyright (C) 2017 Google, Inc
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- */
+// SPDX-License-Identifier: GPL-2.0
+// Driver for barometer sensor behind ChromeOS EC.
+//
+// Copyright (C) 2017 Google, Inc.
 
 #include <linux/delay.h>
 #include <linux/device.h>
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 25+ messages in thread

* [PATCH v3 12/12] i2c: i2c-cros-ec-tunnel: Switch to SPDX identifier.
  2018-06-06 15:08 [PATCH v3 00/12] cros_ec: Match licenses and switch to SPDX identifier Enric Balletbo i Serra
                   ` (10 preceding siblings ...)
  2018-06-06 15:08 ` [PATCH v3 11/12] iio: cros_ec: " Enric Balletbo i Serra
@ 2018-06-06 15:09 ` Enric Balletbo i Serra
  2018-12-17 22:10   ` Wolfram Sang
  2018-06-06 15:42 ` [PATCH v3 00/12] cros_ec: Match licenses and switch " Joe Perches
  12 siblings, 1 reply; 25+ messages in thread
From: Enric Balletbo i Serra @ 2018-06-06 15:09 UTC (permalink / raw)
  To: linux-kernel; +Cc: Gwendal Grignou, kernel, Dmitry Torokhov, linux-i2c

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

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---

Changes in v3: None
Changes in v2: None

 drivers/i2c/busses/i2c-cros-ec-tunnel.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/drivers/i2c/busses/i2c-cros-ec-tunnel.c b/drivers/i2c/busses/i2c-cros-ec-tunnel.c
index eb76b76f4754..82bcd9a78759 100644
--- a/drivers/i2c/busses/i2c-cros-ec-tunnel.c
+++ b/drivers/i2c/busses/i2c-cros-ec-tunnel.c
@@ -1,13 +1,7 @@
-/*
- *  Copyright (C) 2013 Google, 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, or
- *  (at your option) any later version.
- *
- * Expose an I2C passthrough to the ChromeOS EC.
- */
+// SPDX-License-Identifier: GPL-2.0+
+// Expose an I2C passthrough to the ChromeOS EC.
+//
+// Copyright (C) 2013 Google, Inc.
 
 #include <linux/module.h>
 #include <linux/i2c.h>
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 25+ messages in thread

* Re: [PATCH v3 00/12] cros_ec: Match licenses and switch to SPDX identifier.
  2018-06-06 15:08 [PATCH v3 00/12] cros_ec: Match licenses and switch to SPDX identifier Enric Balletbo i Serra
                   ` (11 preceding siblings ...)
  2018-06-06 15:09 ` [PATCH v3 12/12] i2c: i2c-cros-ec-tunnel: " Enric Balletbo i Serra
@ 2018-06-06 15:42 ` Joe Perches
  2018-06-08  8:58   ` Enric Balletbo i Serra
  12 siblings, 1 reply; 25+ messages in thread
From: Joe Perches @ 2018-06-06 15:42 UTC (permalink / raw)
  To: Enric Balletbo i Serra, linux-kernel
  Cc: Gwendal Grignou, kernel, Dmitry Torokhov, Tony Luck,
	Alessandro Zummo, Paolo Cretaro, linux-iio, Alexandre Belloni,
	linux-i2c, Olof Johansson, linux-rtc, Anton Vorontsov,
	Chanwoo Choi, Benson Leung, linux-input, Lars-Peter Clausen,
	Jonathan Cameron, Peter Meerwald-Stadler, MyungJoo Ham,
	Lee Jones, Hartmut Knaack, Colin Cross, Kees Cook

On Wed, 2018-06-06 at 17:08 +0200, Enric Balletbo i Serra wrote:
> Dear all,
> 
> This patchset is just to adopt the SPDX license identifier for all
> ChromeOS Embedded Controller related drivers.

This bit is fine,

>  The patches touches
> different subsystems but every patch can be picked from their respective
> maintainer independently.
> 
> This third version takes the license note as the valid license (I did
> the contrary in the second version) so apart from add the SPDX tags it
> also introduces new patches to match the license.

But why change any MODULE_LICENSE text?

There are uses of MODULE_LICENSE("GPL") where
the SPDX license identifier is some GPL variant

For instance:
$ git grep -P --name-only
'MODULE_LICENSE\s*\("GPL"\s*\)\s*;'| \
  xargs grep "SPDX-License-
Identifier:" | \
  cut -f3- -d: | \
  sed -r 's@\s*\*/\s*$@@' | \
  sort |
uniq -c | sort -rn
    551  GPL-2.0+
    281  GPL-2.0
     13  GPL-1.0+
    
  9  GPL-2.0-only
      2  GPL-2.0 OR MIT
      1  (GPL-2.0 OR MPL-1.1)
   
   1  (GPL-2.0+ OR BSD-3-Clause)
      1  (GPL-2.0 OR BSD-3-Clause)

And if you were to do this, please do it tree-wide,
and ideally via a script

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PATCH v3 05/12] rtc: cros-ec: Make license text and module license match.
  2018-06-06 15:08 ` [PATCH v3 05/12] rtc: cros-ec: Make license text and module license match Enric Balletbo i Serra
@ 2018-06-06 15:51   ` Alexandre Belloni
  0 siblings, 0 replies; 25+ messages in thread
From: Alexandre Belloni @ 2018-06-06 15:51 UTC (permalink / raw)
  To: Enric Balletbo i Serra
  Cc: linux-kernel, Gwendal Grignou, kernel, Dmitry Torokhov,
	linux-rtc, Alessandro Zummo

On 06/06/2018 17:08:53+0200, Enric Balletbo i Serra wrote:
> The license text is specifying "GPLv2" but the MODULE_LICENSE is set to
> GPL which means GNU Public License v2 or later. When MODULE_LICENSE and
> boiler plate does not match, go for boiler plate license.
> 
> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> ---
> 
> Changes in v3: None
> Changes in v2: None
> 
>  drivers/rtc/rtc-cros-ec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
Applied, thanks.

-- 
Alexandre Belloni, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PATCH v3 06/12] rtc: cros-ec: Switch to SPDX identifier.
  2018-06-06 15:08 ` [PATCH v3 06/12] rtc: cros-ec: Switch to SPDX identifier Enric Balletbo i Serra
@ 2018-06-06 15:52   ` Alexandre Belloni
  0 siblings, 0 replies; 25+ messages in thread
From: Alexandre Belloni @ 2018-06-06 15:52 UTC (permalink / raw)
  To: Enric Balletbo i Serra
  Cc: linux-kernel, Gwendal Grignou, kernel, Dmitry Torokhov,
	linux-rtc, Alessandro Zummo

On 06/06/2018 17:08:54+0200, Enric Balletbo i Serra wrote:
> Adopt the SPDX license identifier headers to ease license compliance
> management.
> 
> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> ---
> 
> Changes in v3: None
> Changes in v2: None
> 
>  drivers/rtc/rtc-cros-ec.c | 21 +++++----------------
>  1 file changed, 5 insertions(+), 16 deletions(-)
> 
Applied, thanks.

-- 
Alexandre Belloni, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PATCH v3 00/12] cros_ec: Match licenses and switch to SPDX identifier.
  2018-06-06 15:42 ` [PATCH v3 00/12] cros_ec: Match licenses and switch " Joe Perches
@ 2018-06-08  8:58   ` Enric Balletbo i Serra
  0 siblings, 0 replies; 25+ messages in thread
From: Enric Balletbo i Serra @ 2018-06-08  8:58 UTC (permalink / raw)
  To: Joe Perches, linux-kernel
  Cc: Gwendal Grignou, kernel, Dmitry Torokhov, Tony Luck,
	Alessandro Zummo, Paolo Cretaro, linux-iio, Alexandre Belloni,
	linux-i2c, Olof Johansson, linux-rtc, Anton Vorontsov,
	Chanwoo Choi, Benson Leung, linux-input, Lars-Peter Clausen,
	Jonathan Cameron, Peter Meerwald-Stadler, MyungJoo Ham,
	Lee Jones, Hartmut Knaack, Colin Cross, Kees Cook

Hi Joe,

On 06/06/18 17:42, Joe Perches wrote:
> On Wed, 2018-06-06 at 17:08 +0200, Enric Balletbo i Serra wrote:
>> Dear all,
>>
>> This patchset is just to adopt the SPDX license identifier for all
>> ChromeOS Embedded Controller related drivers.
> 
> This bit is fine,
> 
>>  The patches touches
>> different subsystems but every patch can be picked from their respective
>> maintainer independently.
>>
>> This third version takes the license note as the valid license (I did
>> the contrary in the second version) so apart from add the SPDX tags it
>> also introduces new patches to match the license.
> 
> But why change any MODULE_LICENSE text?
> 

Because in some cases there is a mismatch between the license note and the
MODULE_LICENSE text.

According to the documentation setting MODULE_LICENSE("GPL") means GNU Public
License v2 or later [1], in the cases where the license note tells explicitly
that is GPL v2 only I think that the MODULE_LICENSE should match and be changed
to "GPL v2".

[1] https://elixir.bootlin.com/linux/v4.17/source/include/linux/module.h#L172

> There are uses of MODULE_LICENSE("GPL") where
> the SPDX license identifier is some GPL variant
> 

Right, but I suppose in such cases is wrong and should be changed too?

> For instance:
> $ git grep -P --name-only
> 'MODULE_LICENSE\s*\("GPL"\s*\)\s*;'| \
>   xargs grep "SPDX-License-
> Identifier:" | \
>   cut -f3- -d: | \
>   sed -r 's@\s*\*/\s*$@@' | \
>   sort |
> uniq -c | sort -rn
>     551  GPL-2.0+
>     281  GPL-2.0
>      13  GPL-1.0+
>     
>   9  GPL-2.0-only
>       2  GPL-2.0 OR MIT
>       1  (GPL-2.0 OR MPL-1.1)
>    
>    1  (GPL-2.0+ OR BSD-3-Clause)
>       1  (GPL-2.0 OR BSD-3-Clause)
> 
> And if you were to do this, please do it tree-wide,
> and ideally via a script
> 

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PATCH v3 09/12] Input: cros_ec_keyb - Make license text and module license match.
  2018-06-06 15:08 ` [PATCH v3 09/12] Input: cros_ec_keyb - Make license text and module license match Enric Balletbo i Serra
@ 2018-06-12 23:30   ` Dmitry Torokhov
  0 siblings, 0 replies; 25+ messages in thread
From: Dmitry Torokhov @ 2018-06-12 23:30 UTC (permalink / raw)
  To: Enric Balletbo i Serra; +Cc: linux-kernel, Gwendal Grignou, kernel, linux-input

On Wed, Jun 06, 2018 at 05:08:57PM +0200, Enric Balletbo i Serra wrote:
> The license text is specifying "GPLv2" but the MODULE_LICENSE is set to
> GPL which means GNU Public License v2 or later. When MODULE_LICENSE and
> boiler plate does not match, go for boiler plate license.
> 
> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>

Applied, thank you.

> ---
> 
> Changes in v3: None
> Changes in v2: None
> 
>  drivers/input/keyboard/cros_ec_keyb.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c
> index 79eb29550c34..9dd8c146699f 100644
> --- a/drivers/input/keyboard/cros_ec_keyb.c
> +++ b/drivers/input/keyboard/cros_ec_keyb.c
> @@ -674,6 +674,6 @@ static struct platform_driver cros_ec_keyb_driver = {
>  
>  module_platform_driver(cros_ec_keyb_driver);
>  
> -MODULE_LICENSE("GPL");
> +MODULE_LICENSE("GPL v2");
>  MODULE_DESCRIPTION("ChromeOS EC keyboard driver");
>  MODULE_ALIAS("platform:cros-ec-keyb");
> -- 
> 2.17.1
> 

-- 
Dmitry

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PATCH v3 10/12] Input: cros_ec_keyb - Switch to SPDX identifier.
  2018-06-06 15:08 ` [PATCH v3 10/12] Input: cros_ec_keyb - Switch to SPDX identifier Enric Balletbo i Serra
@ 2018-06-12 23:30   ` Dmitry Torokhov
  0 siblings, 0 replies; 25+ messages in thread
From: Dmitry Torokhov @ 2018-06-12 23:30 UTC (permalink / raw)
  To: Enric Balletbo i Serra; +Cc: linux-kernel, Gwendal Grignou, kernel, linux-input

On Wed, Jun 06, 2018 at 05:08:58PM +0200, Enric Balletbo i Serra wrote:
> Adopt the SPDX license identifier headers to ease license compliance
> management.
> 
> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>

Applied, thank you.

> ---
> 
> Changes in v3: None
> Changes in v2: None
> 
>  drivers/input/keyboard/cros_ec_keyb.c | 34 ++++++++++-----------------
>  1 file changed, 12 insertions(+), 22 deletions(-)
> 
> diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c
> index 9dd8c146699f..dd1b356d0004 100644
> --- a/drivers/input/keyboard/cros_ec_keyb.c
> +++ b/drivers/input/keyboard/cros_ec_keyb.c
> @@ -1,25 +1,15 @@
> -/*
> - * ChromeOS EC keyboard driver
> - *
> - * Copyright (C) 2012 Google, Inc
> - *
> - * This software is licensed under the terms of the GNU General Public
> - * License version 2, as published by the Free Software Foundation, and
> - * may be copied, distributed, and modified under those terms.
> - *
> - * 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.
> - *
> - * This driver uses the Chrome OS EC byte-level message-based protocol for
> - * communicating the keyboard state (which keys are pressed) from a keyboard EC
> - * to the AP over some bus (such as i2c, lpc, spi).  The EC does debouncing,
> - * but everything else (including deghosting) is done here.  The main
> - * motivation for this is to keep the EC firmware as simple as possible, since
> - * it cannot be easily upgraded and EC flash/IRAM space is relatively
> - * expensive.
> - */
> +// SPDX-License-Identifier: GPL-2.0
> +// ChromeOS EC keyboard driver
> +//
> +// Copyright (C) 2012 Google, Inc.
> +//
> +// This driver uses the ChromeOS EC byte-level message-based protocol for
> +// communicating the keyboard state (which keys are pressed) from a keyboard EC
> +// to the AP over some bus (such as i2c, lpc, spi).  The EC does debouncing,
> +// but everything else (including deghosting) is done here.  The main
> +// motivation for this is to keep the EC firmware as simple as possible, since
> +// it cannot be easily upgraded and EC flash/IRAM space is relatively
> +// expensive.
>  
>  #include <linux/module.h>
>  #include <linux/bitops.h>
> -- 
> 2.17.1
> 

-- 
Dmitry

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PATCH v3 03/12] mfd: cros_ec: Make license text and module license match.
  2018-06-06 15:08 ` [PATCH v3 03/12] mfd: cros_ec: Make license text and module license match Enric Balletbo i Serra
@ 2018-06-18  7:18   ` Lee Jones
  2018-06-18  7:20     ` Lee Jones
  0 siblings, 1 reply; 25+ messages in thread
From: Lee Jones @ 2018-06-18  7:18 UTC (permalink / raw)
  To: Enric Balletbo i Serra
  Cc: linux-kernel, Gwendal Grignou, kernel, Dmitry Torokhov

On Wed, 06 Jun 2018, Enric Balletbo i Serra wrote:

> The license text is specifying "GPLv2" but the MODULE_LICENSE is set to
> GPL which means GNU Public License v2 or later. When MODULE_LICENSE and
> boiler plate does not match, go for boiler plate license.
> 
> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> ---
> 
> Changes in v3: None
> Changes in v2: None
> 
>  drivers/mfd/cros_ec.c     | 2 +-
>  drivers/mfd/cros_ec_i2c.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Applied, thanks.

-- 
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PATCH v3 03/12] mfd: cros_ec: Make license text and module license match.
  2018-06-18  7:18   ` Lee Jones
@ 2018-06-18  7:20     ` Lee Jones
  2018-06-18  7:53       ` Enric Balletbo Serra
  0 siblings, 1 reply; 25+ messages in thread
From: Lee Jones @ 2018-06-18  7:20 UTC (permalink / raw)
  To: Enric Balletbo i Serra
  Cc: linux-kernel, Gwendal Grignou, kernel, Dmitry Torokhov

On Mon, 18 Jun 2018, Lee Jones wrote:

> On Wed, 06 Jun 2018, Enric Balletbo i Serra wrote:
> 
> > The license text is specifying "GPLv2" but the MODULE_LICENSE is set to
> > GPL which means GNU Public License v2 or later. When MODULE_LICENSE and
> > boiler plate does not match, go for boiler plate license.
> > 
> > Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> > ---
> > 
> > Changes in v3: None
> > Changes in v2: None
> > 
> >  drivers/mfd/cros_ec.c     | 2 +-
> >  drivers/mfd/cros_ec_i2c.c | 2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> Applied, thanks.

I've just seen Joe's comment.

Unapplied, for now.

-- 
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PATCH v3 03/12] mfd: cros_ec: Make license text and module license match.
  2018-06-18  7:20     ` Lee Jones
@ 2018-06-18  7:53       ` Enric Balletbo Serra
  2018-06-18  8:13         ` Lee Jones
  0 siblings, 1 reply; 25+ messages in thread
From: Enric Balletbo Serra @ 2018-06-18  7:53 UTC (permalink / raw)
  To: Lee Jones
  Cc: Enric Balletbo i Serra, linux-kernel, Gwendal Grignou, kernel,
	Dmitry Torokhov

Hi Lee,
Missatge de Lee Jones <lee.jones@linaro.org> del dia dl., 18 de juny
2018 a les 9:21:
>
> On Mon, 18 Jun 2018, Lee Jones wrote:
>
> > On Wed, 06 Jun 2018, Enric Balletbo i Serra wrote:
> >
> > > The license text is specifying "GPLv2" but the MODULE_LICENSE is set to
> > > GPL which means GNU Public License v2 or later. When MODULE_LICENSE and
> > > boiler plate does not match, go for boiler plate license.
> > >
> > > Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> > > ---
> > >
> > > Changes in v3: None
> > > Changes in v2: None
> > >
> > >  drivers/mfd/cros_ec.c     | 2 +-
> > >  drivers/mfd/cros_ec_i2c.c | 2 +-
> > >  2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > Applied, thanks.
>
> I've just seen Joe's comment.
>

Did you read my answer [1] to the Joe's email?

According to the doc if MODULE_LICENSE is GPL that means  GPL-2.0 or
later which to be strict is wrong if your file is GPL-2.0 only. It's
right that there are modules in the kernel that have this mismatch but
IMHO is wrong, there are also some examples where people fix this, i.e
[2]

Best regards,
  Enric

[1] https://lkml.org/lkml/2018/6/8/144
[2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=75dc344145190bf53aed7a28dbc27c11180d94e5




> Unapplied, for now.
>
> --
> Lee Jones [李琼斯]
> Linaro Services Technical Lead
> Linaro.org │ Open source software for ARM SoCs
> Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PATCH v3 03/12] mfd: cros_ec: Make license text and module license match.
  2018-06-18  7:53       ` Enric Balletbo Serra
@ 2018-06-18  8:13         ` Lee Jones
  2018-06-18  8:42           ` Enric Balletbo Serra
  0 siblings, 1 reply; 25+ messages in thread
From: Lee Jones @ 2018-06-18  8:13 UTC (permalink / raw)
  To: Enric Balletbo Serra
  Cc: Enric Balletbo i Serra, linux-kernel, Gwendal Grignou, kernel,
	Dmitry Torokhov

On Mon, 18 Jun 2018, Enric Balletbo Serra wrote:

> Hi Lee,
> Missatge de Lee Jones <lee.jones@linaro.org> del dia dl., 18 de juny
> 2018 a les 9:21:
> >
> > On Mon, 18 Jun 2018, Lee Jones wrote:
> >
> > > On Wed, 06 Jun 2018, Enric Balletbo i Serra wrote:
> > >
> > > > The license text is specifying "GPLv2" but the MODULE_LICENSE is set to
> > > > GPL which means GNU Public License v2 or later. When MODULE_LICENSE and
> > > > boiler plate does not match, go for boiler plate license.
> > > >
> > > > Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> > > > ---
> > > >
> > > > Changes in v3: None
> > > > Changes in v2: None
> > > >
> > > >  drivers/mfd/cros_ec.c     | 2 +-
> > > >  drivers/mfd/cros_ec_i2c.c | 2 +-
> > > >  2 files changed, 2 insertions(+), 2 deletions(-)
> > >
> > > Applied, thanks.
> >
> > I've just seen Joe's comment.
> >
> 
> Did you read my answer [1] to the Joe's email?
> 
> According to the doc if MODULE_LICENSE is GPL that means  GPL-2.0 or
> later which to be strict is wrong if your file is GPL-2.0 only. It's
> right that there are modules in the kernel that have this mismatch but
> IMHO is wrong, there are also some examples where people fix this, i.e
> [2]

I did.  Did you read his comment about making these changes wider?

-- 
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PATCH v3 03/12] mfd: cros_ec: Make license text and module license match.
  2018-06-18  8:13         ` Lee Jones
@ 2018-06-18  8:42           ` Enric Balletbo Serra
  0 siblings, 0 replies; 25+ messages in thread
From: Enric Balletbo Serra @ 2018-06-18  8:42 UTC (permalink / raw)
  To: Lee Jones
  Cc: Enric Balletbo i Serra, linux-kernel, Gwendal Grignou, kernel,
	Dmitry Torokhov

Hi Lee,
Missatge de Lee Jones <lee.jones@linaro.org> del dia dl., 18 de juny
2018 a les 10:13:
>
> On Mon, 18 Jun 2018, Enric Balletbo Serra wrote:
>
> > Hi Lee,
> > Missatge de Lee Jones <lee.jones@linaro.org> del dia dl., 18 de juny
> > 2018 a les 9:21:
> > >
> > > On Mon, 18 Jun 2018, Lee Jones wrote:
> > >
> > > > On Wed, 06 Jun 2018, Enric Balletbo i Serra wrote:
> > > >
> > > > > The license text is specifying "GPLv2" but the MODULE_LICENSE is set to
> > > > > GPL which means GNU Public License v2 or later. When MODULE_LICENSE and
> > > > > boiler plate does not match, go for boiler plate license.
> > > > >
> > > > > Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> > > > > ---
> > > > >
> > > > > Changes in v3: None
> > > > > Changes in v2: None
> > > > >
> > > > >  drivers/mfd/cros_ec.c     | 2 +-
> > > > >  drivers/mfd/cros_ec_i2c.c | 2 +-
> > > > >  2 files changed, 2 insertions(+), 2 deletions(-)
> > > >
> > > > Applied, thanks.
> > >
> > > I've just seen Joe's comment.
> > >
> >
> > Did you read my answer [1] to the Joe's email?
> >
> > According to the doc if MODULE_LICENSE is GPL that means  GPL-2.0 or
> > later which to be strict is wrong if your file is GPL-2.0 only. It's
> > right that there are modules in the kernel that have this mismatch but
> > IMHO is wrong, there are also some examples where people fix this, i.e
> > [2]
>
> I did.  Did you read his comment about making these changes wider?
>

Ah ok, that's the reason, so you prefer I do a script to fix this in a
more general way instead of only fix this for cros-ec devices. I'll
do.

Thanks,
 Enric

> --
> Lee Jones [李琼斯]
> Linaro Services Technical Lead
> Linaro.org │ Open source software for ARM SoCs
> Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PATCH v3 12/12] i2c: i2c-cros-ec-tunnel: Switch to SPDX identifier.
  2018-06-06 15:09 ` [PATCH v3 12/12] i2c: i2c-cros-ec-tunnel: " Enric Balletbo i Serra
@ 2018-12-17 22:10   ` Wolfram Sang
  0 siblings, 0 replies; 25+ messages in thread
From: Wolfram Sang @ 2018-12-17 22:10 UTC (permalink / raw)
  To: Enric Balletbo i Serra
  Cc: linux-kernel, Gwendal Grignou, kernel, Dmitry Torokhov, linux-i2c

[-- Attachment #1: Type: text/plain, Size: 270 bytes --]

On Wed, Jun 06, 2018 at 05:09:00PM +0200, Enric Balletbo i Serra wrote:
> Adopt the SPDX license identifier headers to ease license compliance
> management.
> 
> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>

Applied to for-next, thanks!


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 25+ messages in thread

end of thread, other threads:[~2018-12-17 22:10 UTC | newest]

Thread overview: 25+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-06 15:08 [PATCH v3 00/12] cros_ec: Match licenses and switch to SPDX identifier Enric Balletbo i Serra
2018-06-06 15:08 ` [PATCH v3 01/12] platform/chrome: Make license text and module license match Enric Balletbo i Serra
2018-06-06 15:08 ` [PATCH v3 02/12] platform/chrome: Switch to SPDX identifier Enric Balletbo i Serra
2018-06-06 15:08 ` [PATCH v3 03/12] mfd: cros_ec: Make license text and module license match Enric Balletbo i Serra
2018-06-18  7:18   ` Lee Jones
2018-06-18  7:20     ` Lee Jones
2018-06-18  7:53       ` Enric Balletbo Serra
2018-06-18  8:13         ` Lee Jones
2018-06-18  8:42           ` Enric Balletbo Serra
2018-06-06 15:08 ` [PATCH v3 04/12] mfd: cros_ec: Switch to SPDX identifier Enric Balletbo i Serra
2018-06-06 15:08 ` [PATCH v3 05/12] rtc: cros-ec: Make license text and module license match Enric Balletbo i Serra
2018-06-06 15:51   ` Alexandre Belloni
2018-06-06 15:08 ` [PATCH v3 06/12] rtc: cros-ec: Switch to SPDX identifier Enric Balletbo i Serra
2018-06-06 15:52   ` Alexandre Belloni
2018-06-06 15:08 ` [PATCH v3 07/12] extcon: usbc-cros-ec: Make license text and module license match Enric Balletbo i Serra
2018-06-06 15:08 ` [PATCH v3 08/12] extcon: usbc-cros-ec: Switch to SPDX identifier Enric Balletbo i Serra
2018-06-06 15:08 ` [PATCH v3 09/12] Input: cros_ec_keyb - Make license text and module license match Enric Balletbo i Serra
2018-06-12 23:30   ` Dmitry Torokhov
2018-06-06 15:08 ` [PATCH v3 10/12] Input: cros_ec_keyb - Switch to SPDX identifier Enric Balletbo i Serra
2018-06-12 23:30   ` Dmitry Torokhov
2018-06-06 15:08 ` [PATCH v3 11/12] iio: cros_ec: " Enric Balletbo i Serra
2018-06-06 15:09 ` [PATCH v3 12/12] i2c: i2c-cros-ec-tunnel: " Enric Balletbo i Serra
2018-12-17 22:10   ` Wolfram Sang
2018-06-06 15:42 ` [PATCH v3 00/12] cros_ec: Match licenses and switch " Joe Perches
2018-06-08  8:58   ` Enric Balletbo i Serra

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).