diff --git a/configs/fedora/generic/riscv/CONFIG_REGMAP_I2C b/configs/fedora/generic/riscv/CONFIG_REGMAP_I2C
index 907c212ef..8440b2caf 100644
--- a/configs/fedora/generic/riscv/CONFIG_REGMAP_I2C
+++ b/configs/fedora/generic/riscv/CONFIG_REGMAP_I2C
@@ -1 +1 @@
-CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_I2C=m
diff --git a/configs/fedora/generic/riscv/CONFIG_REGMAP_SPI b/configs/fedora/generic/riscv/CONFIG_REGMAP_SPI
index eb9c6a3f7..adb8804fa 100644
--- a/configs/fedora/generic/riscv/CONFIG_REGMAP_SPI
+++ b/configs/fedora/generic/riscv/CONFIG_REGMAP_SPI
@@ -1 +1 @@
-CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_SPI=m
diff --git a/kernel-riscv64-debug.config b/kernel-riscv64-debug.config
index b05d9a4de..f1db861ce 100644
--- a/kernel-riscv64-debug.config
+++ b/kernel-riscv64-debug.config
@@ -4008,8 +4008,8 @@ CONFIG_REALTEK_AUTOPM=y
 CONFIG_REALTEK_PHY=y
 # CONFIG_REED_SOLOMON_TEST is not set
 CONFIG_REFCOUNT_FULL=y
-CONFIG_REGMAP_I2C=y
-CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_SPI=m
 CONFIG_REGMAP=y
 # CONFIG_REGULATOR_88PG86X is not set
 # CONFIG_REGULATOR_ACT8865 is not set
diff --git a/kernel-riscv64.config b/kernel-riscv64.config
index fa30cd588..bceaf4859 100644
--- a/kernel-riscv64.config
+++ b/kernel-riscv64.config
@@ -3986,8 +3986,8 @@ CONFIG_REALTEK_AUTOPM=y
 CONFIG_REALTEK_PHY=y
 # CONFIG_REED_SOLOMON_TEST is not set
 # CONFIG_REFCOUNT_FULL is not set
-CONFIG_REGMAP_I2C=y
-CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_SPI=m
 CONFIG_REGMAP=y
 # CONFIG_REGULATOR_88PG86X is not set
 # CONFIG_REGULATOR_ACT8865 is not set