From c9f97cf386edb7006e2fe468ba5d0022e2c46792 Mon Sep 17 00:00:00 2001
From: Henrik Brix Andersen <hebad@vestas.com>
Date: Thu, 1 Jun 2023 15:30:53 +0200
Subject: [PATCH] drivers: can: mcan: move header file to public includes

Move the Bosch M_CAN header file to include/zephyr/drivers/can/can_mcan.h
for use in out-of-tree drivers.

Signed-off-by: Henrik Brix Andersen <hebad@vestas.com>
---
 drivers/can/can_mcan.c                             | 3 +--
 drivers/can/can_mcux_mcan.c                        | 3 +--
 drivers/can/can_sam.c                              | 3 +--
 drivers/can/can_sam0.c                             | 3 +--
 drivers/can/can_stm32fd.c                          | 3 +--
 drivers/can/can_stm32h7.c                          | 3 +--
 {drivers => include/zephyr/drivers}/can/can_mcan.h | 6 +++---
 7 files changed, 9 insertions(+), 15 deletions(-)
 rename {drivers => include/zephyr/drivers}/can/can_mcan.h (99%)

diff --git a/drivers/can/can_mcan.c b/drivers/can/can_mcan.c
index b320eabd6d4..cf5aba19729 100644
--- a/drivers/can/can_mcan.c
+++ b/drivers/can/can_mcan.c
@@ -6,14 +6,13 @@
  */
 
 #include <zephyr/drivers/can.h>
+#include <zephyr/drivers/can/can_mcan.h>
 #include <zephyr/drivers/can/transceiver.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/sys_io.h>
 #include <zephyr/sys/util.h>
 
-#include "can_mcan.h"
-
 LOG_MODULE_REGISTER(can_mcan, CONFIG_CAN_LOG_LEVEL);
 
 #define CAN_INIT_TIMEOUT_MS 100
diff --git a/drivers/can/can_mcux_mcan.c b/drivers/can/can_mcux_mcan.c
index 711129c04f2..73caabb9d9c 100644
--- a/drivers/can/can_mcux_mcan.c
+++ b/drivers/can/can_mcux_mcan.c
@@ -6,13 +6,12 @@
 
 #include <zephyr/device.h>
 #include <zephyr/drivers/can.h>
+#include <zephyr/drivers/can/can_mcan.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/irq.h>
 
-#include "can_mcan.h"
-
 LOG_MODULE_REGISTER(can_mcux_mcan, CONFIG_CAN_LOG_LEVEL);
 
 #define DT_DRV_COMPAT nxp_lpc_mcan
diff --git a/drivers/can/can_sam.c b/drivers/can/can_sam.c
index 679ca41cd5f..10ff7bc503f 100644
--- a/drivers/can/can_sam.c
+++ b/drivers/can/can_sam.c
@@ -6,6 +6,7 @@
  */
 
 #include <zephyr/drivers/can.h>
+#include <zephyr/drivers/can/can_mcan.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/drivers/clock_control/atmel_sam_pmc.h>
 #include <soc.h>
@@ -13,8 +14,6 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/irq.h>
 
-#include "can_mcan.h"
-
 LOG_MODULE_REGISTER(can_sam, CONFIG_CAN_LOG_LEVEL);
 
 #define DT_DRV_COMPAT atmel_sam_can
diff --git a/drivers/can/can_sam0.c b/drivers/can/can_sam0.c
index 3377cef5b98..786d2cb9a72 100644
--- a/drivers/can/can_sam0.c
+++ b/drivers/can/can_sam0.c
@@ -7,14 +7,13 @@
  */
 
 #include <zephyr/drivers/can.h>
+#include <zephyr/drivers/can/can_mcan.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/irq.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <soc.h>
 
-#include "can_mcan.h"
-
 LOG_MODULE_REGISTER(can_sam0, CONFIG_CAN_LOG_LEVEL);
 
 #define DT_DRV_COMPAT atmel_sam0_can
diff --git a/drivers/can/can_stm32fd.c b/drivers/can/can_stm32fd.c
index 2db8216f48f..94bc1802c3a 100644
--- a/drivers/can/can_stm32fd.c
+++ b/drivers/can/can_stm32fd.c
@@ -6,6 +6,7 @@
  */
 
 #include <zephyr/drivers/can.h>
+#include <zephyr/drivers/can/can_mcan.h>
 #include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/pinctrl.h>
@@ -16,8 +17,6 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/irq.h>
 
-#include "can_mcan.h"
-
 LOG_MODULE_REGISTER(can_stm32fd, CONFIG_CAN_LOG_LEVEL);
 
 #define DT_DRV_COMPAT st_stm32_fdcan
diff --git a/drivers/can/can_stm32h7.c b/drivers/can/can_stm32h7.c
index a3aee9f46fd..7ff6fcd1eb9 100644
--- a/drivers/can/can_stm32h7.c
+++ b/drivers/can/can_stm32h7.c
@@ -6,6 +6,7 @@
  */
 
 #include <zephyr/drivers/can.h>
+#include <zephyr/drivers/can/can_mcan.h>
 #include <zephyr/drivers/clock_control/stm32_clock_control.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/pinctrl.h>
@@ -14,8 +15,6 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/irq.h>
 
-#include "can_mcan.h"
-
 LOG_MODULE_REGISTER(can_stm32h7, CONFIG_CAN_LOG_LEVEL);
 
 #define DT_DRV_COMPAT st_stm32h7_fdcan
diff --git a/drivers/can/can_mcan.h b/include/zephyr/drivers/can/can_mcan.h
similarity index 99%
rename from drivers/can/can_mcan.h
rename to include/zephyr/drivers/can/can_mcan.h
index 8c54fd54cfc..e2162894eea 100644
--- a/drivers/can/can_mcan.h
+++ b/include/zephyr/drivers/can/can_mcan.h
@@ -6,8 +6,8 @@
  *
  */
 
-#ifndef ZEPHYR_DRIVERS_CAN_MCAN_H_
-#define ZEPHYR_DRIVERS_CAN_MCAN_H_
+#ifndef ZEPHYR_INCLUDE_DRIVERS_CAN_CAN_MCAN_H_
+#define ZEPHYR_INCLUDE_DRIVERS_CAN_CAN_MCAN_H_
 
 #include <zephyr/cache.h>
 #include <zephyr/devicetree.h>
@@ -1703,4 +1703,4 @@ void can_mcan_set_state_change_callback(const struct device *dev,
  */
 int can_mcan_get_max_bitrate(const struct device *dev, uint32_t *max_bitrate);
 
-#endif /* ZEPHYR_DRIVERS_CAN_MCAN_H_ */
+#endif /* ZEPHYR_INCLUDE_DRIVERS_CAN_CAN_MCAN_H_ */