diff options
| author | Jason Zhou <jason.zhou@starfivetech.com> | 2022-07-08 13:21:33 +0300 |
|---|---|---|
| committer | Jason Zhou <jason.zhou@starfivetech.com> | 2022-07-08 13:21:33 +0300 |
| commit | 4041122dab8b47a96d1234be677a335737609560 (patch) | |
| tree | 8fcd25db2ee5de19eaf0547f528211ca025b2a4b /drivers | |
| parent | 3e6f6db05977b4a31d72eb7b388eb80205fb06ed (diff) | |
| parent | 21bd5e757e5df81f6f54009cd0c9e5feb9114070 (diff) | |
| download | linux-4041122dab8b47a96d1234be677a335737609560.tar.xz | |
Merge branch 'CR_1534_gpiomon_jianlong' into 'jh7110-5.15.y-devel'
CR_1534 pinctrl: starfive: Fix gpiomon erro
See merge request sdk/linux!249
Diffstat (limited to 'drivers')
| -rwxr-xr-x | drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c index 3d3237cf7335..56c74154fa4c 100755 --- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c +++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c @@ -19,6 +19,7 @@ #include <linux/pinctrl/pinconf.h> #include <linux/pinctrl/pinconf-generic.h> #include <linux/platform_device.h> +#include <linux/pm_runtime.h> #include <linux/regmap.h> #include <linux/slab.h> #include <linux/module.h> @@ -895,6 +896,9 @@ static int starfive_jh7110_sys_gpio_register(struct platform_device *pdev, pctl->gc.irq.handler = handle_bad_irq; pctl->gc.irq.init_hw = starfive_jh7110_sys_init_hw; + if (IS_ENABLED(CONFIG_PM)) + pm_runtime_enable(dev); + ret = platform_get_irq(pdev, 0); if (ret < 0) return ret; @@ -1595,6 +1599,9 @@ static int starfive_jh7110_aon_gpio_register(struct platform_device *pdev, pctl->gc.irq.handler = handle_bad_irq; pctl->gc.irq.init_hw = starfive_jh7110_aon_init_hw; + if (IS_ENABLED(CONFIG_PM)) + pm_runtime_enable(dev); + ret = platform_get_irq(pdev, 0); if (ret < 0) return ret; |