Skip to content

Commit 7e0bb52

Browse files
author
Enric Balletbo i Serra
committed
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: Enric Balletbo i Serra <[email protected]>
2 parents 058bf14 + 28e6fcc commit 7e0bb52

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+900
-746
lines changed

‎drivers/extcon/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ config EXTCON_USB_GPIO
181181

182182
config EXTCON_USBC_CROS_EC
183183
tristate "ChromeOS Embedded Controller EXTCON support"
184-
depends on MFD_CROS_EC
184+
depends on CROS_EC
185185
help
186186
Say Y here to enable USB Type C cable detection extcon support when
187187
using Chrome OS EC based USB Type-C ports.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66

77
#include <linux/extcon-provider.h>
88
#include <linux/kernel.h>
9-
#include <linux/mfd/cros_ec.h>
109
#include <linux/module.h>
1110
#include <linux/notifier.h>
1211
#include <linux/of.h>
12+
#include <linux/platform_data/cros_ec_commands.h>
13+
#include <linux/platform_data/cros_ec_proto.h>
1314
#include <linux/platform_device.h>
1415
#include <linux/slab.h>
1516
#include <linux/sched.h>

‎drivers/hid/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ config HOLTEK_FF
376376

377377
config HID_GOOGLE_HAMMER
378378
tristate "Google Hammer Keyboard"
379-
depends on USB_HID && LEDS_CLASS && MFD_CROS_EC
379+
depends on USB_HID && LEDS_CLASS && CROS_EC
380380
---help---
381381
Say Y here if you have a Google Hammer device.
382382

‎drivers/hid/hid-google-hammer.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
#include <linux/acpi.h>
1717
#include <linux/hid.h>
1818
#include <linux/leds.h>
19-
#include <linux/mfd/cros_ec.h>
20-
#include <linux/mfd/cros_ec_commands.h>
2119
#include <linux/module.h>
20+
#include <linux/platform_data/cros_ec_commands.h>
21+
#include <linux/platform_data/cros_ec_proto.h>
2222
#include <linux/platform_device.h>
2323
#include <linux/pm_wakeup.h>
2424
#include <asm/unaligned.h>

‎drivers/i2c/busses/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1345,7 +1345,7 @@ config I2C_SIBYTE
13451345

13461346
config I2C_CROS_EC_TUNNEL
13471347
tristate "ChromeOS EC tunnel I2C bus"
1348-
depends on MFD_CROS_EC
1348+
depends on CROS_EC
13491349
help
13501350
If you say yes here you get an I2C bus that will tunnel i2c commands
13511351
through to the other side of the ChromeOS EC to the i2c bus

‎drivers/i2c/busses/i2c-cros-ec-tunnel.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#include <linux/module.h>
77
#include <linux/i2c.h>
8-
#include <linux/mfd/cros_ec.h>
9-
#include <linux/mfd/cros_ec_commands.h>
8+
#include <linux/platform_data/cros_ec_commands.h>
9+
#include <linux/platform_data/cros_ec_proto.h>
1010
#include <linux/platform_device.h>
1111
#include <linux/slab.h>
1212

‎drivers/iio/accel/cros_ec_accel_legacy.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@
1818
#include <linux/iio/triggered_buffer.h>
1919
#include <linux/kernel.h>
2020
#include <linux/mfd/cros_ec.h>
21-
#include <linux/mfd/cros_ec_commands.h>
2221
#include <linux/module.h>
2322
#include <linux/slab.h>
23+
#include <linux/platform_data/cros_ec_commands.h>
24+
#include <linux/platform_data/cros_ec_proto.h>
2425
#include <linux/platform_device.h>
2526

2627
#define DRV_NAME "cros-ec-accel-legacy"

‎drivers/iio/common/cros_ec_sensors/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
config IIO_CROS_EC_SENSORS_CORE
66
tristate "ChromeOS EC Sensors Core"
7-
depends on SYSFS && MFD_CROS_EC
7+
depends on SYSFS && CROS_EC
88
select IIO_BUFFER
99
select IIO_TRIGGERED_BUFFER
1010
help

‎drivers/iio/common/cros_ec_sensors/cros_ec_lid_angle.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@
2020
#include <linux/iio/triggered_buffer.h>
2121
#include <linux/iio/trigger_consumer.h>
2222
#include <linux/kernel.h>
23-
#include <linux/mfd/cros_ec.h>
24-
#include <linux/mfd/cros_ec_commands.h>
2523
#include <linux/module.h>
24+
#include <linux/platform_data/cros_ec_commands.h>
2625
#include <linux/platform_device.h>
2726
#include <linux/slab.h>
2827

‎drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
#include <linux/iio/triggered_buffer.h>
1818
#include <linux/kernel.h>
1919
#include <linux/mfd/cros_ec.h>
20-
#include <linux/mfd/cros_ec_commands.h>
2120
#include <linux/module.h>
21+
#include <linux/platform_data/cros_ec_commands.h>
22+
#include <linux/platform_data/cros_ec_proto.h>
2223
#include <linux/platform_device.h>
2324
#include <linux/slab.h>
2425

‎drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414
#include <linux/iio/trigger_consumer.h>
1515
#include <linux/kernel.h>
1616
#include <linux/mfd/cros_ec.h>
17-
#include <linux/mfd/cros_ec_commands.h>
1817
#include <linux/module.h>
1918
#include <linux/slab.h>
19+
#include <linux/platform_data/cros_ec_commands.h>
20+
#include <linux/platform_data/cros_ec_proto.h>
2021
#include <linux/platform_device.h>
2122

