[PATCH v2 8/9] ARM: dts: ux500: Add Samsung phone audio graphs

[Linus Walleij <linusw@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. Keep the codec-provided clocks continuous as in the
product kernels.

Add a common two-link audio graph 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  | 21 ++++++
 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        | 77 ++++++++++++++++++++++
 8 files changed, 108 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..857396201147 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,26 @@ display_out: endpoint {
 	};
 };
 
+&samsung_playback_cpu {
+	dai-format = "dsp_b";
+	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-format = "dsp_b";
+	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..2b46145f68c9
--- /dev/null
+++ b/arch/arm/boot/dts/st/ste-ux500-samsung.dtsi
@@ -0,0 +1,77 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+/ {
+	samsung_sound: sound {
+		compatible = "audio-graph-card2";
+		label = "Samsung";
+		links = <&samsung_msp1_port &samsung_msp3_port>;
+	};
+};
+
+&codec {
+	assigned-clocks = <&ab8500_clock AB8500_SYSCLK_INT>;
+	assigned-clock-parents = <&ab8500_clock AB8500_SYSCLK_ULP>;
+
+	ports {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		port@0 {
+			reg = <0>;
+
+			samsung_codec_playback: endpoint {
+				remote-endpoint = <&samsung_playback_cpu>;
+				bitclock-master;
+				frame-master;
+				dai-tdm-slot-num = <8>;
+				dai-tdm-slot-width = <16>;
+				dai-tdm-slot-tx-mask = <1 1>;
+			};
+		};
+
+		port@1 {
+			reg = <1>;
+
+			samsung_codec_capture: endpoint {
+				remote-endpoint = <&samsung_capture_cpu>;
+				bitclock-master;
+				frame-master;
+				dai-tdm-slot-num = <8>;
+				dai-tdm-slot-width = <16>;
+				dai-tdm-slot-rx-mask = <1>;
+			};
+		};
+	};
+};
+
+&msp1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&msp1txrx_a_1_default>;
+	status = "okay";
+
+	samsung_msp1_port: port {
+		samsung_playback_cpu: endpoint {
+			continuous-clock;
+			remote-endpoint = <&samsung_codec_playback>;
+			dai-format = "dsp_a";
+			dai-tdm-slot-num = <8>;
+			dai-tdm-slot-width = <16>;
+			dai-tdm-slot-tx-mask = <1 1>;
+		};
+	};
+};
+
+&msp3 {
+	status = "okay";
+
+	samsung_msp3_port: port {
+		samsung_capture_cpu: endpoint {
+			continuous-clock;
+			remote-endpoint = <&samsung_codec_capture>;
+			dai-format = "dsp_a";
+			dai-tdm-slot-num = <8>;
+			dai-tdm-slot-width = <16>;
+			dai-tdm-slot-rx-mask = <1>;
+		};
+	};
+};

-- 
2.55.0