From d5801d04706430bf2fa76ef4d4aa32909a610d0e Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Mon, 27 Nov 2023 07:40:29 +0100 Subject: firmware: arm_scmi: sync with Linux v6.6 Since our initial import of the ARM SCMI infrastructure in Linux, the upstream driver has been extended to support SCMI via OP-TEE and arm_ffa as well and also gained support for more function, including sensors and power domains, which may be useful in barebox going forward. Let's sync with Linux again and add the OP-TEE transport alongside the existing SMC-based transport. Signed-off-by: Ahmad Fatoum Link: https://lore.barebox.org/20231127064034.2206788-2-a.fatoum@pengutronix.de Signed-off-by: Sascha Hauer --- drivers/regulator/scmi-regulator.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'drivers/regulator') diff --git a/drivers/regulator/scmi-regulator.c b/drivers/regulator/scmi-regulator.c index 39736d3cab..6f22fa6420 100644 --- a/drivers/regulator/scmi-regulator.c +++ b/drivers/regulator/scmi-regulator.c @@ -299,7 +299,7 @@ static int scmi_regulator_probe(struct scmi_device *sdev) if (!handle) return -ENODEV; - voltage_ops = handle->protocol_get(sdev, SCMI_PROTOCOL_VOLTAGE, &ph); + voltage_ops = handle->dev_protocol_get(sdev, SCMI_PROTOCOL_VOLTAGE, &ph); if (IS_ERR(voltage_ops)) return PTR_ERR(voltage_ops); @@ -362,13 +362,16 @@ static int scmi_regulator_probe(struct scmi_device *sdev) if (ret) continue; - ret = of_regulator_register(&sreg->rdev, np); + sreg->rdev.desc = &sdesc->desc; + sreg->rdev.dev = &sdev->dev; + + ret = of_regulator_register(&sreg->rdev, sreg->of_node); if (ret) continue; - dev_info(&sdev->dev, - "Regulator %s registered for domain [%d]\n", - sreg->sdesc.name, sreg->id); + dev_dbg(&sdev->dev, + "Regulator %s registered for domain [%d]\n", + sreg->sdesc.name, sreg->id); } return 0; -- cgit v1.2.3