Merge branch 'CR_1560_v4l2_changhuang.liang' into 'jh7110-5.15.y-devel'

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

Fri, 26 Aug 2022 07:40:03 +0000 (07:40 +0000)

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

Fri, 26 Aug 2022 07:40:03 +0000 (07:40 +0000)
author andy.hu <andy.hu@starfivetech.com>
Fri, 26 Aug 2022 07:40:03 +0000 (07:40 +0000)
committer andy.hu <andy.hu@starfivetech.com>
Fri, 26 Aug 2022 07:40:03 +0000 (07:40 +0000)
diff --cc sound/soc/starfive/i2srx-master.c

index d6e96bd,d6e96bd..d6e96bd

mode 100755,100644..100644
--- 1/sound/soc/starfive/i2srx-master.c
--- 2/sound/soc/dwc/i2srx-master.c
+++ b/sound/soc/starfive/i2srx-master.c
diff --cc sound/soc/starfive/i2srx-master.h

index a0b9adc,a0b9adc..a0b9adc

mode 100755,100644..100644
--- 1/sound/soc/starfive/i2srx-master.h
--- 2/sound/soc/dwc/i2srx-master.h
+++ b/sound/soc/starfive/i2srx-master.h
author	andy.hu <andy.hu@starfivetech.com>
	Fri, 26 Aug 2022 07:40:03 +0000 (07:40 +0000)
committer	andy.hu <andy.hu@starfivetech.com>
	Fri, 26 Aug 2022 07:40:03 +0000 (07:40 +0000)
		1	2
sound/soc/starfive/i2srx-master.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/starfive/i2srx-master.h	patch \|	diff1 \|	diff2 \|	blob \| history