github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-22 12:44:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

i2c: rcar: add R-Car Gen5 support

Browse Source 
To support the next generation of R-Car SoCs, we need to skip polling
the reset status. SCMI doesn't support it and the firmware must take
care of this anyhow. Other than that, the driver works fine as-is.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Link: https://lore.kernel.org/r/20260727122546.4232-6-wsa+renesas@sang-engineering.com
This commit is contained in:
Wolfram Sang 2026-07-27 14:25:48 +02:00 committed by Andi Shyti
parent a5c811aa0a
commit 87e713f200
No known key found for this signature in database
GPG Key ID: DA78056626D32D6E
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/i2c/busses/i2c-rcar.c
View File

@ -137,6 +137,7 @@ enum rcar_i2c_type {
I2C_RCAR_GEN2, I2C_RCAR_GEN2,
I2C_RCAR_GEN3, I2C_RCAR_GEN3,
I2C_RCAR_GEN4, I2C_RCAR_GEN4,
I2C_RCAR_GEN5,
}; };
struct rcar_i2c_priv { struct rcar_i2c_priv {
@ -900,8 +901,12 @@ static int rcar_i2c_do_reset(struct rcar_i2c_priv *priv)
if (ret) if (ret)
return ret; return ret;
return read_poll_timeout_atomic(reset_control_status, ret, ret == 0, 1, /* SCMI based resets don't need to poll for success */
100, false, priv->rstc); if (priv->devtype < I2C_RCAR_GEN5)
return read_poll_timeout_atomic(reset_control_status, ret, ret == 0,
1, 100, false, priv->rstc);
return 0;
} }
static int rcar_i2c_master_xfer(struct i2c_adapter *adap, static int rcar_i2c_master_xfer(struct i2c_adapter *adap,
@ -1111,6 +1116,7 @@ static const struct of_device_id rcar_i2c_dt_ids[] = {
{ .compatible = "renesas,rcar-gen2-i2c", .data = (void *)I2C_RCAR_GEN2 }, { .compatible = "renesas,rcar-gen2-i2c", .data = (void *)I2C_RCAR_GEN2 },
{ .compatible = "renesas,rcar-gen3-i2c", .data = (void *)I2C_RCAR_GEN3 }, { .compatible = "renesas,rcar-gen3-i2c", .data = (void *)I2C_RCAR_GEN3 },
{ .compatible = "renesas,rcar-gen4-i2c", .data = (void *)I2C_RCAR_GEN4 }, { .compatible = "renesas,rcar-gen4-i2c", .data = (void *)I2C_RCAR_GEN4 },
{ .compatible = "renesas,rcar-gen5-i2c", .data = (void *)I2C_RCAR_GEN5 },
{}, {},
}; };
MODULE_DEVICE_TABLE(of, rcar_i2c_dt_ids); MODULE_DEVICE_TABLE(of, rcar_i2c_dt_ids);
@ -1194,9 +1200,15 @@ static int rcar_i2c_probe(struct platform_device *pdev)
goto out_pm_put; goto out_pm_put;
} }
ret = reset_control_status(priv->rstc); /*
if (ret < 0) * Gen5+ uses SCMI based reset which cannot report status.
goto out_pm_put; * Firmware has to ensure proper reset
*/
if (priv->devtype < I2C_RCAR_GEN5) {
ret = reset_control_status(priv->rstc);
if (ret < 0)
goto out_pm_put;
}
/* hard reset disturbs HostNotify local target, so disable it */ /* hard reset disturbs HostNotify local target, so disable it */
priv->flags &= ~ID_P_HOST_NOTIFY; priv->flags &= ~ID_P_HOST_NOTIFY;