diff options
| author | andy.hu <andy.hu@starfivetech.com> | 2024-03-07 13:45:49 +0300 |
|---|---|---|
| committer | andy.hu <andy.hu@starfivetech.com> | 2024-03-07 13:45:49 +0300 |
| commit | c979eafc61a4f3e5a792508c17aa42e6f1f803cd (patch) | |
| tree | 996790f55110837bec6c64501e22fd79d9c37e86 | |
| parent | 7e408c366f541af6f258531a2c8955ca2b3d8580 (diff) | |
| parent | 5b93f86c2f747ba6661cfac84c1e3c0f521d9475 (diff) | |
| download | linux-c979eafc61a4f3e5a792508c17aa42e6f1f803cd.tar.xz | |
Merge branch 'CR_9700_VF2_CAN_5.15_william.qiu' into 'vf2-515-devel'JH7110_VF2_515_v5.11.4
CR_9700_5.15: riscv: dts: can: add dts for CAN
See merge request sbc/linux!199
| -rw-r--r-- | arch/riscv/boot/dts/starfive/vf2-overlay/Makefile | 1 | ||||
| -rw-r--r-- | arch/riscv/boot/dts/starfive/vf2-overlay/vf2-overlay-can.dts | 23 |
2 files changed, 24 insertions, 0 deletions
diff --git a/arch/riscv/boot/dts/starfive/vf2-overlay/Makefile b/arch/riscv/boot/dts/starfive/vf2-overlay/Makefile index 21e425e9dc1e..b5f6778c91cc 100644 --- a/arch/riscv/boot/dts/starfive/vf2-overlay/Makefile +++ b/arch/riscv/boot/dts/starfive/vf2-overlay/Makefile @@ -1,2 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 dtb-$(CONFIG_SOC_STARFIVE_JH7110) += vf2-overlay-uart3-i2c.dtbo +dtb-$(CONFIG_SOC_STARFIVE_JH7110) += vf2-overlay-can.dtbo diff --git a/arch/riscv/boot/dts/starfive/vf2-overlay/vf2-overlay-can.dts b/arch/riscv/boot/dts/starfive/vf2-overlay/vf2-overlay-can.dts new file mode 100644 index 000000000000..c7b7d3292d92 --- /dev/null +++ b/arch/riscv/boot/dts/starfive/vf2-overlay/vf2-overlay-can.dts @@ -0,0 +1,23 @@ +/dts-v1/; +/plugin/; +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/pinctrl/starfive,jh7110-pinfunc.h> +/ { + compatible = "starfive,visionfive-v2", "starfive,jh7110"; + + /* can0 */ + fragment@0 { + target-path = "/soc/can@130d0000"; + __overlay__ { + status = "okay"; + }; + }; + + /* can1 */ + fragment@1 { + target-path = "/soc/can@130e0000"; + __overlay__ { + status = "okay"; + }; + }; +}; |