| Message ID | 1622981777-5023-3-git-send-email-stefan.wahren@i2se.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | ARM: dts: Add Raspberry Pi 400 support | expand |
Hi Guenther, Am 06.06.21 um 14:16 schrieb Stefan Wahren: > Until now all Raspberry Pi boards used the power off function of the SoC. > But the Raspberry Pi 400 uses gpio-poweroff for the whole board which > possibly cannot register the poweroff handler because the it's > already registered by this watchdog driver. So consider the > system-power-controller property for registering, which is already > defined in soc/bcm/brcm,bcm2835-pm.txt . > > Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> > Reviewed-by: Nicolas Saenz Julienne <nsaenz@kernel.org> > Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/bcm2835_wdt.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > all the other patches from this series has been applied. Can this go via the watchdog-next tree? Best regards Stefan
Hi Guenter, Am 06.06.21 um 14:16 schrieb Stefan Wahren: > Until now all Raspberry Pi boards used the power off function of the SoC. > But the Raspberry Pi 400 uses gpio-poweroff for the whole board which > possibly cannot register the poweroff handler because the it's > already registered by this watchdog driver. So consider the > system-power-controller property for registering, which is already > defined in soc/bcm/brcm,bcm2835-pm.txt . > > Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> > Reviewed-by: Nicolas Saenz Julienne <nsaenz@kernel.org> > Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/bcm2835_wdt.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c > index dec6ca0..9490717 100644 > --- a/drivers/watchdog/bcm2835_wdt.c > +++ b/drivers/watchdog/bcm2835_wdt.c > @@ -205,9 +205,13 @@ static int bcm2835_wdt_probe(struct platform_device *pdev) > if (err) > return err; > > - if (pm_power_off == NULL) { > - pm_power_off = bcm2835_power_off; > - bcm2835_power_off_wdt = wdt; > + if (of_device_is_system_power_controller(pdev->dev.parent->of_node)) { > + if (!pm_power_off) { > + pm_power_off = bcm2835_power_off; > + bcm2835_power_off_wdt = wdt; > + } else { > + dev_info(dev, "Poweroff handler already present!\n"); > + } > } > > dev_info(dev, "Broadcom BCM2835 watchdog timer"); this isn't not applied yet. Can this go via the watchdog-next tree into 5.14? Best regards Stefan
On Tue, Jun 22, 2021 at 09:12:30AM +0200, Stefan Wahren wrote: > Hi Guenter, > > Am 06.06.21 um 14:16 schrieb Stefan Wahren: > > Until now all Raspberry Pi boards used the power off function of the SoC. > > But the Raspberry Pi 400 uses gpio-poweroff for the whole board which > > possibly cannot register the poweroff handler because the it's > > already registered by this watchdog driver. So consider the > > system-power-controller property for registering, which is already > > defined in soc/bcm/brcm,bcm2835-pm.txt . > > > > Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> > > Reviewed-by: Nicolas Saenz Julienne <nsaenz@kernel.org> > > Reviewed-by: Guenter Roeck <linux@roeck-us.net> > > --- > > drivers/watchdog/bcm2835_wdt.c | 10 +++++++--- > > 1 file changed, 7 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c > > index dec6ca0..9490717 100644 > > --- a/drivers/watchdog/bcm2835_wdt.c > > +++ b/drivers/watchdog/bcm2835_wdt.c > > @@ -205,9 +205,13 @@ static int bcm2835_wdt_probe(struct platform_device *pdev) > > if (err) > > return err; > > > > - if (pm_power_off == NULL) { > > - pm_power_off = bcm2835_power_off; > > - bcm2835_power_off_wdt = wdt; > > + if (of_device_is_system_power_controller(pdev->dev.parent->of_node)) { > > + if (!pm_power_off) { > > + pm_power_off = bcm2835_power_off; > > + bcm2835_power_off_wdt = wdt; > > + } else { > > + dev_info(dev, "Poweroff handler already present!\n"); > > + } > > } > > > > dev_info(dev, "Broadcom BCM2835 watchdog timer"); > > this isn't not applied yet. Can this go via the watchdog-next tree into > 5.14? > I applied it to my watchdog-next branch; it will be up to Wim to send it upstream. Note that the patch does not how up in linux-watchdog patchwork (no idea why, though), which is why it got lost. Guenter
diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c index dec6ca0..9490717 100644 --- a/drivers/watchdog/bcm2835_wdt.c +++ b/drivers/watchdog/bcm2835_wdt.c @@ -205,9 +205,13 @@ static int bcm2835_wdt_probe(struct platform_device *pdev) if (err) return err; - if (pm_power_off == NULL) { - pm_power_off = bcm2835_power_off; - bcm2835_power_off_wdt = wdt; + if (of_device_is_system_power_controller(pdev->dev.parent->of_node)) { + if (!pm_power_off) { + pm_power_off = bcm2835_power_off; + bcm2835_power_off_wdt = wdt; + } else { + dev_info(dev, "Poweroff handler already present!\n"); + } } dev_info(dev, "Broadcom BCM2835 watchdog timer");