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>

diff --cc arch/arm/mach-ux500/board-mop500.c
index 2d70e2b45660ffeb7175fd6fc3c190d3248e03dd,70a8057f3acfe00b6a3340cf8db025d198dae5d8..df5d27a532e9d8a048e7ed701d34549b38db2ea5
--- 1/arch/arm/mach-ux500/board-mop500.c
--- 2/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@@ -413,25 -413,26 +413,16 @@@ static void mop500_prox_deactivate(stru
        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 = STEDMA40_MEM_TO_PERIPH,
 -                              .src_dev_type = STEDMA40_DEV_SRC_MEMORY,
 -                              .dst_dev_type = DB8500_DMA_DEV48_CAC1_TX,
 -                              .src_info.data_width = STEDMA40_WORD_WIDTH,
 -                              .dst_info.data_width = STEDMA40_WORD_WIDTH,
 +                              .dir = DMA_MEM_TO_DEV,
 +                              .dev_type = DB8500_DMA_DEV48_CAC1,
                                .mode = STEDMA40_MODE_LOGICAL,
 -                              .src_info.psize = STEDMA40_PSIZE_LOG_4,
 -                              .dst_info.psize = STEDMA40_PSIZE_LOG_4,
                },
                .engine_to_mem = {
 -                              .dir = STEDMA40_PERIPH_TO_MEM,
 -                              .src_dev_type = DB8500_DMA_DEV48_CAC1_RX,
 -                              .dst_dev_type = STEDMA40_DEV_DST_MEMORY,
 -                              .src_info.data_width = STEDMA40_WORD_WIDTH,
 -                              .dst_info.data_width = STEDMA40_WORD_WIDTH,
 +                              .dir = DMA_DEV_TO_MEM,
 +                              .dev_type = DB8500_DMA_DEV48_CAC1,
                                .mode = STEDMA40_MODE_LOGICAL,
 -                              .src_info.psize = STEDMA40_PSIZE_LOG_4,
 -                              .dst_info.psize = STEDMA40_PSIZE_LOG_4,
                }
  };
  
@@@ -635,10 -665,6 +626,8 @@@ static void __init snowball_init_machin
        mop500_audio_init(parent);
        mop500_uart_init(parent);
  
-       mop500_snowball_ethernet_clock_enable();
- 
 +      u8500_cryp1_hash1_init(parent);
 +
        /* This board has full regulator constraints */
        regulator_has_full_constraints();
  }

diff --cc arch/arm/mach-ux500/board-mop500.h
Simple merge

diff --cc arch/arm/mach-ux500/cpu-db8500.c
Simple merge