diff --git a/drivers/platform/apple/Kconfig b/drivers/platform/apple/Kconfig
index 42525aa9fbbe..5bcadd349493 100644
--- a/drivers/platform/apple/Kconfig
+++ b/drivers/platform/apple/Kconfig
@@ -16,7 +16,7 @@ if APPLE_PLATFORMS
 
 config APPLE_SMC
 	tristate "Apple SMC Driver"
-	depends on ARCH_APPLE || COMPILE_TEST
+	depends on ARCH_APPLE || (COMPILE_TEST && 64BIT)
 	default ARCH_APPLE
 	select MFD_CORE
 	help
@@ -33,7 +33,7 @@ if APPLE_SMC
 
 config APPLE_SMC_RTKIT
 	tristate "RTKit (Apple Silicon) backend"
-	depends on ARCH_APPLE || COMPILE_TEST
+	depends on ARCH_APPLE || (COMPILE_TEST && 64BIT)
 	depends on APPLE_RTKIT
 	default ARCH_APPLE
 	help
diff --git a/drivers/platform/apple/smc_rtkit.c b/drivers/platform/apple/smc_rtkit.c
index 5b7c4c475bbb..e84e2e369e6a 100644
--- a/drivers/platform/apple/smc_rtkit.c
+++ b/drivers/platform/apple/smc_rtkit.c
@@ -5,6 +5,7 @@
  */
 
 #include <asm/unaligned.h>
+#include <linux/bitfield.h>
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/io.h>
@@ -34,7 +35,7 @@
 #define SMC_MSG				GENMASK(7, 0)
 #define SMC_RESULT			SMC_MSG
 
-#define SMC_RECV_TIMEOUT		100
+#define SMC_RECV_TIMEOUT		500
 
 struct apple_smc_rtkit {
 	struct device *dev;