Merge branch 'CR_2261_CAN_515_william.qiu' into 'jh7110-5.15.y-devel'

Cr 2261 can 515 william.qiu

See merge request sdk/linux!521

diff --cc arch/riscv/boot/dts/starfive/jh7110-evb-pinctrl.dtsi
index 852f5a5,ad165ce..f5df4f7
mode 100644,100755..100644
--- 1/arch/riscv/boot/dts/starfive/jh7110-evb-pinctrl.dtsi
--- 2/arch/riscv/boot/dts/starfive/jh7110-evb-pinctrl.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110-evb-pinctrl.dtsi

diff --cc arch/riscv/boot/dts/starfive/jh7110.dtsi
index d4c707d,4ec9a84..21af51d
mode 100644,100755..100644
--- 1/arch/riscv/boot/dts/starfive/jh7110.dtsi
--- 2/arch/riscv/boot/dts/starfive/jh7110.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi