Merge branch 'for-next/vpl'

Merge branch 'for-next/video'

Merge branch 'for-next/ppc'

Merge branch 'for-next/net'

Merge branch 'for-next/misc'

Merge branch 'for-next/imx'

Merge branch 'for-next/fbcon'

Merge branch 'for-next/exitcall'

mtd: nand_base: replace ifdef with IS_ENABLE ...

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

mtd: concat: initialize *retlen ...

In concat_write and concat_read *retlen is only added to, but it's never
initialized. If the caller hasn't initialized retlen doesn't contain
valid values. Fix this by initializing *retlen properly.

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

mtd: cfi-flash: Fix info ...

Since

636d384 mtd: cfi-flash: Add mtd concat support

The devinfo output is broken. dev->priv no longer contains a
struct flash_info * but instead a struct cfi_priv *.

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

watchdog: add davinci watchdog driver ...

This driver is based on the Linux driver (v4.0).

Signed-off-by: Jan Luebbe <jluebbe@debian.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

PPC/MPC5200: re-use the IMX I2C master driver for MPC5200 ...

This IP core is shared between many FSL SoCs. The MPC5200 provides this
core as well.

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

PPC/MPC52xx: unify header file name for clock API ...

In preparation to re-use the i.MX I2C driver for the MPC5200 SoC use
clock.h instead of clocks.h for the clock API.

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

ata: sata-imx: Add delay to prevent link timeout ...

On the Utilite board this delay is necessary to prevent a link timeout.
It seems the values written to GPR13 have to settle for some time before
further accesses may be made.

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

net: phy: at803x: Use genphy_config_init ...

Based on the Linux commit:

6ff01db net: phy: at803x: use genphy_config_init()

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

pinctrl: imx-iomux-v2: correct names in EXPORT_SYMBOL macros ...

The functions have been renamed, but this has not been reflected in the
EXPORT_SYMBOL macros. Do that now.

Fixes several errors like this:
drivers/pinctrl/imx-iomux-v2.c:61:15: error:
	'mxc_iomux_mode' undeclared here (not in a function)
 EXPORT_SYMBOL(mxc_iomux_mode);

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

net: enc28j60: fix set mac function signature ...

Fixes:
drivers/net/enc28j60.c: In function 'enc28j60_probe':
drivers/net/enc28j60.c:947:20: warning: assignment from incompatible pointer type
  edev->set_ethaddr = enc28j60_set_ethaddr;

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

video: backlight-pwm: depend on GPIOLIB ...

The PWM backlight driver does not only control PWMs but also GPIOs.

Fixes:
In file included from include/gpio.h:4:0,
                 from drivers/video/backlight-pwm.c:27:
arch/arm/include/asm/gpio.h:5:23: fatal error: mach/gpio.h: No such file or directory

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

usb: gadget: serial: only call into CONSOLE_FULL code if it's there ...

Fixes:
drivers/built-in.o: In function `gserial_connect':
drivers/usb/gadget/u_serial.c:539: undefined reference to `console_set_active'

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: of: put master offset into partition name ...

Partition names should be partition@<offset> with <offset> being the
offset in the master mtd, and not a counting number.

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

mtd: core: Check partitions for empty string ...

Make setting partitions a litte bit more robust.

Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

video: implement framebuffer console ...

This patch realizes framebuffer console support for barebox. It
supports colors and enough escape sequences to show the barebox
console and editor properly.

fbconsole mini-HOWTO
====================

1. compile sandbox barebox with

    CONFIG_VIDEO=y
    CONFIG_FRAMEBUFFER_CONSOLE=y
    CONFIG_DRIVER_VIDEO_SDL=y

2. run barebox

3. test fbconsole

    fbconsole0.active=oe

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

fb: sdl: create graphics window on enabling ...

The framebuffer should be enabled on the fb_enable callback and disabled
in the fb_disable callback. In SDL context this means the grapics window
has to be created / destroyed in fb_enable / fb_disable.

With this change the framebuffer has to be enabled explicitly with
fb0.enable=1 like with other framebuffer driver aswell.

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

fb: Add fb_enable/disable functions ...

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

spi: i.MX: move register defines to include/ ...

The register defines will be used by the SPI xload code, so move
them to a place where the xload code can include them.

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

regulator: Add support for regulator-boot-on device tree property ...

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

regulator: Factor out functions to work with regulator_internal ...

Internally we only have a struct regulator_internal, so factor
out regulator_enable_internal and regulator_disable_internal
functions which can be called from regulator internal code.

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

video: Add simple-panel support ...

This adds support for simple panels. These are panels which don't need
special handling but can have enable gpios and such. Unlike the Linux
kernel implementation this one is able to understand display-timings
nodes so that it's not necessary to keep a list of all known displays
with their corresponding timings in barebox.

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

video: ipuv3: match ipu_di_signal_cfg's clk_pol with its description ...

From this Linux commit:

commit 85de9d1
Author: Denis Carikli <denis@eukrea.com>
Date:   Mon Apr 7 14:44:43 2014 +0200

    imx-drm: match ipu_di_signal_cfg's clk_pol with its description.

    According to the datasheet, setting the di0_polarity_disp_clk
    field in the GENERAL di register sets the output clock polarity
    to active high.

    Signed-off-by: Denis Carikli <denis@eukrea.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

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