Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

diff --combined MAINTAINERS
index 1614b913bdfe709925e853445139bc08b1f123be,0f19078bc447db0476e0422b71bb71f58f422068..e131f80534578ca23bf860721b4082a08192e4a1
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -150,6 -150,9 +150,6 @@@ Wolfgang Denk <wd@denx.de
  
        P3G4            MPC7410
  
 -      PCIPPC2         MPC750
 -      PCIPPC6         MPC750
 -
  Phil Edworthy <phil.edworthy@renesas.com>
  
        rsk7264         SH7264
@@@ -231,7 -234,6 +231,7 @@@ Wolfgang Grandegger <wg@denx.de
  
  Anatolij Gustschin <agust@denx.de>
  
 +      ac14xx          MPC5121e
        O2D             MPC5200
        O2D300          MPC5200
        O2DNT2          MPC5200
@@@ -395,7 -397,6 +395,7 @@@ Ricardo Ribalda <ricardo.ribalda@uam.es
  Stefan Roese <sr@denx.de>
  
        a3m071          MPC5200
 +      a4m2k           MPC5200
  
        P3M7448         MPC7448
  
@@@ -663,6 -664,7 +663,7 @@@ Fabio Estevam <fabio.estevam@freescale.
        mx53smd         i.MX53
        mx6qsabresd     i.MX6Q
        mx6qsabreauto   i.MX6Q
+       wandboard       i.MX6DL/S
  
  Daniel Gorsulowski <daniel.gorsulowski@esd.eu>
  
@@@ -688,10 -690,6 +689,10 @@@ Stefan Herbrechtsmeier <stefan@code.her
  
        dns325          ARM926EJS (Kirkwood SoC)
  
 +Lauri Hintsala <lauri.hintsala@bluegiga.com>
 +
 +      apx4devkit      i.MX28
 +
  Vaibhav Hiremath <hvaibhav@ti.com>
  
        am3517_evm      ARM ARMV7 (AM35x SoC)
@@@ -810,6 -808,10 +811,6 @@@ Linus Walleij <linus.walleij@linaro.org
        integratorap    various
        integratorcp    various
  
 -Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com>
 -
 -      apx4devkit      i.MX28
 -
  Luka Perkov <luka@openwrt.org>
  
        ib62x0          ARM926EJS
@@@ -833,10 -835,6 +834,10 @@@ Stelian Pop <stelian@popies.net
        at91sam9263ek   ARM926EJS (AT91SAM9263 SoC)
        at91sam9rlek    ARM926EJS (AT91SAM9RL SoC)
  
 +Matt Porter <mporter@ti.com>
 +
 +      ti814x_evm      ARM ARMV7 (TI814x Soc)
 +
  Dave Purdy <david.c.purdy@gmail.com>
  
        pogo_e02        ARM926EJS (Kirkwood SoC)
@@@ -914,10 -912,6 +915,10 @@@ Matt Sealey <matt@genesi-usa.com
  Bo Shen <voice.shen@atmel.com>
        at91sam9x5ek            ARM926EJS (AT91SAM9G15,G25,G35,X25,X35 SoC)
  
 +Rajeshwari Shinde <rajeshwari.s@samsung.com>
 +
 +      snow                    ARM ARMV7 (EXYNOS5250 SoC)
 +
  Michal Simek <monstr@monstr.eu>
  
        zynq            ARM ARMV7 (Zynq SoC)

diff --combined boards.cfg
index 5fc70be8f537956c09faee52012664a7ffb70701,7725a1534d4dec6dbbec7acd5168cddc1426b4c6..d7bda3663c61367577e589a6c129fe6bad3d2eb8
--- 1/boards.cfg
--- 2/boards.cfg
+++ b/boards.cfg
@@@ -196,7 -196,8 +196,8 @@@ mx23_olinuxino               ar
  apx4devkit                   arm         arm926ejs   apx4devkit          bluegiga       mxs           apx4devkit
  mx23evk                      arm         arm926ejs   mx23evk             freescale      mxs           mx23evk
  m28evk                       arm         arm926ejs   m28evk              denx           mxs           m28evk
- mx28evk                      arm         arm926ejs   mx28evk             freescale      mxs           mx28evk
+ mx28evk                      arm         arm926ejs   mx28evk             freescale      mxs           mx28evk:ENV_IS_IN_MMC
+ mx28evk_nand                 arm         arm926ejs   mx28evk             freescale      mxs           mx28evk:ENV_IS_IN_NAND
  sc_sps_1                     arm         arm926ejs   sc_sps_1            schulercontrol mxs
  nhk8815                      arm         arm926ejs   nhk8815             st             nomadik
  nhk8815_onenand              arm         arm926ejs   nhk8815             st             nomadik       nhk8815:BOOT_ONENAND
@@@ -241,7 -242,6 +242,7 @@@ am335x_evm_uart3             ar
  am335x_evm_uart4             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL5,CONS_INDEX=5
  am335x_evm_uart5             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL6,CONS_INDEX=6
  am335x_evm_usbspl            arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1,SPL_USBETH_SUPPORT
 +ti814x_evm                   arm         armv7       ti814x              ti             am33xx
  pcm051                       arm         armv7       pcm051              phytec         am33xx      pcm051
  highbank                     arm         armv7       highbank            -              highbank
  mx51_efikamx                 arm         armv7       mx51_efikamx        genesi         mx5           mx51_efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_mx.cfg
