summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2020-03-07 00:47:46 +0000
committerPeter Robinson <pbrobinson@gmail.com>2020-03-07 00:47:46 +0000
commit9988696aaef86cd8046bd0ed94512c26ab585375 (patch)
tree3eed127f5f113930af46fd0aa1153a75d86d4a19
parent5650295ae7d914eb931d3830d91a739dccd0915b (diff)
downloadkernel-9988696aaef86cd8046bd0ed94512c26ab585375.tar.gz
kernel-9988696aaef86cd8046bd0ed94512c26ab585375.tar.xz
kernel-9988696aaef86cd8046bd0ed94512c26ab585375.zip
arm: enable some sounds options for imx8 on aarch64
-rw-r--r--configs/fedora/generic/arm/CONFIG_SND_IMX_SOC (renamed from configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_IMX_SOC)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_SND_SOC_IMX_AUDMUX (renamed from configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_AUDMUX)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_SND_SOC_IMX_SGTL5000 (renamed from configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_SGTL5000)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_SND_SOC_IMX_SPDIF (renamed from configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_SPDIF)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_SND_SOC_WM8962 (renamed from configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_WM8962)0
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_SND_IMX_SOC1
-rw-r--r--kernel-aarch64-debug-fedora.config8
-rw-r--r--kernel-aarch64-fedora.config8
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config7
-rw-r--r--kernel-armv7hl-lpae-fedora.config7
10 files changed, 20 insertions, 11 deletions
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_IMX_SOC b/configs/fedora/generic/arm/CONFIG_SND_IMX_SOC
index 25cc80938..25cc80938 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_IMX_SOC
+++ b/configs/fedora/generic/arm/CONFIG_SND_IMX_SOC
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_AUDMUX b/configs/fedora/generic/arm/CONFIG_SND_SOC_IMX_AUDMUX
index efa06fed2..efa06fed2 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_AUDMUX
+++ b/configs/fedora/generic/arm/CONFIG_SND_SOC_IMX_AUDMUX
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_SGTL5000 b/configs/fedora/generic/arm/CONFIG_SND_SOC_IMX_SGTL5000
index 9bc19346c..9bc19346c 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_SGTL5000
+++ b/configs/fedora/generic/arm/CONFIG_SND_SOC_IMX_SGTL5000
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_SPDIF b/configs/fedora/generic/arm/CONFIG_SND_SOC_IMX_SPDIF
index 58a211e43..58a211e43 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_SPDIF
+++ b/configs/fedora/generic/arm/CONFIG_SND_SOC_IMX_SPDIF
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_WM8962 b/configs/fedora/generic/arm/CONFIG_SND_SOC_WM8962
index cfebf5ded..cfebf5ded 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_WM8962
+++ b/configs/fedora/generic/arm/CONFIG_SND_SOC_WM8962
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SND_IMX_SOC b/configs/fedora/generic/arm/aarch64/CONFIG_SND_IMX_SOC
deleted file mode 100644
index f0bf90c04..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_SND_IMX_SOC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SND_IMX_SOC is not set
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index bf6c1fe20..79c56514a 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -5939,7 +5939,7 @@ CONFIG_SND_HRTIMER=m
CONFIG_SND_I2S_HI6210_I2S=m
CONFIG_SND_ICE1712=m
CONFIG_SND_ICE1724=m
-# CONFIG_SND_IMX_SOC is not set
+CONFIG_SND_IMX_SOC=m
CONFIG_SND_INDIGODJ=m
CONFIG_SND_INDIGODJX=m
CONFIG_SND_INDIGOIO=m
@@ -6069,8 +6069,10 @@ CONFIG_SND_SOC_HDMI_CODEC=m
CONFIG_SND_SOC_ICS43432=m
# CONFIG_SND_SOC_IMG is not set
CONFIG_SND_SOC_IMX_AUDMIX=m
-# CONFIG_SND_SOC_IMX_AUDMUX is not set
+CONFIG_SND_SOC_IMX_AUDMUX=m
# CONFIG_SND_SOC_IMX_ES8328 is not set
+CONFIG_SND_SOC_IMX_SGTL5000=m
+CONFIG_SND_SOC_IMX_SPDIF=m
# CONFIG_SND_SOC_INNO_RK3036 is not set
CONFIG_SND_SOC=m
CONFIG_SND_SOC_MAX9759=m
@@ -6208,7 +6210,7 @@ CONFIG_SND_SOC_WM8804_SPI=m
# CONFIG_SND_SOC_WM8903 is not set
# CONFIG_SND_SOC_WM8904 is not set
CONFIG_SND_SOC_WM8960=m
-# CONFIG_SND_SOC_WM8962 is not set
+CONFIG_SND_SOC_WM8962=m
# CONFIG_SND_SOC_WM8974 is not set
# CONFIG_SND_SOC_WM8978 is not set
# CONFIG_SND_SOC_WM8985 is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index f7c494461..42c565e7f 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -5918,7 +5918,7 @@ CONFIG_SND_HRTIMER=m
CONFIG_SND_I2S_HI6210_I2S=m
CONFIG_SND_ICE1712=m
CONFIG_SND_ICE1724=m
-# CONFIG_SND_IMX_SOC is not set
+CONFIG_SND_IMX_SOC=m
CONFIG_SND_INDIGODJ=m
CONFIG_SND_INDIGODJX=m
CONFIG_SND_INDIGOIO=m
@@ -6047,8 +6047,10 @@ CONFIG_SND_SOC_HDMI_CODEC=m
CONFIG_SND_SOC_ICS43432=m
# CONFIG_SND_SOC_IMG is not set
CONFIG_SND_SOC_IMX_AUDMIX=m
-# CONFIG_SND_SOC_IMX_AUDMUX is not set
+CONFIG_SND_SOC_IMX_AUDMUX=m
# CONFIG_SND_SOC_IMX_ES8328 is not set
+CONFIG_SND_SOC_IMX_SGTL5000=m
+CONFIG_SND_SOC_IMX_SPDIF=m
# CONFIG_SND_SOC_INNO_RK3036 is not set
CONFIG_SND_SOC=m
CONFIG_SND_SOC_MAX9759=m
@@ -6186,7 +6188,7 @@ CONFIG_SND_SOC_WM8804_SPI=m
# CONFIG_SND_SOC_WM8903 is not set
# CONFIG_SND_SOC_WM8904 is not set
CONFIG_SND_SOC_WM8960=m
-# CONFIG_SND_SOC_WM8962 is not set
+CONFIG_SND_SOC_WM8962=m
# CONFIG_SND_SOC_WM8974 is not set
# CONFIG_SND_SOC_WM8978 is not set
# CONFIG_SND_SOC_WM8985 is not set
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index f5ff31416..5c622089d 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -5875,6 +5875,7 @@ CONFIG_SND_HRTIMER=m
CONFIG_SND_I2S_HI6210_I2S=m
CONFIG_SND_ICE1712=m
CONFIG_SND_ICE1724=m
+CONFIG_SND_IMX_SOC=m
CONFIG_SND_INDIGODJ=m
CONFIG_SND_INDIGODJX=m
CONFIG_SND_INDIGOIO=m
@@ -6009,8 +6010,10 @@ CONFIG_SND_SOC_HDMI_CODEC=m
CONFIG_SND_SOC_ICS43432=m
# CONFIG_SND_SOC_IMG is not set
# CONFIG_SND_SOC_IMX_AUDMIX is not set
-# CONFIG_SND_SOC_IMX_AUDMUX is not set
+CONFIG_SND_SOC_IMX_AUDMUX=m
# CONFIG_SND_SOC_IMX_ES8328 is not set
+CONFIG_SND_SOC_IMX_SGTL5000=m
+CONFIG_SND_SOC_IMX_SPDIF=m
# CONFIG_SND_SOC_INNO_RK3036 is not set
CONFIG_SND_SOC=m
CONFIG_SND_SOC_MAX9759=m
@@ -6154,7 +6157,7 @@ CONFIG_SND_SOC_WM8804_SPI=m
# CONFIG_SND_SOC_WM8903 is not set
# CONFIG_SND_SOC_WM8904 is not set
CONFIG_SND_SOC_WM8960=m
-# CONFIG_SND_SOC_WM8962 is not set
+CONFIG_SND_SOC_WM8962=m
# CONFIG_SND_SOC_WM8974 is not set
# CONFIG_SND_SOC_WM8978 is not set
# CONFIG_SND_SOC_WM8985 is not set
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 1818f68e1..498092b43 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -5855,6 +5855,7 @@ CONFIG_SND_HRTIMER=m
CONFIG_SND_I2S_HI6210_I2S=m
CONFIG_SND_ICE1712=m
CONFIG_SND_ICE1724=m
+CONFIG_SND_IMX_SOC=m
CONFIG_SND_INDIGODJ=m
CONFIG_SND_INDIGODJX=m
CONFIG_SND_INDIGOIO=m
@@ -5988,8 +5989,10 @@ CONFIG_SND_SOC_HDMI_CODEC=m
CONFIG_SND_SOC_ICS43432=m
# CONFIG_SND_SOC_IMG is not set
# CONFIG_SND_SOC_IMX_AUDMIX is not set
-# CONFIG_SND_SOC_IMX_AUDMUX is not set
+CONFIG_SND_SOC_IMX_AUDMUX=m
# CONFIG_SND_SOC_IMX_ES8328 is not set
+CONFIG_SND_SOC_IMX_SGTL5000=m
+CONFIG_SND_SOC_IMX_SPDIF=m
# CONFIG_SND_SOC_INNO_RK3036 is not set
CONFIG_SND_SOC=m
CONFIG_SND_SOC_MAX9759=m
@@ -6133,7 +6136,7 @@ CONFIG_SND_SOC_WM8804_SPI=m
# CONFIG_SND_SOC_WM8903 is not set
# CONFIG_SND_SOC_WM8904 is not set
CONFIG_SND_SOC_WM8960=m
-# CONFIG_SND_SOC_WM8962 is not set
+CONFIG_SND_SOC_WM8962=m
# CONFIG_SND_SOC_WM8974 is not set
# CONFIG_SND_SOC_WM8978 is not set
# CONFIG_SND_SOC_WM8985 is not set