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

Commit ebcce7b1 authored by Ian Molton's avatar Ian Molton
Browse files

[ARM] eseries: move UDC defs to machine files 



This patchset moves the UDC definitons for e7xx compatible eseries machines
to a common location and moves the 'oddball' e800 definition to its machine
file.

Signed-off-by: default avatarIan Molton <spyro@f2s.com>
parent 0ec3cf69

arch/arm/mach-pxa/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ obj-$(CONFIG_MACH_PCM990_BASEBOARD) += pcm990-baseboard.o 
obj-$(CONFIG_MACH_TOSA)		+= tosa.o

obj-$(CONFIG_MACH_EM_X270)	+= em-x270.o

obj-$(CONFIG_MACH_MAGICIAN)	+= magician.o

obj-$(CONFIG_ARCH_PXA_ESERIES)	+= eseries.o eseries_udc.o

obj-$(CONFIG_ARCH_PXA_ESERIES)	+= eseries.o

obj-$(CONFIG_MACH_E330)		+= e330.o

obj-$(CONFIG_MACH_E350)		+= e350.o

obj-$(CONFIG_MACH_E740)		+= e740.o

arch/arm/mach-pxa/e330.c

+7 −0
Original line number Diff line number Diff line
@@ -19,10 +19,16 @@ 


#include <mach/mfp-pxa25x.h>

#include <mach/hardware.h>

#include <mach/udc.h>



#include "generic.h"

#include "eseries.h"



static void __init e330_init(void)

{

	pxa_set_udc_info(&e7xx_udc_mach_info);

}



MACHINE_START(E330, "Toshiba e330")

	/* Maintainer: Ian Molton (spyro@f2s.com) */

	.phys_io	= 0x40000000,
@@ -31,6 +37,7 @@ MACHINE_START(E330, "Toshiba e330") 
	.map_io		= pxa_map_io,

	.init_irq	= pxa25x_init_irq,

	.fixup		= eseries_fixup,

	.init_machine	= e330_init,

	.timer		= &pxa_timer,

MACHINE_END

arch/arm/mach-pxa/e350.c

+7 −0
Original line number Diff line number Diff line
@@ -19,10 +19,16 @@ 


#include <mach/mfp-pxa25x.h>

#include <mach/hardware.h>

#include <mach/udc.h>



#include "generic.h"

#include "eseries.h"



static void __init e350_init(void)

{

	pxa_set_udc_info(&e7xx_udc_mach_info);

}



MACHINE_START(E350, "Toshiba e350")

	/* Maintainer: Ian Molton (spyro@f2s.com) */

	.phys_io	= 0x40000000,
@@ -31,6 +37,7 @@ MACHINE_START(E350, "Toshiba e350") 
	.map_io		= pxa_map_io,

	.init_irq	= pxa25x_init_irq,

	.fixup		= eseries_fixup,

	.init_machine	= e350_init,

	.timer		= &pxa_timer,

MACHINE_END

arch/arm/mach-pxa/e400.c

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <mach/hardware.h>



#include <mach/pxafb.h>

#include <mach/udc.h>



#include "generic.h"

#include "eseries.h"
@@ -76,6 +77,7 @@ static void __init e400_init(void) 
{

	pxa2xx_mfp_config(ARRAY_AND_SIZE(e400_pin_config));

	set_pxa_fb_info(&e400_pxafb_mach_info);

	pxa_set_udc_info(&e7xx_udc_mach_info);

}



MACHINE_START(E400, "Toshiba e400")

arch/arm/mach-pxa/e740.c

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


#include <mach/mfp-pxa25x.h>

#include <mach/hardware.h>

#include <mach/udc.h>



#include "generic.h"

#include "eseries.h"
@@ -151,6 +152,7 @@ static void __init e740_init(void) 
{

	pxa2xx_mfp_config(ARRAY_AND_SIZE(e740_pin_config));

	platform_add_devices(devices, ARRAY_SIZE(devices));

	pxa_set_udc_info(&e7xx_udc_mach_info);

}



MACHINE_START(E740, "Toshiba e740")