On 10.02.2025 23:13, Ryan.Wanner@xxxxxxxxxxxxx wrote:
> From: Ryan Wanner <Ryan.Wanner@xxxxxxxxxxxxx>
>
> Add support for SAMA7D65 new compatible strings in pm.c file for wakeup source
> IDs and PMC.
> This is the first bits of PM for this new SoC. PM depends on other patches.
>
> Signed-off-by: Ryan Wanner <Ryan.Wanner@xxxxxxxxxxxxx>
> [nicolas.ferre@xxxxxxxxxxxxx: split patch and address only the pm.c changes]
> Signed-off-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxxxxxx>
> ---
> arch/arm/mach-at91/pm.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
> index 6c3e6aa22606f..1eec68e92f8d8 100644
> --- a/arch/arm/mach-at91/pm.c
> +++ b/arch/arm/mach-at91/pm.c
> @@ -222,13 +222,16 @@ static const struct of_device_id sam9x60_ws_ids[] = {
> { /* sentinel */ }
> };
>
> -static const struct of_device_id sama7g5_ws_ids[] = {
> - { .compatible = "microchip,sama7g5-rtc", .data = &ws_info[1] },
> +static const struct of_device_id sama7_ws_ids[] = {
> + { .compatible = "microchip,sama7d65-rtc", .data = &ws_info[1] },
> + { .compatible = "microchip,sama7g5-rtc", .data = &ws_info[1] },
There are spaces b/w , and .data
> { .compatible = "microchip,sama7g5-ohci", .data = &ws_info[2] },
> { .compatible = "usb-ohci", .data = &ws_info[2] },
> { .compatible = "atmel,at91sam9g45-ehci", .data = &ws_info[2] },
> { .compatible = "usb-ehci", .data = &ws_info[2] },
> + { .compatible = "microchip,sama7d65-sdhci", .data = &ws_info[3] },
> { .compatible = "microchip,sama7g5-sdhci", .data = &ws_info[3] },
> + { .compatible = "microchip,sama7d65-rtt", .data = &ws_info[4] },
There are spaces b/w , and .data
> { .compatible = "microchip,sama7g5-rtt", .data = &ws_info[4] },
> { /* sentinel */ }
> };
> @@ -1379,6 +1382,7 @@ static const struct of_device_id atmel_pmc_ids[] __initconst = {
> { .compatible = "atmel,sama5d2-pmc", .data = &pmc_infos[1] },
> { .compatible = "microchip,sam9x60-pmc", .data = &pmc_infos[4] },
> { .compatible = "microchip,sam9x7-pmc", .data = &pmc_infos[4] },
> + { .compatible = "microchip,sama7d65-pmc", .data = &pmc_infos[4] },
> { .compatible = "microchip,sama7g5-pmc", .data = &pmc_infos[5] },
> { /* sentinel */ },
> };
> @@ -1672,7 +1676,7 @@ void __init sama7_pm_init(void)
> at91_pm_modes_init(iomaps, ARRAY_SIZE(iomaps));
> at91_pm_init(NULL);
>
> - soc_pm.ws_ids = sama7g5_ws_ids;
> + soc_pm.ws_ids = sama7_ws_ids;
> soc_pm.config_pmc_ws = at91_sam9x60_config_pmc_ws;
>
> soc_pm.sfrbu_regs.pswbu.key = (0x4BD20C << 8);
