| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20230222190246.ihknh2tgjb2w3qmf@pengutronix.de>
Date: Wed, 22 Feb 2023 20:02:46 +0100
From: Marco Felsch <m.felsch@...gutronix.de>
To: Marek Vasut <marex@...x.de>
Cc: Luca Ceresoli <luca.ceresoli@...tlin.com>,
Rob Herring <robh+dt@...nel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@...aro.org>,
Shawn Guo <shawnguo@...nel.org>,
Sascha Hauer <s.hauer@...gutronix.de>,
Pengutronix Kernel Team <kernel@...gutronix.de>,
Fabio Estevam <festevam@...il.com>,
NXP Linux Team <linux-imx@....com>,
Martyn Welch <martyn.welch@...labora.com>,
devicetree@...r.kernel.org, Abel Vesa <abel.vesa@....com>,
Stephen Boyd <sboyd@...nel.org>,
Michael Turquette <mturquette@...libre.com>,
linux-kernel@...r.kernel.org,
Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org>,
Laurent Pinchart <laurent.pinchart@...asonboard.com>,
Thomas Petazzoni <thomas.petazzoni@...tlin.com>,
Lucas Stach <l.stach@...gutronix.de>,
linux-arm-kernel@...ts.infradead.org, Jacky Bai <ping.bai@....com>
Subject: Re: [PATCH] arm64: dts: imx8mp-msc-sm2s: Add sound card
On 23-02-22, Marek Vasut wrote:
> On 2/22/23 18:59, Marco Felsch wrote:
> > Hi Luca,
> >
> > On 23-02-22, Luca Ceresoli wrote:
> > > The MSC SM2-MB-EP1 carrier board for the SM2S-IMX8PLUS SMARC module has an
> > > NXPP SGTL5000 audio codec connected to I2S-0 (sai2).
> > >
> > > This requires to:
> > >
> > > * add the power supplies (always on)
> > > * enable sai2 with pinmuxes
> > > * reparent the CLKOUT1 clock that feeds the codec SYS_MCLK to
> > > IMX8MP_CLK_24M in order it to generate an accurate 24 MHz rate
> > >
> > > Signed-off-by: Luca Ceresoli <luca.ceresoli@...tlin.com>
> > > ---
> > > .../dts/freescale/imx8mp-msc-sm2s-ep1.dts | 60 +++++++++++++++++++
> > > 1 file changed, 60 insertions(+)
> > >
> > > diff --git a/arch/arm64/boot/dts/freescale/imx8mp-msc-sm2s-ep1.dts b/arch/arm64/boot/dts/freescale/imx8mp-msc-sm2s-ep1.dts
> > > index 470ff8e31e32..894d9809f76d 100644
> > > --- a/arch/arm64/boot/dts/freescale/imx8mp-msc-sm2s-ep1.dts
> > > +++ b/arch/arm64/boot/dts/freescale/imx8mp-msc-sm2s-ep1.dts
> > > @@ -14,6 +14,57 @@ / {
> > > compatible = "avnet,sm2s-imx8mp-14N0600E-ep1",
> > > "avnet,sm2s-imx8mp-14N0600E", "avnet,sm2s-imx8mp",
> > > "fsl,imx8mp";
> >
> > ...
> >
> > > +/* I2S-0 = sai2 */
> > > +&sai2 {
> > > + pinctrl-names = "default";
> > > + pinctrl-0 = <&pinctrl_sai2>;
> > > +
> > > + assigned-clocks = <&clk IMX8MP_CLK_SAI2>;
> > > + assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL1_OUT>;
> > > + assigned-clock-rates = <12288000>;
> > > +
> > > + fsl,sai-mclk-direction-output;
> > > + status = "okay";
> > > };
> >
> > Do you have some downstream patches for the sai interfaces? AFAIR Marek
> > worked on this but the patches are not mainlien yet.
>
> I guess it is time to resubmit these.
I would have two patches for your series first is necessary the other is
changing the sound-card to make use of the simple-audio-card.
Regards,
Marco
8<-----------------------------------------------------------------------------------------
[1]
diff --git a/drivers/clk/imx/clk-imx8mp-audiomix.c b/drivers/clk/imx/clk-imx8mp-audiomix.c
index 2d5d8255c7fa2..32eb29ae8f71f 100644
--- a/drivers/clk/imx/clk-imx8mp-audiomix.c
+++ b/drivers/clk/imx/clk-imx8mp-audiomix.c
@@ -18,7 +18,7 @@
#define CLKEN0 0x000
#define CLKEN1 0x004
-#define SAI_MCLK_SEL(n) (300 + 4 * (n)) /* n in 0..5 */
+#define SAI_MCLK_SEL(n) (0x300 + 4 * (n)) /* n in 0..5 */
#define PDM_SEL 0x318
#define SAI_PLL_GNRL_CTL 0x400
8<-----------------------------------------------------------------------------------------
[2]
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-evk.dts b/arch/arm64/boot/dts/freescale/imx8mp-evk.dts
index 8547391d9cbbf..3b38ec7bb47be 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp-evk.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-evk.dts
@@ -47,7 +47,6 @@ reg_audio_pwr: regulator-audio-pwr {
regulator-max-microvolt = <3300000>;
gpio = <&gpio4 29 GPIO_ACTIVE_HIGH>;
enable-active-high;
- regulator-always-on;
};
reg_can1_stby: regulator-can1-stby {
@@ -94,21 +93,34 @@ reg_usdhc2_vmmc: regulator-usdhc2 {
enable-active-high;
};
- sound-wm8960 {
- compatible = "fsl,imx-audio-wm8960";
- model = "wm8960-audio";
- audio-cpu = <&sai3>;
- audio-codec = <&codec>;
- audio-routing =
+ sound-wm8524 {
+ compatible = "simple-audio-card";
+ simple-audio-card,name = "wm8960-audio";
+ simple-audio-card,format = "i2s";
+ simple-audio-card,frame-master = <&cpudai>;
+ simple-audio-card,bitclock-master = <&cpudai>;
+ simple-audio-card,widgets =
+ "Headphone", "Headphone Jack",
+ "Speaker", "External Speaker",
+ "Microphone", "Mic Jack";
+ simple-audio-card,routing =
"Headphone Jack", "HP_L",
"Headphone Jack", "HP_R",
- "Ext Spk", "SPK_LP",
- "Ext Spk", "SPK_LN",
- "Ext Spk", "SPK_RP",
- "Ext Spk", "SPK_RN",
+ "External Speaker", "SPK_LP",
+ "External Speaker", "SPK_LN",
+ "External Speaker", "SPK_RP",
+ "External Speaker", "SPK_RN",
"LINPUT1", "Mic Jack",
"LINPUT3", "Mic Jack",
"Mic Jack", "MICB";
+
+ cpudai: simple-audio-card,cpu {
+ sound-dai = <&sai3>;
+ };
+
+ simple-audio-card,codec {
+ sound-dai = <&wm8960>;
+ };
};
};
@@ -364,7 +376,7 @@ &i2c3 {
pinctrl-0 = <&pinctrl_i2c3>;
status = "okay";
- codec: wm8960@1a {
+ wm8960: codec@1a {
compatible = "wlf,wm8960";
reg = <0x1a>;
clocks = <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI3_MCLK1>;
@@ -373,6 +385,7 @@ codec: wm8960@1a {
wlf,hp-cfg = <3 2 3>;
wlf,gpio-cfg = <1 3>;
SPKVDD1-supply = <®_audio_pwr>;
+ #sound-dai-cells = <0>;
};
pca6416: gpio@20 {
8<-----------------------------------------------------------------------------------------
Powered by blists - more mailing lists