| Message ID | 20250217144643.178222-1-eichest@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [v1] arm64: dts: ti: k3-am62-verdin-dahlia: add Microphone Jack to sound card | expand |
On Mon, Feb 17, 2025 at 03:46:04PM +0100, Stefan Eichenberger wrote: > From: Stefan Eichenberger <stefan.eichenberger@toradex.com> > > 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") > Signed-off-by: Stefan Eichenberger <stefan.eichenberger@toradex.com> Cc:stable@vger.kernel.org Reviewed-by: Francesco Dolcini <francesco.dolcini@toradex.com> Francesco
Hi Stefan, Thanks for the patch. On Mon, Feb 17, 2025 at 03:46:04PM +0100, Stefan Eichenberger wrote: > From: Stefan Eichenberger <stefan.eichenberger@toradex.com> > > 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") > Signed-off-by: Stefan Eichenberger <stefan.eichenberger@toradex.com> Reviewed-by: Jai Luthra <jai.luthra@linux.dev> > --- > arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi b/arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi > index 9202181fbd652..fcc4cb2e9389b 100644 > --- a/arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi > +++ b/arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi > @@ -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"; > > -- > 2.45.2 >
Hi Stefan Eichenberger, On Mon, 17 Feb 2025 15:46:04 +0100, Stefan Eichenberger wrote: > 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
diff --git a/arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi b/arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi index 9202181fbd652..fcc4cb2e9389b 100644 --- a/arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi @@ -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";