Commit 32b90daf authored by Linus Torvalds's avatar Linus Torvalds

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

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

Pull chrome platform updates from Benson Leung:
 "CrOS EC / MFD Migration:
    - Move cros_ec core driver from mfd into chrome platform.

  Wilco EC:
    - Add batt_ppid_info command to Wilco telemetry driver.

  CrOS EC:
    - cros_ec_rpmsg : Add support to inform EC of suspend/resume status
    - cros_ec_rpmsg : Fix race condition on probe failed
    - cros_ec_chardev : Add a poll handler to receive MKBP events

  Misc:
    - bugfixes in cros_usbpd_logger and cros_ec_ishtp"

* tag 'tag-chrome-platform-for-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux:
  platform/chrome: cros_usbpd_logger: null check create_singlethread_workqueue
  platform/chrome: cros_ec_chardev: Add a poll handler to receive MKBP events
  platform/chrome: cros_ec_rpmsg: Fix race with host command when probe failed
  platform/chrome: chromeos_tbmc: Report wake events
  mfd: cros_ec: Use mfd_add_hotplug_devices() helper
  mfd: cros_ec: Add convenience struct to define autodetectable CrOS EC subdevices
  mfd: cros_ec: Add convenience struct to define dedicated CrOS EC MCUs
  mfd: cros_ec: Use kzalloc and cros_ec_cmd_xfer_status helper
  mfd / platform: cros_ec: Reorganize platform and mfd includes
  mfd / platform: cros_ec: Rename config to a better name
  mfd: cros_ec: Switch to use the new cros-ec-chardev driver
  mfd / platform: cros_ec: Miscellaneous character device to talk with the EC
  mfd / platform: cros_ec: Move cros-ec core driver out from MFD
  mfd / platform: cros_ec: Handle chained ECs as platform devices
  platform/chrome: cros_ec_rpmsg: Add host command AP sleep state support
  platform/chrome: chromeos_laptop: drop checks of NULL-safe functions
  platform/chrome: wilco_ec: Add batt_ppid_info command to telemetry driver
