From 2df0c1b5c1d777fa61d8cb9032dba47d0df419fb Mon Sep 17 00:00:00 2001
From: Tristan Seifert <tristans@carbonrobotics.com>
Date: Fri, 16 Aug 2024 16:08:13 -0700
Subject: [PATCH] can2 fix

---
 drivers/can/can_mcan.c     | 1 -
 dts/arm/st/h7/stm32h7.dtsi | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/can/can_mcan.c b/drivers/can/can_mcan.c
index 9414765cc3e2e7..4afae019f9f6cd 100644
--- a/drivers/can/can_mcan.c
+++ b/drivers/can/can_mcan.c
@@ -380,7 +380,6 @@ int can_mcan_init(const struct device *dev)
 	uint32_t mrba = 0;
 #ifdef CONFIG_CAN_STM32H7
 	mrba = (uint32_t)msg_ram;
-	mrba = 0x4000ac00;
 #endif
 #ifdef CONFIG_CAN_MCUX_MCAN
 	mrba = (uint32_t)msg_ram & CAN_MCAN_MRBA_BA_MSK;
diff --git a/dts/arm/st/h7/stm32h7.dtsi b/dts/arm/st/h7/stm32h7.dtsi
index c7a53ac8170d1d..7e9b6fa280e453 100644
--- a/dts/arm/st/h7/stm32h7.dtsi
+++ b/dts/arm/st/h7/stm32h7.dtsi
@@ -484,7 +484,7 @@
 				compatible = "st,stm32h7-fdcan";
 				#address-cells = <1>;
 				#size-cells = <0>;
-				reg = <0x4000a400 0x400>, <0x4000af50 0x350>;
+				reg = <0x4000a400 0x400>, <0x4000ac00 0x6a0>;
 				reg-names = "m_can", "message_ram";
 				clocks = <&rcc STM32_CLOCK_BUS_APB1_2 0x00000100>;
 				interrupts = <20 0>, <22 0>, <63 0>;