usb: gadget: udc: atmel: handle at91sam9rl PMC
authorAlexandre Belloni <alexandre.belloni@bootlin.com>
Mon, 10 Sep 2018 20:12:49 +0000 (22:12 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 13 Nov 2018 19:14:58 +0000 (11:14 -0800)
[ Upstream commit bb80e4fa57eb75ebd64ae9be4155da6d12c1a997 ]

The at91sam9rl PMC is not quite the same as the at91sam9g45 one and now has
its own compatible string. Add support for that.

Fixes: 217bace8e548 ("ARM: dts: fix PMC compatible")
Acked-by: Cristian Birsan <cristian.birsan@microchip.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/gadget/udc/atmel_usba_udc.c

index a884c022df7a5455e1f0c2746dd933afc55f65e3..cb66f982c313bf9e472820931a35d2264fda227d 100644 (file)
@@ -2071,6 +2071,8 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev,
 
        udc->errata = match->data;
        udc->pmc = syscon_regmap_lookup_by_compatible("atmel,at91sam9g45-pmc");
+       if (IS_ERR(udc->pmc))
+               udc->pmc = syscon_regmap_lookup_by_compatible("atmel,at91sam9rl-pmc");
        if (IS_ERR(udc->pmc))
                udc->pmc = syscon_regmap_lookup_by_compatible("atmel,at91sam9x5-pmc");
        if (udc->errata && IS_ERR(udc->pmc))