diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
index dce9081826083f..2a4b2cb20dd5ec 100644
--- a/arch/arm/configs/bcm2709_defconfig
+++ b/arch/arm/configs/bcm2709_defconfig
@@ -737,7 +737,6 @@ CONFIG_BATTERY_DS2760=m
 CONFIG_BATTERY_MAX17040=m
 CONFIG_CHARGER_GPIO=m
 CONFIG_BATTERY_GAUGE_LTC2941=m
-CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADT7410=m
 CONFIG_SENSORS_AHT10=m
 CONFIG_SENSORS_CHIPCAP2=m
@@ -754,6 +753,7 @@ CONFIG_SENSORS_SHT3x=m
 CONFIG_SENSORS_SHT4x=m
 CONFIG_SENSORS_SHTC1=m
 CONFIG_SENSORS_EMC2305=m
+CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_INA2XX=m
 CONFIG_SENSORS_INA238=m
 CONFIG_SENSORS_TMP102=m
@@ -1624,5 +1624,6 @@ CONFIG_LATENCYTOP=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_STACK_TRACER=y
 CONFIG_SCHED_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
 CONFIG_BLK_DEV_IO_TRACE=y
 # CONFIG_UPROBE_EVENTS is not set
diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
index e73ca78874c9aa..0b18b883612cf7 100644
--- a/arch/arm/configs/bcm2711_defconfig
+++ b/arch/arm/configs/bcm2711_defconfig
@@ -762,7 +762,6 @@ CONFIG_BATTERY_DS2760=m
 CONFIG_BATTERY_MAX17040=m
 CONFIG_CHARGER_GPIO=m
 CONFIG_BATTERY_GAUGE_LTC2941=m
-CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADT7410=m
 CONFIG_SENSORS_AHT10=m
 CONFIG_SENSORS_CHIPCAP2=m
@@ -779,6 +778,7 @@ CONFIG_SENSORS_SHT3x=m
 CONFIG_SENSORS_SHT4x=m
 CONFIG_SENSORS_SHTC1=m
 CONFIG_SENSORS_EMC2305=m
+CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_INA2XX=m
 CONFIG_SENSORS_INA238=m
 CONFIG_SENSORS_TMP102=m
@@ -1661,5 +1661,6 @@ CONFIG_LATENCYTOP=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_STACK_TRACER=y
 CONFIG_SCHED_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
 CONFIG_BLK_DEV_IO_TRACE=y
 # CONFIG_UPROBE_EVENTS is not set
diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
index a6110978282289..dfa4c9010e5311 100644
--- a/arch/arm/configs/bcmrpi_defconfig
+++ b/arch/arm/configs/bcmrpi_defconfig
@@ -730,7 +730,6 @@ CONFIG_BATTERY_DS2760=m
 CONFIG_BATTERY_MAX17040=m
 CONFIG_CHARGER_GPIO=m
 CONFIG_BATTERY_GAUGE_LTC2941=m
-CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADT7410=m
 CONFIG_SENSORS_AHT10=m
 CONFIG_SENSORS_CHIPCAP2=m
@@ -747,6 +746,7 @@ CONFIG_SENSORS_SHT3x=m
 CONFIG_SENSORS_SHT4x=m
 CONFIG_SENSORS_SHTC1=m
 CONFIG_SENSORS_EMC2305=m
+CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_INA2XX=m
 CONFIG_SENSORS_INA238=m
 CONFIG_SENSORS_TMP102=m
@@ -1616,5 +1616,6 @@ CONFIG_LATENCYTOP=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_STACK_TRACER=y
 CONFIG_SCHED_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
 CONFIG_BLK_DEV_IO_TRACE=y
 # CONFIG_UPROBE_EVENTS is not set
diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
index ce3e13572fb4a0..2ebae800093206 100644
--- a/arch/arm64/configs/bcm2711_defconfig
+++ b/arch/arm64/configs/bcm2711_defconfig
@@ -800,7 +800,6 @@ CONFIG_BATTERY_DS2760=m
 CONFIG_BATTERY_MAX17040=m
 CONFIG_CHARGER_GPIO=m
 CONFIG_BATTERY_GAUGE_LTC2941=m
-CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADT7410=m
 CONFIG_SENSORS_AHT10=m
 CONFIG_SENSORS_CHIPCAP2=m
@@ -817,6 +816,7 @@ CONFIG_SENSORS_SHT3x=m
 CONFIG_SENSORS_SHT4x=m
 CONFIG_SENSORS_SHTC1=m
 CONFIG_SENSORS_EMC2305=m
+CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_INA2XX=m
 CONFIG_SENSORS_INA238=m
 CONFIG_SENSORS_TMP102=m
@@ -1739,6 +1739,7 @@ CONFIG_LATENCYTOP=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_STACK_TRACER=y
 CONFIG_SCHED_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
 CONFIG_BLK_DEV_IO_TRACE=y
 # CONFIG_UPROBE_EVENTS is not set
 # CONFIG_STRICT_DEVMEM is not set
diff --git a/arch/arm64/configs/bcm2711_rt_defconfig b/arch/arm64/configs/bcm2711_rt_defconfig
index 54d908fc038e29..712179836291d0 100644
--- a/arch/arm64/configs/bcm2711_rt_defconfig
+++ b/arch/arm64/configs/bcm2711_rt_defconfig
@@ -800,7 +800,6 @@ CONFIG_BATTERY_DS2760=m
 CONFIG_BATTERY_MAX17040=m
 CONFIG_CHARGER_GPIO=m
 CONFIG_BATTERY_GAUGE_LTC2941=m
-CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADT7410=m
 CONFIG_SENSORS_AHT10=m
 CONFIG_SENSORS_CHIPCAP2=m
@@ -817,6 +816,7 @@ CONFIG_SENSORS_SHT3x=m
 CONFIG_SENSORS_SHT4x=m
 CONFIG_SENSORS_SHTC1=m
 CONFIG_SENSORS_EMC2305=m
+CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_INA2XX=m
 CONFIG_SENSORS_INA238=m
 CONFIG_SENSORS_TMP102=m
@@ -1739,6 +1739,7 @@ CONFIG_FUNCTION_PROFILER=y
 CONFIG_STACK_TRACER=y
 CONFIG_SCHED_TRACER=y
 CONFIG_TIMERLAT_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
 CONFIG_BLK_DEV_IO_TRACE=y
 # CONFIG_UPROBE_EVENTS is not set
 # CONFIG_STRICT_DEVMEM is not set
diff --git a/arch/arm64/configs/bcm2712_defconfig b/arch/arm64/configs/bcm2712_defconfig
index 9e2bda050f8145..c97a848416d6f5 100644
--- a/arch/arm64/configs/bcm2712_defconfig
+++ b/arch/arm64/configs/bcm2712_defconfig
@@ -802,7 +802,6 @@ CONFIG_BATTERY_DS2760=m
 CONFIG_BATTERY_MAX17040=m
 CONFIG_CHARGER_GPIO=m
 CONFIG_BATTERY_GAUGE_LTC2941=m
-CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADT7410=m
 CONFIG_SENSORS_AHT10=m
 CONFIG_SENSORS_CHIPCAP2=m
@@ -819,6 +818,7 @@ CONFIG_SENSORS_SHT3x=m
 CONFIG_SENSORS_SHT4x=m
 CONFIG_SENSORS_SHTC1=m
 CONFIG_SENSORS_EMC2305=m
+CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_INA2XX=m
 CONFIG_SENSORS_INA238=m
 CONFIG_SENSORS_TMP102=m
@@ -1741,6 +1741,7 @@ CONFIG_LATENCYTOP=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_STACK_TRACER=y
 CONFIG_SCHED_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
 CONFIG_BLK_DEV_IO_TRACE=y
 # CONFIG_UPROBE_EVENTS is not set
 # CONFIG_STRICT_DEVMEM is not set