2019-09-26 10:39:05

by Claudiu Beznea

[permalink] [raw]
Subject: [PATCH] power: reset: at91-poweroff: lookup for proper PMC DT node

Driver has been enabled also for SAM9X60. At the moment the patch which did
this has been sent to mainline the PMC for SAM9X60 wasn't integrated.
SAM9X60 has a new PMC compatible (see commit 01e2113de9a5
("clk: at91: add sam9x60 pmc driver")). Do to this we have to
look for proper PMC compatible here, in SHDWC driver.

Signed-off-by: Claudiu Beznea <[email protected]>
---
drivers/power/reset/at91-sama5d2_shdwc.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/power/reset/at91-sama5d2_shdwc.c b/drivers/power/reset/at91-sama5d2_shdwc.c
index e341cc5c0ea6..1c18f465a245 100644
--- a/drivers/power/reset/at91-sama5d2_shdwc.c
+++ b/drivers/power/reset/at91-sama5d2_shdwc.c
@@ -269,6 +269,12 @@ static const struct of_device_id at91_shdwc_of_match[] = {
};
MODULE_DEVICE_TABLE(of, at91_shdwc_of_match);

+static const struct of_device_id at91_pmc_ids[] = {
+ { .compatible = "atmel,sama5d2-pmc" },
+ { .compatible = "microchip,sam9x60-pmc" },
+ { /* Sentinel. */ }
+};
+
static int __init at91_shdwc_probe(struct platform_device *pdev)
{
struct resource *res;
@@ -313,7 +319,7 @@ static int __init at91_shdwc_probe(struct platform_device *pdev)

at91_shdwc_dt_configure(pdev);

- np = of_find_compatible_node(NULL, NULL, "atmel,sama5d2-pmc");
+ np = of_find_matching_node(NULL, at91_pmc_ids);
if (!np) {
ret = -ENODEV;
goto clk_disable;
--
2.7.4


2019-10-15 01:02:45

by Sebastian Reichel

[permalink] [raw]
Subject: Re: [PATCH] power: reset: at91-poweroff: lookup for proper PMC DT node

Hi,

On Thu, Sep 26, 2019 at 01:25:37PM +0300, Claudiu Beznea wrote:
> Driver has been enabled also for SAM9X60. At the moment the patch which did
> this has been sent to mainline the PMC for SAM9X60 wasn't integrated.
> SAM9X60 has a new PMC compatible (see commit 01e2113de9a5
> ("clk: at91: add sam9x60 pmc driver")). Do to this we have to
> look for proper PMC compatible here, in SHDWC driver.
>
> Signed-off-by: Claudiu Beznea <[email protected]>
> ---

Thanks, queued.

-- Sebastian

> drivers/power/reset/at91-sama5d2_shdwc.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/power/reset/at91-sama5d2_shdwc.c b/drivers/power/reset/at91-sama5d2_shdwc.c
> index e341cc5c0ea6..1c18f465a245 100644
> --- a/drivers/power/reset/at91-sama5d2_shdwc.c
> +++ b/drivers/power/reset/at91-sama5d2_shdwc.c
> @@ -269,6 +269,12 @@ static const struct of_device_id at91_shdwc_of_match[] = {
> };
> MODULE_DEVICE_TABLE(of, at91_shdwc_of_match);
>
> +static const struct of_device_id at91_pmc_ids[] = {
> + { .compatible = "atmel,sama5d2-pmc" },
> + { .compatible = "microchip,sam9x60-pmc" },
> + { /* Sentinel. */ }
> +};
> +
> static int __init at91_shdwc_probe(struct platform_device *pdev)
> {
> struct resource *res;
> @@ -313,7 +319,7 @@ static int __init at91_shdwc_probe(struct platform_device *pdev)
>
> at91_shdwc_dt_configure(pdev);
>
> - np = of_find_compatible_node(NULL, NULL, "atmel,sama5d2-pmc");
> + np = of_find_matching_node(NULL, at91_pmc_ids);
> if (!np) {
> ret = -ENODEV;
> goto clk_disable;
> --
> 2.7.4
>


Attachments:
(No filename) (1.60 kB)
signature.asc (849.00 B)
Download all attachments