Keep cros_ec in chromeos-4.14 in sync with upstream patches (applied and pending) to ensure that the next rebase is as pain free as possible.
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/ee2623a930fd895c3bd0fd9940b6ba9a4a48ad2c commit ee2623a930fd895c3bd0fd9940b6ba9a4a48ad2c Author: Thierry Escande <thierry.escande@collabora.com> Date: Tue Dec 05 04:02:40 2017 BACKPORT: FROMLIST: cros_ec: Split cros_ec_devs module This patch splits the cros_ec_devs module in two parts with a cros_ec_dev module responsible for handling MFD devices registration and a cros_ec_ctl module responsible for handling the various user-space interfaces. For consistency purpose, the driver name for the cros_ec_dev module is now cros-ec-dev instead of cros-ec-ctl. In the next commit, the new cros_ec_dev module will be moved to the MFD subtree so mfd_add_devices() calls are not done from outside MFD. BUG= chromium:790718 TEST=Boot with patch applied and check cros driver functionality Signed-off-by: Thierry Escande <thierry.escande@collabora.com> (am from https://patchwork.kernel.org/patch/10066743/) [sync chromeos version with v2 patches sent to upstream] Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> (cherry picked from commit e837828f93fcc64ab824a6f11dab39526e2a5d79 https://gitlab.collabora.com/eballetbo/linux.git) Signed-off-by: Guenter Roeck <groeck@chromium.org> Change-Id: I4cd7762fcca25c3b74b872188c289f510e1ca558 Reviewed-on: https://chromium-review.googlesource.com/801798 Commit-Ready: Guenter Roeck <groeck@chromium.org> Tested-by: Guenter Roeck <groeck@chromium.org> Reviewed-by: Gwendal Grignou <gwendal@chromium.org> [modify] https://crrev.com/ee2623a930fd895c3bd0fd9940b6ba9a4a48ad2c/drivers/platform/chrome/cros_ec_lightbar.c [modify] https://crrev.com/ee2623a930fd895c3bd0fd9940b6ba9a4a48ad2c/drivers/platform/chrome/Kconfig [modify] https://crrev.com/ee2623a930fd895c3bd0fd9940b6ba9a4a48ad2c/drivers/platform/chrome/cros_ec_dev.c [modify] https://crrev.com/ee2623a930fd895c3bd0fd9940b6ba9a4a48ad2c/drivers/platform/chrome/cros_ec_vbc.c [modify] https://crrev.com/ee2623a930fd895c3bd0fd9940b6ba9a4a48ad2c/drivers/platform/chrome/cros_ec_debugfs.c [modify] https://crrev.com/ee2623a930fd895c3bd0fd9940b6ba9a4a48ad2c/drivers/platform/chrome/Makefile [modify] https://crrev.com/ee2623a930fd895c3bd0fd9940b6ba9a4a48ad2c/drivers/platform/chrome/cros_ec_sysfs.c [modify] https://crrev.com/ee2623a930fd895c3bd0fd9940b6ba9a4a48ad2c/drivers/mfd/cros_ec.c
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/f3aba5560a5eaa1b173470f159a84f6155bbd150 commit f3aba5560a5eaa1b173470f159a84f6155bbd150 Author: Thierry Escande <thierry.escande@collabora.com> Date: Tue Dec 05 04:02:41 2017 BACKPORT: FROMLIST: cros_ec: Move cros_ec_dev module to drivers/mfd The cros_ec_dev module is responsible for registering the MFD devices attached to the ChromeOS EC. This patch moves this module to drivers/mfd so calls to mfd_add_devices() are not done from outside the MFD subtree anymore. BUG= chromium:790718 TEST=Boot with patch applied and check cros driver functionality Signed-off-by: Thierry Escande <thierry.escande@collabora.com> (am from https://patchwork.kernel.org/patch/10066745/) [sync chromeos version with v2 patches sent to upstream] Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> (cherry picked from commit 2464d610fe86793ac06c8d0e3689cc18e846d8a9 https://gitlab.collabora.com/eballetbo/linux.git) Signed-off-by: Guenter Roeck <groeck@chromium.org> Change-Id: I65cf7afe66b2abe37e54f8a2428cfd18c27c4bc7 Reviewed-on: https://chromium-review.googlesource.com/801799 Commit-Ready: Guenter Roeck <groeck@chromium.org> Tested-by: Guenter Roeck <groeck@chromium.org> Reviewed-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-by: Benson Leung <bleung@chromium.org> [rename] https://crrev.com/f3aba5560a5eaa1b173470f159a84f6155bbd150/drivers/mfd/cros_ec_dev.h [modify] https://crrev.com/f3aba5560a5eaa1b173470f159a84f6155bbd150/drivers/platform/chrome/cros_ec_lightbar.c [modify] https://crrev.com/f3aba5560a5eaa1b173470f159a84f6155bbd150/drivers/mfd/Kconfig [modify] https://crrev.com/f3aba5560a5eaa1b173470f159a84f6155bbd150/drivers/platform/chrome/Kconfig [modify] https://crrev.com/f3aba5560a5eaa1b173470f159a84f6155bbd150/drivers/mfd/Makefile [modify] https://crrev.com/f3aba5560a5eaa1b173470f159a84f6155bbd150/include/linux/mfd/cros_ec.h [modify] https://crrev.com/f3aba5560a5eaa1b173470f159a84f6155bbd150/drivers/platform/chrome/cros_ec_debugfs.c [modify] https://crrev.com/f3aba5560a5eaa1b173470f159a84f6155bbd150/drivers/platform/chrome/Makefile [modify] https://crrev.com/f3aba5560a5eaa1b173470f159a84f6155bbd150/drivers/platform/chrome/cros_ec_sysfs.c [delete] https://crrev.com/ee2623a930fd895c3bd0fd9940b6ba9a4a48ad2c/drivers/platform/chrome/cros_ec_debugfs.h [rename] https://crrev.com/f3aba5560a5eaa1b173470f159a84f6155bbd150/drivers/mfd/cros_ec_dev.c
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/22aab38ddc3c4026fe775ebfea97707fe45b8d67 commit 22aab38ddc3c4026fe775ebfea97707fe45b8d67 Author: Guenter Roeck <groeck@chromium.org> Date: Tue Dec 05 04:02:43 2017 CHROMIUM: Enable CONFIG_MFD_CROS_EC_CHARDEV and renormalize defconfig CONFIG_CROS_EC_CHARDEV was replaced with CONFIG_MFD_CROS_EC_CHARDEV and CONFIG_CROS_EC_CTL. Update configuration files accordingly and renormalize configuration (which disables CONFIG_VIRTIO_WL by default). BUG= chromium:790718 TEST=Boot with patch applied and check cros driver functionality Change-Id: Ic8e75acf504addf7282f0fc908ba6744552ce506 Signed-off-by: Guenter Roeck <groeck@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/802074 Reviewed-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-by: Benson Leung <bleung@chromium.org> [modify] https://crrev.com/22aab38ddc3c4026fe775ebfea97707fe45b8d67/chromeos/config/i386/common.config [modify] https://crrev.com/22aab38ddc3c4026fe775ebfea97707fe45b8d67/chromeos/config/x86_64/common.config [modify] https://crrev.com/22aab38ddc3c4026fe775ebfea97707fe45b8d67/chromeos/config/arm64/chromiumos-arm64.flavour.config [modify] https://crrev.com/22aab38ddc3c4026fe775ebfea97707fe45b8d67/chromeos/config/armel/common.config [modify] https://crrev.com/22aab38ddc3c4026fe775ebfea97707fe45b8d67/chromeos/config/arm64/common.config
Handled with various other bugs. No need to keep this one open.
Comment 1 by bugdroid1@chromium.org
, Dec 5 2017