diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_BQ27XXX b/configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_BQ27XXX
new file mode 100644
index 000000000..70c971363
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_BQ27XXX
@@ -0,0 +1 @@
+CONFIG_BATTERY_BQ27XXX=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM b/configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM
new file mode 100644
index 000000000..13f2e3d86
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM
@@ -0,0 +1 @@
+# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_BQ27XXX_HDQ b/configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_BQ27XXX_HDQ
new file mode 100644
index 000000000..aca89e5df
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_BQ27XXX_HDQ
@@ -0,0 +1 @@
+# CONFIG_BATTERY_BQ27XXX_HDQ is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_BQ27XXX_I2C b/configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_BQ27XXX_I2C
new file mode 100644
index 000000000..574be81f5
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_BQ27XXX_I2C
@@ -0,0 +1 @@
+CONFIG_BATTERY_BQ27XXX_I2C=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_MAX98357A b/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_MAX98357A
new file mode 100644
index 000000000..bcf5b6da4
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_MAX98357A
@@ -0,0 +1 @@
+CONFIG_SND_SOC_MAX98357A=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_NAU8825 b/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_NAU8825
new file mode 100644
index 000000000..a1454e04a
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_NAU8825
@@ -0,0 +1 @@
+CONFIG_SND_SOC_NAU8825=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_RT5677 b/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_RT5677
new file mode 100644
index 000000000..56536df16
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_RT5677
@@ -0,0 +1 @@
+CONFIG_SND_SOC_RT5677=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_RT5677_SPI b/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_RT5677_SPI
new file mode 100644
index 000000000..439952c49
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_RT5677_SPI
@@ -0,0 +1 @@
+CONFIG_SND_SOC_RT5677_SPI=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 7f757d740..30fa89beb 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -528,7 +528,10 @@ CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_SYSFS=y
 CONFIG_BATMAN_ADV_TRACING=y
 CONFIG_BATTERY_AXP20X=m
-# CONFIG_BATTERY_BQ27XXX is not set
+# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
+# CONFIG_BATTERY_BQ27XXX_HDQ is not set
+CONFIG_BATTERY_BQ27XXX_I2C=m
+CONFIG_BATTERY_BQ27XXX=m
 # CONFIG_BATTERY_DS2760 is not set
 # CONFIG_BATTERY_DS2780 is not set
 # CONFIG_BATTERY_DS2781 is not set
@@ -5869,6 +5872,7 @@ CONFIG_SND_SOC_IMX_AUDMIX=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MAX98088=m
+CONFIG_SND_SOC_MAX98357A=m
 CONFIG_SND_SOC_MAX98373=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
@@ -5884,6 +5888,7 @@ CONFIG_SND_SOC_MSM8996=m
 # CONFIG_SND_SOC_NAU8810 is not set
 # CONFIG_SND_SOC_NAU8822 is not set
 CONFIG_SND_SOC_NAU8824=m
+CONFIG_SND_SOC_NAU8825=m
 # CONFIG_SND_SOC_PCM1681 is not set
 CONFIG_SND_SOC_PCM1789_I2C=m
 # CONFIG_SND_SOC_PCM179X_I2C is not set
@@ -5913,6 +5918,8 @@ CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
 # CONFIG_SND_SOC_RT5631 is not set
 CONFIG_SND_SOC_RT5660=m
 CONFIG_SND_SOC_RT5663=m
+CONFIG_SND_SOC_RT5677=m
+CONFIG_SND_SOC_RT5677_SPI=m
 CONFIG_SND_SOC_SDM845=m
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index ed167ee26..3f4b6a235 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -528,7 +528,10 @@ CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_SYSFS=y
 CONFIG_BATMAN_ADV_TRACING=y
 CONFIG_BATTERY_AXP20X=m
-# CONFIG_BATTERY_BQ27XXX is not set
+# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
+# CONFIG_BATTERY_BQ27XXX_HDQ is not set
+CONFIG_BATTERY_BQ27XXX_I2C=m
+CONFIG_BATTERY_BQ27XXX=m
 # CONFIG_BATTERY_DS2760 is not set
 # CONFIG_BATTERY_DS2780 is not set
 # CONFIG_BATTERY_DS2781 is not set
@@ -5847,6 +5850,7 @@ CONFIG_SND_SOC_IMX_AUDMIX=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MAX98088=m
+CONFIG_SND_SOC_MAX98357A=m
 CONFIG_SND_SOC_MAX98373=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
@@ -5862,6 +5866,7 @@ CONFIG_SND_SOC_MSM8996=m
 # CONFIG_SND_SOC_NAU8810 is not set
 # CONFIG_SND_SOC_NAU8822 is not set
 CONFIG_SND_SOC_NAU8824=m
+CONFIG_SND_SOC_NAU8825=m
 # CONFIG_SND_SOC_PCM1681 is not set
 CONFIG_SND_SOC_PCM1789_I2C=m
 # CONFIG_SND_SOC_PCM179X_I2C is not set
@@ -5891,6 +5896,8 @@ CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
 # CONFIG_SND_SOC_RT5631 is not set
 CONFIG_SND_SOC_RT5660=m
 CONFIG_SND_SOC_RT5663=m
+CONFIG_SND_SOC_RT5677=m
+CONFIG_SND_SOC_RT5677_SPI=m
 CONFIG_SND_SOC_SDM845=m
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m