parents c6cfaf4f 4c1fde50
...@@ -181,7 +181,7 @@ config EXTCON_USB_GPIO ...@@ -181,7 +181,7 @@ config EXTCON_USB_GPIO
config EXTCON_USBC_CROS_EC config EXTCON_USBC_CROS_EC
tristate "ChromeOS Embedded Controller EXTCON support" tristate "ChromeOS Embedded Controller EXTCON support"
depends on MFD_CROS_EC depends on CROS_EC
help help
Say Y here to enable USB Type C cable detection extcon support when Say Y here to enable USB Type C cable detection extcon support when
using Chrome OS EC based USB Type-C ports. using Chrome OS EC based USB Type-C ports.
......
...@@ -6,10 +6,11 @@ ...@@ -6,10 +6,11 @@
#include <linux/extcon-provider.h> #include <linux/extcon-provider.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mfd/cros_ec.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/of.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/platform_device.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/sched.h> #include <linux/sched.h>
......
...@@ -376,7 +376,7 @@ config HOLTEK_FF ...@@ -376,7 +376,7 @@ config HOLTEK_FF
config HID_GOOGLE_HAMMER config HID_GOOGLE_HAMMER
tristate "Google Hammer Keyboard" tristate "Google Hammer Keyboard"
depends on USB_HID && LEDS_CLASS && MFD_CROS_EC depends on USB_HID && LEDS_CLASS && CROS_EC
---help--- ---help---
Say Y here if you have a Google Hammer device. Say Y here if you have a Google Hammer device.
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/hid.h> #include <linux/hid.h>
#include <linux/leds.h> #include <linux/leds.h>
#include <linux/mfd/cros_ec.h>
#include <linux/mfd/cros_ec_commands.h>
#include <linux/module.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/platform_device.h>
#include <linux/pm_wakeup.h> #include <linux/pm_wakeup.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
......
...@@ -1345,7 +1345,7 @@ config I2C_SIBYTE ...@@ -1345,7 +1345,7 @@ config I2C_SIBYTE
config I2C_CROS_EC_TUNNEL config I2C_CROS_EC_TUNNEL
tristate "ChromeOS EC tunnel I2C bus" tristate "ChromeOS EC tunnel I2C bus"
depends on MFD_CROS_EC depends on CROS_EC
help help
If you say yes here you get an I2C bus that will tunnel i2c commands 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 through to the other side of the ChromeOS EC to the i2c bus
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/mfd/cros_ec.h> #include <linux/platform_data/cros_ec_commands.h>
#include <linux/mfd/cros_ec_commands.h> #include <linux/platform_data/cros_ec_proto.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/slab.h> #include <linux/slab.h>
......
...@@ -19,9 +19,10 @@ ...@@ -19,9 +19,10 @@
#include <linux/iio/triggered_buffer.h> #include <linux/iio/triggered_buffer.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mfd/cros_ec.h> #include <linux/mfd/cros_ec.h>
#include <linux/mfd/cros_ec_commands.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/platform_data/cros_ec_commands.h>
#include <linux/platform_data/cros_ec_proto.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#define DRV_NAME "cros-ec-accel-legacy" #define DRV_NAME "cros-ec-accel-legacy"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# #
config IIO_CROS_EC_SENSORS_CORE config IIO_CROS_EC_SENSORS_CORE
tristate "ChromeOS EC Sensors Core" tristate "ChromeOS EC Sensors Core"
depends on SYSFS && MFD_CROS_EC depends on SYSFS && CROS_EC
select IIO_BUFFER select IIO_BUFFER
select IIO_TRIGGERED_BUFFER select IIO_TRIGGERED_BUFFER
help help
......
...@@ -20,9 +20,8 @@ ...@@ -20,9 +20,8 @@
#include <linux/iio/triggered_buffer.h> #include <linux/iio/triggered_buffer.h>
#include <linux/iio/trigger_consumer.h> #include <linux/iio/trigger_consumer.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mfd/cros_ec.h>
#include <linux/mfd/cros_ec_commands.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_data/cros_ec_commands.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/slab.h> #include <linux/slab.h>
......
...@@ -17,8 +17,9 @@ ...@@ -17,8 +17,9 @@
#include <linux/iio/triggered_buffer.h> #include <linux/iio/triggered_buffer.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mfd/cros_ec.h> #include <linux/mfd/cros_ec.h>
#include <linux/mfd/cros_ec_commands.h>
#include <linux/module.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/platform_device.h>
#include <linux/slab.h> #include <linux/slab.h>
......
...@@ -14,9 +14,10 @@ ...@@ -14,9 +14,10 @@
#include <linux/iio/trigger_consumer.h> #include <linux/iio/trigger_consumer.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mfd/cros_ec.h> #include <linux/mfd/cros_ec.h>
#include <linux/mfd/cros_ec_commands.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/platform_data/cros_ec_commands.h>
#include <linux/platform_data/cros_ec_proto.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
static char *cros_ec_loc[] = { static char *cros_ec_loc[] = {
......
...@@ -15,8 +15,9 @@ ...@@ -15,8 +15,9 @@
#include <linux/iio/trigger_consumer.h> #include <linux/iio/trigger_consumer.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mfd/cros_ec.h> #include <linux/mfd/cros_ec.h>
#include <linux/mfd/cros_ec_commands.h>
#include <linux/module.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/platform_device.h>
#include <linux/slab.h> #include <linux/slab.h>
......
...@@ -15,9 +15,10 @@ ...@@ -15,9 +15,10 @@
#include <linux/iio/trigger_consumer.h> #include <linux/iio/trigger_consumer.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mfd/cros_ec.h> #include <linux/mfd/cros_ec.h>
#include <linux/mfd/cros_ec_commands.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/platform_data/cros_ec_commands.h>
#include <linux/platform_data/cros_ec_proto.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
/* /*
......
...@@ -736,7 +736,7 @@ config KEYBOARD_XTKBD ...@@ -736,7 +736,7 @@ config KEYBOARD_XTKBD
config KEYBOARD_CROS_EC config KEYBOARD_CROS_EC
tristate "ChromeOS EC keyboard" tristate "ChromeOS EC keyboard"
select INPUT_MATRIXKMAP select INPUT_MATRIXKMAP
depends on MFD_CROS_EC depends on CROS_EC
help help
Say Y here to enable the matrix keyboard used by ChromeOS devices Say Y here to enable the matrix keyboard used by ChromeOS devices
and implemented on the ChromeOS EC. You must enable one bus option and implemented on the ChromeOS EC. You must enable one bus option
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/sysrq.h> #include <linux/sysrq.h>
#include <linux/input/matrix_keypad.h> #include <linux/input/matrix_keypad.h>
#include <linux/mfd/cros_ec.h> #include <linux/platform_data/cros_ec_commands.h>
#include <linux/mfd/cros_ec_commands.h> #include <linux/platform_data/cros_ec_proto.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
......
...@@ -547,10 +547,9 @@ if CEC_PLATFORM_DRIVERS ...@@ -547,10 +547,9 @@ if CEC_PLATFORM_DRIVERS
config VIDEO_CROS_EC_CEC config VIDEO_CROS_EC_CEC
tristate "ChromeOS EC CEC driver" tristate "ChromeOS EC CEC driver"
depends on MFD_CROS_EC depends on CROS_EC
select CEC_CORE select CEC_CORE
select CEC_NOTIFIER select CEC_NOTIFIER
select CHROME_PLATFORMS
select CROS_EC_PROTO select CROS_EC_PROTO
help help
If you say yes here you will get support for the If you say yes here you will get support for the
......
...@@ -14,10 +14,11 @@ ...@@ -14,10 +14,11 @@
#include <linux/cec.h> #include <linux/cec.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/mfd/cros_ec.h>
#include <linux/platform_data/cros_ec_commands.h>
#include <linux/platform_data/cros_ec_proto.h>
#include <media/cec.h> #include <media/cec.h>
#include <media/cec-notifier.h> #include <media/cec-notifier.h>
#include <linux/mfd/cros_ec.h>
#include <linux/mfd/cros_ec_commands.h>
#define DRV_NAME "cros-ec-cec" #define DRV_NAME "cros-ec-cec"
......
...@@ -211,26 +211,18 @@ config MFD_AXP20X_RSB ...@@ -211,26 +211,18 @@ config MFD_AXP20X_RSB
components like regulators or the PEK (Power Enable Key) under the components like regulators or the PEK (Power Enable Key) under the
corresponding menus. corresponding menus.
config MFD_CROS_EC config MFD_CROS_EC_DEV
tristate "ChromeOS Embedded Controller" tristate "ChromeOS Embedded Controller multifunction device"
select MFD_CORE select MFD_CORE
select CHROME_PLATFORMS depends on CROS_EC
select CROS_EC_PROTO default CROS_EC
depends on X86 || ARM || ARM64 || COMPILE_TEST
help help
If you say Y here you get support for the ChromeOS Embedded Select this to get support for ChromeOS Embedded Controller
Controller (EC) providing keyboard, battery and power services. sub-devices. This driver will instantiate additional drivers such
You also need to enable the driver for the bus you are using. The as RTC, USBPD, etc. but you have to select the individual drivers.
protocol for talking to the EC is defined by the bus driver.
config MFD_CROS_EC_CHARDEV To compile this driver as a module, choose M here: the module will be
tristate "Chrome OS Embedded Controller userspace device interface" called cros-ec-dev.
depends on MFD_CROS_EC
---help---
This driver adds support to talk with the ChromeOS EC from userspace.
If you have a supported Chromebook, choose Y or M here.
The module will be called cros_ec_dev.
config MFD_MADERA config MFD_MADERA
tristate "Cirrus Logic Madera codecs" tristate "Cirrus Logic Madera codecs"
......
...@@ -13,9 +13,7 @@ obj-$(CONFIG_MFD_ASIC3) += asic3.o tmio_core.o ...@@ -13,9 +13,7 @@ obj-$(CONFIG_MFD_ASIC3) += asic3.o tmio_core.o
obj-$(CONFIG_ARCH_BCM2835) += bcm2835-pm.o obj-$(CONFIG_ARCH_BCM2835) += bcm2835-pm.o
obj-$(CONFIG_MFD_BCM590XX) += bcm590xx.o obj-$(CONFIG_MFD_BCM590XX) += bcm590xx.o
obj-$(CONFIG_MFD_BD9571MWV) += bd9571mwv.o obj-$(CONFIG_MFD_BD9571MWV) += bd9571mwv.o
cros_ec_core-objs := cros_ec.o obj-$(CONFIG_MFD_CROS_EC_DEV) += cros_ec_dev.o
obj-$(CONFIG_MFD_CROS_EC) += cros_ec_core.o
obj-$(CONFIG_MFD_CROS_EC_CHARDEV) += cros_ec_dev.o
obj-$(CONFIG_MFD_EXYNOS_LPASS) += exynos-lpass.o obj-$(CONFIG_MFD_EXYNOS_LPASS) += exynos-lpass.o
obj-$(CONFIG_HTC_PASIC3) += htc-pasic3.o obj-$(CONFIG_HTC_PASIC3) += htc-pasic3.o
......
This diff is collapsed.
...@@ -3,6 +3,16 @@ ...@@ -3,6 +3,16 @@
# Platform support for Chrome OS hardware (Chromebooks and Chromeboxes) # Platform support for Chrome OS hardware (Chromebooks and Chromeboxes)
# #
config MFD_CROS_EC
tristate "Platform support for Chrome hardware (transitional)"
select CHROME_PLATFORMS
select CROS_EC
select CONFIG_MFD_CROS_EC_DEV
depends on X86 || ARM || ARM64 || COMPILE_TEST
help
This is a transitional Kconfig option and will be removed after
everyone enables the parts individually.
menuconfig CHROME_PLATFORMS menuconfig CHROME_PLATFORMS
bool "Platform support for Chrome hardware" bool "Platform support for Chrome hardware"
depends on X86 || ARM || ARM64 || COMPILE_TEST depends on X86 || ARM || ARM64 || COMPILE_TEST
...@@ -50,9 +60,22 @@ config CHROMEOS_TBMC ...@@ -50,9 +60,22 @@ config CHROMEOS_TBMC
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called chromeos_tbmc. module will be called chromeos_tbmc.
config CROS_EC
tristate "ChromeOS Embedded Controller"
select CROS_EC_PROTO
depends on X86 || ARM || ARM64 || COMPILE_TEST
help
If you say Y here you get support for the ChromeOS Embedded
Controller (EC) providing keyboard, battery and power services.
You also need to enable the driver for the bus you are using. The
protocol for talking to the EC is defined by the bus driver.
To compile this driver as a module, choose M here: the
module will be called cros_ec.
config CROS_EC_I2C config CROS_EC_I2C
tristate "ChromeOS Embedded Controller (I2C)" tristate "ChromeOS Embedded Controller (I2C)"
depends on MFD_CROS_EC && I2C depends on CROS_EC && I2C
help help
If you say Y here, you get support for talking to the ChromeOS If you say Y here, you get support for talking to the ChromeOS
...@@ -62,7 +85,7 @@ config CROS_EC_I2C ...@@ -62,7 +85,7 @@ config CROS_EC_I2C
config CROS_EC_RPMSG config CROS_EC_RPMSG
tristate "ChromeOS Embedded Controller (rpmsg)" tristate "ChromeOS Embedded Controller (rpmsg)"
depends on MFD_CROS_EC && RPMSG && OF depends on CROS_EC && RPMSG && OF
help help
If you say Y here, you get support for talking to the ChromeOS EC If you say Y here, you get support for talking to the ChromeOS EC
through rpmsg. This uses a simple byte-level protocol with a through rpmsg. This uses a simple byte-level protocol with a
...@@ -74,7 +97,7 @@ config CROS_EC_RPMSG ...@@ -74,7 +97,7 @@ config CROS_EC_RPMSG
config CROS_EC_ISHTP config CROS_EC_ISHTP
tristate "ChromeOS Embedded Controller (ISHTP)" tristate "ChromeOS Embedded Controller (ISHTP)"
depends on MFD_CROS_EC depends on CROS_EC
depends on INTEL_ISH_HID depends on INTEL_ISH_HID
help help
If you say Y here, you get support for talking to the ChromeOS EC If you say Y here, you get support for talking to the ChromeOS EC
...@@ -87,7 +110,7 @@ config CROS_EC_ISHTP ...@@ -87,7 +110,7 @@ config CROS_EC_ISHTP
config CROS_EC_SPI config CROS_EC_SPI
tristate "ChromeOS Embedded Controller (SPI)" tristate "ChromeOS Embedded Controller (SPI)"
depends on MFD_CROS_EC && SPI depends on CROS_EC && SPI
---help--- ---help---
If you say Y here, you get support for talking to the ChromeOS EC If you say Y here, you get support for talking to the ChromeOS EC
...@@ -97,7 +120,7 @@ config CROS_EC_SPI ...@@ -97,7 +120,7 @@ config CROS_EC_SPI
config CROS_EC_LPC config CROS_EC_LPC
tristate "ChromeOS Embedded Controller (LPC)" tristate "ChromeOS Embedded Controller (LPC)"
depends on MFD_CROS_EC && ACPI && (X86 || COMPILE_TEST) depends on CROS_EC && ACPI && (X86 || COMPILE_TEST)
help help
If you say Y here, you get support for talking to the ChromeOS EC If you say Y here, you get support for talking to the ChromeOS EC
over an LPC bus, including the LPC Microchip EC (MEC) variant. over an LPC bus, including the LPC Microchip EC (MEC) variant.
...@@ -123,10 +146,21 @@ config CROS_KBD_LED_BACKLIGHT ...@@ -123,10 +146,21 @@ config CROS_KBD_LED_BACKLIGHT
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called cros_kbd_led_backlight. module will be called cros_kbd_led_backlight.
config CROS_EC_CHARDEV
tristate "ChromeOS EC miscdevice"
depends on MFD_CROS_EC_DEV
default MFD_CROS_EC_DEV
help
This driver adds file operations support to talk with the
ChromeOS EC from userspace via a character device.
To compile this driver as a module, choose M here: the
module will be called cros_ec_chardev.
config CROS_EC_LIGHTBAR config CROS_EC_LIGHTBAR
tristate "Chromebook Pixel's lightbar support" tristate "Chromebook Pixel's lightbar support"
depends on MFD_CROS_EC_CHARDEV depends on MFD_CROS_EC_DEV
default MFD_CROS_EC_CHARDEV default MFD_CROS_EC_DEV
help help
This option exposes the Chromebook Pixel's lightbar to This option exposes the Chromebook Pixel's lightbar to
userspace. userspace.
...@@ -136,8 +170,8 @@ config CROS_EC_LIGHTBAR ...@@ -136,8 +170,8 @@ config CROS_EC_LIGHTBAR
config CROS_EC_VBC config CROS_EC_VBC
tristate "ChromeOS EC vboot context support" tristate "ChromeOS EC vboot context support"
depends on MFD_CROS_EC_CHARDEV && OF depends on MFD_CROS_EC_DEV && OF
default MFD_CROS_EC_CHARDEV default MFD_CROS_EC_DEV
help help
This option exposes the ChromeOS EC vboot context nvram to This option exposes the ChromeOS EC vboot context nvram to
userspace. userspace.
...@@ -147,8 +181,8 @@ config CROS_EC_VBC ...@@ -147,8 +181,8 @@ config CROS_EC_VBC
config CROS_EC_DEBUGFS config CROS_EC_DEBUGFS
tristate "Export ChromeOS EC internals in DebugFS" tristate "Export ChromeOS EC internals in DebugFS"
depends on MFD_CROS_EC_CHARDEV && DEBUG_FS depends on MFD_CROS_EC_DEV && DEBUG_FS
default MFD_CROS_EC_CHARDEV default MFD_CROS_EC_DEV
help help
This option exposes the ChromeOS EC device internals to This option exposes the ChromeOS EC device internals to
userspace. userspace.
...@@ -158,8 +192,8 @@ config CROS_EC_DEBUGFS ...@@ -158,8 +192,8 @@ config CROS_EC_DEBUGFS
config CROS_EC_SYSFS config CROS_EC_SYSFS
tristate "ChromeOS EC control and information through sysfs" tristate "ChromeOS EC control and information through sysfs"
depends on MFD_CROS_EC_CHARDEV && SYSFS depends on MFD_CROS_EC_DEV && SYSFS
default MFD_CROS_EC_CHARDEV default MFD_CROS_EC_DEV
help help
This option exposes some sysfs attributes to control and get This option exposes some sysfs attributes to control and get
information from ChromeOS EC. information from ChromeOS EC.
......
...@@ -6,6 +6,7 @@ CFLAGS_cros_ec_trace.o:= -I$(src) ...@@ -6,6 +6,7 @@ CFLAGS_cros_ec_trace.o:= -I$(src)
obj-$(CONFIG_CHROMEOS_LAPTOP) += chromeos_laptop.o obj-$(CONFIG_CHROMEOS_LAPTOP) += chromeos_laptop.o
obj-$(CONFIG_CHROMEOS_PSTORE) += chromeos_pstore.o obj-$(CONFIG_CHROMEOS_PSTORE) += chromeos_pstore.o
obj-$(CONFIG_CHROMEOS_TBMC) += chromeos_tbmc.o obj-$(CONFIG_CHROMEOS_TBMC) += chromeos_tbmc.o
obj-$(CONFIG_CROS_EC) += cros_ec.o
obj-$(CONFIG_CROS_EC_I2C) += cros_ec_i2c.o obj-$(CONFIG_CROS_EC_I2C) += cros_ec_i2c.o
obj-$(CONFIG_CROS_EC_ISHTP) += cros_ec_ishtp.o obj-$(CONFIG_CROS_EC_ISHTP) += cros_ec_ishtp.o
obj-$(CONFIG_CROS_EC_RPMSG) += cros_ec_rpmsg.o obj-$(CONFIG_CROS_EC_RPMSG) += cros_ec_rpmsg.o
...@@ -14,6 +15,7 @@ cros_ec_lpcs-objs := cros_ec_lpc.o cros_ec_lpc_mec.o ...@@ -14,6 +15,7 @@ cros_ec_lpcs-objs := cros_ec_lpc.o cros_ec_lpc_mec.o
obj-$(CONFIG_CROS_EC_LPC) += cros_ec_lpcs.o obj-$(CONFIG_CROS_EC_LPC) += cros_ec_lpcs.o
obj-$(CONFIG_CROS_EC_PROTO) += cros_ec_proto.o cros_ec_trace.o obj-$(CONFIG_CROS_EC_PROTO) += cros_ec_proto.o cros_ec_trace.o
obj-$(CONFIG_CROS_KBD_LED_BACKLIGHT) += cros_kbd_led_backlight.o obj-$(CONFIG_CROS_KBD_LED_BACKLIGHT) += cros_kbd_led_backlight.o
obj-$(CONFIG_CROS_EC_CHARDEV) += cros_ec_chardev.o
obj-$(CONFIG_CROS_EC_LIGHTBAR) += cros_ec_lightbar.o obj-$(CONFIG_CROS_EC_LIGHTBAR) += cros_ec_lightbar.o
obj-$(CONFIG_CROS_EC_VBC) += cros_ec_vbc.o obj-$(CONFIG_CROS_EC_VBC) += cros_ec_vbc.o
obj-$(CONFIG_CROS_EC_DEBUGFS) += cros_ec_debugfs.o obj-$(CONFIG_CROS_EC_DEBUGFS) += cros_ec_debugfs.o
......
...@@ -838,18 +838,14 @@ static void chromeos_laptop_destroy(const struct chromeos_laptop *cros_laptop) ...@@ -838,18 +838,14 @@ static void chromeos_laptop_destroy(const struct chromeos_laptop *cros_laptop)
i2c_dev = &cros_laptop->i2c_peripherals[i]; i2c_dev = &cros_laptop->i2c_peripherals[i];
info = &i2c_dev->board_info; info = &i2c_dev->board_info;
if (i2c_dev->client) i2c_unregister_device(i2c_dev->client);
i2c_unregister_device(i2c_dev->client); property_entries_free(info->properties);
if (info->properties)
property_entries_free(info->properties);
} }
for (i = 0; i < cros_laptop->num_acpi_peripherals; i++) { for (i = 0; i < cros_laptop->num_acpi_peripherals; i++) {
acpi_dev = &cros_laptop->acpi_peripherals[i]; acpi_dev = &cros_laptop->acpi_peripherals[i];
if (acpi_dev->properties) property_entries_free(acpi_dev->properties);
property_entries_free(acpi_dev->properties);
} }
kfree(cros_laptop->i2c_peripherals); kfree(cros_laptop->i2c_peripherals);
......
...@@ -47,6 +47,7 @@ static __maybe_unused int chromeos_tbmc_resume(struct device *dev) ...@@ -47,6 +47,7 @@ static __maybe_unused int chromeos_tbmc_resume(struct device *dev)
static void chromeos_tbmc_notify(struct acpi_device *adev, u32 event) static void chromeos_tbmc_notify(struct acpi_device *adev, u32 event)
{ {
acpi_pm_wakeup_event(&adev->dev);
switch (event) { switch (event) {
case 0x80: case 0x80:
chromeos_tbmc_query_switch(adev, adev->driver_data); chromeos_tbmc_query_switch(adev, adev->driver_data);
...@@ -90,6 +91,7 @@ static int chromeos_tbmc_add(struct acpi_device *adev) ...@@ -90,6 +91,7 @@ static int chromeos_tbmc_add(struct acpi_device *adev)
dev_err(dev, "cannot register input device\n"); dev_err(dev, "cannot register input device\n");
return ret; return ret;
} }
device_init_wakeup(dev, true);
return 0; return 0;
} }
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/mfd/core.h> #include <linux/platform_data/cros_ec_commands.h>
#include <linux/mfd/cros_ec.h> #include <linux/platform_data/cros_ec_proto.h>
#include <linux/suspend.h> #include <linux/suspend.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
...@@ -31,18 +31,6 @@ static struct cros_ec_platform pd_p = { ...@@ -31,18 +31,6 @@ static struct cros_ec_platform pd_p = {
.cmd_offset = EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX), .cmd_offset = EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX),
}; };
static const struct mfd_cell ec_cell = {
.name = "cros-ec-dev",
.platform_data = &ec_p,
.pdata_size = sizeof(ec_p),
};
static const struct mfd_cell ec_pd_cell = {
.name = "cros-ec-dev",
.platform_data = &pd_p,
.pdata_size = sizeof(pd_p),
};
static irqreturn_t ec_irq_thread(int irq, void *data) static irqreturn_t ec_irq_thread(int irq, void *data)
{ {
struct cros_ec_device *ec_dev = data; struct cros_ec_device *ec_dev = data;
...@@ -154,38 +142,42 @@ int cros_ec_register(struct cros_ec_device *ec_dev) ...@@ -154,38 +142,42 @@ int cros_ec_register(struct cros_ec_device *ec_dev)
} }
} }
err = devm_mfd_add_devices(ec_dev->dev, PLATFORM_DEVID_AUTO, &ec_cell, /* Register a platform device for the main EC instance */
1, NULL, ec_dev->irq, NULL); ec_dev->ec = platform_device_register_data(ec_dev->dev, "cros-ec-dev",
if (err) { PLATFORM_DEVID_AUTO, &ec_p,
dev_err(dev, sizeof(struct cros_ec_platform));
"Failed to register Embedded Controller subdevice %d\n", if (IS_ERR(ec_dev->ec)) {
err); dev_err(ec_dev->dev,
return err; "Failed to create CrOS EC platform device\n");
return PTR_ERR(ec_dev->ec);
} }
if (ec_dev->max_passthru) { if (ec_dev->max_passthru) {
/* /*
* Register a PD device as well on top of this device. * Register a platform device for the PD behind the main EC.
* We make the following assumptions: * We make the following assumptions:
* - behind an EC, we have a pd * - behind an EC, we have a pd
* - only one device added. * - only one device added.
* - the EC is responsive at init time (it is not true for a * - the EC is responsive at init time (it is not true for a
* sensor hub. * sensor hub).
*/ */
err = devm_mfd_add_devices(ec_dev->dev, PLATFORM_DEVID_AUTO, ec_dev->pd = platform_device_register_data(ec_dev->dev,
&ec_pd_cell, 1, NULL, ec_dev->irq, NULL); "cros-ec-dev",
if (err) { PLATFORM_DEVID_AUTO, &pd_p,
dev_err(dev, sizeof(struct cros_ec_platform));
"Failed to register Power Delivery subdevice %d\n", if (IS_ERR(ec_dev->pd)) {
err); dev_err(ec_dev->dev,
return err; "Failed to create CrOS PD platform device\n");
platform_device_unregister(ec_dev->ec);
return PTR_ERR(ec_dev->pd);
} }
} }
if (IS_ENABLED(CONFIG_OF) && dev->of_node) { if (IS_ENABLED(CONFIG_OF) && dev->of_node) {
err = devm_of_platform_populate(dev); err = devm_of_platform_populate(dev);
if (err) { if (err) {
mfd_remove_devices(dev); platform_device_unregister(ec_dev->pd);
platform_device_unregister(ec_dev->ec);
dev_err(dev, "Failed to register sub-devices\n"); dev_err(dev, "Failed to register sub-devices\n");
return err; return err;
} }
...@@ -206,6 +198,16 @@ int cros_ec_register(struct cros_ec_device *ec_dev) ...@@ -206,6 +198,16 @@ int cros_ec_register(struct cros_ec_device *ec_dev)
} }
EXPORT_SYMBOL(cros_ec_register); EXPORT_SYMBOL(cros_ec_register);
int cros_ec_unregister(struct cros_ec_device *ec_dev)
{
if (ec_dev->pd)
platform_device_unregister(ec_dev->pd);
platform_device_unregister(ec_dev->ec);
return 0;
}
EXPORT_SYMBOL(cros_ec_unregister);
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
int cros_ec_suspend(struct cros_ec_device *ec_dev) int cros_ec_suspend(struct cros_ec_device *ec_dev)
{ {
......
This diff is collapsed.
...@@ -8,9 +8,10 @@ ...@@ -8,9 +8,10 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/mfd/cros_ec.h> #include <linux/mfd/cros_ec.h>
#include <linux/mfd/cros_ec_commands.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/platform_data/cros_ec_commands.h>
#include <linux/platform_data/cros_ec_proto.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/sched.h> #include <linux/sched.h>
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/mfd/cros_ec.h> #include <linux/platform_data/cros_ec_commands.h>
#include <linux/mfd/cros_ec_commands.h> #include <linux/platform_data/cros_ec_proto.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -307,6 +307,13 @@ static int cros_ec_i2c_probe(struct i2c_client *client, ...@@ -307,6 +307,13 @@ static int cros_ec_i2c_probe(struct i2c_client *client,
return 0; return 0;
} }
static int cros_ec_i2c_remove(struct i2c_client *client)
{
struct cros_ec_device *ec_dev = i2c_get_clientdata(client);
return cros_ec_unregister(ec_dev);
}
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static int cros_ec_i2c_suspend(struct device *dev) static int cros_ec_i2c_suspend(struct device *dev)
{ {
...@@ -357,6 +364,7 @@ static struct i2c_driver cros_ec_driver = { ...@@ -357,6 +364,7 @@ static struct i2c_driver cros_ec_driver = {
.pm = &cros_ec_i2c_pm_ops, .pm = &cros_ec_i2c_pm_ops,
}, },
.probe = cros_ec_i2c_probe, .probe = cros_ec_i2c_probe,
.remove = cros_ec_i2c_remove,
.id_table = cros_ec_i2c_id, .id_table = cros_ec_i2c_id,
}; };
......
...@@ -8,11 +8,10 @@ ...@@ -8,11 +8,10 @@
// (ISH-TP). // (ISH-TP).
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/mfd/core.h>
#include <linux/mfd/cros_ec.h>
#include <linux/mfd/cros_ec_commands.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/platform_data/cros_ec_commands.h>
#include <linux/platform_data/cros_ec_proto.h>
#include <linux/intel-ish-client-if.h> #include <linux/intel-ish-client-if.h>
/* /*
......
...@@ -9,8 +9,9 @@ ...@@ -9,8 +9,9 @@
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/kobject.h> #include <linux/kobject.h>
#include <linux/mfd/cros_ec.h> #include <linux/mfd/cros_ec.h>
#include <linux/mfd/cros_ec_commands.h>
#include <linux/module.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/platform_device.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/types.h> #include <linux/types.h>
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/mfd/cros_ec.h>
#include <linux/mfd/cros_ec_commands.h>
#include <linux/module.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/platform_device.h>
#include <linux/printk.h> #include <linux/printk.h>
#include <linux/suspend.h> #include <linux/suspend.h>
...@@ -421,6 +421,7 @@ static int cros_ec_lpc_probe(struct platform_device *pdev) ...@@ -421,6 +421,7 @@ static int cros_ec_lpc_probe(struct platform_device *pdev)
static int cros_ec_lpc_remove(struct platform_device *pdev) static int cros_ec_lpc_remove(struct platform_device *pdev)
{ {
struct cros_ec_device *ec_dev = platform_get_drvdata(pdev);
struct acpi_device *adev; struct acpi_device *adev;
adev = ACPI_COMPANION(&pdev->dev); adev = ACPI_COMPANION(&pdev->dev);
...@@ -428,7 +429,7 @@ static int cros_ec_lpc_remove(struct platform_device *pdev) ...@@ -428,7 +429,7 @@ static int cros_ec_lpc_remove(struct platform_device *pdev)
acpi_remove_notify_handler(adev->handle, ACPI_ALL_NOTIFY, acpi_remove_notify_handler(adev->handle, ACPI_ALL_NOTIFY,
cros_ec_lpc_acpi_notify); cros_ec_lpc_acpi_notify);
return 0; return cros_ec_unregister(ec_dev);
} }
static const struct acpi_device_id cros_ec_lpc_acpi_device_ids[] = { static const struct acpi_device_id cros_ec_lpc_acpi_device_ids[] = {
......
...@@ -3,10 +3,11 @@ ...@@ -3,10 +3,11 @@
// //
// Copyright (C) 2015 Google, Inc // Copyright (C) 2015 Google, Inc
#include <linux/mfd/cros_ec.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_data/cros_ec_commands.h>
#include <linux/platform_data/cros_ec_proto.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
......
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/mfd/cros_ec.h>
#include <linux/mfd/cros_ec_commands.h>
#include <linux/of.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/platform_device.h>
#include <linux/rpmsg.h> #include <linux/rpmsg.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -41,6 +41,7 @@ struct cros_ec_rpmsg { ...@@ -41,6 +41,7 @@ struct cros_ec_rpmsg {
struct rpmsg_device *rpdev; struct rpmsg_device *rpdev;
struct completion xfer_ack; struct completion xfer_ack;
struct work_struct host_event_work; struct work_struct host_event_work;
struct rpmsg_endpoint *ept;
}; };
/** /**
...@@ -72,7 +73,6 @@ static int cros_ec_pkt_xfer_rpmsg(struct cros_ec_device *ec_dev, ...@@ -72,7 +73,6 @@ static int cros_ec_pkt_xfer_rpmsg(struct cros_ec_device *ec_dev,
struct cros_ec_command *ec_msg) struct cros_ec_command *ec_msg)
{ {
struct cros_ec_rpmsg *ec_rpmsg = ec_dev->priv; struct cros_ec_rpmsg *ec_rpmsg = ec_dev->priv;
struct rpmsg_device *rpdev = ec_rpmsg->rpdev;
struct ec_host_response *response; struct ec_host_response *response;
unsigned long timeout; unsigned long timeout;
int len; int len;
...@@ -85,7 +85,7 @@ static int cros_ec_pkt_xfer_rpmsg(struct cros_ec_device *ec_dev, ...@@ -85,7 +85,7 @@ static int cros_ec_pkt_xfer_rpmsg(struct cros_ec_device *ec_dev,
dev_dbg(ec_dev->dev, "prepared, len=%d\n", len); dev_dbg(ec_dev->dev, "prepared, len=%d\n", len);
reinit_completion(&ec_rpmsg->xfer_ack); reinit_completion(&ec_rpmsg->xfer_ack);
ret = rpmsg_send(rpdev->ept, ec_dev->dout, len); ret = rpmsg_send(ec_rpmsg->ept, ec_dev->dout, len);
if (ret) { if (ret) {
dev_err(ec_dev->dev, "rpmsg send failed\n"); dev_err(ec_dev->dev, "rpmsg send failed\n");
return ret; return ret;
...@@ -196,11 +196,24 @@ static int cros_ec_rpmsg_callback(struct rpmsg_device *rpdev, void *data, ...@@ -196,11 +196,24 @@ static int cros_ec_rpmsg_callback(struct rpmsg_device *rpdev, void *data,
return 0; return 0;
} }
static struct rpmsg_endpoint *
cros_ec_rpmsg_create_ept(struct rpmsg_device *rpdev)
{
struct rpmsg_channel_info chinfo = {};
strscpy(chinfo.name, rpdev->id.name, RPMSG_NAME_SIZE);
chinfo.src = rpdev->src;
chinfo.dst = RPMSG_ADDR_ANY;
return rpmsg_create_ept(rpdev, cros_ec_rpmsg_callback, NULL, chinfo);
}
static int cros_ec_rpmsg_probe(struct rpmsg_device *rpdev) static int cros_ec_rpmsg_probe(struct rpmsg_device *rpdev)
{ {
struct device *dev = &rpdev->dev; struct device *dev = &rpdev->dev;
struct cros_ec_rpmsg *ec_rpmsg; struct cros_ec_rpmsg *ec_rpmsg;
struct cros_ec_device *ec_dev; struct cros_ec_device *ec_dev;
int ret;
ec_dev = devm_kzalloc(dev, sizeof(*ec_dev), GFP_KERNEL); ec_dev = devm_kzalloc(dev, sizeof(*ec_dev), GFP_KERNEL);
if (!ec_dev) if (!ec_dev)
...@@ -225,7 +238,18 @@ static int cros_ec_rpmsg_probe(struct rpmsg_device *rpdev) ...@@ -225,7 +238,18 @@ static int cros_ec_rpmsg_probe(struct rpmsg_device *rpdev)
INIT_WORK(&ec_rpmsg->host_event_work, INIT_WORK(&ec_rpmsg->host_event_work,
cros_ec_rpmsg_host_event_function); cros_ec_rpmsg_host_event_function);
return cros_ec_register(ec_dev); ec_rpmsg->ept = cros_ec_rpmsg_create_ept(rpdev);
if (!ec_rpmsg->ept)
return -ENOMEM;
ret = cros_ec_register(ec_dev);
if (ret < 0) {
rpmsg_destroy_ept(ec_rpmsg->ept);
cancel_work_sync(&ec_rpmsg->host_event_work);
return ret;
}
return 0;
} }
static void cros_ec_rpmsg_remove(struct rpmsg_device *rpdev) static void cros_ec_rpmsg_remove(struct rpmsg_device *rpdev)
...@@ -233,9 +257,30 @@ static void cros_ec_rpmsg_remove(struct rpmsg_device *rpdev) ...@@ -233,9 +257,30 @@ static void cros_ec_rpmsg_remove(struct rpmsg_device *rpdev)
struct cros_ec_device *ec_dev = dev_get_drvdata(&rpdev->dev); struct cros_ec_device *ec_dev = dev_get_drvdata(&rpdev->dev);
struct cros_ec_rpmsg *ec_rpmsg = ec_dev->priv; struct cros_ec_rpmsg *ec_rpmsg = ec_dev->priv;
cros_ec_unregister(ec_dev);
rpmsg_destroy_ept(ec_rpmsg->ept);
cancel_work_sync(&ec_rpmsg->host_event_work); cancel_work_sync(&ec_rpmsg->host_event_work);
} }
#ifdef CONFIG_PM_SLEEP
static int cros_ec_rpmsg_suspend(struct device *dev)
{
struct cros_ec_device *ec_dev = dev_get_drvdata(dev);
return cros_ec_suspend(ec_dev);
}
static int cros_ec_rpmsg_resume(struct device *dev)
{
struct cros_ec_device *ec_dev = dev_get_drvdata(dev);
return cros_ec_resume(ec_dev);
}
#endif
static SIMPLE_DEV_PM_OPS(cros_ec_rpmsg_pm_ops, cros_ec_rpmsg_suspend,
cros_ec_rpmsg_resume);
static const struct of_device_id cros_ec_rpmsg_of_match[] = { static const struct of_device_id cros_ec_rpmsg_of_match[] = {
{ .compatible = "google,cros-ec-rpmsg", }, { .compatible = "google,cros-ec-rpmsg", },
{ } { }
...@@ -246,10 +291,10 @@ static struct rpmsg_driver cros_ec_driver_rpmsg = { ...@@ -246,10 +291,10 @@ static struct rpmsg_driver cros_ec_driver_rpmsg = {
.drv = { .drv = {
.name = "cros-ec-rpmsg", .name = "cros-ec-rpmsg",
.of_match_table = cros_ec_rpmsg_of_match, .of_match_table = cros_ec_rpmsg_of_match,
.pm = &cros_ec_rpmsg_pm_ops,
}, },
.probe = cros_ec_rpmsg_probe, .probe = cros_ec_rpmsg_probe,
.remove = cros_ec_rpmsg_remove, .remove = cros_ec_rpmsg_remove,
.callback = cros_ec_rpmsg_callback,
}; };
module_rpmsg_driver(cros_ec_driver_rpmsg); module_rpmsg_driver(cros_ec_driver_rpmsg);
......
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/mfd/cros_ec.h>
#include <linux/mfd/cros_ec_commands.h>
#include <linux/of.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/platform_device.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
...@@ -785,6 +785,13 @@ static int cros_ec_spi_probe(struct spi_device *spi) ...@@ -785,6 +785,13 @@ static int cros_ec_spi_probe(struct spi_device *spi)
return 0; return 0;
} }
static int cros_ec_spi_remove(struct spi_device *spi)
{
struct cros_ec_device *ec_dev = spi_get_drvdata(spi);
return cros_ec_unregister(ec_dev);
}
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static int cros_ec_spi_suspend(struct device *dev) static int cros_ec_spi_suspend(struct device *dev)
{ {
...@@ -823,6 +830,7 @@ static struct spi_driver cros_ec_driver_spi = { ...@@ -823,6 +830,7 @@ static struct spi_driver cros_ec_driver_spi = {
.pm = &cros_ec_spi_pm_ops, .pm = &cros_ec_spi_pm_ops,
}, },
.probe = cros_ec_spi_probe, .probe = cros_ec_spi_probe,
.remove = cros_ec_spi_remove,
.id_table = cros_ec_spi_id, .id_table = cros_ec_spi_id,
}; };
......
...@@ -9,8 +9,9 @@ ...@@ -9,8 +9,9 @@
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/kobject.h> #include <linux/kobject.h>
#include <linux/mfd/cros_ec.h> #include <linux/mfd/cros_ec.h>
#include <linux/mfd/cros_ec_commands.h>
#include <linux/module.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/platform_device.h>
#include <linux/printk.h> #include <linux/printk.h>
#include <linux/slab.h> #include <linux/slab.h>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#define TRACE_SYMBOL(a) {a, #a} #define TRACE_SYMBOL(a) {a, #a}
// Generate the list using the following script: // Generate the list using the following script:
// sed -n 's/^#define \(EC_CMD_[[:alnum:]_]*\)\s.*/\tTRACE_SYMBOL(\1), \\/p' include/linux/mfd/cros_ec_commands.h // sed -n 's/^#define \(EC_CMD_[[:alnum:]_]*\)\s.*/\tTRACE_SYMBOL(\1), \\/p' include/linux/platform_data/cros_ec_commands.h
#define EC_CMDS \ #define EC_CMDS \
TRACE_SYMBOL(EC_CMD_PROTO_VERSION), \ TRACE_SYMBOL(EC_CMD_PROTO_VERSION), \
TRACE_SYMBOL(EC_CMD_HELLO), \ TRACE_SYMBOL(EC_CMD_HELLO), \
......
...@@ -11,8 +11,10 @@ ...@@ -11,8 +11,10 @@
#if !defined(_CROS_EC_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ) #if !defined(_CROS_EC_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ)
#define _CROS_EC_TRACE_H_ #define _CROS_EC_TRACE_H_
#include <linux/bits.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/mfd/cros_ec.h> #include <linux/platform_data/cros_ec_commands.h>
#include <linux/platform_data/cros_ec_proto.h>
#include <linux/tracepoint.h> #include <linux/tracepoint.h>
......
...@@ -7,8 +7,9 @@ ...@@ -7,8 +7,9 @@
#include <linux/of.h> #include <linux/of.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/mfd/cros_ec.h> #include <linux/mfd/cros_ec.h>
#include <linux/mfd/cros_ec_commands.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_data/cros_ec_commands.h>
#include <linux/platform_data/cros_ec_proto.h>
#include <linux/slab.h> #include <linux/slab.h>
#define DRV_NAME "cros-ec-vbc" #define DRV_NAME "cros-ec-vbc"
......
...@@ -6,10 +6,11 @@ ...@@ -6,10 +6,11 @@
*/ */
#include <linux/ktime.h> #include <linux/ktime.h>
#include <linux/math64.h>
#include <linux/mfd/cros_ec.h> #include <linux/mfd/cros_ec.h>
#include <linux/mfd/cros_ec_commands.h> #include <linux/math64.h>
#include <linux/module.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/platform_device.h>
#include <linux/rtc.h> #include <linux/rtc.h>
...@@ -209,6 +210,9 @@ static int cros_usbpd_logger_probe(struct platform_device *pd) ...@@ -209,6 +210,9 @@ static int cros_usbpd_logger_probe(struct platform_device *pd)
/* Retrieve PD event logs periodically */ /* Retrieve PD event logs periodically */
INIT_DELAYED_WORK(&logger->log_work, cros_usbpd_log_check); INIT_DELAYED_WORK(&logger->log_work, cros_usbpd_log_check);
logger->log_workqueue = create_singlethread_workqueue("cros_usbpd_log"); logger->log_workqueue = create_singlethread_workqueue("cros_usbpd_log");
if (!logger->log_workqueue)
return -ENOMEM;
queue_delayed_work(logger->log_workqueue, &logger->log_work, queue_delayed_work(logger->log_workqueue, &logger->log_work,
CROS_USBPD_LOG_UPDATE_DELAY); CROS_USBPD_LOG_UPDATE_DELAY);
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* the OS sends a command to the EC via a write() to a char device, * the OS sends a command to the EC via a write() to a char device,
* and can read the response with a read(). The write() request is * and can read the response with a read(). The write() request is
* verified by the driver to ensure that it is performing only one * verified by the driver to ensure that it is performing only one
* of the whitelisted commands, and that no extraneous data is * of the allowlisted commands, and that no extraneous data is
* being transmitted to the EC. The response is passed directly * being transmitted to the EC. The response is passed directly
* back to the reader with no modification. * back to the reader with no modification.
* *
...@@ -59,21 +59,10 @@ static DEFINE_IDA(telem_ida); ...@@ -59,21 +59,10 @@ static DEFINE_IDA(telem_ida);
#define WILCO_EC_TELEM_GET_TEMP_INFO 0x95 #define WILCO_EC_TELEM_GET_TEMP_INFO 0x95
#define WILCO_EC_TELEM_GET_TEMP_READ 0x2C #define WILCO_EC_TELEM_GET_TEMP_READ 0x2C
#define WILCO_EC_TELEM_GET_BATT_EXT_INFO 0x07 #define WILCO_EC_TELEM_GET_BATT_EXT_INFO 0x07
#define WILCO_EC_TELEM_GET_BATT_PPID_INFO 0x8A
#define TELEM_ARGS_SIZE_MAX 30 #define TELEM_ARGS_SIZE_MAX 30
/**
* struct wilco_ec_telem_request - Telemetry command and arguments sent to EC.
* @command: One of WILCO_EC_TELEM_GET_* command codes.
* @reserved: Must be 0.
* @args: The first N bytes are one of telem_args_get_* structs, the rest is 0.
*/
struct wilco_ec_telem_request {
u8 command;
u8 reserved;
u8 args[TELEM_ARGS_SIZE_MAX];
} __packed;
/* /*
* The following telem_args_get_* structs are embedded within the |args| field * The following telem_args_get_* structs are embedded within the |args| field
* of wilco_ec_telem_request. * of wilco_ec_telem_request.
...@@ -122,6 +111,32 @@ struct telem_args_get_batt_ext_info { ...@@ -122,6 +111,32 @@ struct telem_args_get_batt_ext_info {
u8 var_args[5]; u8 var_args[5];
} __packed; } __packed;
struct telem_args_get_batt_ppid_info {
u8 always1; /* Should always be 1 */
} __packed;
/**
* struct wilco_ec_telem_request - Telemetry command and arguments sent to EC.
* @command: One of WILCO_EC_TELEM_GET_* command codes.
* @reserved: Must be 0.
* @args: The first N bytes are one of telem_args_get_* structs, the rest is 0.
*/
struct wilco_ec_telem_request {
u8 command;
u8 reserved;
union {
u8 buf[TELEM_ARGS_SIZE_MAX];
struct telem_args_get_log get_log;
struct telem_args_get_version get_version;
struct telem_args_get_fan_info get_fan_info;
struct telem_args_get_diag_info get_diag_info;
struct telem_args_get_temp_info get_temp_info;
struct telem_args_get_temp_read get_temp_read;
struct telem_args_get_batt_ext_info get_batt_ext_info;
struct telem_args_get_batt_ppid_info get_batt_ppid_info;
} args;
} __packed;
/** /**
* check_telem_request() - Ensure that a request from userspace is valid. * check_telem_request() - Ensure that a request from userspace is valid.
* @rq: Request buffer copied from userspace. * @rq: Request buffer copied from userspace.
...@@ -133,7 +148,7 @@ struct telem_args_get_batt_ext_info { ...@@ -133,7 +148,7 @@ struct telem_args_get_batt_ext_info {
* We do not want to allow userspace to send arbitrary telemetry commands to * We do not want to allow userspace to send arbitrary telemetry commands to
* the EC. Therefore we check to ensure that * the EC. Therefore we check to ensure that
* 1. The request follows the format of struct wilco_ec_telem_request. * 1. The request follows the format of struct wilco_ec_telem_request.
* 2. The supplied command code is one of the whitelisted commands. * 2. The supplied command code is one of the allowlisted commands.
* 3. The request only contains the necessary data for the header and arguments. * 3. The request only contains the necessary data for the header and arguments.
*/ */
static int check_telem_request(struct wilco_ec_telem_request *rq, static int check_telem_request(struct wilco_ec_telem_request *rq,
...@@ -146,25 +161,31 @@ static int check_telem_request(struct wilco_ec_telem_request *rq, ...@@ -146,25 +161,31 @@ static int check_telem_request(struct wilco_ec_telem_request *rq,
switch (rq->command) { switch (rq->command) {
case WILCO_EC_TELEM_GET_LOG: case WILCO_EC_TELEM_GET_LOG:
max_size += sizeof(struct telem_args_get_log); max_size += sizeof(rq->args.get_log);
break; break;
case WILCO_EC_TELEM_GET_VERSION: case WILCO_EC_TELEM_GET_VERSION:
max_size += sizeof(struct telem_args_get_version); max_size += sizeof(rq->args.get_version);
break; break;
case WILCO_EC_TELEM_GET_FAN_INFO: case WILCO_EC_TELEM_GET_FAN_INFO:
max_size += sizeof(struct telem_args_get_fan_info); max_size += sizeof(rq->args.get_fan_info);
break; break;
case WILCO_EC_TELEM_GET_DIAG_INFO: case WILCO_EC_TELEM_GET_DIAG_INFO:
max_size += sizeof(struct telem_args_get_diag_info); max_size += sizeof(rq->args.get_diag_info);
break; break;
case WILCO_EC_TELEM_GET_TEMP_INFO: case WILCO_EC_TELEM_GET_TEMP_INFO:
max_size += sizeof(struct telem_args_get_temp_info); max_size += sizeof(rq->args.get_temp_info);
break; break;
case WILCO_EC_TELEM_GET_TEMP_READ: case WILCO_EC_TELEM_GET_TEMP_READ:
max_size += sizeof(struct telem_args_get_temp_read); max_size += sizeof(rq->args.get_temp_read);
break; break;
case WILCO_EC_TELEM_GET_BATT_EXT_INFO: case WILCO_EC_TELEM_GET_BATT_EXT_INFO:
max_size += sizeof(struct telem_args_get_batt_ext_info); max_size += sizeof(rq->args.get_batt_ext_info);
break;
case WILCO_EC_TELEM_GET_BATT_PPID_INFO:
if (rq->args.get_batt_ppid_info.always1 != 1)
return -EINVAL;
max_size += sizeof(rq->args.get_batt_ppid_info);
break; break;
default: default:
return -EINVAL; return -EINVAL;
...@@ -250,6 +271,7 @@ static ssize_t telem_write(struct file *filp, const char __user *buf, ...@@ -250,6 +271,7 @@ static ssize_t telem_write(struct file *filp, const char __user *buf,
if (count > sizeof(sess_data->request)) if (count > sizeof(sess_data->request))
return -EMSGSIZE; return -EMSGSIZE;
memset(&sess_data->request, 0, sizeof(sess_data->request));
if (copy_from_user(&sess_data->request, buf, count)) if (copy_from_user(&sess_data->request, buf, count))
return -EFAULT; return -EFAULT;
ret = check_telem_request(&sess_data->request, count); ret = check_telem_request(&sess_data->request, count);
......
...@@ -670,7 +670,7 @@ config CHARGER_RT9455 ...@@ -670,7 +670,7 @@ config CHARGER_RT9455
config CHARGER_CROS_USBPD config CHARGER_CROS_USBPD
tristate "ChromeOS EC based USBPD charger" tristate "ChromeOS EC based USBPD charger"
depends on MFD_CROS_EC depends on CROS_EC
default n default n
help help
Say Y here to enable ChromeOS EC based USBPD charger Say Y here to enable ChromeOS EC based USBPD charger
......
...@@ -5,9 +5,10 @@ ...@@ -5,9 +5,10 @@
* Copyright (c) 2014 - 2018 Google, Inc * Copyright (c) 2014 - 2018 Google, Inc
*/ */
#include <linux/module.h>
#include <linux/mfd/cros_ec.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/platform_device.h>
#include <linux/power_supply.h> #include <linux/power_supply.h>
#include <linux/slab.h> #include <linux/slab.h>
......
...@@ -145,7 +145,7 @@ config PWM_CRC ...@@ -145,7 +145,7 @@ config PWM_CRC
config PWM_CROS_EC config PWM_CROS_EC
tristate "ChromeOS EC PWM driver" tristate "ChromeOS EC PWM driver"
depends on MFD_CROS_EC depends on CROS_EC
help help
PWM driver for exposing a PWM attached to the ChromeOS Embedded PWM driver for exposing a PWM attached to the ChromeOS Embedded
Controller. Controller.
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/mfd/cros_ec.h> #include <linux/platform_data/cros_ec_commands.h>
#include <linux/mfd/cros_ec_commands.h> #include <linux/platform_data/cros_ec_proto.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/pwm.h> #include <linux/pwm.h>
#include <linux/slab.h> #include <linux/slab.h>
......
...@@ -1274,7 +1274,7 @@ config RTC_DRV_ZYNQMP ...@@ -1274,7 +1274,7 @@ config RTC_DRV_ZYNQMP
config RTC_DRV_CROS_EC config RTC_DRV_CROS_EC
tristate "Chrome OS EC RTC driver" tristate "Chrome OS EC RTC driver"
depends on MFD_CROS_EC depends on CROS_EC
help help
If you say yes here you will get support for the If you say yes here you will get support for the
Chrome OS Embedded Controller's RTC. Chrome OS Embedded Controller's RTC.
......
...@@ -6,8 +6,9 @@ ...@@ -6,8 +6,9 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mfd/cros_ec.h> #include <linux/mfd/cros_ec.h>
#include <linux/mfd/cros_ec_commands.h>
#include <linux/module.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/platform_device.h>
#include <linux/rtc.h> #include <linux/rtc.h>
#include <linux/slab.h> #include <linux/slab.h>
......
...@@ -310,7 +310,6 @@ header-test- += linux/mfd/adp5520.h ...@@ -310,7 +310,6 @@ header-test- += linux/mfd/adp5520.h
header-test- += linux/mfd/arizona/pdata.h header-test- += linux/mfd/arizona/pdata.h
header-test- += linux/mfd/as3711.h header-test- += linux/mfd/as3711.h
header-test- += linux/mfd/as3722.h header-test- += linux/mfd/as3722.h
header-test- += linux/mfd/cros_ec_commands.h
header-test- += linux/mfd/da903x.h header-test- += linux/mfd/da903x.h
header-test- += linux/mfd/da9055/pdata.h header-test- += linux/mfd/da9055/pdata.h
header-test- += linux/mfd/da9063/pdata.h header-test- += linux/mfd/da9063/pdata.h
...@@ -455,6 +454,7 @@ header-test- += linux/platform_data/ata-pxa.h ...@@ -455,6 +454,7 @@ header-test- += linux/platform_data/ata-pxa.h
header-test- += linux/platform_data/atmel.h header-test- += linux/platform_data/atmel.h
header-test- += linux/platform_data/bh1770glc.h header-test- += linux/platform_data/bh1770glc.h
header-test- += linux/platform_data/brcmfmac.h header-test- += linux/platform_data/brcmfmac.h
header-test- += linux/platform_data/cros_ec_commands.h
header-test- += linux/platform_data/clk-u300.h header-test- += linux/platform_data/clk-u300.h
header-test- += linux/platform_data/cyttsp4.h header-test- += linux/platform_data/cyttsp4.h
header-test- += linux/platform_data/dma-coh901318.h header-test- += linux/platform_data/dma-coh901318.h
......
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
#include <linux/iio/iio.h> #include <linux/iio/iio.h>
#include <linux/irqreturn.h> #include <linux/irqreturn.h>
#include <linux/mfd/cros_ec.h> #include <linux/platform_data/cros_ec_commands.h>
#include <linux/platform_data/cros_ec_proto.h>
enum { enum {
CROS_EC_SENSOR_X, CROS_EC_SENSOR_X,
......
This diff is collapsed.
/* SPDX-License-Identifier: GPL-2.0-or-later */ /* SPDX-License-Identifier: GPL-2.0 */
/* /*
* cros_ec_dev - expose the Chrome OS Embedded Controller to userspace * ChromeOS EC device interface.
* *
* Copyright (C) 2014 Google, Inc. * Copyright (C) 2014 Google, Inc.
*/ */
#ifndef _CROS_EC_DEV_H_ #ifndef _UAPI_LINUX_CROS_EC_DEV_H_
#define _CROS_EC_DEV_H_ #define _UAPI_LINUX_CROS_EC_DEV_H_
#include <linux/bits.h>
#include <linux/ioctl.h> #include <linux/ioctl.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/mfd/cros_ec.h>
#include <linux/platform_data/cros_ec_commands.h>
#define CROS_EC_DEV_VERSION "1.0.0" #define CROS_EC_DEV_VERSION "1.0.0"
...@@ -31,5 +33,6 @@ struct cros_ec_readmem { ...@@ -31,5 +33,6 @@ struct cros_ec_readmem {
#define CROS_EC_DEV_IOC 0xEC #define CROS_EC_DEV_IOC 0xEC
#define CROS_EC_DEV_IOCXCMD _IOWR(CROS_EC_DEV_IOC, 0, struct cros_ec_command) #define CROS_EC_DEV_IOCXCMD _IOWR(CROS_EC_DEV_IOC, 0, struct cros_ec_command)
#define CROS_EC_DEV_IOCRDMEM _IOWR(CROS_EC_DEV_IOC, 1, struct cros_ec_readmem) #define CROS_EC_DEV_IOCRDMEM _IOWR(CROS_EC_DEV_IOC, 1, struct cros_ec_readmem)
#define CROS_EC_DEV_IOCEVENTMASK _IO(CROS_EC_DEV_IOC, 2)
#endif /* _CROS_EC_DEV_H_ */ #endif /* _CROS_EC_DEV_H_ */
This diff is collapsed.
...@@ -51,7 +51,7 @@ config SND_SOC_ALL_CODECS ...@@ -51,7 +51,7 @@ config SND_SOC_ALL_CODECS
select SND_SOC_BT_SCO select SND_SOC_BT_SCO
select SND_SOC_BD28623 select SND_SOC_BD28623
select SND_SOC_CQ0093VC select SND_SOC_CQ0093VC
select SND_SOC_CROS_EC_CODEC if MFD_CROS_EC select SND_SOC_CROS_EC_CODEC if CROS_EC
select SND_SOC_CS35L32 if I2C select SND_SOC_CS35L32 if I2C
select SND_SOC_CS35L33 if I2C select SND_SOC_CS35L33 if I2C
select SND_SOC_CS35L34 if I2C select SND_SOC_CS35L34 if I2C
...@@ -477,7 +477,7 @@ config SND_SOC_CQ0093VC ...@@ -477,7 +477,7 @@ config SND_SOC_CQ0093VC
config SND_SOC_CROS_EC_CODEC config SND_SOC_CROS_EC_CODEC
tristate "codec driver for ChromeOS EC" tristate "codec driver for ChromeOS EC"
depends on MFD_CROS_EC depends on CROS_EC
help help
If you say yes here you will get support for the If you say yes here you will get support for the
ChromeOS Embedded Controller's Audio Codec. ChromeOS Embedded Controller's Audio Codec.
......
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mfd/cros_ec.h>
#include <linux/mfd/cros_ec_commands.h>
#include <linux/module.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/platform_device.h>
#include <sound/pcm.h> #include <sound/pcm.h>
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
......
...@@ -99,7 +99,7 @@ config SND_SOC_MSM8996 ...@@ -99,7 +99,7 @@ config SND_SOC_MSM8996
config SND_SOC_SDM845 config SND_SOC_SDM845
tristate "SoC Machine driver for SDM845 boards" tristate "SoC Machine driver for SDM845 boards"
depends on QCOM_APR && MFD_CROS_EC && I2C depends on QCOM_APR && CROS_EC && I2C
select SND_SOC_QDSP6 select SND_SOC_QDSP6
select SND_SOC_QCOM_COMMON select SND_SOC_QCOM_COMMON
select SND_SOC_RT5663 select SND_SOC_RT5663
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment