| Message ID | 20210314061054.19451-2-srivasam@codeaurora.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 29bd62ee951b6ee8c0f20f924b80523cf4f179c0 |
| Headers | show |
| Series | Qualcomm's lpass device tree changes for I2s dai | expand |
Hi, On Sat, Mar 13, 2021 at 10:11 PM Srinivasa Rao Mandadapu <srivasam@codeaurora.org> wrote: > > From: Ajit Pandey <ajitp@codeaurora.org> > > Add dai link for supporting lpass I2S driver, which is used > for audio capture and playback. > Add lpass-cpu node with pin controls and i2s primary > and secondary dai-links You missed Stephen's comments on your commit message [1] [1] https://lore.kernel.org/r/161566899554.1478170.1265435102634351195@swboyd.mtv.corp.google.com/ > Signed-off-by: Ajit Pandey <ajitp@codeaurora.org> > Signed-off-by: V Sujith Kumar Reddy <vsujithk@codeaurora.org> > Signed-off-by: Srinivasa Rao Mandadapu <srivasam@codeaurora.org> > --- > arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 58 ++++++++++++++++++++ > 1 file changed, 58 insertions(+) The commit message nits aren't terribly important and Bjorn can presumably just fix them when applying if he cares. IMO you don't need to re-spin. Reviewed-by: Douglas Anderson <dianders@chromium.org> With these two patches plus commit 9922f50f7178 ("ASoC: qcom: lpass-cpu: Fix lpass dai ids parse") in the sound tree I get audio on sc7180-trogdor-lazor! Thus: Tested-by: Douglas Anderson <dianders@chromium.org>
Quoting Srinivasa Rao Mandadapu (2021-03-13 22:10:53) > From: Ajit Pandey <ajitp@codeaurora.org> > > Add dai link for supporting lpass I2S driver, which is used > for audio capture and playback. > Add lpass-cpu node with pin controls and i2s primary > and secondary dai-links > > Signed-off-by: Ajit Pandey <ajitp@codeaurora.org> > Signed-off-by: V Sujith Kumar Reddy <vsujithk@codeaurora.org> > Signed-off-by: Srinivasa Rao Mandadapu <srivasam@codeaurora.org> > --- Reviewed-by: Stephen Boyd <swboyd@chromium.org>
On 14/03/2021 06:10, Srinivasa Rao Mandadapu wrote: > From: Ajit Pandey <ajitp@codeaurora.org> > > Add dai link for supporting lpass I2S driver, which is used > for audio capture and playback. > Add lpass-cpu node with pin controls and i2s primary > and secondary dai-links > > Signed-off-by: Ajit Pandey <ajitp@codeaurora.org> > Signed-off-by: V Sujith Kumar Reddy <vsujithk@codeaurora.org> > Signed-off-by: Srinivasa Rao Mandadapu <srivasam@codeaurora.org> > --- LGTM, Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 58 ++++++++++++++++++++ > 1 file changed, 58 insertions(+) > > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi > index 436582279dad..fd345972a361 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi > @@ -9,6 +9,7 @@ > #include <dt-bindings/input/gpio-keys.h> > #include <dt-bindings/input/input.h> > #include <dt-bindings/regulator/qcom,rpmh-regulator.h> > +#include <dt-bindings/sound/sc7180-lpass.h> > > /* PMICs depend on spmi_bus label and so must come after SoC */ > #include "pm6150.dtsi" > @@ -283,6 +284,42 @@ keyboard_backlight: keyboard-backlight { > max-brightness = <1023>; > }; > }; > + > + sound: sound { > + compatible = "google,sc7180-trogdor"; > + model = "sc7180-rt5682-max98357a-1mic"; > + > + audio-routing = > + "Headphone Jack", "HPOL", > + "Headphone Jack", "HPOR"; > + > + #address-cells = <1>; > + #size-cells = <0>; > + > + dai-link@0 { > + link-name = "MultiMedia0"; > + reg = <MI2S_PRIMARY>; > + cpu { > + sound-dai = <&lpass_cpu MI2S_PRIMARY>; > + }; > + > + sound_multimedia0_codec: codec { > + sound-dai = <&alc5682 0 /* aif1 */>; > + }; > + }; > + > + dai-link@1 { > + link-name = "MultiMedia1"; > + reg = <MI2S_SECONDARY>; > + cpu { > + sound-dai = <&lpass_cpu MI2S_SECONDARY>; > + }; > + > + sound_multimedia1_codec: codec { > + sound-dai = <&max98357a>; > + }; > + }; > + }; > }; > > &qfprom { > @@ -720,6 +757,27 @@ &ipa { > modem-init; > }; > > +&lpass_cpu { > + status = "okay"; > + > + pinctrl-names = "default"; > + pinctrl-0 = <&sec_mi2s_active>, <&pri_mi2s_active>, <&pri_mi2s_mclk_active>; > + > + #address-cells = <1>; > + #size-cells = <0>; > + > + mi2s@0 { > + reg = <MI2S_PRIMARY>; > + qcom,playback-sd-lines = <1>; > + qcom,capture-sd-lines = <0>; > + }; > + > + mi2s@1 { > + reg = <MI2S_SECONDARY>; > + qcom,playback-sd-lines = <0>; > + }; > +}; > + > &mdp { > status = "okay"; > }; >
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi index 436582279dad..fd345972a361 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -9,6 +9,7 @@ #include <dt-bindings/input/gpio-keys.h> #include <dt-bindings/input/input.h> #include <dt-bindings/regulator/qcom,rpmh-regulator.h> +#include <dt-bindings/sound/sc7180-lpass.h> /* PMICs depend on spmi_bus label and so must come after SoC */ #include "pm6150.dtsi" @@ -283,6 +284,42 @@ keyboard_backlight: keyboard-backlight { max-brightness = <1023>; }; }; + + sound: sound { + compatible = "google,sc7180-trogdor"; + model = "sc7180-rt5682-max98357a-1mic"; + + audio-routing = + "Headphone Jack", "HPOL", + "Headphone Jack", "HPOR"; + + #address-cells = <1>; + #size-cells = <0>; + + dai-link@0 { + link-name = "MultiMedia0"; + reg = <MI2S_PRIMARY>; + cpu { + sound-dai = <&lpass_cpu MI2S_PRIMARY>; + }; + + sound_multimedia0_codec: codec { + sound-dai = <&alc5682 0 /* aif1 */>; + }; + }; + + dai-link@1 { + link-name = "MultiMedia1"; + reg = <MI2S_SECONDARY>; + cpu { + sound-dai = <&lpass_cpu MI2S_SECONDARY>; + }; + + sound_multimedia1_codec: codec { + sound-dai = <&max98357a>; + }; + }; + }; }; &qfprom { @@ -720,6 +757,27 @@ &ipa { modem-init; }; +&lpass_cpu { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&sec_mi2s_active>, <&pri_mi2s_active>, <&pri_mi2s_mclk_active>; + + #address-cells = <1>; + #size-cells = <0>; + + mi2s@0 { + reg = <MI2S_PRIMARY>; + qcom,playback-sd-lines = <1>; + qcom,capture-sd-lines = <0>; + }; + + mi2s@1 { + reg = <MI2S_SECONDARY>; + qcom,playback-sd-lines = <0>; + }; +}; + &mdp { status = "okay"; };