* [PATCH v4 1/3] arm64: dts: qcom: sc7280: herobrine: Add pinconf settings for mi2s1
2022-07-21 8:38 [PATCH v4 0/3] Add dtsi for sc7280 herobrine boards that using Judy Hsiao
@ 2022-07-21 8:38 ` Judy Hsiao
2022-07-21 8:38 ` [PATCH v4 2/3] arm64: dts: qcom: sc7280: Add sc7280-herobrine-audio-rt5682.dtsi Judy Hsiao
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Judy Hsiao @ 2022-07-21 8:38 UTC (permalink / raw)
To: Andy Gross
Cc: Bjorn Andersson, Rob Herring, Srini Kandagatla, dianders, mka,
cychiang, judyhsiao, swboyd, linux-arm-kernel, linux-arm-msm,
devicetree, linux-kernel, Judy Hsiao
1. Add drive strength property for mi2s1 on sc7280 based platforms.
2. Disable the pull-up for mi2s1 lines.
Signed-off-by: Judy Hsiao <judyhsiao@chromium.org>
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
---
arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi
index 57bacca6c5e1..67874749f1a8 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi
@@ -632,6 +632,21 @@ &dp_hot_plug_det {
bias-disable;
};
+&mi2s1_data0 {
+ drive-strength = <6>;
+ bias-disable;
+};
+
+&mi2s1_sclk {
+ drive-strength = <6>;
+ bias-disable;
+};
+
+&mi2s1_ws {
+ drive-strength = <6>;
+ bias-disable;
+};
+
&pcie1_clkreq_n {
bias-pull-up;
drive-strength = <2>;
--
2.37.0.170.g444d1eabd0-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v4 2/3] arm64: dts: qcom: sc7280: Add sc7280-herobrine-audio-rt5682.dtsi
2022-07-21 8:38 [PATCH v4 0/3] Add dtsi for sc7280 herobrine boards that using Judy Hsiao
2022-07-21 8:38 ` [PATCH v4 1/3] arm64: dts: qcom: sc7280: herobrine: Add pinconf settings for mi2s1 Judy Hsiao
@ 2022-07-21 8:38 ` Judy Hsiao
2022-07-21 8:38 ` [PATCH v4 3/3] arm64: dts: qcom: sc7280: Include sc7280-herobrine-audio-rt5682.dtsi in herobrine-r1 Judy Hsiao
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Judy Hsiao @ 2022-07-21 8:38 UTC (permalink / raw)
To: Andy Gross
Cc: Bjorn Andersson, Rob Herring, Srini Kandagatla, dianders, mka,
cychiang, judyhsiao, swboyd, linux-arm-kernel, linux-arm-msm,
devicetree, linux-kernel, Judy Hsiao
Audio dtsi for sc7280 boards that using rt5682 headset codec:
1. Add dt nodes for sound card which use I2S playback and record
through rt5682s and I2S playback through max98357a.
2. Enable lpass cpu node and add pin control and dai-links.
Signed-off-by: Judy Hsiao <judyhsiao@chromium.org>
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
---
.../qcom/sc7280-herobrine-audio-rt5682.dtsi | 122 ++++++++++++++++++
1 file changed, 122 insertions(+)
create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi
diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi
new file mode 100644
index 000000000000..2dbdeeb29ece
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi
@@ -0,0 +1,122 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ *
+ * This file defines the common audio settings for the child boards
+ * using rt5682 codec.
+ *
+ * Copyright 2022 Google LLC.
+ */
+
+/ {
+ /* BOARD-SPECIFIC TOP LEVEL NODES */
+ sound: sound {
+ compatible = "google,sc7280-herobrine";
+ model = "sc7280-rt5682-max98360a-1mic";
+
+ status = "okay";
+ audio-routing =
+ "Headphone Jack", "HPOL",
+ "Headphone Jack", "HPOR";
+
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ dai-link@0 {
+ link-name = "MAX98360";
+ reg = <0>;
+
+ cpu {
+ sound-dai = <&lpass_cpu MI2S_SECONDARY>;
+ };
+
+ codec {
+ sound-dai = <&max98360a>;
+ };
+ };
+
+ dai-link@1 {
+ link-name = "ALC5682";
+ reg = <1>;
+
+ cpu {
+ sound-dai = <&lpass_cpu MI2S_PRIMARY>;
+ };
+
+ codec {
+ sound-dai = <&alc5682 0 /* aif1 */>;
+ };
+ };
+ };
+};
+
+hp_i2c: &i2c2 {
+ status = "okay";
+ clock-frequency = <400000>;
+
+ alc5682: codec@1a {
+ compatible = "realtek,rt5682s";
+ reg = <0x1a>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&hp_irq>;
+
+ #sound-dai-cells = <1>;
+
+ interrupt-parent = <&tlmm>;
+ interrupts = <101 IRQ_TYPE_EDGE_BOTH>;
+
+ AVDD-supply = <&pp1800_alc5682>;
+ MICVDD-supply = <&pp3300_codec>;
+
+ realtek,dmic1-data-pin = <1>;
+ realtek,dmic1-clk-pin = <2>;
+ realtek,jd-src = <1>;
+ realtek,dmic-clk-rate-hz = <2048000>;
+ };
+};
+
+&lpass_cpu {
+ status = "okay";
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&mi2s0_data0>, <&mi2s0_data1>, <&mi2s0_mclk>, <&mi2s0_sclk>, <&mi2s0_ws>,
+ <&mi2s1_data0>, <&mi2s1_sclk>, <&mi2s1_ws>;
+
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ dai-link@0 {
+ reg = <MI2S_PRIMARY>;
+ qcom,playback-sd-lines = <1>;
+ qcom,capture-sd-lines = <0>;
+ };
+
+ dai-link@1 {
+ reg = <MI2S_SECONDARY>;
+ qcom,playback-sd-lines = <0>;
+ };
+};
+
+&mi2s0_data0 {
+ drive-strength = <6>;
+ bias-disable;
+};
+
+&mi2s0_data1 {
+ drive-strength = <6>;
+ bias-disable;
+};
+
+&mi2s0_mclk {
+ drive-strength = <6>;
+ bias-disable;
+};
+
+&mi2s0_sclk {
+ drive-strength = <6>;
+ bias-disable;
+};
+
+&mi2s0_ws {
+ drive-strength = <6>;
+ bias-disable;
+};
--
2.37.0.170.g444d1eabd0-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v4 3/3] arm64: dts: qcom: sc7280: Include sc7280-herobrine-audio-rt5682.dtsi in herobrine-r1
2022-07-21 8:38 [PATCH v4 0/3] Add dtsi for sc7280 herobrine boards that using Judy Hsiao
2022-07-21 8:38 ` [PATCH v4 1/3] arm64: dts: qcom: sc7280: herobrine: Add pinconf settings for mi2s1 Judy Hsiao
2022-07-21 8:38 ` [PATCH v4 2/3] arm64: dts: qcom: sc7280: Add sc7280-herobrine-audio-rt5682.dtsi Judy Hsiao
@ 2022-07-21 8:38 ` Judy Hsiao
2022-09-14 14:28 ` [PATCH v4 0/3] Add dtsi for sc7280 herobrine boards that using Judy Hsiao
2022-10-18 3:05 ` Bjorn Andersson
4 siblings, 0 replies; 6+ messages in thread
From: Judy Hsiao @ 2022-07-21 8:38 UTC (permalink / raw)
To: Andy Gross
Cc: Bjorn Andersson, Rob Herring, Srini Kandagatla, dianders, mka,
cychiang, judyhsiao, swboyd, linux-arm-kernel, linux-arm-msm,
devicetree, linux-kernel, Judy Hsiao
Include sc7280-herobrine-audio-rt5682.dtsi in herobrine-r1
as it uses rt5682 codec.
Signed-off-by: Judy Hsiao <judyhsiao@chromium.org>
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
---
arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts
index c1647a85a371..98280436813d 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts
@@ -8,6 +8,7 @@
/dts-v1/;
#include "sc7280-herobrine.dtsi"
+#include "sc7280-herobrine-audio-rt5682.dtsi"
/ {
model = "Google Herobrine (rev1+)";
--
2.37.0.170.g444d1eabd0-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v4 0/3] Add dtsi for sc7280 herobrine boards that using
2022-07-21 8:38 [PATCH v4 0/3] Add dtsi for sc7280 herobrine boards that using Judy Hsiao
` (2 preceding siblings ...)
2022-07-21 8:38 ` [PATCH v4 3/3] arm64: dts: qcom: sc7280: Include sc7280-herobrine-audio-rt5682.dtsi in herobrine-r1 Judy Hsiao
@ 2022-09-14 14:28 ` Judy Hsiao
2022-10-18 3:05 ` Bjorn Andersson
4 siblings, 0 replies; 6+ messages in thread
From: Judy Hsiao @ 2022-09-14 14:28 UTC (permalink / raw)
To: Andy Gross
Cc: Bjorn Andersson, Rob Herring, Srini Kandagatla, dianders, mka,
cychiang, judyhsiao, swboyd, linux-arm-kernel, linux-arm-msm,
devicetree, linux-kernel
The dependencies of this series were just landed, please help to apply
this series as well.
Thanks!
Best regards,
Judy
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v4 0/3] Add dtsi for sc7280 herobrine boards that using
2022-07-21 8:38 [PATCH v4 0/3] Add dtsi for sc7280 herobrine boards that using Judy Hsiao
` (3 preceding siblings ...)
2022-09-14 14:28 ` [PATCH v4 0/3] Add dtsi for sc7280 herobrine boards that using Judy Hsiao
@ 2022-10-18 3:05 ` Bjorn Andersson
4 siblings, 0 replies; 6+ messages in thread
From: Bjorn Andersson @ 2022-10-18 3:05 UTC (permalink / raw)
To: agross, judyhsiao
Cc: linux-arm-kernel, swboyd, dianders, cychiang, devicetree,
linux-kernel, mka, srinivas.kandagatla, robh+dt, linux-arm-msm,
judyhsiao
On Thu, 21 Jul 2022 08:38:46 +0000, Judy Hsiao wrote:
> Put sound node and lpass_cpu node settings for boards that use rt5682
> codec in the sc7280-herobrine-audio-rt5682.dtsi as there are different
> choices of headset codec for herobrine projects. Common audio setting
> for the internal speaker is in sc7280-herobrine.dtsi.
>
> This series depends on:
> Add soundcard support for sc7280 based platforms. [1]
>
> [...]
Applied, thanks!
[1/3] arm64: dts: qcom: sc7280: herobrine: Add pinconf settings for mi2s1
commit: a1afae1ac6e71f9995fd87fea3a116859fd64fe1
[2/3] arm64: dts: qcom: sc7280: Add sc7280-herobrine-audio-rt5682.dtsi
commit: 1c5b7afeaf5b6568dc2f36d444d70ad9f6632582
[3/3] arm64: dts: qcom: sc7280: Include sc7280-herobrine-audio-rt5682.dtsi in herobrine-r1
commit: dd1651572165ffbe52e3d1aa184c04a9c11d3a03
Best regards,
--
Bjorn Andersson <andersson@kernel.org>
^ permalink raw reply [flat|nested] 6+ messages in thread