Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e0bb52d authored by Enric Balletbo i Serra's avatar Enric Balletbo i Serra
Browse files

Merge tag... 


Merge tag 'ib-mfd-extcon-hid-i2c-iio-input-media-chrome-power-pwm-rtc-sound-v5.4' into chrome-platform/for-next

Immutable branch between MFD, Extcon, HID, I2C, IIO, Input, Chrome, Power,
PWM, RTC and Sound to allow picking patches that depends on the series
that moves some code from the MFD subsystem to platform/chrome.

Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
parents 058bf149 28e6fcc8

drivers/extcon/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ config EXTCON_USB_GPIO 


config EXTCON_USBC_CROS_EC

	tristate "ChromeOS Embedded Controller EXTCON support"

	depends on MFD_CROS_EC

	depends on CROS_EC

	help

	  Say Y here to enable USB Type C cable detection extcon support when

	  using Chrome OS EC based USB Type-C ports.

drivers/extcon/extcon-usbc-cros-ec.c

+2 −1
Original line number Diff line number Diff line
@@ -6,10 +6,11 @@ 


#include <linux/extcon-provider.h>

#include <linux/kernel.h>

#include <linux/mfd/cros_ec.h>

#include <linux/module.h>

#include <linux/notifier.h>

#include <linux/of.h>

#include <linux/platform_data/cros_ec_commands.h>

#include <linux/platform_data/cros_ec_proto.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/sched.h>

drivers/hid/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ config HOLTEK_FF 


config HID_GOOGLE_HAMMER

	tristate "Google Hammer Keyboard"

	depends on USB_HID && LEDS_CLASS && MFD_CROS_EC

	depends on USB_HID && LEDS_CLASS && CROS_EC

	---help---

	Say Y here if you have a Google Hammer device.

drivers/hid/hid-google-hammer.c

+2 −2
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 
#include <linux/acpi.h>

#include <linux/hid.h>

#include <linux/leds.h>

#include <linux/mfd/cros_ec.h>

#include <linux/mfd/cros_ec_commands.h>

#include <linux/module.h>

#include <linux/platform_data/cros_ec_commands.h>

#include <linux/platform_data/cros_ec_proto.h>

#include <linux/platform_device.h>

#include <linux/pm_wakeup.h>

#include <asm/unaligned.h>

drivers/i2c/busses/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1345,7 +1345,7 @@ config I2C_SIBYTE 


config I2C_CROS_EC_TUNNEL

	tristate "ChromeOS EC tunnel I2C bus"

	depends on MFD_CROS_EC

	depends on CROS_EC

	help

	  If you say yes here you get an I2C bus that will tunnel i2c commands

	  through to the other side of the ChromeOS EC to the i2c bus