Merge commit '0d8cce351f927bad0e649c439c888821e72524a5'

Merge made by the 'ours' strategy.

* commit '0d8cce351f927bad0e649c439c888821e72524a5':
  ASoC: rockchip: i2s-tdm: Fix stuck on probe
  arm64: dts: rockchip: rk3308: Assign 'i2s-lrck-gpio' for SOF
  arm64: dts: rockchip: rk3568: Assign 'i2s-lrck-gpio' for SOF
  arm64: dts: rockchip: rk3588: Assign 'i2s-lrck-gpio' for SOF
  ASoC: rockchip: i2s-tdm: Fix channels order for TDM_ONE_FRAME
  ASoC: rockchip: i2s-tdm: Use GPIOD_ASIS for TDM_MULTI_LANES
  ASoC: rockchip: i2s-tdm: Fix warning
  ASoC: rockchip: i2s-tdm: Handle HCLK with runtime PM
  ASoC: rockchip: i2s-tdm: Simplify clk sync on TRCM mode
  ASoC: rockchip: i2s-tdm: Fix multi-channels order for TRCM
  ASoC: rockchip: Add dmaengine for TRCM mode

Change-Id: I111f0a538e8e94c4d5e0ecb419fa7bf6e27da9e3
This commit is contained in:
Tao Huang
2024-01-18 14:59:52 +08:00

Diff Content Not Available