aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform/chrome/cros_ec_i2c.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-03-12 12:46:32 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2019-03-12 12:46:32 -0400
commitf47d633134f7033e3d0c667419d9f8afd69e308d (patch)
treea5242d86288599fda63ed79b2d131f5a298bb66f /drivers/platform/chrome/cros_ec_i2c.c
parent004cc08675b761fd82288bab1b5ba5e1ca746eca (diff)
parent2794449576a6024e203eca5cc2c1a3ae33102b8e (diff)
Merge tag 'tag-chrome-platform-for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux
Pull chrome platform updates from Benson Leung: - SPDX identifier cleanup for platform/chrome - Cleanup series between mfd and chrome/platform, moving cros-ec attributes from mfd/cros_ec_dev to sub-drivers in platform/chrome - Wilco EC driver - Maintainership change to new group repository * tag 'tag-chrome-platform-for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux: platform/chrome: fix wilco-ec dependencies platform/chrome: wilco_ec: Add RTC driver platform/chrome: wilco_ec: Add support for raw commands in debugfs platform/chrome: Add new driver for Wilco EC platform/chrome: cros_ec: Remove cros_ec dependency in lpc_mec MAINTAINERS: chrome-platform: change the git tree to a chrome-platform group git tree platform/chrome: cros_ec_sysfs: remove pr_fmt() define platform/chrome: cros_ec_lightbar: remove pr_fmt() define platform/chrome: cros_kbd_led_backlight: switch to SPDX identifier platform/chrome: cros_ec_spi: switch to SPDX identifier platform/chrome: cros_ec_proto: switch to SPDX identifier platform/chrome: cros_ec_lpc: switch to SPDX identifier platform/chrome: cros_ec_i2c: switch to SPDX identifier platform/chrome: cros_ec_vbc: switch to SPDX identifier platform/chrome: cros_ec_sysfs: switch to SPDX identifier platform/chrome: cros_ec_lightbar: switch to SPDX identifier platform/chrome: cros_ec_debugfs: switch to SPDX identifier platform/chrome: cromeos_pstore: switch to SPDX identifier
Diffstat (limited to 'drivers/platform/chrome/cros_ec_i2c.c')
-rw-r--r--drivers/platform/chrome/cros_ec_i2c.c22
1 files changed, 6 insertions, 16 deletions
diff --git a/drivers/platform/chrome/cros_ec_i2c.c b/drivers/platform/chrome/cros_ec_i2c.c
index 9a009eaa4ada..61d75395f86d 100644
--- a/drivers/platform/chrome/cros_ec_i2c.c
+++ b/drivers/platform/chrome/cros_ec_i2c.c
@@ -1,17 +1,7 @@
1/* 1// SPDX-License-Identifier: GPL-2.0
2 * ChromeOS EC multi-function device (I2C) 2// I2C interface for ChromeOS Embedded Controller
3 * 3//
4 * Copyright (C) 2012 Google, Inc 4// Copyright (C) 2012 Google, Inc
5 *
6 * This software is licensed under the terms of the GNU General Public
7 * License version 2, as published by the Free Software Foundation, and
8 * may be copied, distributed, and modified under those terms.
9 *
10 * This program is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 */
15 5
16#include <linux/acpi.h> 6#include <linux/acpi.h>
17#include <linux/delay.h> 7#include <linux/delay.h>
@@ -372,5 +362,5 @@ static struct i2c_driver cros_ec_driver = {
372 362
373module_i2c_driver(cros_ec_driver); 363module_i2c_driver(cros_ec_driver);
374 364
375MODULE_LICENSE("GPL"); 365MODULE_LICENSE("GPL v2");
376MODULE_DESCRIPTION("ChromeOS EC multi function device"); 366MODULE_DESCRIPTION("I2C interface for ChromeOS Embedded Controller");