@@@ -264,6 -264,8 +265,8 @@@ nitrogen6q                   ar
  nitrogen6q2g                 arm         armv7       nitrogen6x          boundary       mx6           nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048
  nitrogen6s                   arm         armv7       nitrogen6x          boundary       mx6           nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512
  nitrogen6s1g                 arm         armv7       nitrogen6x          boundary       mx6           nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024
+ wandboard_dl               arm         armv7       wandboard           -              mx6 wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024
+ wandboard_solo                     arm         armv7       wandboard           -              mx6 wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512
  cm_t35                       arm         armv7       cm_t35              -              omap3
  omap3_overo                  arm         armv7       overo               -              omap3
  omap3_pandora                arm         armv7       pandora             -              omap3
@@@ -298,7 -300,6 +301,7 @@@ s5p_goni                     ar
  smdkc100                     arm         armv7       smdkc100            samsung        s5pc1xx
  origen                             arm         armv7       origen              samsung        exynos
  s5pc210_universal            arm         armv7       universal_c210      samsung        exynos
 +snow                       arm         armv7       smdk5250            samsung        exynos
  smdk5250                   arm         armv7       smdk5250            samsung        exynos
  smdkv310                   arm         armv7       smdkv310            samsung        exynos
  trats                        arm         armv7       trats               samsung        exynos
@@@ -479,6 -480,8 +482,6 @@@ openrisc-generic             openris
  EVB64260                     powerpc     74xx_7xx    evb64260            -              -           EVB64260
  EVB64260_750CX               powerpc     74xx_7xx    evb64260            -              -           EVB64260
  P3G4                         powerpc     74xx_7xx    evb64260
 -PCIPPC2                      powerpc     74xx_7xx    pcippc2
 -PCIPPC6                      powerpc     74xx_7xx    pcippc2
  ppmc7xx                      powerpc     74xx_7xx
  ZUMA                         powerpc     74xx_7xx    evb64260
  ELPPC                        powerpc     74xx_7xx    elppc               eltec
@@@ -493,12 -496,10 +496,12 @@@ aria                         powerp
  mecp5123                     powerpc     mpc512x     -                   esd
  mpc5121ads                   powerpc     mpc512x     mpc5121ads          freescale
  mpc5121ads_rev2              powerpc     mpc512x     mpc5121ads          freescale      -           mpc5121ads:MPC5121ADS_REV2
 +ac14xx                       powerpc     mpc512x     ac14xx              ifm
  cmi_mpc5xx                   powerpc     mpc5xx      cmi
  PATI                         powerpc     mpc5xx      pati                mpl
  a3m071                       powerpc     mpc5xxx     a3m071
  a4m072                       powerpc     mpc5xxx     a4m072
 +a4m2k                        powerpc     mpc5xxx     a3m071              -              -           a3m071:A4M2K
  BC3450                       powerpc     mpc5xxx     bc3450
  canmb                        powerpc     mpc5xxx
  cm5200                       powerpc     mpc5xxx

diff --combined drivers/spi/mxc_spi.c
index d792d8d493c13c475ec8ca03694f4efd8fde0e7f,4c19e0bf18b65cdb08faab5141c79be759080dea..cb48019a42b409acb8195ea3bd3cfa97f005de5d
--- 1/drivers/spi/mxc_spi.c
--- 2/drivers/spi/mxc_spi.c
+++ b/drivers/spi/mxc_spi.c
@@@ -137,11 -137,11 +137,11 @@@ static s32 spi_cfg_mxc(struct mxc_spi_s
                return -1;
        }
  
-       reg_ctrl = reg_read(&regs->ctrl);
- 
        /* Reset spi */
-       reg_write(&regs->ctrl, (reg_ctrl & ~MXC_CSPICTRL_EN));
-       reg_write(&regs->ctrl, (reg_ctrl | MXC_CSPICTRL_EN));
+       reg_write(&regs->ctrl, 0);
+       reg_write(&regs->ctrl, MXC_CSPICTRL_EN);
+ 
+       reg_ctrl = reg_read(&regs->ctrl);
  
        /*
         * The following computation is taken directly from Freescale's code.
@@@ -408,7 -408,7 +408,7 @@@ struct spi_slave *spi_setup_slave(unsig
        if (bus >= ARRAY_SIZE(spi_bases))
                return NULL;
  
 -      mxcs = calloc(sizeof(struct mxc_spi_slave), 1);
 +      mxcs = spi_alloc_slave(struct mxc_spi_slave, bus, cs);
        if (!mxcs) {
                puts("mxc_spi: SPI Slave not allocated !\n");
                return NULL;
@@@ -424,6 -424,8 +424,6 @@@
  
        cs = ret;
  
 -      mxcs->slave.bus = bus;
 -      mxcs->slave.cs = cs;
        mxcs->base = spi_bases[bus];
  
        ret = spi_cfg_mxc(mxcs, cs, max_hz, mode);