Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aed6fad8 authored by Milan Svoboda's avatar Milan Svoboda Committed by Russell King
Browse files

[ARM] 3943/1: share declaration of struct pxa2xx_udc_mach_info between multiple platforms 



Move declaration of struct pxa2xx_udc_mach_info from
include/asm-arm/arch-pxa/udc.h to new file
include/asm-arm/mach/udc_pxa2xx.h.

This allow us to use this structure with
multiple platforms - pxa and ixp4xx. USB
device controller used in pxa25x is the same
as controller used in ixp4xx.

Signed-off-by: default avatarMilan Svoboda <msvoboda@ra.rockwell.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent e730bf96

include/asm-arm/arch-pxa/udc.h

+1 −16
Original line number Diff line number Diff line
@@ -4,23 +4,8 @@ 
 * This supports machine-specific differences in how the PXA2xx

 * USB Device Controller (UDC) is wired.

 *

 * It is set in linux/arch/arm/mach-pxa/<machine>.c and used in

 * the probe routine of linux/drivers/usb/gadget/pxa2xx_udc.c

 */

struct pxa2xx_udc_mach_info {

        int  (*udc_is_connected)(void);		/* do we see host? */

        void (*udc_command)(int cmd);

#define	PXA2XX_UDC_CMD_CONNECT		0	/* let host see us */

#define	PXA2XX_UDC_CMD_DISCONNECT	1	/* so host won't see us */



	/* Boards following the design guidelines in the developer's manual,

	 * with on-chip GPIOs not Lubbock's wierd hardware, can have a sane

	 * VBUS IRQ and omit the methods above.  Store the GPIO number

	 * here; for GPIO 0, also mask in one of the pxa_gpio_mode() bits.

	 */

	u16	gpio_vbus;			/* high == vbus present */

	u16	gpio_pullup;			/* high == pullup activated */

};

#include <asm/mach/udc_pxa2xx.h>



extern void pxa_set_udc_info(struct pxa2xx_udc_mach_info *info);

include/asm-arm/mach/udc_pxa2xx.h

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/*

 * linux/include/asm-arm/mach/udc_pxa2xx.h

 *

 * This supports machine-specific differences in how the PXA2xx

 * USB Device Controller (UDC) is wired.

 *

 * It is set in linux/arch/arm/mach-pxa/<machine>.c or in

 * linux/arch/mach-ixp4xx/<machine>.c and used in

 * the probe routine of linux/drivers/usb/gadget/pxa2xx_udc.c

 */



struct pxa2xx_udc_mach_info {

        int  (*udc_is_connected)(void);		/* do we see host? */

        void (*udc_command)(int cmd);

#define	PXA2XX_UDC_CMD_CONNECT		0	/* let host see us */

#define	PXA2XX_UDC_CMD_DISCONNECT	1	/* so host won't see us */



	/* Boards following the design guidelines in the developer's manual,

	 * with on-chip GPIOs not Lubbock's wierd hardware, can have a sane

	 * VBUS IRQ and omit the methods above.  Store the GPIO number

	 * here; for GPIO 0, also mask in one of the pxa_gpio_mode() bits.

	 */

	u16	gpio_vbus;			/* high == vbus present */

	u16	gpio_pullup;			/* high == pullup activated */

};