5 files changed, 7 insertions, 7 deletions
diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c
index c3e647edfac..fabe4964a33 100644
--- a/drivers/misc/cros_ec.c
+++ b/drivers/misc/cros_ec.c
@@ -487,7 +487,7 @@ int cros_ec_read_build_info(struct udevice *dev, char **strp)
 }
 
 int cros_ec_read_current_image(struct udevice *dev,
-			       enum ec_image *image)
+			       enum ec_current_image *image)
 {
 	struct ec_response_get_version *r;
 
diff --git a/drivers/misc/cros_ec_sandbox.c b/drivers/misc/cros_ec_sandbox.c
index 9fedca4e6b6..432b1fbb0c4 100644
--- a/drivers/misc/cros_ec_sandbox.c
+++ b/drivers/misc/cros_ec_sandbox.c
@@ -100,7 +100,7 @@ struct ec_state {
 	struct fdt_cros_ec ec_config;
 	uint8_t *flash_data;
 	int flash_data_len;
-	enum ec_image current_image;
+	enum ec_current_image current_image;
 	int matrix_count;
 	struct ec_keymatrix_entry *matrix;	/* the key matrix info */
 	uint8_t keyscan[KEYBOARD_COLS];
@@ -726,7 +726,7 @@ int cros_ec_probe(struct udevice *dev)
 	return cros_ec_register(dev);
 }
 
-static const struct dm_cros_ec_ops cros_ec_ops = {
+struct dm_cros_ec_ops cros_ec_ops = {
 	.packet = cros_ec_sandbox_packet,
 	.get_switches = cros_ec_sandbox_get_switches,
 };
diff --git a/drivers/misc/i2c_eeprom_emul.c b/drivers/misc/i2c_eeprom_emul.c
index 40f34ad03a4..3ad2e047ee3 100644
--- a/drivers/misc/i2c_eeprom_emul.c
+++ b/drivers/misc/i2c_eeprom_emul.c
@@ -144,7 +144,7 @@ static int sandbox_i2c_eeprom_xfer(struct udevice *emul, struct i2c_msg *msg,
 	return 0;
 }
 
-static const struct dm_i2c_ops sandbox_i2c_emul_ops = {
+struct dm_i2c_ops sandbox_i2c_emul_ops = {
 	.xfer = sandbox_i2c_eeprom_xfer,
 };
 
diff --git a/drivers/misc/k3_avs.c b/drivers/misc/k3_avs.c
index a885c99c547..0774e0a4c9e 100644
--- a/drivers/misc/k3_avs.c
+++ b/drivers/misc/k3_avs.c
@@ -300,7 +300,7 @@ static void k3_avs_program_tshut(struct k3_avs_privdata *priv)
 	void __iomem *cfg2_base;
 	void __iomem *fuse_base;
 
-	cfg2_base = (void __iomem *)dev_read_addr_index(priv->dev, 1);
+	cfg2_base = (void __iomem *)devfdt_get_addr_index(priv->dev, 1);
 	if (IS_ERR(cfg2_base)) {
 		dev_err(priv->dev, "cfg base is not defined\n");
 		return;
@@ -319,7 +319,7 @@ static void k3_avs_program_tshut(struct k3_avs_privdata *priv)
 	 */
 
 	if (device_is_compatible(priv->dev, "ti,j721e-vtm")) {
-		fuse_base = (void __iomem *)dev_read_addr_index(priv->dev, 2);
+		fuse_base = (void __iomem *)devfdt_get_addr_index(priv->dev, 2);
 		if (IS_ERR(fuse_base)) {
 			dev_err(priv->dev, "fuse-base is not defined for J721E Soc\n");
 			return;
diff --git a/drivers/misc/qfw.c b/drivers/misc/qfw.c
index 8a11637ca7f..0e002ac25f4 100644
--- a/drivers/misc/qfw.c
+++ b/drivers/misc/qfw.c
@@ -152,7 +152,7 @@ UCLASS_DRIVER(qfw) = {
 	.per_device_auto	= sizeof(struct qfw_dev),
 };
 
-static const struct bootdev_ops qfw_bootdev_ops = {
+struct bootdev_ops qfw_bootdev_ops = {
 	.get_bootflow	= qfw_get_bootflow,
 };