diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 798030c0c5ce..295d02e7f0a8 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -2368,8 +2368,8 @@ of_register_spi_device(struct spi_controller *ctlr, struct device_node *nc)
 
 	/* Store a pointer to the node in the device structure */
 	of_node_get(nc);
-	spi->dev.of_node = nc;
-	spi->dev.fwnode = of_fwnode_handle(nc);
+
+	device_set_node(&spi->dev, of_fwnode_handle(nc));
 
 	/* Register the new device */
 	rc = spi_add_device(spi);