usb: gadget: udc: atmel: GPIO inversion is handled by gpiod

When converting to GPIO descriptors, gpiod_get_value automatically
handles the line inversion flags from the device tree.

Do not invert the line twice.

Fixes: 3df034081021 ("usb: gadget: udc: atmel: convert to use GPIO descriptors")
Acked-by: Ludovic Desroches <ludovic.desroches@microchip.com>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: Romain Izard <romain.izard.pro@gmail.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
index 27c16399c7e8e9cc9529b95c0bbd266e8b256672..0fe3d0feb8f721654e68be8611cf7790830347a3 100644 (file)
--- a/drivers/usb/gadget/udc/atmel_usba_udc.c
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
@@ -417,7 +417,7 @@ static inline void usba_int_enb_set(struct usba_udc *udc, u32 val)
 static int vbus_is_present(struct usba_udc *udc)
 {
        if (udc->vbus_pin)
-               return gpiod_get_value(udc->vbus_pin) ^ udc->vbus_pin_inverted;
+               return gpiod_get_value(udc->vbus_pin);
 
        /* No Vbus detection: Assume always present */
        return 1;
@@ -2076,7 +2076,6 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev,
 
        udc->vbus_pin = devm_gpiod_get_optional(&pdev->dev, "atmel,vbus",
                                                GPIOD_IN);
-       udc->vbus_pin_inverted = gpiod_is_active_low(udc->vbus_pin);
 
        if (fifo_mode == 0) {
                pp = NULL;

diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.h b/drivers/usb/gadget/udc/atmel_usba_udc.h
index 969ce8f3c3e206385938f238878b72a0f263e101..d7eb7cf4fd5cabcd63eb0de90561bb476d224f34 100644 (file)
--- a/drivers/usb/gadget/udc/atmel_usba_udc.h
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.h
@@ -326,7 +326,6 @@ struct usba_udc {
        const struct usba_udc_errata *errata;
        int irq;
        struct gpio_desc *vbus_pin;
-       int vbus_pin_inverted;
        int num_ep;
        int configured_ep;
        struct usba_fifo_cfg *fifo_cfg;