Commit f47d6331 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tag-chrome-platform-for-v5.1' of... 

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
parents 004cc086 27944495

Documentation/ABI/testing/debugfs-wilco-ec

0 → 100644
+23 −0
Original line number Diff line number Diff line 
What:		/sys/kernel/debug/wilco_ec/raw

Date:		January 2019

KernelVersion:	5.1

Description:

		Write and read raw mailbox commands to the EC.



		For writing:

		Bytes 0-1 indicate the message type:

			00 F0 = Execute Legacy Command

			00 F2 = Read/Write NVRAM Property

		Byte 2 provides the command code

		Bytes 3+ consist of the data passed in the request



		At least three bytes are required, for the msg type and command,

		with additional bytes optional for additional data.



		Example:

		// Request EC info type 3 (EC firmware build date)

		$ echo 00 f0 38 00 03 00 > raw

		// View the result. The decoded ASCII result "12/21/18" is

		// included after the raw hex.

		$ cat raw

		00 31 32 2f 32 31 2f 31 38 00 38 00 01 00 2f 00  .12/21/18.8...

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -3755,7 +3755,7 @@ CHROME HARDWARE PLATFORM SUPPORT 
M:	Benson Leung <bleung@chromium.org>

M:	Enric Balletbo i Serra <enric.balletbo@collabora.com>

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git

F:	drivers/platform/chrome/



CHROMEOS EC SUBDRIVERS

drivers/platform/chrome/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -152,4 +152,6 @@ config CROS_EC_SYSFS 
	  To compile this driver as a module, choose M here: the

	  module will be called cros_ec_sysfs.



source "drivers/platform/chrome/wilco_ec/Kconfig"



endif # CHROMEOS_PLATFORMS

drivers/platform/chrome/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -14,3 +14,5 @@ obj-$(CONFIG_CROS_EC_LIGHTBAR) += cros_ec_lightbar.o 
obj-$(CONFIG_CROS_EC_VBC)		+= cros_ec_vbc.o

obj-$(CONFIG_CROS_EC_DEBUGFS)		+= cros_ec_debugfs.o

obj-$(CONFIG_CROS_EC_SYSFS)		+= cros_ec_sysfs.o



obj-$(CONFIG_WILCO_EC)			+= wilco_ec/

drivers/platform/chrome/chromeos_pstore.c

+6 −11
Original line number Diff line number Diff line 
/*

 *  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>
@@ -139,4 +134,4 @@ module_init(chromeos_pstore_init); 
module_exit(chromeos_pstore_exit);



MODULE_DESCRIPTION("ChromeOS pstore module");

MODULE_LICENSE("GPL");
 
MODULE_LICENSE("GPL v2");

CRA Git | Maintained and supported by SUSTech CRA and CCSE