From: Linus Walleij <linusw@kernel.org>
To: Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>, Lee Jones <lee@kernel.org>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>
Cc: linux-sound@vger.kernel.org, devicetree@vger.kernel.org,
mfd@lists.linux.dev, Linus Walleij <linusw@kernel.org>
Subject: [PATCH 7/9] ARM: dts: ux500: Add Samsung phone sound cards
Date: Fri, 11 Sep 2026 01:03:50 +0200 [thread overview]
Message-ID: <20260911-ux500-simple-sound-v1-7-6771ac714e82@kernel.org> (raw)
In-Reply-To: <20260911-ux500-simple-sound-v1-0-6771ac714e82@kernel.org>
The released Samsung product kernels all connect codec DAI 0 to MSP1
for playback and codec DAI 1 to MSP3 for capture. The codec provides
the bit and frame clocks, while ULPCLK is the machine driver's default
audio clock parent.
Add a common Samsung simple audio card and include it from Codina,
Codina-TMO, Gavini, Skomer, Kyle, Golden and Janice. Use the generic
card name "Samsung". The later product kernels use DSP_A with an
8-by-16-bit TDM frame, playback slots 0 and 1 and capture slot 0.
Codina and HD Codina retain their older DSP_B configuration with a
16-by-16-bit frame and playback slots 1 and 3. Preserve Gavini's
AMIC1A-to-VAMIC2 bias routing. Golden and Janice use the configuration
from the newest Codina-TMO product source; their board files are
byte-for-byte identical across the available later product releases.
Kyle's audio I2C bus contains only a disabled placeholder, so AB8505
remains its sole active codec.
Assisted-by: LLM
Signed-off-by: Linus Walleij <linusw@kernel.org>
---
.../boot/dts/st/ste-ux500-samsung-codina-tmo.dts | 1 +
arch/arm/boot/dts/st/ste-ux500-samsung-codina.dts | 27 +++++++++
arch/arm/boot/dts/st/ste-ux500-samsung-gavini.dts | 5 ++
arch/arm/boot/dts/st/ste-ux500-samsung-golden.dts | 1 +
arch/arm/boot/dts/st/ste-ux500-samsung-janice.dts | 1 +
arch/arm/boot/dts/st/ste-ux500-samsung-kyle.dts | 1 +
arch/arm/boot/dts/st/ste-ux500-samsung-skomer.dts | 1 +
arch/arm/boot/dts/st/ste-ux500-samsung.dtsi | 67 ++++++++++++++++++++++
8 files changed, 104 insertions(+)
diff --git a/arch/arm/boot/dts/st/ste-ux500-samsung-codina-tmo.dts b/arch/arm/boot/dts/st/ste-ux500-samsung-codina-tmo.dts
index 8f1780d560ff..3350fc775cc9 100644
--- a/arch/arm/boot/dts/st/ste-ux500-samsung-codina-tmo.dts
+++ b/arch/arm/boot/dts/st/ste-ux500-samsung-codina-tmo.dts
@@ -21,6 +21,7 @@
#include "ste-db8500.dtsi"
#include "ste-ab8505.dtsi"
#include "ste-dbx5x0-pinctrl.dtsi"
+#include "ste-ux500-samsung.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/leds/common.h>
#include <dt-bindings/input/input.h>
diff --git a/arch/arm/boot/dts/st/ste-ux500-samsung-codina.dts b/arch/arm/boot/dts/st/ste-ux500-samsung-codina.dts
index 9f58a3c2d06d..069c621abede 100644
--- a/arch/arm/boot/dts/st/ste-ux500-samsung-codina.dts
+++ b/arch/arm/boot/dts/st/ste-ux500-samsung-codina.dts
@@ -22,6 +22,7 @@
#include "ste-db8500.dtsi"
#include "ste-ab8500.dtsi"
#include "ste-dbx5x0-pinctrl.dtsi"
+#include "ste-ux500-samsung.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/leds/common.h>
#include <dt-bindings/input/input.h>
@@ -667,6 +668,32 @@ display_out: endpoint {
};
};
+&samsung_playback_link {
+ format = "dsp_b";
+};
+
+&samsung_capture_link {
+ format = "dsp_b";
+};
+
+&samsung_playback_cpu {
+ dai-tdm-slot-num = <16>;
+ dai-tdm-slot-tx-mask = <0 1 0 1>;
+};
+
+&samsung_codec_playback {
+ dai-tdm-slot-num = <16>;
+ dai-tdm-slot-tx-mask = <0 1 0 1>;
+};
+
+&samsung_capture_cpu {
+ dai-tdm-slot-num = <16>;
+};
+
+&samsung_codec_capture {
+ dai-tdm-slot-num = <16>;
+};
+
&pinctrl {
/*
* This extends the MC0_A_2 default config to include
diff --git a/arch/arm/boot/dts/st/ste-ux500-samsung-gavini.dts b/arch/arm/boot/dts/st/ste-ux500-samsung-gavini.dts
index 0c3eef7a294a..d99ee1581eb7 100644
--- a/arch/arm/boot/dts/st/ste-ux500-samsung-gavini.dts
+++ b/arch/arm/boot/dts/st/ste-ux500-samsung-gavini.dts
@@ -7,6 +7,7 @@
#include "ste-db8500.dtsi"
#include "ste-ab8500.dtsi"
#include "ste-dbx5x0-pinctrl.dtsi"
+#include "ste-ux500-samsung.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/leds/common.h>
#include <dt-bindings/input/input.h>
@@ -604,6 +605,10 @@ display_out: endpoint {
};
};
+&codec {
+ stericsson,amic1a-bias-vamic2;
+};
+
&pinctrl {
/*
* This extends the MC0_A_2 default config to include
diff --git a/arch/arm/boot/dts/st/ste-ux500-samsung-golden.dts b/arch/arm/boot/dts/st/ste-ux500-samsung-golden.dts
index f736888474e7..730818fe073f 100644
--- a/arch/arm/boot/dts/st/ste-ux500-samsung-golden.dts
+++ b/arch/arm/boot/dts/st/ste-ux500-samsung-golden.dts
@@ -4,6 +4,7 @@
#include "ste-db8500.dtsi"
#include "ste-ab8505.dtsi"
#include "ste-dbx5x0-pinctrl.dtsi"
+#include "ste-ux500-samsung.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/leds/common.h>
#include <dt-bindings/input/input.h>
diff --git a/arch/arm/boot/dts/st/ste-ux500-samsung-janice.dts b/arch/arm/boot/dts/st/ste-ux500-samsung-janice.dts
index 18fb7263058e..5f69b931d173 100644
--- a/arch/arm/boot/dts/st/ste-ux500-samsung-janice.dts
+++ b/arch/arm/boot/dts/st/ste-ux500-samsung-janice.dts
@@ -7,6 +7,7 @@
#include "ste-db8500.dtsi"
#include "ste-ab8500.dtsi"
#include "ste-dbx5x0-pinctrl.dtsi"
+#include "ste-ux500-samsung.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/leds/common.h>
#include <dt-bindings/input/input.h>
diff --git a/arch/arm/boot/dts/st/ste-ux500-samsung-kyle.dts b/arch/arm/boot/dts/st/ste-ux500-samsung-kyle.dts
index c34d43a2b750..dc1c3d134199 100644
--- a/arch/arm/boot/dts/st/ste-ux500-samsung-kyle.dts
+++ b/arch/arm/boot/dts/st/ste-ux500-samsung-kyle.dts
@@ -11,6 +11,7 @@
#include "ste-db8500.dtsi"
#include "ste-ab8505.dtsi"
#include "ste-dbx5x0-pinctrl.dtsi"
+#include "ste-ux500-samsung.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/leds/common.h>
#include <dt-bindings/input/input.h>
diff --git a/arch/arm/boot/dts/st/ste-ux500-samsung-skomer.dts b/arch/arm/boot/dts/st/ste-ux500-samsung-skomer.dts
index 7bf4287f6e13..9ed01cc4fa9a 100644
--- a/arch/arm/boot/dts/st/ste-ux500-samsung-skomer.dts
+++ b/arch/arm/boot/dts/st/ste-ux500-samsung-skomer.dts
@@ -7,6 +7,7 @@
#include "ste-db8500.dtsi"
#include "ste-ab8505.dtsi"
#include "ste-dbx5x0-pinctrl.dtsi"
+#include "ste-ux500-samsung.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/leds/common.h>
#include <dt-bindings/input/input.h>
diff --git a/arch/arm/boot/dts/st/ste-ux500-samsung.dtsi b/arch/arm/boot/dts/st/ste-ux500-samsung.dtsi
new file mode 100644
index 000000000000..cc46f8ee1c64
--- /dev/null
+++ b/arch/arm/boot/dts/st/ste-ux500-samsung.dtsi
@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+/ {
+ samsung_sound: sound {
+ compatible = "simple-audio-card";
+ simple-audio-card,name = "Samsung";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ samsung_playback_link: simple-audio-card,dai-link@0 {
+ reg = <0>;
+ format = "dsp_a";
+ bitclock-master = <&samsung_codec_playback>;
+ frame-master = <&samsung_codec_playback>;
+
+ samsung_playback_cpu: cpu {
+ sound-dai = <&msp1>;
+ dai-tdm-slot-num = <8>;
+ dai-tdm-slot-width = <16>;
+ dai-tdm-slot-tx-mask = <1 1>;
+ };
+
+ samsung_codec_playback: codec {
+ sound-dai = <&codec 0>;
+ dai-tdm-slot-num = <8>;
+ dai-tdm-slot-width = <16>;
+ dai-tdm-slot-tx-mask = <1 1>;
+ };
+ };
+
+ samsung_capture_link: simple-audio-card,dai-link@1 {
+ reg = <1>;
+ format = "dsp_a";
+ bitclock-master = <&samsung_codec_capture>;
+ frame-master = <&samsung_codec_capture>;
+
+ samsung_capture_cpu: cpu {
+ sound-dai = <&msp3>;
+ dai-tdm-slot-num = <8>;
+ dai-tdm-slot-width = <16>;
+ dai-tdm-slot-rx-mask = <1>;
+ };
+
+ samsung_codec_capture: codec {
+ sound-dai = <&codec 1>;
+ dai-tdm-slot-num = <8>;
+ dai-tdm-slot-width = <16>;
+ dai-tdm-slot-rx-mask = <1>;
+ };
+ };
+ };
+};
+
+&codec {
+ assigned-clocks = <&ab8500_clock AB8500_SYSCLK_INT>;
+ assigned-clock-parents = <&ab8500_clock AB8500_SYSCLK_ULP>;
+};
+
+&msp1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&msp1txrx_a_1_default>;
+ status = "okay";
+};
+
+&msp3 {
+ status = "okay";
+};
--
2.55.0
next prev parent reply other threads:[~2026-09-10 23:04 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-10 23:03 [PATCH 0/9] ASoC: ux500: Migrate HREF and Samsung audio to simple-card Linus Walleij
2026-09-10 23:03 ` [PATCH 1/9] ASoC: dt-bindings: ux500: Convert MSP binding to DT schema Linus Walleij
2026-09-10 23:10 ` sashiko-bot
2026-09-10 23:03 ` [PATCH 2/9] mfd: dt-bindings: ab8500: Describe codec DAI and microphone wiring Linus Walleij
2026-09-10 23:08 ` sashiko-bot
2026-09-10 23:03 ` [PATCH 3/9] ASoC: dt-bindings: ux500: Remove MOP500 sound card binding Linus Walleij
2026-09-10 23:07 ` sashiko-bot
2026-09-10 23:03 ` [PATCH 4/9] ASoC: ab8500: Skip digital microphone support on AB8505 Linus Walleij
2026-09-10 23:17 ` sashiko-bot
2026-09-10 23:03 ` [PATCH 5/9] ARM: dts: ux500: Add sound DAI provider cells Linus Walleij
2026-09-10 23:08 ` sashiko-bot
2026-09-10 23:03 ` [PATCH 6/9] ARM: dts: ux500: Convert HREF audio card to simple-card Linus Walleij
2026-09-10 23:14 ` sashiko-bot
2026-09-10 23:03 ` Linus Walleij [this message]
2026-09-10 23:15 ` [PATCH 7/9] ARM: dts: ux500: Add Samsung phone sound cards sashiko-bot
2026-09-10 23:03 ` [PATCH 8/9] ASoC: ux500: Remove the MOP500 machine driver Linus Walleij
2026-09-10 23:14 ` sashiko-bot
2026-09-10 23:03 ` [PATCH 9/9] ARM: config: u8500: Enable the simple audio card Linus Walleij
2026-09-10 23:09 ` sashiko-bot
2026-09-10 23:10 ` [PATCH 0/9] ASoC: ux500: Migrate HREF and Samsung audio to simple-card Mark Brown
2026-09-11 8:36 ` Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260911-ux500-simple-sound-v1-7-6771ac714e82@kernel.org \
--to=linusw@kernel.org \
--cc=broonie@kernel.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=krzk+dt@kernel.org \
--cc=lee@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-sound@vger.kernel.org \
--cc=mfd@lists.linux.dev \
--cc=perex@perex.cz \
--cc=robh@kernel.org \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox