← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to arch/arm/mach-pxa/gumstix.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/mach-pxa/gumstix.c
26
26
#include <linux/gpio.h>
27
27
#include <linux/err.h>
28
28
#include <linux/clk.h>
 
29
#include <linux/usb/gpio_vbus.h>
29
30
 
30
31
#include <asm/setup.h>
31
32
#include <asm/memory.h>
106
107
#endif
107
108
 
108
109
#ifdef CONFIG_USB_GADGET_PXA25X
109
 
static struct pxa2xx_udc_mach_info gumstix_udc_info __initdata = {
 
110
static struct gpio_vbus_mach_info gumstix_udc_info = {
110
111
        .gpio_vbus              = GPIO_GUMSTIX_USB_GPIOn,
111
112
        .gpio_pullup            = GPIO_GUMSTIX_USB_GPIOx,
112
113
};
113
114
 
 
115
static struct platform_device gumstix_gpio_vbus = {
 
116
        .name   = "gpio-vbus",
 
117
        .id     = -1,
 
118
        .dev    = {
 
119
                .platform_data  = &gumstix_udc_info,
 
120
        },
 
121
};
 
122
 
114
123
static void __init gumstix_udc_init(void)
115
124
{
116
 
        pxa_set_udc_info(&gumstix_udc_info);
 
125
        platform_device_register(&gumstix_gpio_vbus);
117
126
}
118
127
#else
119
128
static void gumstix_udc_init(void)