mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-04 16:15:11 +00:00
i2c: riic: Simplify reset handling
Read reset phandle as optional instead of exclusive so that all the DT's passing the reset phandle can be used to assert/deassert the reset line. With this change we don't have to differentiate the RZ/G2L SoC. With the above changes we no longer need the "renesas,riic-r9a07g044" compatible string, so drop it from riic_i2c_dt_ids[]. No changes are required to the r9a07g044.dtsi as we already have "renesas,riic-rz" as a fallback compatible string. While at it, check the return code of reset_control_deassert() as it might fail and also add a devres action to assert the reset line. Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Wolfram Sang <wsa@kernel.org>
This commit is contained in:
parent
36c11fee4f
commit
da2e86c0bd
1 changed files with 17 additions and 17 deletions
|
@ -88,11 +88,6 @@
|
||||||
|
|
||||||
#define RIIC_INIT_MSG -1
|
#define RIIC_INIT_MSG -1
|
||||||
|
|
||||||
enum riic_type {
|
|
||||||
RIIC_RZ_A,
|
|
||||||
RIIC_RZ_G2L,
|
|
||||||
};
|
|
||||||
|
|
||||||
struct riic_dev {
|
struct riic_dev {
|
||||||
void __iomem *base;
|
void __iomem *base;
|
||||||
u8 *buf;
|
u8 *buf;
|
||||||
|
@ -396,6 +391,11 @@ static struct riic_irq_desc riic_irqs[] = {
|
||||||
{ .res_num = 5, .isr = riic_tend_isr, .name = "riic-nack" },
|
{ .res_num = 5, .isr = riic_tend_isr, .name = "riic-nack" },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static void riic_reset_control_assert(void *data)
|
||||||
|
{
|
||||||
|
reset_control_assert(data);
|
||||||
|
}
|
||||||
|
|
||||||
static int riic_i2c_probe(struct platform_device *pdev)
|
static int riic_i2c_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct riic_dev *riic;
|
struct riic_dev *riic;
|
||||||
|
@ -404,7 +404,6 @@ static int riic_i2c_probe(struct platform_device *pdev)
|
||||||
struct i2c_timings i2c_t;
|
struct i2c_timings i2c_t;
|
||||||
struct reset_control *rstc;
|
struct reset_control *rstc;
|
||||||
int i, ret;
|
int i, ret;
|
||||||
enum riic_type type;
|
|
||||||
|
|
||||||
riic = devm_kzalloc(&pdev->dev, sizeof(*riic), GFP_KERNEL);
|
riic = devm_kzalloc(&pdev->dev, sizeof(*riic), GFP_KERNEL);
|
||||||
if (!riic)
|
if (!riic)
|
||||||
|
@ -421,16 +420,18 @@ static int riic_i2c_probe(struct platform_device *pdev)
|
||||||
return PTR_ERR(riic->clk);
|
return PTR_ERR(riic->clk);
|
||||||
}
|
}
|
||||||
|
|
||||||
type = (enum riic_type)of_device_get_match_data(&pdev->dev);
|
rstc = devm_reset_control_get_optional_exclusive(&pdev->dev, NULL);
|
||||||
if (type == RIIC_RZ_G2L) {
|
if (IS_ERR(rstc))
|
||||||
rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL);
|
return dev_err_probe(&pdev->dev, PTR_ERR(rstc),
|
||||||
if (IS_ERR(rstc)) {
|
"Error: missing reset ctrl\n");
|
||||||
dev_err(&pdev->dev, "Error: missing reset ctrl\n");
|
|
||||||
return PTR_ERR(rstc);
|
|
||||||
}
|
|
||||||
|
|
||||||
reset_control_deassert(rstc);
|
ret = reset_control_deassert(rstc);
|
||||||
}
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
ret = devm_add_action_or_reset(&pdev->dev, riic_reset_control_assert, rstc);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
for (i = 0; i < ARRAY_SIZE(riic_irqs); i++) {
|
for (i = 0; i < ARRAY_SIZE(riic_irqs); i++) {
|
||||||
ret = platform_get_irq(pdev, riic_irqs[i].res_num);
|
ret = platform_get_irq(pdev, riic_irqs[i].res_num);
|
||||||
|
@ -492,8 +493,7 @@ static int riic_i2c_remove(struct platform_device *pdev)
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct of_device_id riic_i2c_dt_ids[] = {
|
static const struct of_device_id riic_i2c_dt_ids[] = {
|
||||||
{ .compatible = "renesas,riic-r9a07g044", .data = (void *)RIIC_RZ_G2L },
|
{ .compatible = "renesas,riic-rz", },
|
||||||
{ .compatible = "renesas,riic-rz", .data = (void *)RIIC_RZ_A },
|
|
||||||
{ /* Sentinel */ },
|
{ /* Sentinel */ },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue