xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: gadget: pxa27x_udc: transfer mach_info into pxa_udc

Browse Source 
Convert the mach info, and store the udc_command in the pxa_udc control
structure.

It is to be noticed that the udc_is_connected() in mach info is not
transfered. This was not used, as mioa701 machine doesn't need it,
balloon3 doesn't really use it, and most importantly the current driver
never uses it.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Robert Jarzmik
2014-10-01 22:06:15 +02:00
committed by Felipe Balbi
parent 2db88a7696
commit 3ec8347bfa
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/usb/gadget/udc/pxa27x_udc.c
View File

@@ -1510,11 +1510,11 @@ static void dplus_pullup(struct pxa_udc *udc, int on)
{
if (udc->gpiod) {
gpiod_set_value(udc->gpiod, on);
} else if (udc->mach && udc->mach->udc_command) {
} else if (udc->udc_command) {
if (on)
udc->mach->udc_command(PXA2XX_UDC_CMD_CONNECT);
udc->udc_command(PXA2XX_UDC_CMD_CONNECT);
else
udc->mach->udc_command(PXA2XX_UDC_CMD_DISCONNECT);
udc->udc_command(PXA2XX_UDC_CMD_DISCONNECT);
}
udc->pullup_on = on;
}
@@ -1605,7 +1605,7 @@ static int pxa_udc_pullup(struct usb_gadget *_gadget, int is_active)
{
struct pxa_udc *udc = to_gadget_udc(_gadget);
if (!udc->gpiod && !udc->mach->udc_command)
if (!udc->gpiod && !udc->udc_command)
return -EOPNOTSUPP;
dplus_pullup(udc, is_active);
@@ -2426,7 +2426,7 @@ static int pxa_udc_probe(struct platform_device *pdev)
return retval;
udc->gpiod = gpio_to_desc(mach->gpio_pullup);
}
udc->mach = mach;
udc->udc_command = mach->udc_command;
}
regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);