diff options
| author | andy.hu <andy.hu@starfivetech.com> | 2023-06-28 09:54:08 +0300 |
|---|---|---|
| committer | andy.hu <andy.hu@starfivetech.com> | 2023-06-28 09:54:08 +0300 |
| commit | 2a9971b999095bdba94a2dd47112c3b1feed0a8b (patch) | |
| tree | dbcf6258a834a773e6f0c486660b2a6a0049dd8a | |
| parent | 1f7e0e5db772372c296c41026f23e4d0afe6af7c (diff) | |
| parent | 749f6cef142ddb34e79a8acd1b920226c8e152ba (diff) | |
| download | linux-2a9971b999095bdba94a2dd47112c3b1feed0a8b.tar.xz | |
Merge branch 'CR_5782_CAN_515_william.qiu' into 'jh7110-5.15.y-devel'
CR_5782: riscv: dts: starfive:disable CANFD func
See merge request sdk/linux!889
| -rwxr-xr-x | arch/riscv/boot/dts/starfive/jh7110.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi index 40268df53602..3541fb432334 100755 --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi @@ -1168,7 +1168,7 @@ reset-names = "rst_apb", "rst_core", "rst_timer"; frequency = <40000000>; starfive,sys-syscon = <&sys_syscon 0x88 0x12 0x40000>; - syscon,can_or_canfd = <1>; + syscon,can_or_canfd = <0>; status = "disabled"; }; |