Commit 46000065 authored by Russell King's avatar Russell King

ARM: move udc_pxa2xx.h to linux/platform_data

Move the PXA2xx/IXP4xx UDC header file into linux/platform_data as it
only contains a driver platform data structure.
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarKrzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 6920b5a7
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* arch/arm/mach-ixp4xx/include/mach/udc.h * arch/arm/mach-ixp4xx/include/mach/udc.h
* *
*/ */
#include <asm/mach/udc_pxa2xx.h> #include <linux/platform_data/pxa2xx_udc.h>
extern void ixp4xx_set_udc_info(struct pxa2xx_udc_mach_info *info); extern void ixp4xx_set_udc_info(struct pxa2xx_udc_mach_info *info);
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* arch/arm/mach-pxa/include/mach/udc.h * arch/arm/mach-pxa/include/mach/udc.h
* *
*/ */
#include <asm/mach/udc_pxa2xx.h> #include <linux/platform_data/pxa2xx_udc.h>
extern void pxa_set_udc_info(struct pxa2xx_udc_mach_info *info); extern void pxa_set_udc_info(struct pxa2xx_udc_mach_info *info);
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/platform_data/pxa2xx_udc.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/irq.h> #include <linux/irq.h>
...@@ -59,9 +60,6 @@ ...@@ -59,9 +60,6 @@
#include <mach/lubbock.h> #include <mach/lubbock.h>
#endif #endif
#include <asm/mach/udc_pxa2xx.h>
/* /*
* This driver handles the USB Device Controller (UDC) in Intel's PXA 25x * This driver handles the USB Device Controller (UDC) in Intel's PXA 25x
* series processors. The UDC for the IXP 4xx series is very similar. * series processors. The UDC for the IXP 4xx series is very similar.
......
/* /*
* arch/arm/include/asm/mach/udc_pxa2xx.h
*
* This supports machine-specific differences in how the PXA2xx * This supports machine-specific differences in how the PXA2xx
* USB Device Controller (UDC) is wired. * USB Device Controller (UDC) is wired.
* *
...@@ -8,6 +6,8 @@ ...@@ -8,6 +6,8 @@
* linux/arch/mach-ixp4xx/<machine>.c and used in * linux/arch/mach-ixp4xx/<machine>.c and used in
* the probe routine of linux/drivers/usb/gadget/pxa2xx_udc.c * the probe routine of linux/drivers/usb/gadget/pxa2xx_udc.c
*/ */
#ifndef PXA2XX_UDC_H
#define PXA2XX_UDC_H
struct pxa2xx_udc_mach_info { struct pxa2xx_udc_mach_info {
int (*udc_is_connected)(void); /* do we see host? */ int (*udc_is_connected)(void); /* do we see host? */
...@@ -24,3 +24,4 @@ struct pxa2xx_udc_mach_info { ...@@ -24,3 +24,4 @@ struct pxa2xx_udc_mach_info {
int gpio_pullup; /* high == pullup activated */ int gpio_pullup; /* high == pullup activated */
}; };
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment