Message ID | 20200218084942.4884-4-martin.kepplinger@puri.sm (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | arm64: dts: librem5-devkit: description updates | expand |
On Tue, Feb 18, 2020 at 09:49:36AM +0100, Martin Kepplinger wrote: > From: "Angus Ainslie (Purism)" <angus@akkea.ca> > > Add the simcomm modem and the sgtl5000 audio codec. > > Signed-off-by: Angus Ainslie (Purism) <angus@akkea.ca> > Signed-off-by: Martin Kepplinger <martin.kepplinger@puri.sm> > --- > .../dts/freescale/imx8mq-librem5-devkit.dts | 60 +++++++++++++++++++ > 1 file changed, 60 insertions(+) > > diff --git a/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts b/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts > index 25135b08d4f8..ec12477d925d 100644 > --- a/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts > +++ b/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts > @@ -148,6 +148,53 @@ > regulator-always-on; > }; > > + wwan_codec: sound-wwan-codec { > + compatible = "option,gtm601"; > + #sound-dai-cells = <0>; > + }; > + > + sound { > + compatible = "simple-audio-card"; > + simple-audio-card,name = "sgtl5000"; > + simple-audio-card,format = "i2s"; > + simple-audio-card,widgets = > + "Microphone", "Microphone Jack", > + "Headphone", "Headphone Jack", > + "Speaker", "Speaker Ext", > + "Line", "Line In Jack"; > + simple-audio-card,routing = > + "MIC_IN", "Microphone Jack", > + "Microphone Jack", "Mic Bias", > + "LINE_IN", "Line In Jack", > + "Headphone Jack", "HP_OUT", > + "Speaker Ext", "LINE_OUT"; > + > + simple-audio-card,cpu { > + sound-dai = <&sai2>; > + }; > + > + simple-audio-card,codec { > + sound-dai = <&audio_codec>; > + clocks = <&clk IMX8MQ_CLK_SAI2_ROOT>; > + frame-master; > + bitclock-master; > + }; > + }; > + > + sound-wwan { > + compatible = "simple-audio-card"; > + simple-audio-card,name = "SIMCom SIM7100"; > + simple-audio-card,format = "dsp_a"; newline > + simple-audio-card,cpu { > + sound-dai = <&sai6>; > + }; newline > + telephony_link_master: simple-audio-card,codec { > + sound-dai = <&wwan_codec>; > + frame-master; > + bitclock-master; > + }; > + }; > + > vibrator { > compatible = "gpio-vibrator"; > pinctrl-names = "default"; > @@ -426,6 +473,19 @@ > vddio-supply = <®_3v3_p>; > }; > > + audio_codec: sgtl5000@a { Node name needs to be generic, not the label name. So it should be: sgtl5000: audio-codec@a { Shawn > + compatible = "fsl,sgtl5000"; > + clocks = <&clk IMX8MQ_CLK_SAI2_ROOT>; > + assigned-clocks = <&clk IMX8MQ_CLK_SAI2>; > + assigned-clock-parents = <&clk IMX8MQ_AUDIO_PLL1_OUT>; > + assigned-clock-rates = <24576000>; > + #sound-dai-cells = <0>; > + reg = <0x0a>; > + VDDD-supply = <®_1v8_p>; > + VDDIO-supply = <®_3v3_p>; > + VDDA-supply = <®_3v3_p>; > + }; > + > touchscreen@5d { > compatible = "goodix,gt5688"; > reg = <0x5d>; > -- > 2.20.1 >
diff --git a/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts b/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts index 25135b08d4f8..ec12477d925d 100644 --- a/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts +++ b/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts @@ -148,6 +148,53 @@ regulator-always-on; }; + wwan_codec: sound-wwan-codec { + compatible = "option,gtm601"; + #sound-dai-cells = <0>; + }; + + sound { + compatible = "simple-audio-card"; + simple-audio-card,name = "sgtl5000"; + simple-audio-card,format = "i2s"; + simple-audio-card,widgets = + "Microphone", "Microphone Jack", + "Headphone", "Headphone Jack", + "Speaker", "Speaker Ext", + "Line", "Line In Jack"; + simple-audio-card,routing = + "MIC_IN", "Microphone Jack", + "Microphone Jack", "Mic Bias", + "LINE_IN", "Line In Jack", + "Headphone Jack", "HP_OUT", + "Speaker Ext", "LINE_OUT"; + + simple-audio-card,cpu { + sound-dai = <&sai2>; + }; + + simple-audio-card,codec { + sound-dai = <&audio_codec>; + clocks = <&clk IMX8MQ_CLK_SAI2_ROOT>; + frame-master; + bitclock-master; + }; + }; + + sound-wwan { + compatible = "simple-audio-card"; + simple-audio-card,name = "SIMCom SIM7100"; + simple-audio-card,format = "dsp_a"; + simple-audio-card,cpu { + sound-dai = <&sai6>; + }; + telephony_link_master: simple-audio-card,codec { + sound-dai = <&wwan_codec>; + frame-master; + bitclock-master; + }; + }; + vibrator { compatible = "gpio-vibrator"; pinctrl-names = "default"; @@ -426,6 +473,19 @@ vddio-supply = <®_3v3_p>; }; + audio_codec: sgtl5000@a { + compatible = "fsl,sgtl5000"; + clocks = <&clk IMX8MQ_CLK_SAI2_ROOT>; + assigned-clocks = <&clk IMX8MQ_CLK_SAI2>; + assigned-clock-parents = <&clk IMX8MQ_AUDIO_PLL1_OUT>; + assigned-clock-rates = <24576000>; + #sound-dai-cells = <0>; + reg = <0x0a>; + VDDD-supply = <®_1v8_p>; + VDDIO-supply = <®_3v3_p>; + VDDA-supply = <®_3v3_p>; + }; + touchscreen@5d { compatible = "goodix,gt5688"; reg = <0x5d>;