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

Conflicts:
	arch/arm/boards/phytec-phyflex-imx6/board.c

Merge branch 'for-next/imx'

Merge branch 'for-next/davinci'

Merge branch 'for-next/boot'

Merge branch 'for-next/mips'

Merge branch 'for-next/imx-ipu-v3'

Release v2014.04.0 ...

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

ARM: Phytec phyCORE i.MX35: Update defconfig ...

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

ARM: i.MX53 QSB: Remove wrong return ...

For a version 1.0 board the rest of loco_late_init should be executed
to completely configure the board.

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

ARM: i.MX6 Sabrelite: Fix ethernet ...

The board code does a phy reset. This implicitly requests the phy reset
gpio. This gpio is also registered in the devicetree as phy reset gpio,
so the fec driver probe can't request the gpio and bails out with -EBUSY.
Fix this by freeing the phy reset gpio in the board code. While at it use
gpio_request_array for the gpios.

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

ARM: i.MX6 Phytec phyFLEX: Add Nand update support ...

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

ARM: i.MX6: Add Nand boot bbu handler ...

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

MIPS: qemu-malta: add CBUS UART support ...

This patch adds CBUS UART dts support;
also it adds the necessary macros for DEBUG_LL.

qemu-malta supports three serial interfaces:

  * two ports are provided by the FDC37M817
    Super I/O; this chip is connected via LPC bus
    to Intel 82371EB (PIIX4E) South Bridge;

  * the third serial port is provided by
    the discrete TI 16C550C (CBUS UART);
    this chip is connected via CBUS directly
    to the board's GT64120 North Bridge.

See Malta User's Manual (MD00048) for details.

CBUS UART Instructions for use:

  1. Enable CONFIG_CONSOLE_ACTIVATE_ALL in .config
     (or disable uart0 in dts) and compile barebox;

  2. run qemu:

     qemu-system-mips -nographic -nodefaults \
        -monitor null -M malta -m 256 \
        -serial null -serial null -serial stdio \
        -bios barebox-flash-image

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

ARM: Panda: Fix board selection in panda defconfig files ...

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

netconsole: bail out when no connection is opened ...

When no connection is opened we should not call into
the networking stack. Otherwise it can happen that we
delay further execution until the network stack detected
a link (or timed out bringing the link up).

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

MIPS: rzx50: use short form for serial1 reference ...

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

ARM: update imx_v7_defconfig ...

- Enable loadenv command
- Enable mtd/NAND/UBI/UBIFS support
- Enable IPUv3 support
- Enable splash support

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

video: i.MX IPUv3: Add hdmi support ...

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

video: i.MX IPUv3: Add lvds bridge support ...

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

video: Add i.MX IPUv3 support ...

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

video: Add kernel fourcc defines ...

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

ARM i.MX6q: Mark VPU and IPU AXI transfers as cacheable, increase IPU priority ...

This is needed so that the IPU framebuffer scanout cannot be
starved by VPU or GPU activity.
Some boards like the SabreLite and SabreSD seem to set this in
the DCD already, but the documented register reset values do not
contain the necessary settings.

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

video: Add edid support ...

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

video: Add display timing from devicetree helper ...

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

string.c: Fix include ...

string.c needs string.h, otherwise we get:

lib/string.c:730: warning: no previous prototype for 'memdup'

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

environment: Fix unitiliazed variable ...

envfs_load_data needs a pointer to the envfs_super, otherwise it
works on an unitialized struct when detecting the envfs version.

This is broken since:

| commit 0a2a8f7
| Author: Sascha Hauer <s.hauer@pengutronix.de>
| Date:   Thu Feb 20 08:16:01 2014 +0100
|
|     environment: Add function to load envfs from buffer
|
|     Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Grmpf. Most compilers do not issue a warning, only the blackfin
gcc 4.3.5 warns about this.

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

input: gpio-keys; dt probing needs CONFIG_OF_GPIO ...

Otherwise of_get_named_gpio_flags is not available.

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

video: rework mode_name parameter setting ...

We have dev_add_param_enum() now, so use it for the mode_name
setting. Also drop the special case for single mode framebuffers,
just add the mode_name parameter for this case aswell.

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

video: introduce struct display_timings ...

And use it inside struct fb_info. This struct has the advantage
that the supported modes can be passed around in a single pointer.

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

ARM: i.MX6: Add video clocks ...

This adds the IPU, LVDS and HDMI clocks. As these are many, depend
on the IPU driver being compiled in.

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