usb: gadget: at91_udc: Convert to GPIO descriptors
Replace the legacy GPIO APIs with gpio descriptor consumer interface. Remove all gpio inversion(active low) flags as it is already handled by the gpiod_set_value() and gpiod_get_value() functions. Reviewed-by: Dan Sneddon <dan.sneddon@microchip.com> Signed-off-by: Balamanikandan Gunasundar <balamanikandan.gunasundar@microchip.com> Link: https://lore.kernel.org/r/20211026085610.25264-1-balamanikandan.gunasundar@microchip.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Balamanikandan Gunasundar
Greg Kroah-Hartman
parent
16d4275920
commit
4a555f2b8d
@ -25,7 +25,7 @@
|
||||
#include <linux/usb/ch9.h>
|
||||
#include <linux/usb/gadget.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_gpio.h>
|
||||
#include <linux/gpio/consumer.h>
|
||||
#include <linux/platform_data/atmel.h>
|
||||
#include <linux/regmap.h>
|
||||
#include <linux/mfd/syscon.h>
|
||||
@ -1510,7 +1510,6 @@ static irqreturn_t at91_udc_irq (int irq, void *_udc)
|
||||
|
||||
static void at91_vbus_update(struct at91_udc *udc, unsigned value)
|
||||
{
|
||||
value ^= udc->board.vbus_active_low;
|
||||
if (value != udc->vbus)
|
||||
at91_vbus_session(&udc->gadget, value);
|
||||
}
|
||||
@ -1521,7 +1520,7 @@ static irqreturn_t at91_vbus_irq(int irq, void *_udc)
|
||||
|
||||
/* vbus needs at least brief debouncing */
|
||||
udelay(10);
|
||||
at91_vbus_update(udc, gpio_get_value(udc->board.vbus_pin));
|
||||
at91_vbus_update(udc, gpiod_get_value(udc->board.vbus_pin));
|
||||
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
@ -1531,7 +1530,7 @@ static void at91_vbus_timer_work(struct work_struct *work)
|
||||
struct at91_udc *udc = container_of(work, struct at91_udc,
|
||||
vbus_timer_work);
|
||||
|
||||
at91_vbus_update(udc, gpio_get_value_cansleep(udc->board.vbus_pin));
|
||||
at91_vbus_update(udc, gpiod_get_value_cansleep(udc->board.vbus_pin));
|
||||
|
||||
if (!timer_pending(&udc->vbus_timer))
|
||||
mod_timer(&udc->vbus_timer, jiffies + VBUS_POLL_TIMEOUT);
|
||||
@ -1595,7 +1594,6 @@ static void at91udc_shutdown(struct platform_device *dev)
|
||||
static int at91rm9200_udc_init(struct at91_udc *udc)
|
||||
{
|
||||
struct at91_ep *ep;
|
||||
int ret;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < NUM_ENDPOINTS; i++) {
|
||||
@ -1615,32 +1613,23 @@ static int at91rm9200_udc_init(struct at91_udc *udc)
|
||||
}
|
||||
}
|
||||
|
||||
if (!gpio_is_valid(udc->board.pullup_pin)) {
|
||||
if (!udc->board.pullup_pin) {
|
||||
DBG("no D+ pullup?\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
ret = devm_gpio_request(&udc->pdev->dev, udc->board.pullup_pin,
|
||||
"udc_pullup");
|
||||
if (ret) {
|
||||
DBG("D+ pullup is busy\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
gpio_direction_output(udc->board.pullup_pin,
|
||||
udc->board.pullup_active_low);
|
||||
gpiod_direction_output(udc->board.pullup_pin,
|
||||
gpiod_is_active_low(udc->board.pullup_pin));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void at91rm9200_udc_pullup(struct at91_udc *udc, int is_on)
|
||||
{
|
||||
int active = !udc->board.pullup_active_low;
|
||||
|
||||
if (is_on)
|
||||
gpio_set_value(udc->board.pullup_pin, active);
|
||||
gpiod_set_value(udc->board.pullup_pin, 1);
|
||||
else
|
||||
gpio_set_value(udc->board.pullup_pin, !active);
|
||||
gpiod_set_value(udc->board.pullup_pin, 0);
|
||||
}
|
||||
|
||||
static const struct at91_udc_caps at91rm9200_udc_caps = {
|
||||
@ -1783,20 +1772,20 @@ static void at91udc_of_init(struct at91_udc *udc, struct device_node *np)
|
||||
{
|
||||
struct at91_udc_data *board = &udc->board;
|
||||
const struct of_device_id *match;
|
||||
enum of_gpio_flags flags;
|
||||
u32 val;
|
||||
|
||||
if (of_property_read_u32(np, "atmel,vbus-polled", &val) == 0)
|
||||
board->vbus_polled = 1;
|
||||
|
||||
board->vbus_pin = of_get_named_gpio_flags(np, "atmel,vbus-gpio", 0,
|
||||
&flags);
|
||||
board->vbus_active_low = (flags & OF_GPIO_ACTIVE_LOW) ? 1 : 0;
|
||||
board->vbus_pin = gpiod_get_from_of_node(np, "atmel,vbus-gpio", 0,
|
||||
GPIOD_IN, "udc_vbus");
|
||||
if (IS_ERR(board->vbus_pin))
|
||||
board->vbus_pin = NULL;
|
||||
|
||||
board->pullup_pin = of_get_named_gpio_flags(np, "atmel,pullup-gpio", 0,
|
||||
&flags);
|
||||
|
||||
board->pullup_active_low = (flags & OF_GPIO_ACTIVE_LOW) ? 1 : 0;
|
||||
board->pullup_pin = gpiod_get_from_of_node(np, "atmel,pullup-gpio", 0,
|
||||
GPIOD_ASIS, "udc_pullup");
|
||||
if (IS_ERR(board->pullup_pin))
|
||||
board->pullup_pin = NULL;
|
||||
|
||||
match = of_match_node(at91_udc_dt_ids, np);
|
||||
if (match)
|
||||
@ -1886,22 +1875,14 @@ static int at91udc_probe(struct platform_device *pdev)
|
||||
goto err_unprepare_iclk;
|
||||
}
|
||||
|
||||
if (gpio_is_valid(udc->board.vbus_pin)) {
|
||||
retval = devm_gpio_request(dev, udc->board.vbus_pin,
|
||||
"udc_vbus");
|
||||
if (retval) {
|
||||
DBG("request vbus pin failed\n");
|
||||
goto err_unprepare_iclk;
|
||||
}
|
||||
|
||||
gpio_direction_input(udc->board.vbus_pin);
|
||||
if (udc->board.vbus_pin) {
|
||||
gpiod_direction_input(udc->board.vbus_pin);
|
||||
|
||||
/*
|
||||
* Get the initial state of VBUS - we cannot expect
|
||||
* a pending interrupt.
|
||||
*/
|
||||
udc->vbus = gpio_get_value_cansleep(udc->board.vbus_pin) ^
|
||||
udc->board.vbus_active_low;
|
||||
udc->vbus = gpiod_get_value_cansleep(udc->board.vbus_pin);
|
||||
|
||||
if (udc->board.vbus_polled) {
|
||||
INIT_WORK(&udc->vbus_timer_work, at91_vbus_timer_work);
|
||||
@ -1910,7 +1891,7 @@ static int at91udc_probe(struct platform_device *pdev)
|
||||
jiffies + VBUS_POLL_TIMEOUT);
|
||||
} else {
|
||||
retval = devm_request_irq(dev,
|
||||
gpio_to_irq(udc->board.vbus_pin),
|
||||
gpiod_to_irq(udc->board.vbus_pin),
|
||||
at91_vbus_irq, 0, driver_name, udc);
|
||||
if (retval) {
|
||||
DBG("request vbus irq %d failed\n",
|
||||
@ -1988,8 +1969,8 @@ static int at91udc_suspend(struct platform_device *pdev, pm_message_t mesg)
|
||||
enable_irq_wake(udc->udp_irq);
|
||||
|
||||
udc->active_suspend = wake;
|
||||
if (gpio_is_valid(udc->board.vbus_pin) && !udc->board.vbus_polled && wake)
|
||||
enable_irq_wake(udc->board.vbus_pin);
|
||||
if (udc->board.vbus_pin && !udc->board.vbus_polled && wake)
|
||||
enable_irq_wake(gpiod_to_irq(udc->board.vbus_pin));
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1998,9 +1979,9 @@ static int at91udc_resume(struct platform_device *pdev)
|
||||
struct at91_udc *udc = platform_get_drvdata(pdev);
|
||||
unsigned long flags;
|
||||
|
||||
if (gpio_is_valid(udc->board.vbus_pin) && !udc->board.vbus_polled &&
|
||||
if (udc->board.vbus_pin && !udc->board.vbus_polled &&
|
||||
udc->active_suspend)
|
||||
disable_irq_wake(udc->board.vbus_pin);
|
||||
disable_irq_wake(gpiod_to_irq(udc->board.vbus_pin));
|
||||
|
||||
/* maybe reconnect to host; if so, clocks on */
|
||||
if (udc->active_suspend)
|
||||
|
||||
@ -109,11 +109,9 @@ struct at91_udc_caps {
|
||||
};
|
||||
|
||||
struct at91_udc_data {
|
||||
int vbus_pin; /* high == host powering us */
|
||||
u8 vbus_active_low; /* vbus polarity */
|
||||
u8 vbus_polled; /* Use polling, not interrupt */
|
||||
int pullup_pin; /* active == D+ pulled up */
|
||||
u8 pullup_active_low; /* true == pullup_pin is active low */
|
||||
struct gpio_desc *vbus_pin; /* high == host powering us */
|
||||
u8 vbus_polled; /* Use polling, not interrupt */
|
||||
struct gpio_desc *pullup_pin; /* active == D+ pulled up */
|
||||
};
|
||||
|
||||
/*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user