Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

memory: renesas-rpc-if: Add regmap to struct rpcif_info

The RZ/G3E XSPI has different regmap compared to RPC-IF. Add regmap to
struct rpcif_info in order to support RZ/G3E XSPI.

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/20250424090000.136804-5-biju.das.jz@bp.renesas.com
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

authored by

Biju Das and committed by
Krzysztof Kozlowski
198158a8 c66fce83

+7 -3
+7 -3
drivers/memory/renesas-rpc-if.c
··· 32 32 }; 33 33 34 34 struct rpcif_info { 35 + const struct regmap_config *regmap_config; 35 36 enum rpcif_type type; 36 37 u8 strtim; 37 38 }; ··· 589 588 rpc->base = devm_platform_ioremap_resource_byname(pdev, "regs"); 590 589 if (IS_ERR(rpc->base)) 591 590 return PTR_ERR(rpc->base); 592 - 593 - rpc->regmap = devm_regmap_init(dev, NULL, rpc, &rpcif_regmap_config); 591 + rpc->info = of_device_get_match_data(dev); 592 + rpc->regmap = devm_regmap_init(dev, NULL, rpc, rpc->info->regmap_config); 594 593 if (IS_ERR(rpc->regmap)) { 595 594 dev_err(dev, "failed to init regmap for rpcif, error %ld\n", 596 595 PTR_ERR(rpc->regmap)); ··· 603 602 return PTR_ERR(rpc->dirmap); 604 603 605 604 rpc->size = resource_size(res); 606 - rpc->info = of_device_get_match_data(dev); 607 605 rpc->rstc = devm_reset_control_array_get_exclusive(dev); 608 606 if (IS_ERR(rpc->rstc)) 609 607 return PTR_ERR(rpc->rstc); ··· 633 633 } 634 634 635 635 static const struct rpcif_info rpcif_info_r8a7796 = { 636 + .regmap_config = &rpcif_regmap_config, 636 637 .type = RPCIF_RCAR_GEN3, 637 638 .strtim = 6, 638 639 }; 639 640 640 641 static const struct rpcif_info rpcif_info_gen3 = { 642 + .regmap_config = &rpcif_regmap_config, 641 643 .type = RPCIF_RCAR_GEN3, 642 644 .strtim = 7, 643 645 }; 644 646 645 647 static const struct rpcif_info rpcif_info_rz_g2l = { 648 + .regmap_config = &rpcif_regmap_config, 646 649 .type = RPCIF_RZ_G2L, 647 650 .strtim = 7, 648 651 }; 649 652 650 653 static const struct rpcif_info rpcif_info_gen4 = { 654 + .regmap_config = &rpcif_regmap_config, 651 655 .type = RPCIF_RCAR_GEN4, 652 656 .strtim = 15, 653 657 };