From 3897067168c771c1af413b36b55edcf1115f5d2d Mon Sep 17 00:00:00 2001 From: "Clivia.Cai" Date: Sat, 23 Apr 2022 23:35:09 -0700 Subject: [PATCH] dt-bingings:can:Add syscon register config Add the syscon register config for can/canfd dt-bindings. In addition, Redefine some attribute names. Signed-off-by: Clivia.Cai --- arch/riscv/boot/dts/starfive/jh7110.dtsi | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi index cae9d06..7b89af3 100644 --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi @@ -698,18 +698,14 @@ status = "disabled"; }; - ipmscan0: can@130d0000 { + can0: can@130d0000 { compatible = "ipms,can"; - reg = <0x0 0x130d0000 0x0 0x1000>, - <0x0 0x13030000 0x0 0x10000>; - reg-names = "reg_base","sys_syscon"; + reg = <0x0 0x130d0000 0x0 0x1000>; interrupts = <112>; - clocks = <&canclk>, - <&clkgen JH7110_CAN0_CTRL_CLK_APB>, + clocks = <&clkgen JH7110_CAN0_CTRL_CLK_APB>, <&clkgen JH7110_CAN0_CTRL_CLK_CAN>, <&clkgen JH7110_CAN0_CTRL_CLK_TIMER>; - clock-names = "ipms_can_clk", - "apb_clk", + clock-names = "apb_clk", "core_clk", "timer_clk"; resets = <&rstgen RSTN_U0_CAN_CTRL_APB>, @@ -718,21 +714,19 @@ reset-names = "rst_apb", "rst_core", "rst_timer"; + starfive,sys-syscon = <&sys_syscon 0x10 0x3 0x8>; + syscon,can_or_canfd = <0>; status = "disabled"; }; - ipmscan1: can@130c0000 { + can1: can@130e0000 { compatible = "ipms,can"; - reg = <0x0 0x130c0000 0x0 0x1000>, - <0x0 0x13030000 0x0 0x10000>; - reg-names = "reg_base","sys_syscon"; + reg = <0x0 0x130e0000 0x0 0x1000>; interrupts = <113>; - clocks = <&canclk>, - <&clkgen JH7110_CAN1_CTRL_CLK_APB>, + clocks = <&clkgen JH7110_CAN1_CTRL_CLK_APB>, <&clkgen JH7110_CAN1_CTRL_CLK_CAN>, <&clkgen JH7110_CAN1_CTRL_CLK_TIMER>; - clock-names = "ipms_can_clk", - "apb_clk", + clock-names = "apb_clk", "core_clk", "timer_clk"; resets = <&rstgen RSTN_U1_CAN_CTRL_APB>, @@ -741,6 +735,8 @@ reset-names = "rst_apb", "rst_core", "rst_timer"; + starfive,sys-syscon = <&sys_syscon 0x88 0x12 0x40000>; + syscon,can_or_canfd = <0>; status = "disabled"; }; -- 2.7.4