On 5/19/22 10:42, Charles Keepax wrote: > Currently the set_fmt callback always passes clock provider/consumer > with respect to the CODEC. This made sense when the framework was > directly broken down into platforms and CODECs. However, as things > are now broken down into components which can be connected as either > the CPU or CODEC side of a DAI link it simplifies things if each > side of the link is just told if it is provider or consumer of the > clocks. Making this change allows us to remove one of the last parts > of the ASoC core that needs to know if a driver is a CODEC driver, > where it flips the clock format specifier if a CODEC driver is used on > the CPU side of a DAI link, as well as just being conceptually more > consistent with componentisation. > > The basic idea of this patch chain is to change the set_fmt callback > from specifying if the CODEC is provider/consumer into directly > specifying if the component is provider/consumer. To do this we add > some new defines, and then to preserve bisectability, the migration is > done by adding a new callback, converting over all existing CPU side > drivers, converting the core, and then finally reverting back to the > old callback. > > Converting the platform drivers makes sense as the existing defines > are from the perspective of the CODEC and there are more CODEC drivers > than platform drivers. > > Obviously a fair amount of this patch chain I was only able to build > test, so any testing that can be done would be greatly appreciated. All good for the SOF CI (small subset tested for Intel platforms). https://github.com/thesofproject/linux/pull/3660 > > Thanks, > Charles > > Charles Keepax (56): > ASoC: core: Add set_fmt_new callback that directly specifies provider > ASoC: amd: vangogh: Update to use set_fmt_new callback > ASoC: atmel: Update to use set_fmt_new callback > ASoC: au1x: Update to use set_fmt_new callback > ASoC: bcm: Update to use set_fmt_new callback > ASoC: ep93xx: Update to use set_fmt_new callback > ASoC: dwc: Update to use set_fmt_new callback > ASoC: fsl: Update to use set_fmt_new callback > ASoC: hisilicon: Update to use set_fmt_new callback > ASoC: img: Update to use set_fmt_new callback > ASoC: Intel: Update to use set_fmt_new callback > ASoC: js4740-i2s: Update to use set_fmt_new callback > ASoC: mediatek: Update to use set_fmt_new callback > ASoC: meson: Update to use set_fmt_new callback > ASoC: mxs-saif: Update to use set_fmt_new callback > ASoC: pxa: Update to use set_fmt_new callback > ASoC: qcom: Update to use set_fmt_new callback > ASoC: rockchip: Update to use set_fmt_new callback > ASoC: samsung: Update to use set_fmt_new callback > ASoC: sh: Update to use set_fmt_new callback > ASoC: stm: Update to use set_fmt_new callback > ASoC: sunxi: Update to use set_fmt_new callback > ASoC: tegra: Update to use set_fmt_new callback > ASoC: test-component: Update to use set_fmt_new callback > ASoC: ti: Update to use set_fmt_new callback > ASoC: ux500: Update to use set_fmt_new callback > ASoC: xtensa: Update to use set_fmt_new callback > ASoC: core: Always send the CPU DAI a direct clock specifier > ASoC: amd: vangogh: Rename set_fmt_new back to set_fmt > ASoC: atmel: Rename set_fmt_new back to set_fmt > ASoC: au1x: Rename set_fmt_new back to set_fmt > ASoC: bcm: Rename set_fmt_new back to set_fmt > ASoC: ep93xx: Rename set_fmt_new back to set_fmt > ASoC: dwc: Rename set_fmt_new back to set_fmt > ASoC: fsl: Rename set_fmt_new back to set_fmt > ASoC: hisilicon: Rename set_fmt_new back to set_fmt > ASoC: img: Rename set_fmt_new back to set_fmt > ASoC: Intel: Rename set_fmt_new back to set_fmt > ASoC: jz4740-i2s: Rename set_fmt_new back to set_fmt > ASoC: mediatek: Rename set_fmt_new back to set_fmt > ASoC: meson: Rename set_fmt_new back to set_fmt > ASoC: mxs-saif: Rename set_fmt_new back to set_fmt > ASoC: pxa: Rename set_fmt_new back to set_fmt > ASoC: qcom: Rename set_fmt_new back to set_fmt > ASoC: rockchip: Rename set_fmt_new back to set_fmt > ASoC: samsung: Rename set_fmt_new back to set_fmt > ASoC: sh: Rename set_fmt_new back to set_fmt > ASoC: stm: Rename set_fmt_new back to set_fmt > ASoC: sunxi: Rename set_fmt_new back to set_fmt > ASoC: tegra: Rename set_fmt_new back to set_fmt > ASoC: test-component: Rename set_fmt_new back to set_fmt > ASoC: ti: Rename set_fmt_new back to set_fmt > ASoC: ux500: Rename set_fmt_new back to set_fmt > ASoC: xtensa: Rename set_fmt_new back to set_fmt > ASoC: soc-dai: Remove set_fmt_new callback > ASoC: simple-card-utils: Move snd_soc_component_is_codec to be local > > include/sound/soc-component.h | 5 --- > include/sound/soc-dai.h | 6 ++++ > sound/soc/amd/vangogh/acp5x-i2s.c | 4 +-- > sound/soc/atmel/atmel-i2s.c | 4 +-- > sound/soc/atmel/atmel_ssc_dai.c | 18 +++++----- > sound/soc/atmel/mchp-i2s-mcc.c | 8 ++--- > sound/soc/atmel/mchp-pdmc.c | 4 +-- > sound/soc/au1x/i2sc.c | 2 +- > sound/soc/au1x/psc-i2s.c | 4 +-- > sound/soc/bcm/bcm2835-i2s.c | 20 +++++------ > sound/soc/bcm/cygnus-ssp.c | 4 +-- > sound/soc/cirrus/ep93xx-i2s.c | 4 +-- > sound/soc/dwc/dwc-i2s.c | 8 ++--- > sound/soc/fsl/fsl_audmix.c | 6 ++-- > sound/soc/fsl/fsl_esai.c | 8 ++--- > sound/soc/fsl/fsl_mqs.c | 2 +- > sound/soc/fsl/fsl_sai.c | 8 ++--- > sound/soc/fsl/fsl_ssi.c | 22 ++++++------ > sound/soc/fsl/imx-audmix.c | 4 +-- > sound/soc/fsl/imx-card.c | 2 +- > sound/soc/generic/simple-card-utils.c | 7 +++- > sound/soc/generic/test-component.c | 18 +++++----- > sound/soc/hisilicon/hi6210-i2s.c | 18 +++++----- > sound/soc/img/img-i2s-in.c | 4 +-- > sound/soc/img/img-i2s-out.c | 6 ++-- > sound/soc/intel/atom/sst-atom-controls.c | 4 +-- > sound/soc/intel/boards/bytcht_cx2072x.c | 2 +- > sound/soc/intel/boards/bytcht_da7213.c | 2 +- > sound/soc/intel/boards/bytcht_es8316.c | 2 +- > sound/soc/intel/boards/bytcht_nocodec.c | 2 +- > sound/soc/intel/boards/bytcr_rt5640.c | 2 +- > sound/soc/intel/boards/bytcr_rt5651.c | 2 +- > sound/soc/intel/boards/bytcr_wm5102.c | 2 +- > sound/soc/intel/boards/cht_bsw_max98090_ti.c | 3 +- > sound/soc/intel/boards/cht_bsw_rt5645.c | 6 ++-- > sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- > sound/soc/intel/keembay/kmb_platform.c | 4 +-- > sound/soc/jz4740/jz4740-i2s.c | 10 +++--- > sound/soc/mediatek/mt8195/mt8195-dai-etdm.c | 6 ++-- > sound/soc/mediatek/mt8195/mt8195-dai-pcm.c | 6 ++-- > sound/soc/meson/aiu-encoder-i2s.c | 2 +- > sound/soc/meson/axg-tdm-interface.c | 14 ++++---- > sound/soc/mxs/mxs-saif.c | 4 +-- > sound/soc/pxa/magician.c | 8 ++--- > sound/soc/pxa/mmp-sspa.c | 6 ++-- > sound/soc/pxa/pxa-ssp.c | 22 ++++++------ > sound/soc/pxa/pxa2xx-i2s.c | 6 ++-- > sound/soc/qcom/apq8016_sbc.c | 2 +- > sound/soc/qcom/qdsp6/audioreach.c | 4 +-- > sound/soc/qcom/qdsp6/q6afe.c | 6 ++-- > sound/soc/qcom/sc7180.c | 2 +- > sound/soc/qcom/sdm845.c | 6 ++-- > sound/soc/qcom/sm8250.c | 4 +-- > sound/soc/rockchip/rockchip_i2s.c | 6 ++-- > sound/soc/rockchip/rockchip_i2s_tdm.c | 6 ++-- > sound/soc/samsung/i2s.c | 6 ++-- > sound/soc/samsung/pcm.c | 4 +-- > sound/soc/samsung/s3c-i2s-v2.c | 6 ++-- > sound/soc/samsung/s3c24xx-i2s.c | 6 ++-- > sound/soc/sh/fsi.c | 6 ++-- > sound/soc/sh/rcar/core.c | 4 +-- > sound/soc/sh/rz-ssi.c | 2 +- > sound/soc/sh/ssi.c | 10 +++--- > sound/soc/soc-core.c | 14 ++------ > sound/soc/soc-dai.c | 3 +- > sound/soc/stm/stm32_i2s.c | 8 ++--- > sound/soc/stm/stm32_sai_sub.c | 8 ++--- > sound/soc/sunxi/sun4i-i2s.c | 18 +++++----- > sound/soc/sunxi/sun8i-codec.c | 6 ++-- > sound/soc/tegra/tegra20_i2s.c | 6 ++-- > sound/soc/tegra/tegra210_i2s.c | 6 ++-- > sound/soc/tegra/tegra30_i2s.c | 6 ++-- > sound/soc/ti/davinci-i2s.c | 32 ++++++++--------- > sound/soc/ti/davinci-mcasp.c | 10 +++--- > sound/soc/ti/omap-mcbsp.c | 12 +++---- > sound/soc/ux500/ux500_msp_dai.c | 36 ++++++++++---------- > sound/soc/xtensa/xtfpga-i2s.c | 4 +-- > 77 files changed, 279 insertions(+), 283 deletions(-) >
