Commit 63de3747 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Merge tag 'tag-chrome-platform-for-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux

Pull chrome platform changes from Benson Leung:
 "CrOS EC / MFD / IIO:

   - Contains tag-ib-chrome-mfd-iio-input-5.5, which is the first part
     of a series from Gwendal to refactor sensor code between MFD, CrOS
     EC, iio and input in order to add a new sensorhub driver and FIFO
     processing

  Wilco EC:

   - Add support for Dell's USB PowerShare policy control, keyboard
     backlight LED driver, and a new test_event file.

   - Fixes use after free in wilco_ec's telemetry driver.

  Misc:

   - bugfix in cros_usbpd_logger (missing destroy workqueue)"

* tag 'tag-chrome-platform-for-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux:
  platform/chrome: wilco_ec: fix use after free issue
  platform/chrome: cros_ec: Add Kconfig default for cros-ec-sensorhub
  Revert "Input: cros_ec_keyb: mask out extra flags in event_type"
  Revert "Input: cros_ec_keyb - add back missing mask for event_type"
  platform/chrome: cros_ec: handle MKBP more events flag
  platform/chrome: cros_ec: Do not attempt to register a non-positive IRQ number
  platform/chrome: cros-ec: Record event timestamp in the hard irq
  mfd / platform / iio: cros_ec: Register sensor through sensorhub
  iio / platform: cros_ec: Add cros-ec-sensorhub driver
  mfd / platform: cros_ec: Add sensor_count and make check_features public
  platform/chrome: cros_ec: Put docs with the code
  platform/chrome: cros_usbpd_logger: add missed destroy_workqueue in remove
  platform/chrome: cros_ec: Fix Kconfig indentation
  platform/chrome: wilco_ec: Add keyboard backlight LED support
  platform/chrome: wilco_ec: Add charging config driver
  platform/chrome: wilco_ec: Add Dell's USB PowerShare Policy control
  platform/chrome: wilco_ec: Add debugfs test_event file
parents 388c645a 856a0a6e

Documentation/ABI/testing/sysfs-platform-wilco-ec

+17 −0
Original line number Diff line number Diff line
@@ -31,6 +31,23 @@ Description: 
               Output will a version string be similar to the example below:

               08B6



What:          /sys/bus/platform/devices/GOOG000C\:00/usb_charge

Date:          October 2019

KernelVersion: 5.5

Description:

               Control the USB PowerShare Policy. USB PowerShare is a policy

               which affects charging via the special USB PowerShare port

               (marked with a small lightning bolt or battery icon) when in

               low power states:

               - In S0, the port will always provide power.

               - In S0ix, if usb_charge is enabled, then power will be

                 supplied to the port when on AC or if battery is > 50%.

                 Else no power is supplied.

               - In S5, if usb_charge is enabled, then power will be supplied

                 to the port when on AC. Else no power is supplied.



               Input should be either "0" or "1".



What:          /sys/bus/platform/devices/GOOG000C\:00/version

Date:          May 2019

KernelVersion: 5.3

drivers/iio/accel/cros_ec_accel_legacy.c

+0 −6
Original line number Diff line number Diff line
@@ -163,16 +163,10 @@ static const struct iio_chan_spec cros_ec_accel_legacy_channels[] = { 
static int cros_ec_accel_legacy_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct cros_ec_dev *ec = dev_get_drvdata(dev->parent);

	struct iio_dev *indio_dev;

	struct cros_ec_sensors_core_state *state;

	int ret;



	if (!ec || !ec->ec_dev) {

		dev_warn(&pdev->dev, "No EC device found.\n");

		return -EINVAL;

	}



	indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*state));

	if (!indio_dev)

		return -ENOMEM;

drivers/iio/common/cros_ec_sensors/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#

config IIO_CROS_EC_SENSORS_CORE

	tristate "ChromeOS EC Sensors Core"

	depends on SYSFS && CROS_EC

	depends on SYSFS && CROS_EC_SENSORHUB

	select IIO_BUFFER

	select IIO_TRIGGERED_BUFFER

	help

drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c

+0 −6
Original line number Diff line number Diff line
@@ -222,17 +222,11 @@ static const struct iio_info ec_sensors_info = { 
static int cros_ec_sensors_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct cros_ec_dev *ec_dev = dev_get_drvdata(dev->parent);

	struct iio_dev *indio_dev;

	struct cros_ec_sensors_state *state;

	struct iio_chan_spec *channel;

	int ret, i;



	if (!ec_dev || !ec_dev->ec_dev) {

		dev_warn(&pdev->dev, "No CROS EC device found.\n");

		return -EINVAL;

	}



	indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*state));

	if (!indio_dev)

		return -ENOMEM;

drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c

+3 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/slab.h>

#include <linux/platform_data/cros_ec_commands.h>

#include <linux/platform_data/cros_ec_proto.h>

#include <linux/platform_data/cros_ec_sensorhub.h>

#include <linux/platform_device.h>



static char *cros_ec_loc[] = {
@@ -88,7 +89,8 @@ int cros_ec_sensors_core_init(struct platform_device *pdev, 
{

	struct device *dev = &pdev->dev;

	struct cros_ec_sensors_core_state *state = iio_priv(indio_dev);

	struct cros_ec_dev *ec = dev_get_drvdata(pdev->dev.parent);

	struct cros_ec_sensorhub *sensor_hub = dev_get_drvdata(dev->parent);

	struct cros_ec_dev *ec = sensor_hub->ec;

	struct cros_ec_sensor_platform *sensor_platform = dev_get_platdata(dev);

	u32 ver_mask;

	int ret, i;

CRA Git | Maintained and supported by SUSTech CRA and CCSE