diff --git a/configs/fedora/generic/riscv/CONFIG_DRM_DEBUG_MM b/configs/fedora/generic/riscv/CONFIG_DRM_DEBUG_MM
new file mode 100644
index 000000000..117f02c9e
--- /dev/null
+++ b/configs/fedora/generic/riscv/CONFIG_DRM_DEBUG_MM
@@ -0,0 +1 @@
+# CONFIG_DRM_DEBUG_MM is not set
diff --git a/configs/fedora/generic/riscv/CONFIG_I2C_ALGOBIT b/configs/fedora/generic/riscv/CONFIG_I2C_ALGOBIT
new file mode 100644
index 000000000..b89d18d43
--- /dev/null
+++ b/configs/fedora/generic/riscv/CONFIG_I2C_ALGOBIT
@@ -0,0 +1 @@
+CONFIG_I2C_ALGOBIT=y
diff --git a/configs/fedora/generic/riscv/CONFIG_REGMAP_I2C b/configs/fedora/generic/riscv/CONFIG_REGMAP_I2C
deleted file mode 100644
index 907c212ef..000000000
--- a/configs/fedora/generic/riscv/CONFIG_REGMAP_I2C
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGMAP_I2C=y
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-fedora.config b/kernel-riscv64-debug-fedora.config
index aa10ecee5..b89a64223 100644
--- a/kernel-riscv64-debug-fedora.config
+++ b/kernel-riscv64-debug-fedora.config
@@ -1856,7 +1856,7 @@ CONFIG_HZ_100=y
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_500 is not set
 # CONFIG_HZ_PERIODIC is not set
-CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_ALGOPCA=m
 CONFIG_I2C_ALGOPCF=m
 # CONFIG_I2C_ALI1535 is not set
@@ -4144,8 +4144,8 @@ CONFIG_RD_XZ=y
 CONFIG_REALTEK_AUTOPM=y
 CONFIG_REALTEK_PHY=y
 # CONFIG_REED_SOLOMON_TEST 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
diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config
index 3684e9385..273f5901f 100644
--- a/kernel-riscv64-fedora.config
+++ b/kernel-riscv64-fedora.config
@@ -1839,7 +1839,7 @@ CONFIG_HZ_100=y
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_500 is not set
 # CONFIG_HZ_PERIODIC is not set
-CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_ALGOPCA=m
 CONFIG_I2C_ALGOPCF=m
 # CONFIG_I2C_ALI1535 is not set
@@ -4122,8 +4122,8 @@ CONFIG_RD_XZ=y
 CONFIG_REALTEK_AUTOPM=y
 CONFIG_REALTEK_PHY=y
 # CONFIG_REED_SOLOMON_TEST 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