Merge tag 'v2024.07-rc3' into next

Prepare v2024.07-rc3

15 files changed, 15 insertions, 3 deletions

diff --git a/drivers/ata/ahci-pci.c b/drivers/ata/ahci-pci.c
index f2102aaa635..5356b9d83d3 100644
--- a/drivers/ata/ahci-pci.c
+++ b/drivers/ata/ahci-pci.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2017, Bin Meng <[email protected]>
  */
 
+#include <common.h>
 #include <ahci.h>
 #include <scsi.h>
 #include <dm.h>
diff --git a/drivers/ata/ahci-uclass.c b/drivers/ata/ahci-uclass.c
index 7affb3f1ec7..d398b50b9a1 100644
--- a/drivers/ata/ahci-uclass.c
+++ b/drivers/ata/ahci-uclass.c
@@ -6,6 +6,7 @@
 
 #define LOG_CATEGORY UCLASS_AHCI
 
+#include <common.h>
 #include <ahci.h>
 #include <dm.h>
 
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index ac869296d52..04ddc339464 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -8,10 +8,10 @@
  *
  * This driver provides a SCSI interface to SATA.
  */
+#include <common.h>
 #include <blk.h>
 #include <cpu_func.h>
 #include <log.h>
-#include <time.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 
diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c
index f6e2d6bee45..f05150d61dd 100644
--- a/drivers/ata/ahci_mvebu.c
+++ b/drivers/ata/ahci_mvebu.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2016 Stefan Roese <[email protected]>
  */
 
+#include <common.h>
 #include <ahci.h>
 #include <dm.h>
 #include <log.h>
diff --git a/drivers/ata/ahci_sunxi.c b/drivers/ata/ahci_sunxi.c
index 6cf5cee055e..9064774e661 100644
--- a/drivers/ata/ahci_sunxi.c
+++ b/drivers/ata/ahci_sunxi.c
@@ -1,3 +1,4 @@
+#include <common.h>
 #include <ahci.h>
 #include <dm.h>
 #include <log.h>
diff --git a/drivers/ata/dwc_ahci.c b/drivers/ata/dwc_ahci.c
index b480cde4465..15fd3e365b2 100644
--- a/drivers/ata/dwc_ahci.c
+++ b/drivers/ata/dwc_ahci.c
@@ -8,6 +8,7 @@
  * Author: Mugunthan V N <[email protected]>
  */
 
+#include <common.h>
 #include <dm.h>
 #include <ahci.h>
 #include <scsi.h>
diff --git a/drivers/ata/dwc_ahsata.c b/drivers/ata/dwc_ahsata.c
index a29d641343e..b4d4e39c9b3 100644
--- a/drivers/ata/dwc_ahsata.c
+++ b/drivers/ata/dwc_ahsata.c
@@ -4,6 +4,7 @@
  * Terry Lv <[email protected]>
  */
 
+#include <common.h>
 #include <ahci.h>
 #include <blk.h>
 #include <cpu_func.h>
diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c
index 4990148388b..969bc191f8e 100644
--- a/drivers/ata/fsl_sata.c
+++ b/drivers/ata/fsl_sata.c
@@ -5,6 +5,7 @@
  * Author: Dave Liu <[email protected]>
  */
 
+#include <common.h>
 #include <ahci.h>
 #include <blk.h>
 #include <command.h>
diff --git a/drivers/ata/libata.c b/drivers/ata/libata.c
index ef659cb1728..47e2c5c1cc4 100644
--- a/drivers/ata/libata.c
+++ b/drivers/ata/libata.c
@@ -5,9 +5,9 @@
  *		port from the libata of linux kernel
  */
 
+#include <common.h>
 #include <compiler.h>
 #include <libata.h>
-#include <stdio.h>
 
 u64 ata_id_n_sectors(u16 *id)
 {
diff --git a/drivers/ata/mtk_ahci.c b/drivers/ata/mtk_ahci.c
index 53aabee0a5e..2c5227df306 100644
--- a/drivers/ata/mtk_ahci.c
+++ b/drivers/ata/mtk_ahci.c
@@ -8,6 +8,7 @@
  * Author: Frank Wunderlich <[email protected]>
  */
 
+#include <common.h>
 #include <ahci.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
diff --git a/drivers/ata/sata.c b/drivers/ata/sata.c
index 84437d3d346..784d9bbeacb 100644
--- a/drivers/ata/sata.c
+++ b/drivers/ata/sata.c
@@ -9,6 +9,7 @@
  *		Dave Liu <[email protected]>
  */
 
+#include <common.h>
 #include <ahci.h>
 #include <blk.h>
 #include <dm.h>
diff --git a/drivers/ata/sata_bootdev.c b/drivers/ata/sata_bootdev.c
index a5ca6f6fd5b..f638493ce04 100644
--- a/drivers/ata/sata_bootdev.c
+++ b/drivers/ata/sata_bootdev.c
@@ -5,6 +5,7 @@
  * Copyright 2023 Tony Dinh <[email protected]>
  */
 
+#include <common.h>
 #include <ahci.h>
 #include <bootdev.h>
 #include <dm.h>
diff --git a/drivers/ata/sata_ceva.c b/drivers/ata/sata_ceva.c
index a81b3165992..7769d4f99ef 100644
--- a/drivers/ata/sata_ceva.c
+++ b/drivers/ata/sata_ceva.c
@@ -3,6 +3,7 @@
  * (C) Copyright 2015 - 2016 Xilinx, Inc.
  * Michal Simek <[email protected]>
  */
+#include <common.h>
 #include <dm.h>
 #include <ahci.h>
 #include <generic-phy.h>
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index ac78760a33e..94d7369351a 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -31,6 +31,7 @@
  * No port multiplier support
  */
 
+#include <common.h>
 #include <ahci.h>
 #include <blk.h>
 #include <bootdev.h>
@@ -45,7 +46,6 @@
 #include <libata.h>
 #include <malloc.h>
 #include <sata.h>
-#include <time.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index 5b80f6249d7..43a91a79120 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -5,6 +5,7 @@
  * Author: Tang Yuantian <[email protected]>
  */
 
+#include <common.h>
 #include <blk.h>
 #include <cpu_func.h>
 #include <dm.h>