| Message ID | e3bde200e4b8efe69656f1ecc9e8e7c5c6f631a5.1739221064.git.Ryan.Wanner@microchip.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Enable Power Modes Support for SAMA7D65 SoC | expand |
On 10.02.2025 23:13, Ryan.Wanner@microchip.com wrote: > From: Ryan Wanner <Ryan.Wanner@microchip.com> > > Add sama7d65-pmc compatible string to the list of valid PMC IDs. > > Signed-off-by: Ryan Wanner <Ryan.Wanner@microchip.com> > --- > drivers/power/reset/at91-sama5d2_shdwc.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/power/reset/at91-sama5d2_shdwc.c b/drivers/power/reset/at91-sama5d2_shdwc.c > index edb0df86aff45..0cb7fe9f25a07 100644 > --- a/drivers/power/reset/at91-sama5d2_shdwc.c > +++ b/drivers/power/reset/at91-sama5d2_shdwc.c > @@ -326,6 +326,7 @@ static const struct of_device_id at91_pmc_ids[] = { > { .compatible = "atmel,sama5d2-pmc" }, > { .compatible = "microchip,sam9x60-pmc" }, > { .compatible = "microchip,sama7g5-pmc" }, > + { .compatible = "microchip,sama7d65-pmc" }, This does not apply cleanly on top of v6.14-rc1. The conflict is on sam9x7 compatible which is missing from this diff. > { /* Sentinel. */ } > }; >
diff --git a/drivers/power/reset/at91-sama5d2_shdwc.c b/drivers/power/reset/at91-sama5d2_shdwc.c index edb0df86aff45..0cb7fe9f25a07 100644 --- a/drivers/power/reset/at91-sama5d2_shdwc.c +++ b/drivers/power/reset/at91-sama5d2_shdwc.c @@ -326,6 +326,7 @@ static const struct of_device_id at91_pmc_ids[] = { { .compatible = "atmel,sama5d2-pmc" }, { .compatible = "microchip,sam9x60-pmc" }, { .compatible = "microchip,sama7g5-pmc" }, + { .compatible = "microchip,sama7d65-pmc" }, { /* Sentinel. */ } };