10 files changed, 54 insertions, 37 deletions

diff --git a/Documentation/devicetree/bindings/gpio/gpio-exar.txt b/Documentation/devicetree/bindings/gpio/gpio-exar.txt
new file mode 100644
index 000000000000..4540d61824af
--- /dev/null
+++ b/Documentation/devicetree/bindings/gpio/gpio-exar.txt
@@ -0,0 +1,5 @@
+Exportable MPIO interface of Exar UART chips
+
+Required properties of the device:
+ - exar,first-pin: first exportable pins (0..15)
+ - ngpios: number of exportable pins (1..16)
diff --git a/MAINTAINERS b/MAINTAINERS
index 567343b8ffaa..44cb004c765d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14218,6 +14218,12 @@ F:	drivers/watchdog/
 F:      include/linux/watchdog.h
 F:      include/uapi/linux/watchdog.h
 
+WHISKEYCOVE PMIC GPIO DRIVER
+M:      Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
+L:      linux-gpio@vger.kernel.org
+S:      Maintained
+F:      drivers/gpio/gpio-wcove.c
+
 WIIMOTE HID DRIVER
 M:      David Herrmann <dh.herrmann@googlemail.com>
 L:      linux-input@vger.kernel.org
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index f235eae04c16..461d6fc3688b 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -504,6 +504,7 @@ config GPIO_XGENE_SB
         depends on ARCH_XGENE && OF_GPIO
         select GPIO_GENERIC
         select GPIOLIB_IRQCHIP
+        select IRQ_DOMAIN_HIERARCHY
         help
           This driver supports the GPIO block within the APM X-Gene
           Standby Domain. Say yes here to enable the GPIO functionality.
diff --git a/drivers/gpio/gpio-exar.c b/drivers/gpio/gpio-exar.c
index fb8d304cfa17..0ecd2369c2ca 100644
--- a/drivers/gpio/gpio-exar.c
+++ b/drivers/gpio/gpio-exar.c
@@ -132,7 +132,7 @@ static int gpio_exar_probe(struct platform_device *pdev)
         if (!p)
                 return -ENOMEM;
 