2223
static char *cros_ec_loc[] = {

‎drivers/iio/light/cros_ec_light_prox.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
#include <linux/iio/trigger_consumer.h>
1616
#include <linux/kernel.h>
1717
#include <linux/mfd/cros_ec.h>
18-
#include <linux/mfd/cros_ec_commands.h>
1918
#include <linux/module.h>
19+
#include <linux/platform_data/cros_ec_commands.h>
20+
#include <linux/platform_data/cros_ec_proto.h>
2021
#include <linux/platform_device.h>
2122
#include <linux/slab.h>
2223

‎drivers/iio/pressure/cros_ec_baro.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@
1515
#include <linux/iio/trigger_consumer.h>
1616
#include <linux/kernel.h>
1717
#include <linux/mfd/cros_ec.h>
18-
#include <linux/mfd/cros_ec_commands.h>
1918
#include <linux/module.h>
2019
#include <linux/slab.h>
20+
#include <linux/platform_data/cros_ec_commands.h>
21+
#include <linux/platform_data/cros_ec_proto.h>
2122
#include <linux/platform_device.h>
2223

2324
/*

‎drivers/input/keyboard/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@ config KEYBOARD_W90P910
745745
config KEYBOARD_CROS_EC
746746
tristate "ChromeOS EC keyboard"
747747
select INPUT_MATRIXKMAP
748-
depends on MFD_CROS_EC
748+
depends on CROS_EC
749749
help
750750
Say Y here to enable the matrix keyboard used by ChromeOS devices
751751
and implemented on the ChromeOS EC. You must enable one bus option

‎drivers/input/keyboard/cros_ec_keyb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
#include <linux/slab.h>
2323
#include <linux/sysrq.h>
2424
#include <linux/input/matrix_keypad.h>
25-
#include <linux/mfd/cros_ec.h>
26-
#include <linux/mfd/cros_ec_commands.h>
25+
#include <linux/platform_data/cros_ec_commands.h>
26+
#include <linux/platform_data/cros_ec_proto.h>
2727

2828
#include <asm/unaligned.h>
2929

‎drivers/media/platform/Kconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -547,10 +547,9 @@ if CEC_PLATFORM_DRIVERS
547547

548548
config VIDEO_CROS_EC_CEC
549549
tristate "ChromeOS EC CEC driver"
550-
depends on MFD_CROS_EC
550+
depends on CROS_EC
551551
select CEC_CORE
552552
select CEC_NOTIFIER
553-
select CHROME_PLATFORMS
554553
select CROS_EC_PROTO
555554
help
556555
If you say yes here you will get support for the

‎drivers/media/platform/cros-ec-cec/cros-ec-cec.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@
1414
#include <linux/cec.h>
1515
#include <linux/slab.h>
1616
#include <linux/interrupt.h>
17+
#include <linux/mfd/cros_ec.h>
18+
#include <linux/platform_data/cros_ec_commands.h>
19+
#include <linux/platform_data/cros_ec_proto.h>
1720
#include <media/cec.h>
1821
#include <media/cec-notifier.h>
19-
#include <linux/mfd/cros_ec.h>
20-
#include <linux/mfd/cros_ec_commands.h>
2122

2223
#define DRV_NAME "cros-ec-cec"
2324

‎drivers/mfd/Kconfig

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -211,26 +211,18 @@ config MFD_AXP20X_RSB
211211
components like regulators or the PEK (Power Enable Key) under the
212212
corresponding menus.
213213

214-
config MFD_CROS_EC
215-
tristate "ChromeOS Embedded Controller"
214+
config MFD_CROS_EC_DEV
215+
tristate "ChromeOS Embedded Controller multifunction device"
216216
select MFD_CORE
217-
select CHROME_PLATFORMS
218-
select CROS_EC_PROTO
219-
depends on X86 || ARM || ARM64 || COMPILE_TEST
217+
depends on CROS_EC
218+
default CROS_EC
220219
help
221-
If you say Y here you get support for the ChromeOS Embedded
222-
Controller (EC) providing keyboard, battery and power services.
223-
You also need to enable the driver for the bus you are using. The
224-
protocol for talking to the EC is defined by the bus driver.
220+
Select this to get support for ChromeOS Embedded Controller
221+
sub-devices. This driver will instantiate additional drivers such
222+
as RTC, USBPD, etc. but you have to select the individual drivers.
225223

226-
config MFD_CROS_EC_CHARDEV
227-
tristate "Chrome OS Embedded Controller userspace device interface"
228-
depends on MFD_CROS_EC
229-
---help---
230-
This driver adds support to talk with the ChromeOS EC from userspace.
231-
232-
If you have a supported Chromebook, choose Y or M here.
233-
The module will be called cros_ec_dev.
224+
To compile this driver as a module, choose M here: the module will be
225+
called cros-ec-dev.
234226

235227
config MFD_MADERA
236228
tristate "Cirrus Logic Madera codecs"

‎drivers/mfd/Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ obj-$(CONFIG_MFD_ASIC3) += asic3.o tmio_core.o
1313
obj-$(CONFIG_ARCH_BCM2835) += bcm2835-pm.o
1414
obj-$(CONFIG_MFD_BCM590XX) += bcm590xx.o
1515
obj-$(CONFIG_MFD_BD9571MWV) += bd9571mwv.o
16-
cros_ec_core-objs := cros_ec.o
17-
obj-$(CONFIG_MFD_CROS_EC) += cros_ec_core.o
18-
obj-$(CONFIG_MFD_CROS_EC_CHARDEV) += cros_ec_dev.o
16+
obj-$(CONFIG_MFD_CROS_EC_DEV) += cros_ec_dev.o
1917
obj-$(CONFIG_MFD_EXYNOS_LPASS) += exynos-lpass.o
2018

2119
obj-$(CONFIG_HTC_PASIC3) += htc-pasic3.o

0 commit comments

Comments
 (0)