diff options
| author | Joel Stanley <joel@jms.id.au> | 2019-03-15 09:00:28 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2019-03-15 09:01:07 +0300 |
| commit | 9bd1e03005e74ecfe16f58143714f25793ae1c5d (patch) | |
| tree | 557f67e781effd12a2fdf1816b757c61be8d832e /drivers/gpio | |
| parent | 7859d04be772a1d185de335a8e9d38ac03a89f3f (diff) | |
| parent | ce194fa2b267e2018f42442347d90df01c4071d6 (diff) | |
| download | linux-dev-4.19.tar.xz | |
Merge tag 'v4.19.29' into dev-4.19dev-4.19
This is the 4.19.29 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpio-vf610.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-vf610.c b/drivers/gpio/gpio-vf610.c index d4ad6d0e02a2..7e09ce75ffb2 100644 --- a/drivers/gpio/gpio-vf610.c +++ b/drivers/gpio/gpio-vf610.c @@ -259,6 +259,7 @@ static int vf610_gpio_probe(struct platform_device *pdev) struct vf610_gpio_port *port; struct resource *iores; struct gpio_chip *gc; + int i; int ret; port = devm_kzalloc(&pdev->dev, sizeof(*port), GFP_KERNEL); @@ -298,6 +299,10 @@ static int vf610_gpio_probe(struct platform_device *pdev) if (ret < 0) return ret; + /* Mask all GPIO interrupts */ + for (i = 0; i < gc->ngpio; i++) + vf610_gpio_writel(0, port->base + PORT_PCR(i)); + /* Clear the interrupt status register for all GPIO's */ vf610_gpio_writel(~0, port->base + PORT_ISFR); |