Skip to content

Commit f71e33b

Browse files
authored
audio: Update patchset from v3 to v5 with mclk changes (#405)
audio: Update patchset from v3 to v5 with mclk changes
2 parents 2956f08 + f288717 commit f71e33b

2 files changed

Lines changed: 20 additions & 9 deletions

File tree

arch/arm64/boot/dts/qcom/talos-evk.dts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
compatible = "qcom,qcs615-sndcard";
4646
model = "TALOS-EVK";
4747

48-
pinctrl-0 = <&mi2s1_pins>;
48+
pinctrl-0 = <&mi2s1_pins>, <&mi2s_mclk>;
4949
pinctrl-names = "default";
5050

5151
pri-mi2s-capture-dai-link {
@@ -151,10 +151,14 @@
151151
};
152152

153153
&i2c5 {
154+
status = "okay";
155+
154156
codec_da7212: codec@1a {
155157
compatible = "dlg,da7212";
156158
reg = <0x1a>;
157159
#sound-dai-cells = <0>;
160+
clocks = <&q6prmcc LPASS_CLK_ID_MCLK_2 LPASS_CLK_ATTRIBUTE_COUPLE_NO>;
161+
clock-names = "mclk";
158162
VDDA-supply = <&vreg_v1p8_out>;
159163
VDDIO-supply = <&vreg_v1p8_out>;
160164
VDDMIC-supply = <&vreg_v3p3_out>;

arch/arm64/boot/dts/qcom/talos.dtsi

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
#include <dt-bindings/phy/phy-qcom-qmp.h>
1919
#include <dt-bindings/power/qcom-rpmpd.h>
2020
#include <dt-bindings/power/qcom,rpmhpd.h>
21+
#include <dt-bindings/soc/qcom,gpr.h>
2122
#include <dt-bindings/soc/qcom,rpmh-rsc.h>
2223
#include <dt-bindings/thermal/thermal.h>
23-
#include <dt-bindings/soc/qcom,gpr.h>
2424

2525
/ {
2626
interrupt-parent = <&intc>;
@@ -1629,13 +1629,6 @@
16291629
#interrupt-cells = <2>;
16301630
wakeup-parent = <&pdc>;
16311631

1632-
mi2s1_pins: mi2s1-state {
1633-
pins = "gpio108", "gpio109", "gpio110", "gpio111";
1634-
function = "mi2s_1";
1635-
drive-strength = <8>;
1636-
bias-disable;
1637-
};
1638-
16391632
cam0_default: cam0-default-state {
16401633
pins = "gpio28";
16411634
function = "cam_mclk";
@@ -1680,6 +1673,20 @@
16801673
bias-pull-up;
16811674
};
16821675

1676+
mi2s1_pins: mi2s1-state {
1677+
pins = "gpio108", "gpio109", "gpio110", "gpio111";
1678+
function = "mi2s_1";
1679+
drive-strength = <8>;
1680+
bias-disable;
1681+
};
1682+
1683+
mi2s_mclk: mi2s-mclk-state {
1684+
pins = "gpio122";
1685+
function = "mclk2";
1686+
drive-strength = <8>;
1687+
bias-disable;
1688+
};
1689+
16831690
qspi_cs0: qspi-cs0-state {
16841691
pins = "gpio44";
16851692
function = "qspi";

0 commit comments

Comments
 (0)