Hi Enric, On Tue, Jun 05, 2018 at 07:54:22PM +0200, Enric Balletbo i Serra wrote: > Adopt the SPDX license identifier headers to ease license compliance > management. > > Signed-off-by: Enric Balletbo i Serra <[email protected]> > --- > > Changes in v2: > - s/Chrome OS/ChromeOS/ > - [1/9] Fixed wrong copyright year. > > 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 +++-------- > 9 files changed, 61 insertions(+), 169 deletions(-) > Several of these change V2 only to V2+. We should match the old license notice.
My bad. I made the same error on the tbmc driver. I will fix that myself. > 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 3682e1539251..f196aa4fa84c 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+ This one was submitted previously as GPL-2.0 only, so let's keep it that way. 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..7c69883cea5d 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+ This one was submitted previously as GPL-2.0 only, so let's keep it that way. 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..4a1013964841 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+ Same here. 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..13b925aba61d 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+ 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 > Thanks! -- Benson Leung Staff Software Engineer Chrome OS Kernel Google Inc. [email protected] Chromium OS Project [email protected]
signature.asc
Description: PGP signature
