Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 00:52:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: move udc_pxa2xx.h to linux/platform_data

Browse Source 
Move the PXA2xx/IXP4xx UDC header file into linux/platform_data as it
only contains a driver platform data structure.

Acked-by: Felipe Balbi <balbi@ti.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Krzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2012-09-21 10:23:44 +01:00
parent 6920b5a791
commit 46000065a6
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-ixp4xx/include/mach/udc.h
View File

@ -2,7 +2,7 @@
* 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);

2
arch/arm/mach-pxa/include/mach/udc.h
View File

@ -2,7 +2,7 @@
* 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);

4
drivers/usb/gadget/pxa25x_udc.c
View File

@ -29,6 +29,7 @@
#include <linux/list.h>
#include <linux/interrupt.h>
#include <linux/mm.h>
#include <linux/platform_data/pxa2xx_udc.h>
#include <linux/platform_device.h>
#include <linux/dma-mapping.h>
#include <linux/irq.h>
@ -59,9 +60,6 @@
#include <mach/lubbock.h>
#endif
#include <asm/mach/udc_pxa2xx.h>
/*
* 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.

5
arch/arm/include/asm/mach/udc_pxa2xx.h → include/linux/platform_data/pxa2xx_udc.h
View File

@ -1,6 +1,4 @@
/*
* arch/arm/include/asm/mach/udc_pxa2xx.h
*
* This supports machine-specific differences in how the PXA2xx
* USB Device Controller (UDC) is wired.
*
@ -8,6 +6,8 @@
* linux/arch/mach-ixp4xx/<machine>.c and used in
* the probe routine of linux/drivers/usb/gadget/pxa2xx_udc.c
*/
#ifndef PXA2XX_UDC_H
#define PXA2XX_UDC_H
struct pxa2xx_udc_mach_info {
int (*udc_is_connected)(void); /* do we see host? */
@ -24,3 +24,4 @@ struct pxa2xx_udc_mach_info {
int gpio_pullup; /* high == pullup activated */
};
#endif