Merge branch 'for-next/tftp'

Merge branch 'for-next/phylib' ...

Conflicts:
	drivers/net/phy/phy.c

Merge branch 'for-next/omap'

Merge branch 'for-next/mtd'

Merge branch 'for-next/misc'

Merge branch 'for-next/mfd'

Merge branch 'for-next/mem-commands'

Merge branch 'for-next/mci'

Merge branch 'for-next/led'

Merge branch 'for-next/imx' ...

Conflicts:
	arch/arm/mach-imx/include/mach/devices-imx53.h

Merge branch 'for-next/ext4'

Merge branch 'for-next/driver'

Merge branch 'for-next/commands'

Merge branch 'for-next/clk'

Merge branch 'for-next/ata'

Merge branch 'for-next/at91'

Merge branch 'for-next/archos'

mxs: get_fecclk is hclk, not a constant ...

The fec has multiple clock inputs:

- 50MHz clock for generating the (R)MII clock
- bus clock

The MDIO clock is derived from the bus clock, not the 50MHz clock,
so pass this into the driver so that it can correctly configure
the MDIO clock divider.
This fixes several wrong MDIO register read problems on i.MX28 boards.

Reported-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM i.MX5: Add SATA support ...

Add the convenience wrappers for registering the SATA device.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ata: Add i.MX AHCI driver ...

This adds the glue code for the i.MX SATA controller. This controller
needs some i.MX specific setup and some SoC specific setting outside
the controller itself. The code for setting up the correct clock source
for the SATA phy has been taken from U-Boot.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mfd: Add i.MX6 iomux gpr header file ...

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ata: Add ahci support ...

This adds ahci controller support based on U-Boot ahci support. Unlike
U-Boot we do not push the SCSI layer in between, but use the ata interface
directly. Tested on a Freescale i.MX53.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ata: Use dma_alloc for buffer ...

ATA devices using DMA may need a sufficiently aligned buffer, so use
dma_alloc instead of regular malloc.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ata: align ata command defines with kernel ...

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ata: split ide sff suport to separate file ...

Currently we only support oldschool IDE SFF devices. This is done
by registering a register layout struct and everything else is done
by the generic IDE SFF driver. Since modern ATA devices still use
ATA, but not the SFF interface anymore, split out the IDE SFF support
to a separate file to allow for other types of ata interfaces.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ata: fix status flags ...

Some status flags are wrong, fix them. All of them are currently unused,
so no functional change included.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ata: register disks as /dev/ata* ...

Using /dev/disk* for every type of device is not helpful. It increases
the chance that the user doesn't know which file corresponds to which
device. So rename ata device files to /dev/ata*. Also add a dev_info
about which device just has been registered.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Merge branch 'pu/clk' into for-next/clk ...

Conflicts:
	include/linux/clk.h

clk: use the 'CLK_ALWAYS_ENABLED' flag for clk-fixed by default ...

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd core: call driver write function with complete buffer ...

mtd->write is supposed to loop around pages internally, no need
to do this in mtd_write. This fixes a huge write performance drop
with the m25p80 driver when it was converted to a mtd driver recently.
Since mtd->writesize is 1 for this driver mtd_write ended up doing
single byte writes on the flash.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>