| Message ID | 20200205143003.28408-3-martin.kepplinger@puri.sm (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: dts: librem5-devkit: description updates | expand |
On Wed, Feb 05, 2020 at 03:29:53PM +0100, Martin Kepplinger wrote: > From: "Angus Ainslie (Purism)" <angus@akkea.ca> > > Add the simcomm modem and the sai6 interface that connects it, as well > as the sgtl5000 audio codec. > > Signed-off-by: Angus Ainslie (Purism) <angus@akkea.ca> When you forward a patch from others, you need to add your SoB. > --- > .../dts/freescale/imx8mq-librem5-devkit.dts | 55 +++++++++++++++++++ > 1 file changed, 55 insertions(+) > > diff --git a/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts b/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts > index 9702db69d3ed..8162576e8f3d 100644 > --- a/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts > +++ b/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts > @@ -148,6 +148,51 @@ > regulator-always-on; > }; > > + sim7100_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"; Please have a newline between properties and child node. > + simple-audio-card,cpu { > + sound-dai = <&sai2>; > + }; Also have a newline between nodes. Shawn > + simple-audio-card,codec { > + sound-dai = <&sgtl5000>; > + 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 = <&sim7100_codec>; > + frame-master; > + bitclock-master; > + }; > + }; > + > vibrator { > compatible = "gpio-vibrator"; > pinctrl-names = "default"; > @@ -749,6 +794,16 @@ > status = "okay"; > }; > > +&sai6 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_sai6>; > + assigned-clocks = <&clk IMX8MQ_CLK_SAI6>; > + assigned-clock-parents = <&clk IMX8MQ_AUDIO_PLL1_OUT>; > + assigned-clock-rates = <24576000>; > + fsl,sai-synchronous-rx; > + status = "okay"; > +}; > + > &uart1 { /* console */ > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_uart1>; > -- > 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 9702db69d3ed..8162576e8f3d 100644 --- a/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts +++ b/arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts @@ -148,6 +148,51 @@ regulator-always-on; }; + sim7100_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 = <&sgtl5000>; + 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 = <&sim7100_codec>; + frame-master; + bitclock-master; + }; + }; + vibrator { compatible = "gpio-vibrator"; pinctrl-names = "default"; @@ -749,6 +794,16 @@ status = "okay"; }; +&sai6 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sai6>; + assigned-clocks = <&clk IMX8MQ_CLK_SAI6>; + assigned-clock-parents = <&clk IMX8MQ_AUDIO_PLL1_OUT>; + assigned-clock-rates = <24576000>; + fsl,sai-synchronous-rx; + status = "okay"; +}; + &uart1 { /* console */ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1>;