diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-21 08:48:58 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-21 08:48:58 -0400 |
| commit | d925ef43869a2da86444e3f68ebe9ce81efaa0c6 (patch) | |
| tree | ed1c2e19977008240a295c4ebb4b8b6c87e4f588 /arch/arm/mach-ux500/cpu-db8500.c | |
| parent | 86727c62c8a88828084e42bb2b937c417e8edafe (diff) | |
| parent | b6f5f4a5930855175dff7f783c0595bcdfb08280 (diff) | |
Merge branch 'ux500/cleanup' into next/drivers
Patches from Lee Jones:
This gets rid of mop500_snowball_ethernet_clock_enable() which is no
longer in use. It also straightens out a bug which ensures the SMSC911x's
regulator is turned on at start-up when using Device Tree.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-ux500/cpu-db8500.c')
| -rw-r--r-- | arch/arm/mach-ux500/cpu-db8500.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index f63847dabe7d..cd4b0a08bbf2 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c | |||
| @@ -279,7 +279,6 @@ static void __init u8500_init_machine(void) | |||
| 279 | mop500_pinmaps_init(); | 279 | mop500_pinmaps_init(); |
| 280 | else if (of_machine_is_compatible("calaosystems,snowball-a9500")) { | 280 | else if (of_machine_is_compatible("calaosystems,snowball-a9500")) { |
| 281 | snowball_pinmaps_init(); | 281 | snowball_pinmaps_init(); |
| 282 | mop500_snowball_ethernet_clock_enable(); | ||
| 283 | } else if (of_machine_is_compatible("st-ericsson,hrefv60+")) | 282 | } else if (of_machine_is_compatible("st-ericsson,hrefv60+")) |
| 284 | hrefv60_pinmaps_init(); | 283 | hrefv60_pinmaps_init(); |
| 285 | else if (of_machine_is_compatible("st-ericsson,ccu9540")) {} | 284 | else if (of_machine_is_compatible("st-ericsson,ccu9540")) {} |