diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2023-11-27 07:40:29 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-12-05 08:45:30 +0100 |
| commit | d5801d04706430bf2fa76ef4d4aa32909a610d0e (patch) | |
| tree | eec26bc69ff9b42515d804f0d50197994e2f4e1a /drivers/regulator | |
| parent | 500d409ca0c6ffd3448615c241189d2508b10953 (diff) | |
| download | barebox-d5801d04706430bf2fa76ef4d4aa32909a610d0e.tar.gz barebox-d5801d04706430bf2fa76ef4d4aa32909a610d0e.tar.xz | |
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 <a.fatoum@pengutronix.de>
Link: https://lore.barebox.org/20231127064034.2206788-2-a.fatoum@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/scmi-regulator.c | 13 |
1 files changed, 8 insertions, 5 deletions
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; |