June 2022 - Alsa-devel - mailman.alsa-project.org

[PATCH v5 0/3] ASoC: rockchip: i2s: switch BCLK to GPIO
by Judy Hsiao 23 Jun '22

23 Jun '22

The patches series is to fix the unexpected large DC output voltage of Max98357a that burns the speakers on the rockchip platform when BCLK and SD_MODE are ON but LRCLK is OFF. Changes Since V5: -- Check i2s->pinctrl is valid before using pinctrl_lookup_state. Changes Since V4: -- Fix indentation in the driver. (Align parameters with the parenthesis placement.) -- Fix incorrect return type of rockchip_snd_rxctrl. Changes Since V3: -- Fix indentation in the documentation. -- Put pinctrl-1 right after pinctrl-0 in dtsi. -- Fix indentation in the driver. -- Remove unnecessary dev_dbg() in the driver. Changes Since V2: -- Add documents of i2s pinctrl-names. -- Fix dtsi syntax error. -- Include the dtsi change and the driver change in the same series. -- Ensure that driver gets both bclk_on and bclk_off states before using them. Judy Hsiao (3): ASoC: rockchip: i2s: switch BCLK to GPIO arm64: dts: rk3399: i2s: switch BCLK to GPIO ASoC: dt-bindings: rockchip: Document pinctrl-names for i2s .../bindings/sound/rockchip-i2s.yaml | 7 + .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 10 + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 25 ++- sound/soc/rockchip/rockchip_i2s.c | 171 +++++++++++++----- 4 files changed, 165 insertions(+), 48 deletions(-) -- 2.37.0.rc0.104.g0611611a94-goog

3 5

[PATCH 00/96] Refactor non_legacy_dai_naming flag
by Charles Keepax 23 Jun '22

23 Jun '22

