]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
arm64: dts: freescale: imx8mp-verdin-dahlia: add Microphone Jack to sound card
authorStefan Eichenberger <stefan.eichenberger@toradex.com>
Mon, 17 Feb 2025 14:56:40 +0000 (15:56 +0100)
committerShawn Guo <shawnguo@kernel.org>
Sun, 23 Feb 2025 08:13:13 +0000 (16:13 +0800)
The simple-audio-card's microphone widget currently connects to the
headphone jack. Routing the microphone input to the microphone jack
allows for independent operation of the microphone and headphones.

This resolves the following boot-time kernel log message, which
indicated a conflict when the microphone and headphone functions were
not separated:
  debugfs: File 'Headphone Jack' in directory 'dapm' already present!

Fixes: 874958916844 ("arm64: dts: freescale: verdin-imx8mp: dahlia: add sound card")
Signed-off-by: Stefan Eichenberger <stefan.eichenberger@toradex.com>
Reviewed-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm64/boot/dts/freescale/imx8mp-verdin-dahlia.dtsi

index da8902c5f7e5b2bc84f26cf9b204cb58ca68b5f4..1493319aa748d0504fc8110cca28161b0428edc0 100644 (file)
                        "Headphone Jack", "HPOUTR",
                        "IN2L", "Line In Jack",
                        "IN2R", "Line In Jack",
-                       "Headphone Jack", "MICBIAS",
-                       "IN1L", "Headphone Jack";
+                       "Microphone Jack", "MICBIAS",
+                       "IN1L", "Microphone Jack";
                simple-audio-card,widgets =
-                       "Microphone", "Headphone Jack",
+                       "Microphone", "Microphone Jack",
                        "Headphone", "Headphone Jack",
                        "Line", "Line In Jack";