| Message ID | 06b64869f2de4b499835d153411ba30512409168.1740671156.git.Ryan.Wanner@microchip.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Enable Power Modes Support for SAMA7D65 SoC | expand |
On 2/27/25 17:51, Ryan.Wanner@microchip.com wrote: > From: Ryan Wanner <Ryan.Wanner@microchip.com> > > 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@microchip.com> > [nicolas.ferre@microchip.com: split patch and address only the pm.c changes] > Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com> > --- > arch/arm/mach-at91/pm.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c > index 6c3e6aa22606..39644703244d 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[] = { > +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] }, > { .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] }, > { .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] }, According to the chapter 42.18.3. PMC System Clock Status Register at [1] there is no AT91SAM926x_PMC_UDP for SAMA7D65 (which you are dropping in the next patch). This patch would have to reflect what the documentation say instead of fixing it in patch 12/21. Thank you, Claudiu [1] https://ww1.microchip.com/downloads/aemDocuments/documents/MPU32/ProductDocuments/DataSheets/SAMA7D6-Series-Data-Sheet-DS60001851.pdf > { .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);
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 6c3e6aa22606..39644703244d 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[] = { +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] }, { .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] }, { .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);