| Message ID | 55D25A06.9030507@tul.cz (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Petr Cvek <petr.cvek@tul.cz> writes: > Add support for PXA27x UDC to HTC Magician. > > Signed-off-by: Petr Cvek <petr.cvek@tul.cz> > --- > arch/arm/mach-pxa/magician.c | 40 +++++++++++++++++++++++++++++++++++++++- > 1 file changed, 39 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c > index 8ca0b67..23b59a0 100644 > --- a/arch/arm/mach-pxa/magician.c > +++ b/arch/arm/mach-pxa/magician.c > @@ -98,6 +98,10 @@ > > #include <linux/regulator/max1586.h> > > +#include <linux/platform_data/pxa2xx_udc.h> > +#include <mach/udc.h> > +#include <mach/pxa27x-udc.h> > + > #include "devices.h" > #include "generic.h" > > @@ -698,6 +702,34 @@ static struct platform_device magician_camera = { > * USB "Transceiver" > */ > > +#if IS_ENABLED(CONFIG_USB_PXA27X) No #if please, just let it out of #ifdefery, no need to. > +static void magician_udc_command(int cmd) > +{ > + if (cmd == PXA2XX_UDC_CMD_CONNECT) > + UP2OCR |= UP2OCR_DPPUE | UP2OCR_DPPUBE; > + else if (cmd == PXA2XX_UDC_CMD_DISCONNECT) > + UP2OCR &= ~(UP2OCR_DPPUE | UP2OCR_DPPUBE); > +} > + > +/* HACK, shared USB connected state with pda-power */ > +int my_usb_online = 1; Definitely not, a global (ie. non static variable) is not something I'll let in. Besides, can't a "gpio_get_value()" give the same level of information ? > +static int magician_udc_is_connected(void) > +{ > + /* Shared with pda_power or gpio-vbus */ > + return my_usb_online; gpio_get_value() something ? > +} > + > +static struct pxa2xx_udc_mach_info magician_udc_info __initdata = { > + .udc_command = magician_udc_command, > + .udc_is_connected = magician_udc_is_connected, I don't think udc_is_connected is a field used by pxa27x_udc.c, it it ? The VBus connection information comes from a transciever, usually from gpio_vbus driver nowadays. > @@ -1175,6 +1207,11 @@ static struct platform_device *devices[] __initdata = { > > /* NOTICE mutually exclusive with PXA I2C */ > &i2c_gpio_bus_alt, > + > + /* NOTICE mutually exclusive with UDC*/ Euh why so ? In arch/arm/mach-pxa/mioa701.c they cooperate, why can't they for magician ? Cheers.
Dne 20.8.2015 v 19:23 Robert Jarzmik napsal(a): > Petr Cvek <petr.cvek@tul.cz> writes: > >> Add support for PXA27x UDC to HTC Magician. >> >> Signed-off-by: Petr Cvek <petr.cvek@tul.cz> >> --- >> arch/arm/mach-pxa/magician.c | 40 +++++++++++++++++++++++++++++++++++++++- >> 1 file changed, 39 insertions(+), 1 deletion(-) >> >> diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c >> index 8ca0b67..23b59a0 100644 >> --- a/arch/arm/mach-pxa/magician.c >> +++ b/arch/arm/mach-pxa/magician.c >> @@ -98,6 +98,10 @@ >> >> #include <linux/regulator/max1586.h> >> >> +#include <linux/platform_data/pxa2xx_udc.h> >> +#include <mach/udc.h> >> +#include <mach/pxa27x-udc.h> >> + >> #include "devices.h" >> #include "generic.h" >> >> @@ -698,6 +702,34 @@ static struct platform_device magician_camera = { >> * USB "Transceiver" >> */ >> >> +#if IS_ENABLED(CONFIG_USB_PXA27X) > No #if please, just let it out of #ifdefery, no need to. > >> +static void magician_udc_command(int cmd) >> +{ >> + if (cmd == PXA2XX_UDC_CMD_CONNECT) >> + UP2OCR |= UP2OCR_DPPUE | UP2OCR_DPPUBE; >> + else if (cmd == PXA2XX_UDC_CMD_DISCONNECT) >> + UP2OCR &= ~(UP2OCR_DPPUE | UP2OCR_DPPUBE); >> +} >> + >> +/* HACK, shared USB connected state with pda-power */ >> +int my_usb_online = 1; > Definitely not, a global (ie. non static variable) is not something I'll let > in. Besides, can't a "gpio_get_value()" give the same level of information ? I will gladly remove it, but I want my phone to be able to charge and work as USB device (and maybe as USB host). > >> +static int magician_udc_is_connected(void) >> +{ >> + /* Shared with pda_power or gpio-vbus */ >> + return my_usb_online; > gpio_get_value() something ? > I need to use EGPIO_MAGICIAN_CABLE_INSERT1 GPIO in pda_power to be able to detect source for charging. >> +} >> + >> +static struct pxa2xx_udc_mach_info magician_udc_info __initdata = { >> + .udc_command = magician_udc_command, >> + .udc_is_connected = magician_udc_is_connected, > I don't think udc_is_connected is a field used by pxa27x_udc.c, it it ? The VBus > connection information comes from a transciever, usually from gpio_vbus driver > nowadays. Really? Well I guess I took a bad route :-D (when I tried to learn how to add an udc support). As there are two ways to define udc_is_connected, would it be possible to remove this field altogether (only mioa701 and lubbock have relevant use, but if this function is never called, then it is dead code)? Do you know which code / source is responsible for gpio_vbus -> pxa27x_udc communication about inserted cable? I will need to put some assert for testing. > >> @@ -1175,6 +1207,11 @@ static struct platform_device *devices[] __initdata = { >> >> /* NOTICE mutually exclusive with PXA I2C */ >> &i2c_gpio_bus_alt, >> + >> + /* NOTICE mutually exclusive with UDC*/ > Euh why so ? > In arch/arm/mach-pxa/mioa701.c they cooperate, why can't they for magician ? In mioa701 the GPIO13_nUSB_DETECT GPIO is requested by gpio_vbus driver, used in pda_power (without request) and "used" in PXA UDC driver without request. It is basically similar solution as my (ugly) global variable. Solution: I will try to use that second new GPIO (EGPIO_MAGICIAN_CABLE_INSERT2) for that, so there is no GPIO request dependency. I may create new names for them (magician.h). > > Cheers. > Best regards, Petr
Petr Cvek <petr.cvek@tul.cz> writes: > Dne 20.8.2015 v 19:23 Robert Jarzmik napsal(a): >> Petr Cvek <petr.cvek@tul.cz> writes: >>> +static void magician_udc_command(int cmd) >>> +{ >>> + if (cmd == PXA2XX_UDC_CMD_CONNECT) >>> + UP2OCR |= UP2OCR_DPPUE | UP2OCR_DPPUBE; >>> + else if (cmd == PXA2XX_UDC_CMD_DISCONNECT) >>> + UP2OCR &= ~(UP2OCR_DPPUE | UP2OCR_DPPUBE); >>> +} >>> + >>> +/* HACK, shared USB connected state with pda-power */ >>> +int my_usb_online = 1; >> Definitely not, a global (ie. non static variable) is not something I'll let >> in. Besides, can't a "gpio_get_value()" give the same level of information ? > > I will gladly remove it, but I want my phone to be able to charge and work as > USB device (and maybe as USB host). Okay, I understand that, but see below. >> >>> +static int magician_udc_is_connected(void) >>> +{ >>> + /* Shared with pda_power or gpio-vbus */ >>> + return my_usb_online; >> gpio_get_value() something ? >> > > I need to use EGPIO_MAGICIAN_CABLE_INSERT1 GPIO in pda_power to be able to detect source for charging. > >>> +} >>> + >>> +static struct pxa2xx_udc_mach_info magician_udc_info __initdata = { >>> + .udc_command = magician_udc_command, >>> + .udc_is_connected = magician_udc_is_connected, >> I don't think udc_is_connected is a field used by pxa27x_udc.c, it it ? The VBus >> connection information comes from a transciever, usually from gpio_vbus driver >> nowadays. > > Really? Well I guess I took a bad route :-D (when I tried to learn how to add an > udc support). As there are two ways to define udc_is_connected, would it be > possible to remove this field altogether (only mioa701 and lubbock have relevant > use, but if this function is never called, then it is dead code)? > > Do you know which code / source is responsible for gpio_vbus -> pxa27x_udc > communication about inserted cable? I will need to put some assert for > testing. Yes. - hooking: udc->transceiver = usb_get_phy(USB_PHY_TYPE_USB2); - detection: gpio_vbus_work() -> usb_gadget_vbus_connect() -> pxa_udc_vbus_session() >>> @@ -1175,6 +1207,11 @@ static struct platform_device *devices[] __initdata = { >>> >>> /* NOTICE mutually exclusive with PXA I2C */ >>> &i2c_gpio_bus_alt, >>> + >>> + /* NOTICE mutually exclusive with UDC*/ >> Euh why so ? >> In arch/arm/mach-pxa/mioa701.c they cooperate, why can't they for magician ? > > In mioa701 the GPIO13_nUSB_DETECT GPIO is requested by gpio_vbus driver, used in > pda_power (without request) and "used" in PXA UDC driver without request. It is > basically similar solution as my (ugly) global variable. > > Solution: I will try to use that second new GPIO (EGPIO_MAGICIAN_CABLE_INSERT2) > for that, so there is no GPIO request dependency. I may create new names for > them (magician.h). Cool. And if by chance you find an even cleaner solution, don't hesitate to modify mioa701, hein ? ;) Cheers.
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c index 8ca0b67..23b59a0 100644 --- a/arch/arm/mach-pxa/magician.c +++ b/arch/arm/mach-pxa/magician.c @@ -98,6 +98,10 @@ #include <linux/regulator/max1586.h> +#include <linux/platform_data/pxa2xx_udc.h> +#include <mach/udc.h> +#include <mach/pxa27x-udc.h> + #include "devices.h" #include "generic.h" @@ -698,6 +702,34 @@ static struct platform_device magician_camera = { * USB "Transceiver" */ +#if IS_ENABLED(CONFIG_USB_PXA27X) +static void magician_udc_command(int cmd) +{ + if (cmd == PXA2XX_UDC_CMD_CONNECT) + UP2OCR |= UP2OCR_DPPUE | UP2OCR_DPPUBE; + else if (cmd == PXA2XX_UDC_CMD_DISCONNECT) + UP2OCR &= ~(UP2OCR_DPPUE | UP2OCR_DPPUBE); +} + +/* HACK, shared USB connected state with pda-power */ +int my_usb_online = 1; + +static int magician_udc_is_connected(void) +{ + /* Shared with pda_power or gpio-vbus */ + return my_usb_online; +} + +static struct pxa2xx_udc_mach_info magician_udc_info __initdata = { + .udc_command = magician_udc_command, + .udc_is_connected = magician_udc_is_connected, + .gpio_pullup = GPIO27_MAGICIAN_USBC_PUEN, +}; + +#else + +/* GPIO USB client vbus sensing, when no PXA UDC installed */ + static struct resource gpio_vbus_resource = { .flags = IORESOURCE_IRQ, .start = IRQ_MAGICIAN_VBUS, @@ -718,6 +750,7 @@ static struct platform_device gpio_vbus = { .platform_data = &gpio_vbus_info, }, }; +#endif /* IS_ENABLED(CONFIG_USB_PXA27X) */ /* * Charging functions @@ -1167,7 +1200,6 @@ static struct platform_device *devices[] __initdata = { &pasic3, &vads7846_device, &bq24022, - &gpio_vbus, &power_supply, &leds_gpio, &magician_camera, @@ -1175,6 +1207,11 @@ static struct platform_device *devices[] __initdata = { /* NOTICE mutually exclusive with PXA I2C */ &i2c_gpio_bus_alt, + + /* NOTICE mutually exclusive with UDC*/ +#if !(IS_ENABLED(CONFIG_USB_PXA27X)) + &gpio_vbus, +#endif }; /* @@ -1226,6 +1263,7 @@ static void __init magician_init(void) pxa_set_mci_info(&magician_mci_info); pxa_set_ohci_info(&magician_ohci_info); + pxa_set_udc_info(&magician_udc_info); /* Check LCD type we have */ cpld = ioremap_nocache(PXA_CS3_PHYS, 0x1000);
Add support for PXA27x UDC to HTC Magician. Signed-off-by: Petr Cvek <petr.cvek@tul.cz> --- arch/arm/mach-pxa/magician.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-)