Merge tag 'kvm-s390-next-5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / arm / mach-pxa / gumstix.c

diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c
index 4b4589cf431fdb5b8cdaea42ac7555eef8cfa755..49dd618b10f7ef742fee5f996ca1ff6cc73ebf24 100644 (file)
--- a/arch/arm/mach-pxa/gumstix.c
+++ b/arch/arm/mach-pxa/gumstix.c
@@ -20,10 +20,10 @@
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
+#include <linux/gpio/machine.h>
 #include <linux/gpio.h>
 #include <linux/err.h>
 #include <linux/clk.h>
-#include <linux/usb/gpio_vbus.h>
 
 #include <asm/setup.h>
 #include <asm/memory.h>
@@ -101,21 +101,25 @@ static void __init gumstix_mmc_init(void)
 #endif
 
 #ifdef CONFIG_USB_PXA25X
-static struct gpio_vbus_mach_info gumstix_udc_info = {
-       .gpio_vbus              = GPIO_GUMSTIX_USB_GPIOn,
-       .gpio_pullup            = GPIO_GUMSTIX_USB_GPIOx,
+static struct gpiod_lookup_table gumstix_gpio_vbus_gpiod_table = {
+       .dev_id = "gpio-vbus",
+       .table = {
+               GPIO_LOOKUP("gpio-pxa", GPIO_GUMSTIX_USB_GPIOn,
+                           "vbus", GPIO_ACTIVE_HIGH),
+               GPIO_LOOKUP("gpio-pxa", GPIO_GUMSTIX_USB_GPIOx,
+                           "pullup", GPIO_ACTIVE_HIGH),
+               { },
+       },
 };
 
 static struct platform_device gumstix_gpio_vbus = {
        .name   = "gpio-vbus",
        .id     = -1,
-       .dev    = {
-               .platform_data  = &gumstix_udc_info,
-       },
 };
 
 static void __init gumstix_udc_init(void)
 {
+       gpiod_add_lookup_table(&gumstix_gpio_vbus_gpiod_table);
        platform_device_register(&gumstix_gpio_vbus);
 }
 #else