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

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

Wed, 7 Sep 2022 03:37:01 +0000 (03:37 +0000)

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

Wed, 7 Sep 2022 03:37:01 +0000 (03:37 +0000)
author andy.hu <andy.hu@starfivetech.com>
Wed, 7 Sep 2022 03:37:01 +0000 (03:37 +0000)
committer andy.hu <andy.hu@starfivetech.com>
Wed, 7 Sep 2022 03:37:01 +0000 (03:37 +0000)
diff --cc arch/riscv/boot/dts/starfive/jh7110-common.dtsi

index 212532b,52cc542..cf058fc

mode 100644,100755..100755
--- 1/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
--- 2/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
diff --cc arch/riscv/boot/dts/starfive/jh7110.dtsi
Simple merge
author	andy.hu <andy.hu@starfivetech.com>
	Wed, 7 Sep 2022 03:37:01 +0000 (03:37 +0000)
committer	andy.hu <andy.hu@starfivetech.com>
	Wed, 7 Sep 2022 03:37:01 +0000 (03:37 +0000)
		1	2
arch/riscv/boot/dts/starfive/jh7110-common.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history
arch/riscv/boot/dts/starfive/jh7110.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history