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

Commit 284d115e authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] pxa: separate PXA25x and PXA27x UDC register definitions 



The PXA25x and PXA27x USB device controller register definitions are
different.  Currently, they live side by side in pxa-regs.h, but only
one set is available depending on the setting of PXA25x or PXA27x.

This means that if we build to support both PXA25x and PXA27x, the
PXA27x definitions are unavailable, even to PXA27x specific code.

Remove these definitions from pxa-regs.h, and place them in separate
files.  Include these files where appropriate.

Note: according to the dependencies in drivers/usb/gadget/Kconfig,
we do not support the UDC on PXA27x nor PXA3xx CPUs, so remove the
platform devices from pxa27x.c and pxa3xx.c.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 02a8e769

arch/arm/mach-pxa/em-x270.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


#include <asm/arch/pxa-regs.h>

#include <asm/arch/pxa2xx-gpio.h>

#include <asm/arch/pxa27x-udc.h>

#include <asm/arch/pxafb.h>

#include <asm/arch/ohci.h>

#include <asm/arch/mmc.h>

arch/arm/mach-pxa/pxa27x.c

+1 −1
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ void __init pxa_set_i2c_power_info(struct i2c_pxa_platform_data *info) 
}



static struct platform_device *devices[] __initdata = {

	&pxa_device_udc,

/*	&pxa_device_udc,	The UDC driver is PXA25x only */

	&pxa_device_ffuart,

	&pxa_device_btuart,

	&pxa_device_stuart,

arch/arm/mach-pxa/pxa3xx.c

+1 −1
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ void __init pxa3xx_init_irq(void) 
 */



static struct platform_device *devices[] __initdata = {

	&pxa_device_udc,

/*	&pxa_device_udc,	The UDC driver is PXA25x only */

	&pxa_device_ffuart,

	&pxa_device_btuart,

	&pxa_device_stuart,

drivers/usb/gadget/pxa2xx_udc.c

+8 −2
Original line number Diff line number Diff line
@@ -46,19 +46,25 @@ 
#include <linux/err.h>

#include <linux/seq_file.h>

#include <linux/debugfs.h>

#include <linux/io.h>



#include <asm/byteorder.h>

#include <asm/dma.h>

#include <asm/gpio.h>

#include <asm/io.h>

#include <asm/system.h>

#include <asm/mach-types.h>

#include <asm/unaligned.h>

#include <asm/hardware.h>



#include <linux/usb/ch9.h>

#include <linux/usb/gadget.h>



/*

 * This driver is PXA25x only.  Grab the right register definitions.

 */

#ifdef CONFIG_ARCH_PXA

#include <asm/arch/pxa25x-udc.h>

#endif



#include <asm/mach/udc_pxa2xx.h>

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

+0 −412

File changed.

Preview size limit exceeded, changes collapsed.