diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-21 14:48:58 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-21 14:48:58 +0200 |
| commit | d925ef43869a2da86444e3f68ebe9ce81efaa0c6 (patch) | |
| tree | ed1c2e19977008240a295c4ebb4b8b6c87e4f588 /arch/arm/mach-ux500/board-mop500.c | |
| parent | 86727c62c8a88828084e42bb2b937c417e8edafe (diff) | |
| parent | b6f5f4a5930855175dff7f783c0595bcdfb08280 (diff) | |
| download | blackbird-op-linux-d925ef43869a2da86444e3f68ebe9ce81efaa0c6.tar.gz blackbird-op-linux-d925ef43869a2da86444e3f68ebe9ce81efaa0c6.zip | |
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/board-mop500.c')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 2d70e2b45660..df5d27a532e9 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -413,15 +413,6 @@ static void mop500_prox_deactivate(struct device *dev) regulator_put(prox_regulator); } -void mop500_snowball_ethernet_clock_enable(void) -{ - struct clk *clk; - - clk = clk_get_sys("fsmc", NULL); - if (!IS_ERR(clk)) - clk_prepare_enable(clk); -} - static struct cryp_platform_data u8500_cryp1_platform_data = { .mem_to_engine = { .dir = DMA_MEM_TO_DEV, @@ -635,8 +626,6 @@ static void __init snowball_init_machine(void) mop500_audio_init(parent); mop500_uart_init(parent); - mop500_snowball_ethernet_clock_enable(); - u8500_cryp1_hash1_init(parent); /* This board has full regulator constraints */ |