-        ret = device_property_read_u32(&pdev->dev, "linux,first-pin",
+        ret = device_property_read_u32(&pdev->dev, "exar,first-pin",
                                        &first_pin);
         if (ret)
                 return ret;
diff --git a/drivers/gpio/gpio-lp87565.c b/drivers/gpio/gpio-lp87565.c
index 6313c50bb91b..a121c8f10610 100644
--- a/drivers/gpio/gpio-lp87565.c
+++ b/drivers/gpio/gpio-lp87565.c
@@ -26,6 +26,27 @@ struct lp87565_gpio {
         struct regmap *map;
 };
 
+static int lp87565_gpio_get(struct gpio_chip *chip, unsigned int offset)
+{
+        struct lp87565_gpio *gpio = gpiochip_get_data(chip);
+        int ret, val;
+
+        ret = regmap_read(gpio->map, LP87565_REG_GPIO_IN, &val);
+        if (ret < 0)
+                return ret;
+
+        return !!(val & BIT(offset));
+}
+
+static void lp87565_gpio_set(struct gpio_chip *chip, unsigned int offset,
+                             int value)
+{
+        struct lp87565_gpio *gpio = gpiochip_get_data(chip);
+
+        regmap_update_bits(gpio->map, LP87565_REG_GPIO_OUT,
+                           BIT(offset), value ? BIT(offset) : 0);
+}
+
 static int lp87565_gpio_get_direction(struct gpio_chip *chip,
                                       unsigned int offset)
 {
@@ -54,30 +75,11 @@ static int lp87565_gpio_direction_output(struct gpio_chip *chip,
 {
         struct lp87565_gpio *gpio = gpiochip_get_data(chip);
 
+        lp87565_gpio_set(chip, offset, value);
+
         return regmap_update_bits(gpio->map,
                                   LP87565_REG_GPIO_CONFIG,
-                                  BIT(offset), !value ? BIT(offset) : 0);
-}
-
-static int lp87565_gpio_get(struct gpio_chip *chip, unsigned int offset)
-{
-        struct lp87565_gpio *gpio = gpiochip_get_data(chip);
-        int ret, val;
-
-        ret = regmap_read(gpio->map, LP87565_REG_GPIO_IN, &val);
-        if (ret < 0)
-                return ret;
-
-        return !!(val & BIT(offset));
-}
-
-static void lp87565_gpio_set(struct gpio_chip *chip, unsigned int offset,
-                             int value)
-{
-        struct lp87565_gpio *gpio = gpiochip_get_data(chip);
-
-        regmap_update_bits(gpio->map, LP87565_REG_GPIO_OUT,
-                           BIT(offset), value ? BIT(offset) : 0);
+                                  BIT(offset), BIT(offset));
 }
 
 static int lp87565_gpio_request(struct gpio_chip *gc, unsigned int offset)
diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c
index 3abea3f0b307..92692251ade1 100644
--- a/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@ -424,6 +424,9 @@ static int mxc_gpio_probe(struct platform_device *pdev)
                 return PTR_ERR(port->base);
 
         port->irq_high = platform_get_irq(pdev, 1);
+        if (port->irq_high < 0)
+                port->irq_high = 0;
+
         port->irq = platform_get_irq(pdev, 0);
         if (port->irq < 0)
                 return port->irq;
diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c
index 88529d3c06c9..506c6a67c5fc 100644
--- a/drivers/gpio/gpio-tegra.c
+++ b/drivers/gpio/gpio-tegra.c
@@ -360,7 +360,7 @@ static void tegra_gpio_irq_handler(struct irq_desc *desc)
 {
         int port;
         int pin;
-        int unmasked = 0;
+        bool unmasked = false;
         int gpio;
         u32 lvl;
         unsigned long sta;
@@ -384,8 +384,8 @@ static void tegra_gpio_irq_handler(struct irq_desc *desc)
                          * before executing the handler so that we don't
                          * miss edges
                          */
-                        if (lvl & (0x100 << pin)) {
-                                unmasked = 1;
+                        if (!unmasked && lvl & (0x100 << pin)) {
+                                unmasked = true;
                                 chained_irq_exit(chip, desc);
                         }
 
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 9568708a550b..cd003b74512f 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -704,24 +704,23 @@ static irqreturn_t lineevent_irq_thread(int irq, void *p)
 {
         struct lineevent_state *le = p;
         struct gpioevent_data ge;
-        int ret;
+        int ret, level;
 
         ge.timestamp = ktime_get_real_ns();
+        level = gpiod_get_value_cansleep(le->desc);
 
         if (le->eflags & GPIOEVENT_REQUEST_RISING_EDGE
             && le->eflags & GPIOEVENT_REQUEST_FALLING_EDGE) {
-                int level = gpiod_get_value_cansleep(le->desc);
-
                 if (level)
                         /* Emit low-to-high event */
                         ge.id = GPIOEVENT_EVENT_RISING_EDGE;
                 else
                         /* Emit high-to-low event */
                         ge.id = GPIOEVENT_EVENT_FALLING_EDGE;
-        } else if (le->eflags & GPIOEVENT_REQUEST_RISING_EDGE) {
+        } else if (le->eflags & GPIOEVENT_REQUEST_RISING_EDGE && level) {
                 /* Emit low-to-high event */
                 ge.id = GPIOEVENT_EVENT_RISING_EDGE;
-        } else if (le->eflags & GPIOEVENT_REQUEST_FALLING_EDGE) {
+        } else if (le->eflags & GPIOEVENT_REQUEST_FALLING_EDGE && !level) {
                 /* Emit high-to-low event */
                 ge.id = GPIOEVENT_EVENT_FALLING_EDGE;
         } else {
diff --git a/drivers/pinctrl/stm32/Kconfig b/drivers/pinctrl/stm32/Kconfig
index 3b8026fca057..7e1fe39a56a5 100644
--- a/drivers/pinctrl/stm32/Kconfig
+++ b/drivers/pinctrl/stm32/Kconfig
@@ -6,29 +6,30 @@ config PINCTRL_STM32
         select PINMUX
         select GENERIC_PINCONF
         select GPIOLIB
+        select IRQ_DOMAIN_HIERARCHY
         select MFD_SYSCON
 
 config PINCTRL_STM32F429
         bool "STMicroelectronics STM32F429 pin control" if COMPILE_TEST && !MACH_STM32F429
-        depends on OF && IRQ_DOMAIN_HIERARCHY
+        depends on OF
         default MACH_STM32F429
         select PINCTRL_STM32
 
 config PINCTRL_STM32F469
         bool "STMicroelectronics STM32F469 pin control" if COMPILE_TEST && !MACH_STM32F469
-        depends on OF && IRQ_DOMAIN_HIERARCHY
+        depends on OF
         default MACH_STM32F469
         select PINCTRL_STM32
 
 config PINCTRL_STM32F746
         bool "STMicroelectronics STM32F746 pin control" if COMPILE_TEST && !MACH_STM32F746
-        depends on OF && IRQ_DOMAIN_HIERARCHY
+        depends on OF
         default MACH_STM32F746
         select PINCTRL_STM32
 
 config PINCTRL_STM32H743
         bool "STMicroelectronics STM32H743 pin control" if COMPILE_TEST && !MACH_STM32H743
-        depends on OF && IRQ_DOMAIN_HIERARCHY
+        depends on OF
         default MACH_STM32H743
         select PINCTRL_STM32
 endif
diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c
index b5c98e5bf524..c6360fbdf808 100644
--- a/drivers/tty/serial/8250/8250_exar.c
+++ b/drivers/tty/serial/8250/8250_exar.c
@@ -261,7 +261,7 @@ __xr17v35x_register_gpio(struct pci_dev *pcidev,
 }
 
 static const struct property_entry exar_gpio_properties[] = {
-        PROPERTY_ENTRY_U32("linux,first-pin", 0),
+        PROPERTY_ENTRY_U32("exar,first-pin", 0),
         PROPERTY_ENTRY_U32("ngpios", 16),
         { }
 };
@@ -326,7 +326,7 @@ static int iot2040_rs485_config(struct uart_port *port,
 }
 
 static const struct property_entry iot2040_gpio_properties[] = {
-        PROPERTY_ENTRY_U32("linux,first-pin", 10),
+        PROPERTY_ENTRY_U32("exar,first-pin", 10),
         PROPERTY_ENTRY_U32("ngpios", 1),
         { }
 };