Merge branch 'next'HEADmasterWIP/06Jul2026

5 files changed, 9 insertions, 13 deletions

diff --git a/drivers/ata/dwc_ahci.c b/drivers/ata/dwc_ahci.c
index b480cde4465..0431d370716 100644
--- a/drivers/ata/dwc_ahci.c
+++ b/drivers/ata/dwc_ahci.c
@@ -39,7 +39,7 @@ static int dwc_ahci_of_to_plat(struct udevice *dev)
 	priv->base = map_physmem(dev_read_addr(dev), sizeof(void *),
 				 MAP_NOCACHE);
 
-	addr = devfdt_get_addr_index(dev, 1);
+	addr = dev_read_addr_index(dev, 1);
 	if (addr != FDT_ADDR_T_NONE) {
 		priv->wrapper_base = map_physmem(addr, sizeof(void *),
 						 MAP_NOCACHE);
diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c
index 4990148388b..a29735f7609 100644
--- a/drivers/ata/fsl_sata.c
+++ b/drivers/ata/fsl_sata.c
@@ -960,7 +960,7 @@ static int sata_fsl_scan(struct udevice *dev)
 	return 0;
 }
 
-struct ahci_ops sata_fsl_ahci_ops = {
+static const struct ahci_ops sata_fsl_ahci_ops = {
 	.scan = sata_fsl_scan,
 };
 
diff --git a/drivers/ata/mtk_ahci.c b/drivers/ata/mtk_ahci.c
index 53aabee0a5e..1d4245ee635 100644
--- a/drivers/ata/mtk_ahci.c
+++ b/drivers/ata/mtk_ahci.c
@@ -45,7 +45,9 @@ static int mtk_ahci_of_to_plat(struct udevice *dev)
 {
 	struct mtk_ahci_priv *priv = dev_get_priv(dev);
 
-	priv->base = devfdt_remap_addr_index(dev, 0);
+	priv->base = dev_remap_addr_index(dev, 0);
+	if (!priv->base)
+		return -EINVAL;
 
 	return 0;
 }
@@ -54,11 +56,9 @@ static int mtk_ahci_parse_property(struct ahci_uc_priv *hpriv,
 				   struct udevice *dev)
 {
 	struct mtk_ahci_priv *plat = dev_get_priv(dev);
-	const void *fdt = gd->fdt_blob;
 
 	/* enable SATA function if needed */
-	if (fdt_get_property(fdt, dev_of_offset(dev),
-			     "mediatek,phy-mode", NULL)) {
+	if (dev_read_prop(dev, "mediatek,phy-mode", NULL)) {
 		plat->mode = syscon_regmap_lookup_by_phandle(dev,
 						"mediatek,phy-mode");
 		if (IS_ERR(plat->mode)) {
@@ -69,8 +69,8 @@ static int mtk_ahci_parse_property(struct ahci_uc_priv *hpriv,
 				   SYS_CFG_SATA_MSK, SYS_CFG_SATA_EN);
 	}
 
-	ofnode_read_u32(dev_ofnode(dev), "ports-implemented",
-			&hpriv->port_map);
+	dev_read_u32(dev, "ports-implemented", &hpriv->port_map);
+
 	return 0;
 }
 
diff --git a/drivers/ata/sata_bootdev.c b/drivers/ata/sata_bootdev.c
index a5ca6f6fd5b..7d5ef3c94bf 100644
--- a/drivers/ata/sata_bootdev.c
+++ b/drivers/ata/sata_bootdev.c
@@ -37,9 +37,6 @@ static int sata_bootdev_hunt(struct bootdev_hunter *info, bool show)
 	return 0;
 }
 
-struct bootdev_ops sata_bootdev_ops = {
-};
-
 static const struct udevice_id sata_bootdev_ids[] = {
 	{ .compatible = "u-boot,bootdev-sata" },
 	{ }
@@ -48,7 +45,6 @@ static const struct udevice_id sata_bootdev_ids[] = {
 U_BOOT_DRIVER(sata_bootdev) = {
 	.name		= "sata_bootdev",
 	.id		= UCLASS_BOOTDEV,
-	.ops		= &sata_bootdev_ops,
 	.bind		= sata_bootdev_bind,
 	.of_match	= sata_bootdev_ids,
 };
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index b8c73b4a9dd..3fb1a245698 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -1122,7 +1122,7 @@ static const struct udevice_id sata_mv_ids[] = {
 	{ }
 };
 
-struct ahci_ops sata_mv_ahci_ops = {
+static const struct ahci_ops sata_mv_ahci_ops = {
 	.scan = sata_mv_scan,
 };