Historically, the legacy DAI naming scheme was applied to platform drivers and the newer scheme to CODEC drivers. During componentisation the core lost the knowledge of if a driver was a CODEC or platform, they were all now components. To continue to support the legacy naming on older platform drivers a flag was added to the snd_soc_component_driver structure, non_legacy_dai_naming, to indicate to use the new scheme and this was applied to all CODECs as part of the migration. However, a slight issue appears to be developing with respect to this flag being opt in for the non-legacy scheme, which presumably we want to be the primary scheme used. Many codec drivers appear to forget to include this flag: grep -l -r "snd_soc_component_driver" sound/soc/codecs/*.c | xargs grep -L "non_legacy_dai_naming" | wc 48 48 556 Whilst in many cases the configuration of the DAIs themselves will cause the core to apply the new scheme anyway, it would seem more sensible to change the flag to legacy_dai_naming making the new scheme opt out. This patch series migrates across to such a scheme. Thanks, Charles Charles Keepax (96): ASoC: soc-component: Add legacy_dai_naming flag soundwire: intel: Migrate to new style legacy DAI naming flag drm/vc4: Migrate to new style legacy DAI naming flag ASoC: img: Migrate to new style legacy DAI naming flag ASoC: spear: Migrate to new style legacy DAI naming flag ASoC: jz4740-i2c: Migrate to new style legacy DAI naming flag ASoC: ep93xx: Migrate to new style legacy DAI naming flag ASoC: stm32: Migrate to new style legacy DAI naming flag ASoC: bcm: Migrate to new style legacy DAI naming flag ASoC: sh: Migrate to new style legacy DAI naming flag ASoC: tegra: Migrate to new style legacy DAI naming flag ASoC: hisilicon: Migrate to new style legacy DAI naming flag ASoC: xilinx: Migrate to new style legacy DAI naming flag ASoC: sunxi: Migrate to new style legacy DAI naming flag ASoC: Intel: Migrate to new style legacy DAI naming flag ASoC: meson: Migrate to new style legacy DAI naming flag ASoC: sti-uniperf: Migrate to new style legacy DAI naming flag ASoC: amd: Migrate to new style legacy DAI naming flag ASoC: atmel: Migrate to new style legacy DAI naming flag ASoC: fsl: Migrate to new style legacy DAI naming flag ASoC: xtensa: Migrate to new style legacy DAI naming flag ASoC: adi: Migrate to new style legacy DAI naming flag ASoC: dwc: Migrate to new style legacy DAI naming flag ASoC: qcom: Migrate to new style legacy DAI naming flag ASoC: test-component: Migrate to new style legacy DAI naming flag ASoC: rockchip: Migrate to new style legacy DAI naming flag ASoC: au1x: Migrate to new style legacy DAI naming flag ASoC: pxa: Migrate to new style legacy DAI naming flag ASoC: sof: Migrate to new style legacy DAI naming flag ASoC: ux500: Migrate to new style legacy DAI naming flag ASoC: ti: Migrate to new style legacy DAI naming flag ASoC: mxs-saif: Migrate to new style legacy DAI naming flag ASoC: samsung: Migrate to new style legacy DAI naming flag ASoC: core: Switch core to new DAI naming flag media: TDA1997x: Remove now redundant non_legacy_dai_naming flag ASoC: fsl: Remove now redundant non_legacy_dai_naming flag ASoC: meson: Remove now redundant non_legacy_dai_naming flag ASoC: pistachio: Remove now redundant non_legacy_dai_naming flag ASoC: samsung: Remove now redundant non_legacy_dai_naming flag ASoC: soc-utils: Remove now redundant non_legacy_dai_naming flag ASoC: sunxi: Remove now redundant non_legacy_dai_naming flag ASoC: tegra: Remove now redundant non_legacy_dai_naming flag ASoC: test-component: Remove now redundant non_legacy_dai_naming flag ASoC: topology: KUnit: Remove now redundant non_legacy_dai_naming flag ASoC: uniphier: Remove now redundant non_legacy_dai_naming flag ASoC: ad*: Remove now redundant non_legacy_dai_naming flag ASoC: ak*: Remove now redundant non_legacy_dai_naming flag ASoC: alc*: Remove now redundant non_legacy_dai_naming flag ASoC: cs*: Remove now redundant non_legacy_dai_naming flag ASoC: da*: Remove now redundant non_legacy_dai_naming flag ASoC: es*: Remove now redundant non_legacy_dai_naming flag ASoC: max*: Remove now redundant non_legacy_dai_naming flag ASoC: msm*: Remove now redundant non_legacy_dai_naming flag ASoC: nau*: Remove now redundant non_legacy_dai_naming flag ASoC: pcm*: Remove now redundant non_legacy_dai_naming flag ASoC: rt*: Remove now redundant non_legacy_dai_naming flag ASoC: spdif: Remove now redundant non_legacy_dai_naming flag ASoC: ssm*: Remove now redundant non_legacy_dai_naming flag ASoC: sta*: Remove now redundant non_legacy_dai_naming flag ASoC: tas*: Remove now redundant non_legacy_dai_naming flag ASoC: tfa*: Remove now redundant non_legacy_dai_naming flag ASoC: tlv320*: Remove now redundant non_legacy_dai_naming flag ASoC: twl*: Remove now redundant non_legacy_dai_naming flag ASoC: uda*: Remove now redundant non_legacy_dai_naming flag ASoC: wm*: Remove now redundant non_legacy_dai_naming flag ASoC: 88pm860x: Remove now redundant non_legacy_dai_naming flag ASoC: ab8500: Remove now redundant non_legacy_dai_naming flag ASoC: ac97: Remove now redundant non_legacy_dai_naming flag ASoC: ads117x: Remove now redundant non_legacy_dai_naming flag ASoC: bd28623: Remove now redundant non_legacy_dai_naming flag ASoC: bt-sco: Remove now redundant non_legacy_dai_naming flag ASoC: cpcap: Remove now redundant non_legacy_dai_naming flag ASoC: cq93vc: Remove now redundant non_legacy_dai_naming flag ASoC: cx20442: Remove now redundant non_legacy_dai_naming flag ASoC: dmic: Remove now redundant non_legacy_dai_naming flag ASoC: gtm601: Remove now redundant non_legacy_dai_naming flag ASoC: hdac_hdmi: Remove now redundant non_legacy_dai_naming flag ASoC: hdmi-codec: Remove now redundant non_legacy_dai_naming flag ASoC: ics43432: Remove now redundant non_legacy_dai_naming flag ASoC: inno_rk3036: Remove now redundant non_legacy_dai_naming flag ASoC: Intel: avs: Remove now redundant non_legacy_dai_naming flag ASoC: isabelle: Remove now redundant non_legacy_dai_naming flag ASoC: jz4740: Remove now redundant non_legacy_dai_naming flag ASoC: lm49453: Remove now redundant non_legacy_dai_naming flag ASoC: lochnagar: Remove now redundant non_legacy_dai_naming flag ASoC: mc13783: Remove now redundant non_legacy_dai_naming flag ASoC: ml26124: Remove now redundant non_legacy_dai_naming flag ASoC: rk817: Remove now redundant non_legacy_dai_naming flag ASoC: sgtl5000: Remove now redundant non_legacy_dai_naming flag ASoC: si476x: Remove now redundant non_legacy_dai_naming flag ASoC: stac9766: Remove now redundant non_legacy_dai_naming flag ASoC: sti-sas: Remove now redundant non_legacy_dai_naming flag ASoC: tscs42xx: Remove now redundant non_legacy_dai_naming flag ASoC: wl1273: Remove now redundant non_legacy_dai_naming flag ASoC: zl38060: Remove now redundant non_legacy_dai_naming flag ASoC: soc-component: Remove non_legacy_dai_naming flag drivers/gpu/drm/vc4/vc4_hdmi.c | 1 + drivers/media/i2c/tda1997x.c | 1 - drivers/soundwire/intel.c | 5 +++-- include/sound/soc-component.h | 2 +- sound/soc/adi/axi-i2s.c | 1 + sound/soc/adi/axi-spdif.c | 1 + sound/soc/amd/acp/acp-platform.c | 15 ++++++++------- sound/soc/amd/raven/acp3x-i2s.c | 3 ++- sound/soc/amd/renoir/acp3x-pdm-dma.c | 13 +++++++------ sound/soc/amd/vangogh/acp5x-i2s.c | 1 + sound/soc/amd/yc/acp6x-pdm-dma.c | 13 +++++++------ sound/soc/atmel/atmel-classd.c | 1 + sound/soc/atmel/atmel-i2s.c | 3 ++- sound/soc/atmel/atmel-pdmic.c | 1 + sound/soc/atmel/atmel_ssc_dai.c | 7 ++++--- sound/soc/atmel/mchp-i2s-mcc.c | 3 ++- sound/soc/atmel/mchp-pdmc.c | 1 + sound/soc/atmel/mchp-spdifrx.c | 3 ++- sound/soc/atmel/mchp-spdiftx.c | 3 ++- sound/soc/au1x/ac97c.c | 3 ++- sound/soc/au1x/i2sc.c | 3 ++- sound/soc/au1x/psc-ac97.c | 3 ++- sound/soc/au1x/psc-i2s.c | 3 ++- sound/soc/bcm/bcm2835-i2s.c | 3 ++- sound/soc/bcm/bcm63xx-i2s-whistler.c | 1 + sound/soc/bcm/cygnus-ssp.c | 7 ++++--- sound/soc/cirrus/ep93xx-ac97.c | 3 ++- sound/soc/cirrus/ep93xx-i2s.c | 7 ++++--- sound/soc/codecs/88pm860x-codec.c | 1 - sound/soc/codecs/ab8500-codec.c | 1 - sound/soc/codecs/ac97.c | 1 - sound/soc/codecs/ad1836.c | 1 - sound/soc/codecs/ad193x.c | 1 - sound/soc/codecs/ad1980.c | 1 - sound/soc/codecs/ad73311.c | 1 - sound/soc/codecs/adau1373.c | 1 - sound/soc/codecs/adau1701.c | 1 - sound/soc/codecs/adau1761.c | 1 - sound/soc/codecs/adau1781.c | 1 - sound/soc/codecs/adau1977.c | 1 - sound/soc/codecs/adau7002.c | 1 - sound/soc/codecs/adau7118.c | 1 - sound/soc/codecs/adav80x.c | 1 - sound/soc/codecs/ads117x.c | 1 - sound/soc/codecs/ak4104.c | 1 - sound/soc/codecs/ak4118.c | 1 - sound/soc/codecs/ak4375.c | 1 - sound/soc/codecs/ak4458.c | 2 -- sound/soc/codecs/ak4535.c | 1 - sound/soc/codecs/ak4554.c | 1 - sound/soc/codecs/ak4613.c | 1 - sound/soc/codecs/ak4641.c | 1 - sound/soc/codecs/ak4642.c | 1 - sound/soc/codecs/ak4671.c | 1 - sound/soc/codecs/ak5386.c | 1 - sound/soc/codecs/ak5558.c | 2 -- sound/soc/codecs/alc5623.c | 1 - sound/soc/codecs/alc5632.c | 1 - sound/soc/codecs/bd28623.c | 1 - sound/soc/codecs/bt-sco.c | 1 - sound/soc/codecs/cpcap.c | 1 - sound/soc/codecs/cq93vc.c | 1 - sound/soc/codecs/cs35l32.c | 1 - sound/soc/codecs/cs35l33.c | 1 - sound/soc/codecs/cs35l34.c | 1 - sound/soc/codecs/cs35l35.c | 1 - sound/soc/codecs/cs35l36.c | 1 - sound/soc/codecs/cs4234.c | 1 - sound/soc/codecs/cs4265.c | 1 - sound/soc/codecs/cs4270.c | 1 - sound/soc/codecs/cs4271.c | 1 - sound/soc/codecs/cs42l42.c | 1 - sound/soc/codecs/cs42l51.c | 1 - sound/soc/codecs/cs42l52.c | 1 - sound/soc/codecs/cs42l56.c | 1 - sound/soc/codecs/cs42l73.c | 1 - sound/soc/codecs/cs42xx8.c | 1 - sound/soc/codecs/cs43130.c | 1 - sound/soc/codecs/cs4341.c | 1 - sound/soc/codecs/cs4349.c | 1 - sound/soc/codecs/cs47l15.c | 1 - sound/soc/codecs/cs47l24.c | 1 - sound/soc/codecs/cs47l35.c | 1 - sound/soc/codecs/cs47l85.c | 1 - sound/soc/codecs/cs47l90.c | 1 - sound/soc/codecs/cs47l92.c | 1 - sound/soc/codecs/cs53l30.c | 1 - sound/soc/codecs/cx20442.c | 1 - sound/soc/codecs/da7210.c | 1 - sound/soc/codecs/da7213.c | 1 - sound/soc/codecs/da7218.c | 1 - sound/soc/codecs/da7219.c | 1 - sound/soc/codecs/da732x.c | 1 - sound/soc/codecs/da9055.c | 1 - sound/soc/codecs/dmic.c | 1 - sound/soc/codecs/es7134.c | 1 - sound/soc/codecs/es7241.c | 1 - sound/soc/codecs/es8316.c | 1 - sound/soc/codecs/es8328.c | 1 - sound/soc/codecs/gtm601.c | 1 - sound/soc/codecs/hdac_hdmi.c | 1 - sound/soc/codecs/hdmi-codec.c | 1 - sound/soc/codecs/ics43432.c | 1 - sound/soc/codecs/inno_rk3036.c | 1 - sound/soc/codecs/isabelle.c | 1 - sound/soc/codecs/jz4740.c | 2 -- sound/soc/codecs/lm49453.c | 1 - sound/soc/codecs/lochnagar-sc.c | 1 - sound/soc/codecs/max98088.c | 1 - sound/soc/codecs/max98090.c | 1 - sound/soc/codecs/max98095.c | 1 - sound/soc/codecs/max98357a.c | 1 - sound/soc/codecs/max98371.c | 1 - sound/soc/codecs/max98373.c | 2 -- sound/soc/codecs/max98390.c | 1 - sound/soc/codecs/max98396.c | 2 -- sound/soc/codecs/max9850.c | 1 - sound/soc/codecs/max98520.c | 1 - sound/soc/codecs/max9860.c | 1 - sound/soc/codecs/max9867.c | 1 - sound/soc/codecs/max98925.c | 1 - sound/soc/codecs/max98926.c | 1 - sound/soc/codecs/max98927.c | 1 - sound/soc/codecs/mc13783.c | 1 - sound/soc/codecs/ml26124.c | 1 - sound/soc/codecs/msm8916-wcd-analog.c | 1 - sound/soc/codecs/msm8916-wcd-digital.c | 1 - sound/soc/codecs/nau8315.c | 1 - sound/soc/codecs/nau8540.c | 1 - sound/soc/codecs/nau8810.c | 1 - sound/soc/codecs/nau8821.c | 1 - sound/soc/codecs/nau8822.c | 1 - sound/soc/codecs/nau8824.c | 1 - sound/soc/codecs/nau8825.c | 1 - sound/soc/codecs/pcm1681.c | 1 - sound/soc/codecs/pcm1789.c | 1 - sound/soc/codecs/pcm179x.c | 1 - sound/soc/codecs/pcm186x.c | 2 -- sound/soc/codecs/pcm3008.c | 1 - sound/soc/codecs/pcm3168a.c | 1 - sound/soc/codecs/pcm5102a.c | 1 - sound/soc/codecs/pcm512x.c | 1 - sound/soc/codecs/rk817_codec.c | 1 - sound/soc/codecs/rt1011.c | 1 - sound/soc/codecs/rt1015.c | 1 - sound/soc/codecs/rt1015p.c | 1 - sound/soc/codecs/rt1016.c | 1 - sound/soc/codecs/rt1019.c | 1 - sound/soc/codecs/rt1305.c | 1 - sound/soc/codecs/rt1308.c | 1 - sound/soc/codecs/rt274.c | 1 - sound/soc/codecs/rt286.c | 1 - sound/soc/codecs/rt298.c | 1 - sound/soc/codecs/rt5514.c | 1 - sound/soc/codecs/rt5616.c | 1 - sound/soc/codecs/rt5631.c | 1 - sound/soc/codecs/rt5640.c | 2 -- sound/soc/codecs/rt5645.c | 1 - sound/soc/codecs/rt5651.c | 1 - sound/soc/codecs/rt5659.c | 1 - sound/soc/codecs/rt5660.c | 1 - sound/soc/codecs/rt5663.c | 1 - sound/soc/codecs/rt5665.c | 1 - sound/soc/codecs/rt5668.c | 1 - sound/soc/codecs/rt5670.c | 1 - sound/soc/codecs/rt5677.c | 1 - sound/soc/codecs/rt5682.c | 1 - sound/soc/codecs/rt5682s.c | 1 - sound/soc/codecs/sgtl5000.c | 1 - sound/soc/codecs/si476x.c | 1 - sound/soc/codecs/spdif_receiver.c | 1 - sound/soc/codecs/spdif_transmitter.c | 1 - sound/soc/codecs/ssm2518.c | 1 - sound/soc/codecs/ssm2602.c | 1 - sound/soc/codecs/ssm4567.c | 1 - sound/soc/codecs/sta32x.c | 1 - sound/soc/codecs/sta350.c | 1 - sound/soc/codecs/sta529.c | 1 - sound/soc/codecs/stac9766.c | 2 -- sound/soc/codecs/sti-sas.c | 1 - sound/soc/codecs/tas2552.c | 1 - sound/soc/codecs/tas2562.c | 2 -- sound/soc/codecs/tas2764.c | 1 - sound/soc/codecs/tas2770.c | 1 - sound/soc/codecs/tas5086.c | 1 - sound/soc/codecs/tas571x.c | 1 - sound/soc/codecs/tas5720.c | 2 -- sound/soc/codecs/tas5805m.c | 1 - sound/soc/codecs/tas6424.c | 1 - sound/soc/codecs/tfa9879.c | 1 - sound/soc/codecs/tfa989x.c | 1 - sound/soc/codecs/tlv320adcx140.c | 1 - sound/soc/codecs/tlv320aic23.c | 1 - sound/soc/codecs/tlv320aic26.c | 1 - sound/soc/codecs/tlv320aic31xx.c | 1 - sound/soc/codecs/tlv320aic32x4.c | 2 -- sound/soc/codecs/tlv320aic3x.c | 1 - sound/soc/codecs/tlv320dac33.c | 1 - sound/soc/codecs/tscs42xx.c | 1 - sound/soc/codecs/twl4030.c | 1 - sound/soc/codecs/twl6040.c | 1 - sound/soc/codecs/uda1334.c | 1 - sound/soc/codecs/uda134x.c | 1 - sound/soc/codecs/uda1380.c | 1 - sound/soc/codecs/wl1273.c | 1 - sound/soc/codecs/wm0010.c | 1 - sound/soc/codecs/wm1250-ev1.c | 1 - sound/soc/codecs/wm2000.c | 1 - sound/soc/codecs/wm2200.c | 1 - sound/soc/codecs/wm5100.c | 1 - sound/soc/codecs/wm5102.c | 1 - sound/soc/codecs/wm5110.c | 1 - sound/soc/codecs/wm8350.c | 1 - sound/soc/codecs/wm8400.c | 1 - sound/soc/codecs/wm8510.c | 1 - sound/soc/codecs/wm8523.c | 1 - sound/soc/codecs/wm8524.c | 1 - sound/soc/codecs/wm8580.c | 1 - sound/soc/codecs/wm8711.c | 1 - sound/soc/codecs/wm8727.c | 1 - sound/soc/codecs/wm8728.c | 1 - sound/soc/codecs/wm8731.c | 1 - sound/soc/codecs/wm8737.c | 1 - sound/soc/codecs/wm8741.c | 1 - sound/soc/codecs/wm8750.c | 1 - sound/soc/codecs/wm8753.c | 1 - sound/soc/codecs/wm8770.c | 1 - sound/soc/codecs/wm8776.c | 1 - sound/soc/codecs/wm8782.c | 1 - sound/soc/codecs/wm8804.c | 1 - sound/soc/codecs/wm8900.c | 1 - sound/soc/codecs/wm8903.c | 1 - sound/soc/codecs/wm8904.c | 1 - sound/soc/codecs/wm8940.c | 1 - sound/soc/codecs/wm8955.c | 1 - sound/soc/codecs/wm8960.c | 1 - sound/soc/codecs/wm8961.c | 1 - sound/soc/codecs/wm8962.c | 1 - sound/soc/codecs/wm8971.c | 1 - sound/soc/codecs/wm8974.c | 1 - sound/soc/codecs/wm8978.c | 1 - sound/soc/codecs/wm8983.c | 1 - sound/soc/codecs/wm8985.c | 1 - sound/soc/codecs/wm8988.c | 1 - sound/soc/codecs/wm8990.c | 1 - sound/soc/codecs/wm8991.c | 1 - sound/soc/codecs/wm8993.c | 1 - sound/soc/codecs/wm8994.c | 1 - sound/soc/codecs/wm8995.c | 1 - sound/soc/codecs/wm8996.c | 2 -- sound/soc/codecs/wm8997.c | 1 - sound/soc/codecs/wm8998.c | 1 - sound/soc/codecs/wm9081.c | 1 - sound/soc/codecs/wm9090.c | 1 - sound/soc/codecs/wm9705.c | 1 - sound/soc/codecs/wm9712.c | 1 - sound/soc/codecs/wm9713.c | 1 - sound/soc/codecs/zl38060.c | 1 - sound/soc/dwc/dwc-i2s.c | 7 ++++--- sound/soc/fsl/fsl_aud2htx.c | 3 ++- sound/soc/fsl/fsl_easrc.c | 7 ++++--- sound/soc/fsl/fsl_esai.c | 3 ++- sound/soc/fsl/fsl_mqs.c | 1 - sound/soc/fsl/fsl_rpmsg.c | 3 ++- sound/soc/fsl/fsl_sai.c | 3 ++- sound/soc/fsl/fsl_spdif.c | 3 ++- sound/soc/fsl/fsl_ssi.c | 1 + sound/soc/fsl/fsl_xcvr.c | 3 ++- sound/soc/fsl/mpc5200_psc_i2s.c | 3 ++- sound/soc/generic/test-component.c | 2 +- sound/soc/hisilicon/hi6210-i2s.c | 1 + sound/soc/img/img-i2s-in.c | 3 ++- sound/soc/img/img-i2s-out.c | 3 ++- sound/soc/img/img-parallel-out.c | 3 ++- sound/soc/img/img-spdif-in.c | 3 ++- sound/soc/img/img-spdif-out.c | 3 ++- sound/soc/img/pistachio-internal-dac.c | 1 - sound/soc/intel/avs/pcm.c | 2 -- sound/soc/intel/keembay/kmb_platform.c | 14 ++++++++------ sound/soc/jz4740/jz4740-i2s.c | 7 ++++--- sound/soc/meson/aiu-acodec-ctrl.c | 1 - sound/soc/meson/aiu-codec-ctrl.c | 1 - sound/soc/meson/axg-frddr.c | 3 +++ sound/soc/meson/axg-pdm.c | 4 +++- sound/soc/meson/axg-spdifin.c | 1 + sound/soc/meson/axg-spdifout.c | 1 + sound/soc/meson/axg-toddr.c | 3 +++ sound/soc/meson/g12a-toacodec.c | 2 -- sound/soc/meson/g12a-tohdmitx.c | 1 - sound/soc/meson/t9015.c | 1 - sound/soc/mxs/mxs-saif.c | 3 ++- sound/soc/pxa/mmp-sspa.c | 9 +++++---- sound/soc/pxa/pxa-ssp.c | 21 +++++++++++---------- sound/soc/pxa/pxa2xx-i2s.c | 21 +++++++++++---------- sound/soc/qcom/lpass-cpu.c | 1 + sound/soc/qcom/qdsp6/q6asm-dai.c | 23 ++++++++++++----------- sound/soc/rockchip/rockchip_i2s.c | 1 + sound/soc/rockchip/rockchip_i2s_tdm.c | 1 + sound/soc/rockchip/rockchip_pdm.c | 1 + sound/soc/rockchip/rockchip_spdif.c | 1 + sound/soc/samsung/aries_wm8994.c | 1 - sound/soc/samsung/i2s.c | 2 ++ sound/soc/samsung/pcm.c | 3 ++- sound/soc/samsung/s3c2412-i2s.c | 7 ++++--- sound/soc/samsung/s3c24xx-i2s.c | 7 ++++--- sound/soc/samsung/spdif.c | 7 ++++--- sound/soc/sh/hac.c | 3 ++- sound/soc/sh/rcar/core.c | 11 ++++++----- sound/soc/sh/rz-ssi.c | 9 +++++---- sound/soc/sh/siu_pcm.c | 17 +++++++++-------- sound/soc/sh/ssi.c | 3 ++- sound/soc/soc-core.c | 2 +- sound/soc/soc-topology-test.c | 3 --- sound/soc/soc-utils.c | 1 - sound/soc/sof/pcm.c | 2 ++ sound/soc/sof/sof-client-probes.c | 1 + sound/soc/spear/spdif_in.c | 3 ++- sound/soc/spear/spdif_out.c | 3 ++- sound/soc/sti/sti_uniperif.c | 3 ++- sound/soc/stm/stm32_adfsdm.c | 1 + sound/soc/stm/stm32_i2s.c | 1 + sound/soc/stm/stm32_sai_sub.c | 1 + sound/soc/stm/stm32_spdifrx.c | 1 + sound/soc/sunxi/sun4i-codec.c | 7 ++----- sound/soc/sunxi/sun4i-i2s.c | 3 ++- sound/soc/sunxi/sun4i-spdif.c | 3 ++- sound/soc/sunxi/sun8i-codec.c | 1 - sound/soc/tegra/tegra20_ac97.c | 3 ++- sound/soc/tegra/tegra20_i2s.c | 3 ++- sound/soc/tegra/tegra20_spdif.c | 1 + sound/soc/tegra/tegra210_i2s.c | 1 - sound/soc/tegra/tegra30_i2s.c | 3 ++- sound/soc/ti/davinci-i2s.c | 3 ++- sound/soc/ti/davinci-mcasp.c | 3 ++- sound/soc/ti/davinci-vcif.c | 3 ++- sound/soc/ti/omap-dmic.c | 3 ++- sound/soc/ti/omap-hdmi.c | 1 + sound/soc/ti/omap-mcbsp.c | 3 ++- sound/soc/ti/omap-mcpdm.c | 7 ++++--- sound/soc/uniphier/evea.c | 1 - sound/soc/ux500/ux500_msp_dai.c | 3 ++- sound/soc/xilinx/xlnx_formatter_pcm.c | 16 ++++++++-------- sound/soc/xilinx/xlnx_i2s.c | 1 + sound/soc/xilinx/xlnx_spdif.c | 1 + sound/soc/xtensa/xtfpga-i2s.c | 15 ++++++++------- 345 files changed, 274 insertions(+), 435 deletions(-) -- 2.30.2

4 100

[PATCH] ASoC: core: Make snd_soc_unregister_card() return void
by Uwe Kleine-König 23 Jun '22

23 Jun '22

The function snd_soc_unregister_card() returned 0 unconditionally and most callers don't care to check the return value. Make it return void and adapt the callers that didn't ignore the return value before. This is a preparation for making platform remove callbacks return void. Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> --- include/sound/soc.h | 2 +- sound/soc/atmel/mikroe-proto.c | 4 +++- sound/soc/fsl/pcm030-audio-fabric.c | 5 ++--- sound/soc/soc-core.c | 4 +--- sound/soc/soc-topology-test.c | 4 +--- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index f20f5f890794..adcc756fe0c2 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -416,7 +416,7 @@ enum snd_soc_pcm_subclass { }; int snd_soc_register_card(struct snd_soc_card *card); -int snd_soc_unregister_card(struct snd_soc_card *card); +void snd_soc_unregister_card(struct snd_soc_card *card); int devm_snd_soc_register_card(struct device *dev, struct snd_soc_card *card); #ifdef CONFIG_PM_SLEEP int snd_soc_suspend(struct device *dev); diff --git a/sound/soc/atmel/mikroe-proto.c b/sound/soc/atmel/mikroe-proto.c index ce46d8a0b7e4..954460719aa3 100644 --- a/sound/soc/atmel/mikroe-proto.c +++ b/sound/soc/atmel/mikroe-proto.c @@ -157,7 +157,9 @@ static int snd_proto_probe(struct platform_device *pdev) static int snd_proto_remove(struct platform_device *pdev) { - return snd_soc_unregister_card(&snd_proto); + snd_soc_unregister_card(&snd_proto); + + return 0; } static const struct of_device_id snd_proto_of_match[] = { diff --git a/sound/soc/fsl/pcm030-audio-fabric.c b/sound/soc/fsl/pcm030-audio-fabric.c index 83b4a22bf15a..e4c805acc349 100644 --- a/sound/soc/fsl/pcm030-audio-fabric.c +++ b/sound/soc/fsl/pcm030-audio-fabric.c @@ -113,12 +113,11 @@ static int pcm030_fabric_probe(struct platform_device *op) static int pcm030_fabric_remove(struct platform_device *op) { struct pcm030_audio_data *pdata = platform_get_drvdata(op); - int ret; - ret = snd_soc_unregister_card(pdata->card); + snd_soc_unregister_card(pdata->card); platform_device_unregister(pdata->codec_device); - return ret; + return 0; } static const struct of_device_id pcm030_audio_match[] = { diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 9574f86dd4de..c5836066ead3 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2326,14 +2326,12 @@ EXPORT_SYMBOL_GPL(snd_soc_register_card); * @card: Card to unregister * */ -int snd_soc_unregister_card(struct snd_soc_card *card) +void snd_soc_unregister_card(struct snd_soc_card *card) { mutex_lock(&client_mutex); snd_soc_unbind_card(card, true); mutex_unlock(&client_mutex); dev_dbg(card->dev, "ASoC: Unregistered card '%s'\n", card->name); - - return 0; } EXPORT_SYMBOL_GPL(snd_soc_unregister_card); diff --git a/sound/soc/soc-topology-test.c b/sound/soc/soc-topology-test.c index ae3968161509..225d74355974 100644 --- a/sound/soc/soc-topology-test.c +++ b/sound/soc/soc-topology-test.c @@ -271,9 +271,7 @@ static void snd_soc_tplg_test_load_with_null_comp(struct kunit *test) KUNIT_EXPECT_EQ(test, 0, ret); /* cleanup */ - ret = snd_soc_unregister_card(&kunit_comp->card); - KUNIT_EXPECT_EQ(test, 0, ret); - + snd_soc_unregister_card(&kunit_comp->card); snd_soc_unregister_component(test_dev); } base-commit: f2906aa863381afb0015a9eb7fefad885d4e5a56 -- 2.36.1

