diff --git a/patches-6.18/0003-firmware-arm_scmi-add-acpi-support-to-SCMI.patch b/patches-6.18/0003-firmware-arm_scmi-add-acpi-support-to-SCMI.patch
index 0203590..95cc37a 100644
--- a/patches-6.18/0003-firmware-arm_scmi-add-acpi-support-to-SCMI.patch
+++ b/patches-6.18/0003-firmware-arm_scmi-add-acpi-support-to-SCMI.patch
@@ -128,12 +128,12 @@ index 111111111111..222222222222 100644
  static void __tag##_dev_free(void *data)				       \
  {									       \
  	struct platform_device *spdev = data;				       \
-@@ -492,7 +493,7 @@ static int __tag##_probe(struct platform_device *pdev)			       \
+@@ -492,7 +493,8 @@ static int __tag##_probe(struct platform_device *pdev)			       \
  	if (!spdev)							       \
  		return -ENOMEM;						       \
  									       \
--	device_set_of_node_from_dev(&spdev->dev, dev);			       \
-+	device_set_node(&spdev->dev, dev->fwnode);			       \
++	spdev->dev.fwnode = dev->fwnode;			            \
+ 	device_set_of_node_from_dev(&spdev->dev, dev);			       \
  									       \
  	strans.supplier = dev;						       \
  	memcpy(&strans.desc, &(__desc), sizeof(strans.desc));		       \
diff --git a/patches-7.0/0003-firmware-arm_scmi-add-acpi-support-to-SCMI.patch b/patches-7.0/0003-firmware-arm_scmi-add-acpi-support-to-SCMI.patch
index 7e490fa..6b04954 100644
--- a/patches-7.0/0003-firmware-arm_scmi-add-acpi-support-to-SCMI.patch
+++ b/patches-7.0/0003-firmware-arm_scmi-add-acpi-support-to-SCMI.patch
@@ -129,12 +129,12 @@ index 111111111111..222222222222 100644
  static void __tag##_dev_free(void *data)				       \
  {									       \
  	struct platform_device *spdev = data;				       \
-@@ -492,7 +493,7 @@ static int __tag##_probe(struct platform_device *pdev)			       \
+@@ -492,7 +493,8 @@ static int __tag##_probe(struct platform_device *pdev)			       \
  	if (!spdev)							       \
  		return -ENOMEM;						       \
  									       \
--	device_set_of_node_from_dev(&spdev->dev, dev);			       \
-+	device_set_node(&spdev->dev, dev->fwnode);			       \
++	spdev->dev.fwnode = dev->fwnode;			            \
+	device_set_of_node_from_dev(&spdev->dev, dev);			       \
  									       \
  	strans.supplier = dev;						       \
  	memcpy(&strans.desc, &(__desc), sizeof(strans.desc));		       \
diff --git a/patches-7.1/0003-firmware-arm_scmi-add-acpi-support-to-SCMI.patch b/patches-7.1/0003-firmware-arm_scmi-add-acpi-support-to-SCMI.patch
index c70266a..8a4fe97 100644
--- a/patches-7.1/0003-firmware-arm_scmi-add-acpi-support-to-SCMI.patch
+++ b/patches-7.1/0003-firmware-arm_scmi-add-acpi-support-to-SCMI.patch
@@ -129,12 +129,12 @@ index 111111111111..222222222222 100644
  static void __tag##_dev_free(void *data)				       \
  {									       \
  	struct platform_device *spdev = data;				       \
-@@ -496,7 +497,7 @@ static int __tag##_probe(struct platform_device *pdev)			       \
+@@ -496,7 +497,8 @@ static int __tag##_probe(struct platform_device *pdev)			       \
  	if (!spdev)							       \
  		return -ENOMEM;						       \
  									       \
--	device_set_of_node_from_dev(&spdev->dev, dev);			       \
-+	device_set_node(&spdev->dev, dev->fwnode);			       \
++	spdev->dev.fwnode = dev->fwnode;			            \
+ 	device_set_of_node_from_dev(&spdev->dev, dev);			       \
  									       \
  	strans.supplier = dev;						       \
  	memcpy(&strans.desc, &(__desc), sizeof(strans.desc));		       \