Skip to contentSkip to conversation

SPMI patches for the merge window

PATCH New Stephen Boyd 1 participant 3 messages Jan 16, 2025

Subsystems (2)
lore
Share & tools
lore

Stephen Boyd

author maintainer
#0 lore raw

cover SPMI patches for the merge window

We have two very small patches this time around, both about firmware nodes. One plugs a leak and the other sets the fwnode properly for SPMI devices.

Joe Hattori (1):
spmi: hisi-spmi-controller: Drop duplicated OF node assignment in
spmi_controller_probe()

Saravana Kannan (1):
spmi: Set fwnode for spmi devices

 drivers/spmi/hisi-spmi-controller.c | 3 ---
 drivers/spmi/spmi.c                 | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

base-commit: 40384c840ea1944d7c5a392e8975ed088ecf0b37

Signature · 2 lines
https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/
https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git
author maintainer
#1 lore raw

PATCH 1/2 spmi: Set fwnode for spmi devices

From: Saravana Kannan <[email protected]>

This allows fw_devlink to do proper dependency tracking for SPMI devices. So, better deferred probe handling, async probing, async suspend/resume, etc.

---
 drivers/spmi/spmi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spmi/spmi.c +1 -1
index fb0101da1485..3cf8d9bd4566 100644
@@ -517,7 +517,7 @@ static void of_spmi_register_devices(struct spmi_controller *ctrl)
 		if (!sdev)
 			continue;
 
-		sdev->dev.of_node = node;
+		device_set_node(&sdev->dev, of_fwnode_handle(node));
 		sdev->usid = (u8)reg[0];
 
 		err = spmi_device_add(sdev);
Signature · 2 lines
https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/
https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git
author maintainer
#2 lore raw

PATCH 2/2 spmi: hisi-spmi-controller: Drop duplicated OF node assignment in spmi_controller_probe()

In reply to Stephen Boyd

From: Joe Hattori <[email protected]>

spmi_controller_probe() assigns a parent device and an OF node to an SPMI controller. However, the operations are not needed as they are already assigned in spmi_controller_alloc(). Thus, remove the duplicated assignments. An unnecessary OF node reference acquisition is also dropped by this patch.

---
 drivers/spmi/hisi-spmi-controller.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/spmi/hisi-spmi-controller.c +0 -3
index 3cafdf22c909..122140b97579 100644
@@ -300,9 +300,6 @@ static int spmi_controller_probe(struct platform_device *pdev)
 
 	spin_lock_init(&spmi_controller->lock);
 
-	ctrl->dev.parent = pdev->dev.parent;
-	ctrl->dev.of_node = of_node_get(pdev->dev.of_node);
-
 	/* Callbacks */
 	ctrl->read_cmd = spmi_read_cmd;
 	ctrl->write_cmd = spmi_write_cmd;
Signature · 2 lines
https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/
https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git