3 4

[PATCH 00/14] Canaan devicetree fixes
by Conor Dooley 23 Jun '22

23 Jun '22

From: Conor Dooley <conor.dooley(a)microchip.com> Hey all, This series should rid us of dtbs_check errors for the RISC-V Canaan k210 based boards (well, unless you enable W=1 but that's another days work). I *DO NOT* have any Canaan hardware so I have not tested any of this in anger. I based the series on next-20220617. For the bindings, I am never sure about which of {unevaluated,additional} Properties is correct to use, but the if statements in the binding didn't work with additional so I used unevaluated... @Mark, for your two bindings I was not sure about the properties that I made depend on the compatible, but I looked in tree and was not able to find other users to contradict what's in the Canaan devicetrees nor did I get that much help from their docs. @Rob, yesterday's removal of ilitek,ili9341.txt is moved to ths series since I was editing the dt-schema binding here anyway. Finally, @Palmer: This + Atul's stuff + the sifive dts watchdog patch will get us sorted in terms of dtbs_check errors. To make keeping it that way a little easier, I changed the Canaan devicetree Makefile so that it would build all of the devicetrees in the directory if SOC_CANAAN. Hopefully someone with a device can test it - but my build log *looked* fine but that's not exactly sufficient. Thanks, Conor. Conor Dooley (14): dt-bindings: display: convert ilitek,ili9341.txt to dt-schema dt-bindings: display: panel: allow ilitek,ili9341 in isolation ASoC: dt-bindings: convert designware-i2s to dt-schema dt-bindings: dma: add Canaan k210 to Synopsys DesignWare DMA dt-bindings: timer: add Canaan k210 to Synopsys DesignWare timer spi: dt-bindings: dw-apb-ssi: update spi-{r,t}x-bus-width for dwc-ssi riscv: dts: canaan: fix the k210's memory node riscv: dts: canaan: add a specific compatible for k210's dma riscv: dts: canaan: add a specific compatible for k210's timers riscv: dts: canaan: fix mmc node names riscv: dts: canaan: fix kd233 display spi frequency riscv: dts: canaan: use custom compatible for k210 i2s riscv: dts: canaan: remove spi-max-frequency from controllers riscv: dts: canaan: build all devicetress if SOC_CANAAN .../bindings/display/ilitek,ili9341.txt | 27 ------ .../display/panel/ilitek,ili9341.yaml | 60 ++++++++---- .../bindings/dma/snps,dw-axi-dmac.yaml | 35 +++++-- .../bindings/sound/designware-i2s.txt | 35 ------- .../bindings/sound/snps,designware-i2s.yaml | 93 +++++++++++++++++++ .../bindings/spi/snps,dw-apb-ssi.yaml | 48 +++++++--- .../bindings/timer/snps,dw-apb-timer.yaml | 28 ++++-- arch/riscv/boot/dts/canaan/Makefile | 10 +- arch/riscv/boot/dts/canaan/canaan_kd233.dts | 4 +- arch/riscv/boot/dts/canaan/k210.dtsi | 25 ++--- .../riscv/boot/dts/canaan/sipeed_maix_bit.dts | 2 +- .../boot/dts/canaan/sipeed_maix_dock.dts | 2 +- arch/riscv/boot/dts/canaan/sipeed_maix_go.dts | 2 +- .../boot/dts/canaan/sipeed_maixduino.dts | 2 +- 14 files changed, 239 insertions(+), 134 deletions(-) delete mode 100644 Documentation/devicetree/bindings/display/ilitek,ili9341.txt delete mode 100644 Documentation/devicetree/bindings/sound/designware-i2s.txt create mode 100644 Documentation/devicetree/bindings/sound/snps,designware-i2s.yaml base-commit: 07dc787be2316e243a16a33d0a9b734cd9365bd3 -- 2.36.1

5 30

[PATCH v4 0/4] Add MT8186 ADSP dt-binding
by Tinghan Shen 23 Jun '22

23 Jun '22

v3 -> v4: 1. Update commit message of patch 1/4 2. Add review tag to path 3/4 v2 -> v3: 1. Change mbox-names to rx/tx for both mt8186 and mt8195. 2. Update description of mbox-names 3. Use static string array instead of kasprintf 4. Align clock names in dsp driver with dt-bindings v1 -> v2: 1. Change mbox-names from mbox0/mbox1 to rep/req for both mt8186 and mt8195. 2. rename clock-names and remove unused headers Tinghan Shen (4): dt-bindings: dsp: mediatek: Use meaningful names for mbox firmware: mediatek: Use meaningful names for mbox dt-bindings: dsp: mediatek: Add mt8186 dsp document ASoC: SOF: mediatek: Align mt8186 clock names with dt-bindings .../bindings/dsp/mediatek,mt8186-dsp.yaml | 91 +++++++++++++++++++ .../bindings/dsp/mediatek,mt8195-dsp.yaml | 10 +- drivers/firmware/mtk-adsp-ipc.c | 36 +++----- sound/soc/sof/mediatek/mt8186/mt8186-clk.c | 4 +- 4 files changed, 110 insertions(+), 31 deletions(-) create mode 100644 Documentation/devicetree/bindings/dsp/mediatek,mt8186-dsp.yaml -- 2.18.0

3 6

[PATCH 00/49] regmap-irq cleanups and refactoring
by Aidan MacDonald 23 Jun '22

23 Jun '22

Hi Mark, Here's a bunch of cleanups for regmap-irq focused on simplifying the API and generalizing it a bit. It's broken up into three refactors, focusing on one area at a time. * Patches 01 and 02 are straightforward bugfixes, independent of the rest of the series. Neither of the bugs are triggered by in-tree drivers but they might be worth picking up early anyhow. * Patches 03-13 clean up everything related to configuring IRQ types. * Patches 14-45 deal with mask/unmask registers. First, make unmask registers behave more intuitively and usefully, and get rid of the mask_invert flag in favor of describing inverted mask registers as unmask registers. Second, make the mask_writeonly flag more useful and enable it for two chips where it makes sense. * Patches 46-49 refactor sub_irq_reg() as a get_irq_reg() callback, and use that to eliminate the not_fixed_stride flag. The approach I used when refactoring is pretty simple: (1) introduce new functionality in regmap-irq, (2) convert the drivers, and (3) remove any old code. Nothing should break in the middle. The patches can be re-ordered to some extent if that's preferable, but it's best to add get_irq_reg() last to avoid having to think about how it interacts with features that'll be removed anyway. I can't test most of the devices affected by this series so a lot of the code is only build tested. I've tested on real hardware with my AXP192 patchset[1], although it only provides limited code coverage. qcom-pm8008 in particular deserves careful testing - it used all of the features touched by the refactors and required the most changes. Other drivers only required trivial changes but there are three of them worth mentioning: wcd943x, wcd9335, and wcd938x. They have suspicious looking IRQ type definitions and I'm pretty sure aren't working properly, but I can't fix them myself. The refactor shouldn't affect their behavior so how / when / if they get fixed shouldn't be much of an issue. Oh, and I added the 'mask_writeonly' flag and volatile ranges to the stpmic1 driver based on its datasheet[2] as a small optimization. It's probably fine but testing would be a good idea. [1]: https://lore.kernel.org/linux-iio/20220618214009.2178567-1-aidanmacdonald.0… [2]: https://www.st.com/resource/en/datasheet/stpmic1.pdf Aidan MacDonald (49): regmap-irq: Fix a bug in regmap_irq_enable() for type_in_mask chips regmap-irq: Fix offset/index mismatch in read_sub_irq_data() regmap-irq: Remove an unnecessary restriction on type_in_mask regmap-irq: Introduce config registers for irq types mfd: qcom-pm8008: Convert irq chip to config regs mfd: wcd934x: Convert irq chip to config regs sound: soc: codecs: wcd9335: Convert irq chip to config regs sound: soc: codecs: wcd938x: Remove spurious type_base from irq chip mfd: max77650: Remove useless type_invert flag regmap-irq: Remove virtual registers support regmap-irq: Remove old type register support, refactor regmap-irq: Remove unused type_reg_stride field regmap-irq: Remove unused type_invert flag regmap-irq: Do not use regmap_irq_update_bits() for wake regs regmap-irq: Change the behavior of mask_writeonly regmap-irq: Rename regmap_irq_update_bits() regmap-irq: Add broken_mask_unmask flag mfd: qcom-pm8008: Add broken_mask_unmask irq chip flag mfd: stpmic1: Add broken_mask_unmask irq chip flag regmap-irq: Fix inverted handling of unmask registers mfd: tps65090: replace irqchip mask_invert with unmask_base mfd: sun4i-gpadc: replace irqchip mask_invert with unmask_base mfd: sprd-sc27xx-spi: replace irqchip mask_invert with unmask_base mfd: rt5033: replace irqchip mask_invert with unmask_base mfd: rohm-bd71828: replace irqchip mask_invert with unmask_base mfd: rn5t618: replace irqchip mask_invert with unmask_base mfd: gateworks-gsc: replace irqchip mask_invert with unmask_base mfd: axp20x: replace irqchip mask_invert with unmask_base mfd: atc260x: replace irqchip mask_invert with unmask_base mfd: 88pm800: replace irqchip mask_invert with unmask_base mfd: max14577: replace irqchip mask_invert with unmask_base mfd: max77693: replace irqchip mask_invert with unmask_base mfd: rohm-bd718x7: drop useless mask_invert flag on irqchip mfd: max77843: drop useless mask_invert flag on irqchip extcon: max77843: replace irqchip mask_invert with unmask_base extcon: sm5502: drop useless mask_invert flag on irqchip extcon: rt8973a: drop useless mask_invert flag on irqchip irqchip: sl28cpld: replace irqchip mask_invert with unmask_base gpio: sl28cpld: replace irqchip mask_invert with unmask_base mfd: stpmic1: Fix broken mask/unmask in irq chip mfd: stpmic1: Enable mask_writeonly flag for irq chip mfd: qcom-pm8008: Fix broken mask/unmask in irq chip mfd: qcom-pm8008: Enable mask_writeonly flag for irq chip regmap-irq: Remove broken_mask_unmask flag regmap-irq: Remove mask_invert flag regmap-irq: Refactor checks for status bulk read support regmap-irq: Add get_irq_reg() callback mfd: qcom-pm8008: Use get_irq_reg() for irq chip regmap-irq: Remove not_fixed_stride flag drivers/base/regmap/regmap-irq.c | 457 ++++++++++++++----------------- drivers/extcon/extcon-max77843.c | 3 +- drivers/extcon/extcon-rt8973a.c | 1 - drivers/extcon/extcon-sm5502.c | 2 - drivers/gpio/gpio-sl28cpld.c | 3 +- drivers/irqchip/irq-sl28cpld.c | 3 +- drivers/mfd/88pm800.c | 3 +- drivers/mfd/atc260x-core.c | 6 +- drivers/mfd/axp20x.c | 21 +- drivers/mfd/gateworks-gsc.c | 3 +- drivers/mfd/max14577.c | 7 +- drivers/mfd/max77650.c | 1 - drivers/mfd/max77693.c | 6 +- drivers/mfd/max77843.c | 1 - drivers/mfd/qcom-pm8008.c | 131 ++++----- drivers/mfd/rn5t618.c | 3 +- drivers/mfd/rohm-bd71828.c | 6 +- drivers/mfd/rohm-bd718x7.c | 1 - drivers/mfd/rt5033.c | 3 +- drivers/mfd/sprd-sc27xx-spi.c | 3 +- drivers/mfd/stpmic1.c | 7 +- drivers/mfd/sun4i-gpadc.c | 3 +- drivers/mfd/tps65090.c | 3 +- drivers/mfd/wcd934x.c | 11 +- include/linux/regmap.h | 59 ++-- sound/soc/codecs/wcd9335.c | 10 +- sound/soc/codecs/wcd938x.c | 1 - 27 files changed, 332 insertions(+), 426 deletions(-) -- 2.35.1

6 68

[PATCH v1 0/2] Read _SUB from ACPI to be able to identify firmware
by Stefan Binding 23 Jun '22

23 Jun '22

CS35L41 has a DSP which is able to run firmware, as well as a tuning file. Different systems may want to use different firmwares and tuning files, and some firmwares/tunings may not be compatible with other systems. To allow a system to select the correct fimware/tuning, we can read an _SUB from the ACPI. This _SUB can then be used to uniquely identify the system in the firmware/tuning file name. Add a helper function which reads the _SUB, so this can be used by other parts in the future. Add support inside the CS35L41 ASoC driver to read this _SUB, and save it appropriately. Stefan Binding (2): ACPI: utils: Add api to read _SUB from ACPI ASoC: cs35l41: Read System Name from ACPI _SUB to identify firmware drivers/acpi/utils.c | 26 ++++++++++++++++++++++++++ include/linux/acpi.h | 8 ++++++++ sound/soc/codecs/cs35l41.c | 27 +++++++++++++++++++++++++++ 3 files changed, 61 insertions(+) -- 2.25.1

3 6

ASoC: SOF: Race condition in ipc.c
by noman pouigt 22 Jun '22

22 Jun '22

Folks, I have borrowed part of SOF architecture for my own DSP framework development as the memory on the DSP is extremely small and wouldn't be able to support SOF. Currently I am running into a race condition as below: CPU DSP PCM_TRIGGER_START sof_ipc_send_msg ----> <------Immediate ACK ipc3_wait_tx_done (wait_event_timeout) <------ POSITION update snd_pcm_period_elapsed As you can see TRIGGER_START didn't even finish and waiting for it to complete in ipc3_wait_tx_done function. However, before it could complete the position interrupt was issued which results in calling period_elapsed function. In order to fix this I assume below is called in SOF framework: schedule_work(&spcm->stream[substream->stream].period_elapsed_work); How is this design working? If the interrupt is coming too fast from the DSP than the associated function with this schedule_work will not get called as the scheduler will not get time to schedule the workqueue and elapsed function will not be called thereby not increasing the hw_ptr. How is the flow control for data transfer achieved? I am facing the above problem in my design. I am wondering if I can simply add one more IPC command(don't call wait_event_interruptible for this) after TRIGGER_START to start the streaming.This way schedule_work for updating period_elapsed function can be avoided and it can be called in an interrupt context. Thanks, Variksla

2 2

[PATCH] ASoC: amd: acp: Fix error handling in .remove()
by Uwe Kleine-König 22 Jun '22

22 Jun '22

Even in the presence of problems (here: rn_acp_deinit() might fail), it's important to unregister all resources acquired during .probe() because even if .remove() returns an error code, the device is removed. As .remove() is only called after .probe() returned success, platdata must be valid, so the first check in .remove() can just be dropped. This is a preparation for making platform remove callbacks return void. Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> --- sound/soc/amd/acp/acp-renoir.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/sound/soc/amd/acp/acp-renoir.c b/sound/soc/amd/acp/acp-renoir.c index 75c9229ece97..8375c00ff4c3 100644 --- a/sound/soc/amd/acp/acp-renoir.c +++ b/sound/soc/amd/acp/acp-renoir.c @@ -307,16 +307,10 @@ static int renoir_audio_remove(struct platform_device *pdev) int ret; chip = dev_get_platdata(&pdev->dev); - if (!chip || !chip->base) { - dev_err(&pdev->dev, "ACP chip data is NULL\n"); - return -ENODEV; - } ret = rn_acp_deinit(chip->base); - if (ret) { - dev_err(&pdev->dev, "ACP de-init Failed\n"); - return -EINVAL; - } + if (ret) + dev_err(&pdev->dev, "ACP de-init Failed (%pe)\n", ERR_PTR(ret)); acp_platform_unregister(dev); return 0; base-commit: f2906aa863381afb0015a9eb7fefad885d4e5a56 -- 2.36.1

2 1

[PATCH] ASoC: rockchip: i2s: Fix crash on missing pinctrl
by Chen-Yu Tsai 22 Jun '22

22 Jun '22

From: Chen-Yu Tsai <wens(a)csie.org> Commit 44f362c2cc6d ("ASoC: rockchip: i2s: switch BCLK to GPIO") added pinctrl lookups, but did not skip the lookup if there was no pinctrl device tied to the I2S controller. As a result, the lookup was done on an invalid pointer in such cases, causing a kernel panic. Only do the subsequent pinctrl state lookups and switch if a pinctrl device was found. i2s_pinctrl_select_bclk_{on,off} already guard against missing pinctrl device or pinctrl state, so those two functions aren't touched. Fixes: 44f362c2cc6d ("ASoC: rockchip: i2s: switch BCLK to GPIO") Signed-off-by: Chen-Yu Tsai <wens(a)csie.org> --- This is based on next-20220621, which just saw the inclusion of the commit this patch fixes. This issue was found and tested on ROC-RK3328-CC. Tried to test on RK3399, but that has some other DRM driver related crash. sound/soc/rockchip/rockchip_i2s.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index be051e48b97b..9fa8ffd712ea 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -808,24 +808,23 @@ static int rockchip_i2s_probe(struct platform_device *pdev) i2s->bclk_ratio = 64; i2s->pinctrl = devm_pinctrl_get(&pdev->dev); - if (IS_ERR(i2s->pinctrl)) + if (IS_ERR(i2s->pinctrl)) { dev_err(&pdev->dev, "failed to find i2s pinctrl\n"); + } else { + i2s->bclk_on = pinctrl_lookup_state(i2s->pinctrl, "bclk_on"); + if (IS_ERR_OR_NULL(i2s->bclk_on)) + dev_err(&pdev->dev, "failed to find i2s default state\n"); + else + dev_dbg(&pdev->dev, "find i2s bclk state\n"); - i2s->bclk_on = pinctrl_lookup_state(i2s->pinctrl, - "bclk_on"); - if (IS_ERR_OR_NULL(i2s->bclk_on)) - dev_err(&pdev->dev, "failed to find i2s default state\n"); - else - dev_dbg(&pdev->dev, "find i2s bclk state\n"); - - i2s->bclk_off = pinctrl_lookup_state(i2s->pinctrl, - "bclk_off"); - if (IS_ERR_OR_NULL(i2s->bclk_off)) - dev_err(&pdev->dev, "failed to find i2s gpio state\n"); - else - dev_dbg(&pdev->dev, "find i2s bclk_off state\n"); + i2s->bclk_off = pinctrl_lookup_state(i2s->pinctrl, "bclk_off"); + if (IS_ERR_OR_NULL(i2s->bclk_off)) + dev_err(&pdev->dev, "failed to find i2s gpio state\n"); + else + dev_dbg(&pdev->dev, "find i2s bclk_off state\n"); - i2s_pinctrl_select_bclk_off(i2s); + i2s_pinctrl_select_bclk_off(i2s); + } i2s->playback_dma_data.addr = res->start + I2S_TXDR; i2s->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; -- 2.34.1

2 1