This commit introduces generic compatible strings to use as fallback, so that devices compatible with the generic implementation may avoid changing the driver.
Signed-off-by: Fabrizio Castro <[email protected]> Signed-off-by: Ramesh Shanmugasundaram <[email protected]> --- drivers/soc/renesas/rcar-rst.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/drivers/soc/renesas/rcar-rst.c b/drivers/soc/renesas/rcar-rst.c index 3316b02..f7a0d54 100644 --- a/drivers/soc/renesas/rcar-rst.c +++ b/drivers/soc/renesas/rcar-rst.c @@ -25,8 +25,16 @@ static const struct rst_config rcar_rst_gen2 __initconst = { .modemr = 0x60, }; +static const struct rst_config rcar_rst_gen3 __initconst = { + .modemr = 0x60, +}; + static const struct of_device_id rcar_rst_matches[] __initconst = { - /* RZ/G is handled like R-Car Gen2 */ + /* generic compatible strings */ + { .compatible = "renesas,rcar-gen1-rst", .data = &rcar_rst_gen1 }, + { .compatible = "renesas,rcar-gen2-rst", .data = &rcar_rst_gen2 }, + { .compatible = "renesas,rcar-gen3-rst", .data = &rcar_rst_gen3 }, + /* RZ/G */ { .compatible = "renesas,r8a7743-rst", .data = &rcar_rst_gen2 }, { .compatible = "renesas,r8a7745-rst", .data = &rcar_rst_gen2 }, /* R-Car Gen1 */ @@ -38,11 +46,11 @@ static const struct of_device_id rcar_rst_matches[] __initconst = { { .compatible = "renesas,r8a7792-rst", .data = &rcar_rst_gen2 }, { .compatible = "renesas,r8a7793-rst", .data = &rcar_rst_gen2 }, { .compatible = "renesas,r8a7794-rst", .data = &rcar_rst_gen2 }, - /* R-Car Gen3 is handled like R-Car Gen2 */ - { .compatible = "renesas,r8a7795-rst", .data = &rcar_rst_gen2 }, - { .compatible = "renesas,r8a7796-rst", .data = &rcar_rst_gen2 }, - { .compatible = "renesas,r8a77970-rst", .data = &rcar_rst_gen2 }, - { .compatible = "renesas,r8a77995-rst", .data = &rcar_rst_gen2 }, + /* R-Car Gen3 */ + { .compatible = "renesas,r8a7795-rst", .data = &rcar_rst_gen3 }, + { .compatible = "renesas,r8a7796-rst", .data = &rcar_rst_gen3 }, + { .compatible = "renesas,r8a77970-rst", .data = &rcar_rst_gen3 }, + { .compatible = "renesas,r8a77995-rst", .data = &rcar_rst_gen3 }, { /* sentinel */ } }; -- 2.7.4
