soc: ambiq: Optimize the inclusion relationship of header files

AlessandroLuo · kartben · commit 6f4b92d64d71 · 2025-04-17T09:06:18.000+02:00
Optimized the inclusion relationship of header files

Signed-off-by: Hao Luo &lt;hluo@ambiq.com&gt;
diff --git a/drivers/adc/adc_ambiq.c b/drivers/adc/adc_ambiq.c
@@ -16,7 +16,7 @@
 #include "adc_context.h"
 
 /* ambiq-sdk includes */
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(adc_ambiq, CONFIG_ADC_LOG_LEVEL);
diff --git a/drivers/bluetooth/hci/apollox_blue.c b/drivers/bluetooth/hci/apollox_blue.c
@@ -25,7 +25,7 @@ LOG_MODULE_REGISTER(bt_apollox_driver);
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/clock_control/clock_control_ambiq.h>
 
-#include <am_mcu_apollo.h>
+#include <soc.h>
 #include "apollox_blue.h"
 #if (CONFIG_SOC_SERIES_APOLLO4X)
 #include "am_devices_cooper.h"
diff --git a/drivers/clock_control/clock_control_ambiq.c b/drivers/clock_control/clock_control_ambiq.c
@@ -11,7 +11,7 @@
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/drivers/clock_control/clock_control_ambiq.h>
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(clock_control_ambiq, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
diff --git a/drivers/counter/counter_ambiq_timer.c b/drivers/counter/counter_ambiq_timer.c
@@ -12,7 +12,7 @@
 #include <zephyr/device.h>
 #include <zephyr/logging/log.h>
 /* ambiq-sdk includes */
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 LOG_MODULE_REGISTER(ambiq_counter, CONFIG_COUNTER_LOG_LEVEL);
 
diff --git a/drivers/flash/flash_ambiq.c b/drivers/flash/flash_ambiq.c
@@ -11,7 +11,7 @@
 #include <zephyr/drivers/flash.h>
 #include <zephyr/logging/log.h>
 
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 LOG_MODULE_REGISTER(flash_ambiq, CONFIG_FLASH_LOG_LEVEL);
 
diff --git a/drivers/gpio/gpio_ambiq.c b/drivers/gpio/gpio_ambiq.c
@@ -14,7 +14,7 @@
 #include <zephyr/irq.h>
 #include <zephyr/spinlock.h>
 
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 typedef void (*ambiq_gpio_cfg_func_t)(void);
 
diff --git a/drivers/hwinfo/hwinfo_ambiq.c b/drivers/hwinfo/hwinfo_ambiq.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <am_mcu_apollo.h>
+#include <soc.h>
 #include <zephyr/drivers/hwinfo.h>
 #include <string.h>
 #include <zephyr/sys/byteorder.h>
diff --git a/drivers/i2c/i2c_ambiq.c b/drivers/i2c/i2c_ambiq.c
@@ -13,7 +13,7 @@
 #include <zephyr/pm/policy.h>
 #include <zephyr/pm/device_runtime.h>
 
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 #include <zephyr/mem_mgmt/mem_attr.h>
 
diff --git a/drivers/mspi/mspi_ambiq.h b/drivers/mspi/mspi_ambiq.h
@@ -7,7 +7,7 @@
 #ifndef MSPI_AMBIQ_H_
 #define MSPI_AMBIQ_H_
 
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 /* Hand-calculated minimum heap sizes needed to return a successful
  * 1-byte allocation.  See details in lib/os/heap.[ch]
diff --git a/drivers/pinctrl/pinctrl_ambiq.c b/drivers/pinctrl/pinctrl_ambiq.c
@@ -7,7 +7,7 @@
 #include <zephyr/drivers/pinctrl.h>
 
 /* ambiq-sdk includes */
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 static void pinctrl_configure_pin(const pinctrl_soc_pin_t *pin)
 {
diff --git a/drivers/rtc/rtc_ambiq.c b/drivers/rtc/rtc_ambiq.c
@@ -15,7 +15,7 @@
 
 LOG_MODULE_REGISTER(ambiq_rtc, CONFIG_RTC_LOG_LEVEL);
 
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 #define AMBIQ_RTC_ALARM_TIME_MASK                                                              \
 	(RTC_ALARM_TIME_MASK_SECOND | RTC_ALARM_TIME_MASK_MINUTE | RTC_ALARM_TIME_MASK_HOUR |      \
diff --git a/drivers/sdhc/sdhc_ambiq.c b/drivers/sdhc/sdhc_ambiq.c
@@ -17,7 +17,7 @@
 #include <zephyr/pm/policy.h>
 #include <zephyr/pm/device_runtime.h>
 
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 LOG_MODULE_REGISTER(ambiq_sdio, CONFIG_SDHC_LOG_LEVEL);
 
diff --git a/drivers/serial/uart_pl011_ambiq.h b/drivers/serial/uart_pl011_ambiq.h
@@ -13,7 +13,7 @@
 #include <zephyr/pm/policy.h>
 
 #include "uart_pl011_registers.h"
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 static inline void pl011_ambiq_enable_clk(const struct device *dev)
 {
diff --git a/drivers/spi/spi_ambiq_bleif.c b/drivers/spi/spi_ambiq_bleif.c
@@ -21,7 +21,7 @@ LOG_MODULE_REGISTER(spi_ambiq_bleif);
 #include <stdlib.h>
 #include <errno.h>
 #include "spi_context.h"
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 struct spi_ambiq_config {
 	uint32_t base;
diff --git a/drivers/spi/spi_ambiq_spic.c b/drivers/spi/spi_ambiq_spic.c
@@ -21,7 +21,7 @@ LOG_MODULE_REGISTER(spi_ambiq);
 #include <stdlib.h>
 #include <errno.h>
 #include "spi_context.h"
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 #include <zephyr/mem_mgmt/mem_attr.h>
 
diff --git a/drivers/spi/spi_ambiq_spid.c b/drivers/spi/spi_ambiq_spid.c
@@ -20,7 +20,7 @@ LOG_MODULE_REGISTER(spi_ambiq_spid);
 #include <stdlib.h>
 #include <errno.h>
 #include "spi_context.h"
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 #define SPID_ADDR_INTERVAL 1
 struct spi_ambiq_config {
diff --git a/drivers/timer/ambiq_stimer.c b/drivers/timer/ambiq_stimer.c
@@ -20,7 +20,7 @@
 #include <zephyr/spinlock.h>
 
 /* ambiq-sdk includes */
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 #define COUNTER_MAX UINT32_MAX
 
diff --git a/drivers/usb/udc/udc_ambiq.c b/drivers/usb/udc/udc_ambiq.c
@@ -5,7 +5,6 @@
  */
 
 #include <soc.h>
-#include "am_mcu_apollo.h"
 #include <string.h>
 #include <zephyr/drivers/clock_control/clock_control_ambiq.h>
 #include <zephyr/sys/util.h>
diff --git a/drivers/watchdog/wdt_ambiq.c b/drivers/watchdog/wdt_ambiq.c
@@ -10,7 +10,7 @@
 #include <zephyr/drivers/watchdog.h>
 
 #include <errno.h>
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(wdt_ambiq, CONFIG_WDT_LOG_LEVEL);
diff --git a/soc/ambiq/apollo3x/power.c b/soc/ambiq/apollo3x/power.c
@@ -13,7 +13,7 @@
 #include <zephyr/init.h>
 
 /* ambiq-sdk includes */
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);
 
diff --git a/soc/ambiq/apollo3x/soc.c b/soc/ambiq/apollo3x/soc.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/init.h>
 
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 extern void ambiq_power_init(void);
 
diff --git a/soc/ambiq/apollo3x/soc.h b/soc/ambiq/apollo3x/soc.h
@@ -7,10 +7,6 @@
 #ifndef __SOC_H__
 #define __SOC_H__
 
-#if defined(CONFIG_SOC_APOLLO3P_BLUE)
-#include <apollo3p.h>
-#elif defined(CONFIG_SOC_APOLLO3_BLUE)
-#include <apollo3.h>
-#endif
+#include <am_mcu_apollo.h>
 
 #endif /* __SOC_H__ */
diff --git a/soc/ambiq/apollo4x/power.c b/soc/ambiq/apollo4x/power.c
@@ -13,7 +13,7 @@
 #include <zephyr/init.h>
 
 /* ambiq-sdk includes */
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);
 
diff --git a/soc/ambiq/apollo4x/soc.c b/soc/ambiq/apollo4x/soc.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/init.h>
 
-#include <am_mcu_apollo.h>
+#include <soc.h>
 
 extern void ambiq_power_init(void);
 void soc_early_init_hook(void)
diff --git a/soc/ambiq/apollo4x/soc.h b/soc/ambiq/apollo4x/soc.h
@@ -7,6 +7,6 @@
 #ifndef __SOC_H__
 #define __SOC_H__
 
-#include <apollo4p.h>
+#include <am_mcu_apollo.h>
 
 #endif /* __SOC_H__ */

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#include <zephyr/drivers/pinctrl.h>`
`8`	`8`
`9`	`9`	`/* ambiq-sdk includes */`
`10`		`-#include <am_mcu_apollo.h>`
	`10`	`+#include <soc.h>`
`11`	`11`
`12`	`12`	`static void pinctrl_configure_pin(const pinctrl_soc_pin_t *pin)`
`13`	`13`	`{`