mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2025-01-10 07:44:23 +08:00
81e5b16de8
commiteabd9a3807upstream. cros_ec_trace.h defined 5 tracing events, 2 for cros_ec_proto and 3 for cros_ec_sensorhub_ring. These 2 files are in different kernel modules, the traces are defined twice in the kernel which leads to problem enabling only some traces. Move sensorhub traces from cros_ec_trace.h to cros_ec_sensorhub_trace.h and enable them only in cros_ec_sensorhub kernel module. Check we can now enable any single traces: without this patch, we can only enable all sensorhub traces or none. Fixes:d453ceb654("platform/chrome: sensorhub: Add trace events for sample") Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20220122001301.640337-1-gwendal@chromium.org Signed-off-by: Benson Leung <bleung@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
31 lines
1.3 KiB
Makefile
31 lines
1.3 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
|
|
# tell define_trace.h where to find the cros ec trace header
|
|
CFLAGS_cros_ec_trace.o:= -I$(src)
|
|
CFLAGS_cros_ec_sensorhub_ring.o:= -I$(src)
|
|
|
|
obj-$(CONFIG_CHROMEOS_LAPTOP) += chromeos_laptop.o
|
|
obj-$(CONFIG_CHROMEOS_PSTORE) += chromeos_pstore.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_ISHTP) += cros_ec_ishtp.o
|
|
obj-$(CONFIG_CROS_EC_RPMSG) += cros_ec_rpmsg.o
|
|
obj-$(CONFIG_CROS_EC_SPI) += cros_ec_spi.o
|
|
cros_ec_lpcs-objs := cros_ec_lpc.o cros_ec_lpc_mec.o
|
|
obj-$(CONFIG_CROS_EC_TYPEC) += cros_ec_typec.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_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_VBC) += cros_ec_vbc.o
|
|
obj-$(CONFIG_CROS_EC_DEBUGFS) += cros_ec_debugfs.o
|
|
cros-ec-sensorhub-objs := cros_ec_sensorhub.o cros_ec_sensorhub_ring.o
|
|
obj-$(CONFIG_CROS_EC_SENSORHUB) += cros-ec-sensorhub.o
|
|
obj-$(CONFIG_CROS_EC_SYSFS) += cros_ec_sysfs.o
|
|
obj-$(CONFIG_CROS_USBPD_LOGGER) += cros_usbpd_logger.o
|
|
obj-$(CONFIG_CROS_USBPD_NOTIFY) += cros_usbpd_notify.o
|
|
|
|
obj-$(CONFIG_WILCO_EC) += wilco_ec/
|