Skip to contentSkip to conversation

arm64: dts: ti: k3-am62-verdin-dahlia: add Microphone Jack to sound card

PATCH Applied Stefan Eichenberger 4 participants 4 messages Feb 17, 2025 – Mar 2, 2025

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: dts: ti: k3-am62-verdin-dahlia: add Microphone Jack to sound card

From: Stefan Eichenberger <[email protected]>

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 f5bf894c865b ("arm64: dts: ti: verdin-am62: dahlia: add sound card")
---
 arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi +3 -3
index 9202181fbd652..fcc4cb2e9389b 100644
@@ -28,10 +28,10 @@ sound {
 			"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";
 
Signature · 1 line
2.45.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Stefan Eichenberger

From: Stefan Eichenberger <[email protected]>

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.

Quoted 7 lines

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 f5bf894c865b ("arm64: dts: ti: verdin-am62: dahlia: add sound card")

Francesco

Reviewed-by on v1 1/1
#2 lore raw
In reply to Stefan Eichenberger

Hi Stefan,

Thanks for the patch.

Quoted 6 lines · Stefan Eichenberger

From: Stefan Eichenberger <[email protected]>

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.

Quoted 7 lines

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 f5bf894c865b ("arm64: dts: ti: verdin-am62: dahlia: add sound card")
Quoted 25 lines
---
 arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi +3 -3
index 9202181fbd652..fcc4cb2e9389b 100644
@@ -28,10 +28,10 @@ sound {
 			"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";
 
Signature · 1 line
2.45.2
maintainer Applied
#3 lore raw
In reply to Stefan Eichenberger

Hi Stefan Eichenberger,

Quoted 10 lines · Stefan Eichenberger

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!

[...]

I have applied the following to branch ti-next on [1]. Thank you!

[1/1] arm64: dts: ti: k3-am62-verdin-dahlia: add Microphone Jack to sound card

      commit: 7139df64e7c13c079b754476355c62b490213055

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent up the chain during the next merge window (or sooner if it is a relevant bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
--
Vignesh