Merge branch 'for-next/cfi-flash'

Merge branch 'for-next/blspec'

Merge branch 'for-next/bbu'

Merge branch 'for-next/am335x'

usb: musb: Use proper timeout loop ...

Poll for a well defined time in musb_init. The current counting loop
takes too short for some devices. Tested on OMAP3 with a rather slowish
memory stick.

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

Release v2015.07.0 ...

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

ARM: beagleboard: register update handlers for NAND ...

To make updating barebox to nand easy. To bootstrap from a SD
card:

barebox_update -t nand-xload /boot/MLO
barebox_update -t nand /boot/barebox.bin

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

ARM: start: Fix code reordering problem ...

This adds a barrier after setup_c(). This is necessary because otherwise
some global variable assignments may be reordered by the compiler to be
executed before setup_c which cannot work.
This was observed when doing other unrelated changes to the start function,
it seems in current mainline state the compiler does not actually reorder
the code.

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

ARM: AM335x: replace specific barebox update handler with generic one ...

The AM335x SPI NOR barebox update handlers only writes a file to a device,
so use the generic handler for this purpose.

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

bbu: Add a standard file-to-device-copy handler ...

The most standard update handler will simply copy a file to a device.
This can be shared across several users, so add a standard handler for
this operation.

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

mx53-qsb: Fix boot hang during reboot stress test ...

Fix the DDR init sequence the same way as done by aee0013e53b339a5
from U-boot in order to prevent the boot hang under reboot stress test.

Quoting this commit log:

"Currently by running the following test:

=> setenv bootcmd reset
=> save
=> reset

, we observe a hang after approximately 20-30 minutes of stress reboot test.

Investigation of this issue revealed that when a single DDR chip select is used,
the hang does not happen. It only happens when the two chip selects are active.

MX53 reference manual states at "28.6.2 Memory ZQ calibration sequence":

"The controller must keep the memory lines quiet (except for CK) for the ZQ
calibration time as defined in the Jedec (512 cycles for ZQCL after reset, 256
for other ZQCL and 64 for ZQCS)."

According to the SDE_0 and SDE_1 bit descriptions from register ESDCTL_ESDCTL:

"Writing 1 to SDE0 or SDE1 will initiate power up delays as JEDEC defines.
Power up delays are a function of the configured memory type (DDR2/DDR3/LPDDR2)"

So make sure to activate one chip select at time (CS0 first and then CS1 later),
so that the required JEDEC delay is respected for each chip select.

With this change applied the board has gone through three days of reboot stress
test without any hang."

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: m25p80: Fix Kconfig dependencies ...

The m25p80 driver now depends on MTD_SPI_NOR which is disabled in all
defconfigs, so this effectively disables the m25p80 driver in all
defconfigs. Fix this by selecting MTD_SPI_NOR which is library code
without further dependencies. Also let m25p80 depend on SPI because
it needs the SPI code and won't link without it.

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

ARM: dts: am33xx-strip: Strip more unused nodes ...

There are still some nodes not used in barebox. Removed them.

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

ARM: dts: am33xx-strip: Keep devices we can boot from ...

As we can boot from mmc2 don't strip it.

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

boards: phytec-som-am335x: Get ready for EMMC boot ...

Select correct instance when booting from a mmc interface.

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

PCI: remove bogus host bridge setup skipping ...

Apparently this was here to fix issues with some QEMU version,
but hasn't worked in the intended way for a long time. The probe
code should be mature enough by now, so this workaround isn't
needed anymore.

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

PCI: rework BAR size calculation ...

The probe code now does a much better job at detecting bad BARs.
Also make sure to preserve any previous content of the BAR
registers if we don't relocate them.

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

bmp support: Use unaligned accessors ...

Some fields in the bmp header are unaligned. Use unaligned accessor
functions to acces them.

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

mtd: cfi-flash: Add mtd concat support ...

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

mtd: Add mtd concat support ...

The mtd concat layer supports concatenating several MTD devices
into a single one. This is nearly as-is from the corresponding
Kernel code.

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

devinfo: fix return value ...

devinfo on a non existing device prints:

no such device: blah
devinfo: Operation not permitted

The second message comes because devinfo returns -1 which is -EPERM.

Just return -ENODEV which will print:

devinfo: No such device

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

mtd: cfi-flash: remove dead code ...

CFG_FLASH_PROTECTION is never defined, remove the code. Also
remove code inside #if 0.

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

mtd: cfi-flash: Coding style cleanup ...

- use consistent variable types (drop uchar, ushort and friends)
- remove whitespace between functions and opening brace
- Add some blank lines to rectify code
- drop 'rc' and 'retcode' and use 'ret' consistently
- Do not put variable assignment into if()
- drop unncessary braces

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

mtd: cfi-flash: use unaligned accessor functions ...

Some members in struct cfi_qry are unaligned. Use get_unaligned_*
to access them. Fixes unaligned aborts on busses which don't support
unaligned accesses.

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

mtd: cfi-flash: turn some messages into vdbg ...

Some messages produce a lot of log spam. Turn them into
dev_vdbg to make some more important messages more visible.

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

mtd: cfi-flash: return 0 for success ...

Use zero as success return code and negative standard error codes
consistently in the driver.

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

mtd: cfi-flash: make flash_detect_width more readable ...

Use variables instead of long defines to get the loops into a single
line. Also use goto to move the deeply indented code more to the left.

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

mtd: cfi-flash: remove unnecessary ifdefs ...

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

mtd: cfi-flash: replace ifdef with IS_ENABLED ...

TO get rid of some ifdefs. While at it add the vendor code of
the unsupported vendor to the error message.

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

mtd: cfi-flash: statically initialize instead of memset ...

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