Merge branch 'for-next/logo'

Merge branch 'for-next/imx'

Merge branch 'for-next/fbcon'

Merge branch 'for-next/exitcall'

Merge branch 'for-next/efi'

Merge branch 'for-next/dts'

Merge branch 'for-next/am335x'

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>

Release v2015.08.0 ...

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

ARM: dts: beaglebone: Strip MLO device tree ...

Reduce size of beaglebone MLO image.

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

ARM: [phyFLEX,phyCARD]-i.MX6: rename define in flash-headers ...

The files flash-header-*.imxfg contains two defines which are use in
include files flash-header-phytec-*.h. The first define is SETUP_MDCFG0.
In the second define name some RAM size value were used, e.g.
SETUP_S_DL_512MB_1GB or SETUP_1GIB_2GIB_4GIB.

It's better to name also the second define after the register names,
here MMDC1_MDCTL and MMDC1_MDASP, because these values changes for every
RAM configurations and it's consistent with the first define.

Signed-off-by: Stefan Christ <s.christ@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: imx6: rename SPI NOR device to /dev/spinor0 ...

Barebox currently names the SPI NOR device "/dev/sst25vf016b",
but the barebox update handler still points to "/dev/m25p80",
causing barebox_update to fail.
Choose a descriptive name instead.

Signed-off-by: Philipp Zabel <p.zabel@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>

ARM: i.MX6 cm-fx6: Fix area for get_ram_size ...

for bank2_size get_ram_size must be called with the CS1 area. With the
recent fix to calculate CS1 start this now starts at 0x90000000 and no
longer at 0x80000000.

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

ARM: i.MX6 cm-fx6: Fix Chip density for DDR_64BIT_2GB case ...

DDR_64BIT_2GB corresponds to two chip selects (ncs = 2) with 1GiB
each. In this case cs_density must be configured to 8Gb (1GiB).

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

ARM: imx6-mmdc: Fix cs0_end calculation ...

The current calculation does not take the 0x10000000 offset where
SDRAM starts into account. For example with a 1GiB chip density
the current code calculates cs1 start to 0x40000000, but it
has to be 0x10000000 + 0x40000000 = 0x50000000. Add the missing
8 32MiB chunks.

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

ARM: initial cm-fx6 support ...

The cm-fx6 board is a module from Compulab with different i.MX6 SoCs.
This module is also found in the Utilite Mini Computer this patch
also adds support for.

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

ARM: i.MX: make early UART functions independent of DEBUG_LL ...

We have functions to setup the i.MX uart for early use, but these all
depend on DEBUG_LL. Move them to imx-uart.h to make them usable for
the regular PBL console.

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

PBL: console: Make independent of DEBUG_LL ...

With more stuff being done in PBL regular console support gets more and more
useful. This makes the PBL console independent of DEBUG_LL which is only
meant for early debugging but not regular output.
To use the regular PBL console a board must call pbl_set_putc() which stores
a pointer to the putc function to be used.

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

ARM: i.MX: xload: implement esdhc xload for i.MX6 ...

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

ARM: i.MX6: Add DDR setup code from U-Boot ...

Several i.MX6 boards like to do their SDRAM setup in code rather than
in DCD tables. Add the SDRAM setup code from U-Boot to make it easy
to adopt the SDRAM setup from the U-Boot port of these boards.

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

ARM: i.MX: Add SPI xload code ...

Add PBL xload code to load an image from SPI NOR flash. Currently implemented
for i.MX6.

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>

ARM: imx: guf-neso: only try to enable USB if USB_ULPI is configured ...

Avoids a build failure if the config does not include ULPI support.
This is similar to what has been done to the PCA100 board.

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>

Devicetree/PPC: fix devicetree's fixup ...

Currently Barebox fails to boot a kernel/devicetree pair on PowerPC.

With of_find_node_by_path() the framework uses a global variable to find
the root node and fails. With of_find_node_by_path_from() and forwarding
the 'root' parameter it works again as expected.

This fixes the following error message at run-time:

Loading U-Boot uImage '/tmp/tftpcmd/kernel'
Loading devicetree from '/tmp/tftpcmd/oftree'
bootm: No devicetree given.
handler failed with: Invalid argument

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

xload: fix use after free ...

The variable partname is used in the error path for debugging.
We have to free it after this use.

Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

efi: enable blspec in the defconfig ...

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>