diff options
| author | Roland Stigge <stigge@antcom.de> | 2012-04-22 12:01:19 +0200 | 
|---|---|---|
| committer | Roland Stigge <stigge@antcom.de> | 2012-04-22 12:01:19 +0200 | 
| commit | be20dbc87879582e121e0525adcada13b3a8f476 (patch) | |
| tree | 1731b4f4728d5a839bead0572b51670dd9195def | |
| parent | f5c422713308e492eddc44a12134f9f249ddfbdb (diff) | |
| download | olio-linux-3.10-be20dbc87879582e121e0525adcada13b3a8f476.tar.xz olio-linux-3.10-be20dbc87879582e121e0525adcada13b3a8f476.zip  | |
ARM: LPC32xx: Move common code to common.c
This patch moves non-boardspecific LPC32xx code to common.c
Signed-off-by: Roland Stigge <stigge@antcom.de>
| -rw-r--r-- | arch/arm/mach-lpc32xx/common.c | 13 | ||||
| -rw-r--r-- | arch/arm/mach-lpc32xx/phy3250.c | 13 | 
2 files changed, 13 insertions, 13 deletions
diff --git a/arch/arm/mach-lpc32xx/common.c b/arch/arm/mach-lpc32xx/common.c index 0a41e1ec0c3..5c96057b6d7 100644 --- a/arch/arm/mach-lpc32xx/common.c +++ b/arch/arm/mach-lpc32xx/common.c @@ -223,3 +223,16 @@ void lpc23xx_restart(char mode, const char *cmd)  	while (1)  		;  } + +static int __init lpc32xx_display_uid(void) +{ +	u32 uid[4]; + +	lpc32xx_get_uid(uid); + +	printk(KERN_INFO "LPC32XX unique ID: %08x%08x%08x%08x\n", +		uid[3], uid[2], uid[1], uid[0]); + +	return 1; +} +arch_initcall(lpc32xx_display_uid); diff --git a/arch/arm/mach-lpc32xx/phy3250.c b/arch/arm/mach-lpc32xx/phy3250.c index 483846ff829..540106cdb9e 100644 --- a/arch/arm/mach-lpc32xx/phy3250.c +++ b/arch/arm/mach-lpc32xx/phy3250.c @@ -310,19 +310,6 @@ static void __init lpc3250_machine_init(void)  			SPI0_CS_GPIO);  } -static int __init lpc32xx_display_uid(void) -{ -	u32 uid[4]; - -	lpc32xx_get_uid(uid); - -	printk(KERN_INFO "LPC32XX unique ID: %08x%08x%08x%08x\n", -		uid[3], uid[2], uid[1], uid[0]); - -	return 1; -} -arch_initcall(lpc32xx_display_uid); -  static char const *lpc32xx_dt_compat[] __initdata = {  	"nxp,lpc3220",  	"nxp,lpc3230",  |