Merge branch 'CR_2076_515_I2S_AC108_Xingyu.Wu' into 'jh7110-5.15.y-devel'

author andy.hu <andy.hu@starfivetech.com>

Wed, 7 Sep 2022 06:04:54 +0000 (06:04 +0000)

committer andy.hu <andy.hu@starfivetech.com>

Wed, 7 Sep 2022 06:04:54 +0000 (06:04 +0000)
author andy.hu <andy.hu@starfivetech.com>
Wed, 7 Sep 2022 06:04:54 +0000 (06:04 +0000)
committer andy.hu <andy.hu@starfivetech.com>
Wed, 7 Sep 2022 06:04:54 +0000 (06:04 +0000)
diff --cc sound/soc/dwc/dwc-i2s.c
Simple merge
diff --cc sound/soc/starfive/starfive_pdm.c

index 5f8e910,060576b..b7a64d6

mode 100644,100755..100755
--- 1/sound/soc/starfive/starfive_pdm.c
--- 2/sound/soc/starfive/starfive_pdm.c
+++ b/sound/soc/starfive/starfive_pdm.c
author	andy.hu <andy.hu@starfivetech.com>
	Wed, 7 Sep 2022 06:04:54 +0000 (06:04 +0000)
committer	andy.hu <andy.hu@starfivetech.com>
	Wed, 7 Sep 2022 06:04:54 +0000 (06:04 +0000)
		1	2
sound/soc/dwc/dwc-i2s.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/starfive/starfive_pdm.c	patch \|	diff1 \|	diff2 \|	blob \| history