diff mbox series

power: reset: at91-poweroff: lookup for proper PMC DT node

Message ID 1569493537-7612-1-git-send-email-claudiu.beznea@microchip.com (mailing list archive)
State Mainlined
Commit b0ac8596edc8b37de90a5ec095a25abbbc24f169
Headers show
Series power: reset: at91-poweroff: lookup for proper PMC DT node | expand

Commit Message

Claudiu Beznea Sept. 26, 2019, 10:25 a.m. UTC
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 <claudiu.beznea@microchip.com>
---
 drivers/power/reset/at91-sama5d2_shdwc.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Comments

Sebastian Reichel Oct. 14, 2019, 6:59 a.m. UTC | #1
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 <claudiu.beznea@microchip.com>
> ---

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
>
diff mbox series

Patch

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;