Merge branch 'for-next/imx'

Conflicts:
	arch/arm/Makefile
Merge branch 'for-next/imx-oftree'

Conflicts:
	arch/arm/boards/freescale-mx51-pdk/board.c
Merge branch 'for-next/marvell'

Conflicts:
	arch/arm/Makefile
Merge branch 'for-next/mci'

Conflicts:
	include/driver.h
Merge branch 'for-next/mips'

Conflicts:
	include/of.h
Merge branch 'for-next/mxs'
Merge branch 'for-next/of'
Merge branch 'for-next/of-i2c'
Merge branch 'for-next/omap'
Merge branch 'for-next/ppc'
Merge branch 'for-next/tegra'
Merge branch 'for-next/usb-chipidea'
Remove ftstc(). It is declared but not implemented.

Signed-off-by: Masaki Muranaka <monaka@monami-ya.jp>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Remove a redundant line.

Signed-off-by: Masaki Muranaka <monaka@monami-ya.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Fix typo.

This fix is harmless and obvious.

Signed-off-by: Masaki Muranaka <monaka@monami-ya.jp>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
mci: rename capabilities flags

Use MMC_CAP_ names instead of MMC_MODE_. This makes it more
clear that these are capabilities of host/card and do not refer
to the current mode. These are in line with the Linux Kernel
except for MMC_CAP_MMC_HIGHSPEED_52MHZ which could be fixed
later.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
mci: Print more info

In devinfo for the card also print:

- capabilities for host and card
- current bus width
- current clock

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
MIPS: rzx50: prepare for new debug_ll

Set DEBUG_LL_UART_DIVISOR to use <asm/debug_ll_ns16550.h>.

The JZ4755 uses 24 MHz as the main reference frequency (EXCLK).
The UART controller can work on full EXCLK or on EXCLK/2.
Just now we use EXCLK/2 legacy clock setup made by U-Boot.
So set UART controller base frequency to 12 MHz.

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
MIPS: malta: prepare for new debug_ll

Set fake DEBUG_LL_UART_DIVISOR to use <asm/debug_ll_ns16550.h>.

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
MIPS: unify ns16550 debug_ll support code

This commit moves the C debug_ll code from
the MIPS <debug_ll_ns16550.h> header file to
the MIPS <asm/debug_ll_ns16550.h> header file,
so the C code and the asm code can use the same
register address macros.

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