Merge branch 'for-next/imx'

Merge branch 'for-next/i2c'

Merge branch 'for-next/e1000'

Merge branch 'for-next/dts'

Merge branch 'for-next/doc'

Bootm: remove uimage_close done later in bootm_boot ...

From 24e24f9 Mon Sep 17 00:00:00 2001
From: Clement Leger <clement.leger@kalray.eu>
Date: Thu, 14 Dec 2017 13:29:50 +0100
Subject: [PATCH] Bootm: fix double uimage_close

When uimage crc fails, the error handling path call uimage_close in
bootm_open_os_uimage and also in bootm_boot. This leads to crash/exception.
Keep the main error handling path in bootm_boot and remove uimage_close from
bootm_open_os_uimage to avoid double uimage_close.

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

spi: imx: make xchg_single timeout value compatible for older boards ...

A call of xchg_single will issue the transfer of 24 data bits with a given
maximum frequency. Since there exist some i.MX based boards with
spi-max-frequency = <100000>, change the xchg_single timeout to still
support those boards.

Fixes: 1439cdf7c6fc ("spi: imx: add timeout to xchg_single")
Signed-off-by: Alexander Kurz <akurz@blala.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Release v2017.12.0 ...

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

ARM: dts: bcm2835-rpi: re-enable booting from SD card ...

Kernel commit a19adf8 [0] changed the
RPi1 device tree from &sdhci to &sdhost, which was imported in barebox
commit d14b844. It seems that barebox
does not have a driver for brcm,bcm2835-sdhost (yet), which resulted in
barebox unable to boot from SD card. However, the driver for
brcm,bcm2835-sdhci worked fine in the past.

Although the upstream change was made for good reasons, the simplest
change for barebox for now is to revert to using &sdhci and disable
&sdhost.

Thanks to Alexander Dahl for raising this issue on the DistroKit
mailing list!

[0]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a19adf8

Cc: Alexander Dahl <post@lespocky.de>
Signed-off-by: Roland Hieber <rohieb@rohieb.name>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

net/e1000: indicate at boot time if flash is in secure mode ...

If the flash is in secure mode it is not possible to modify its
contents. So log that useful information at probe time.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

net/e1000: add missing \n in error message ...

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: psci command: Add to misc group ...

Explicitly add psci command to the misc group to get rid of
the warning that the command has no group.

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

Documentation: remove :numbered: from lower level toctrees ...

Only the highest level toctree may have :numbered:, otherwise
sphinxs complains loudly that the subtree is already numbered.

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

Documentation: defaultenv-2: Change highlight to make ...

It's a make snippet, so change highlighting accordingly.

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

Documentation: change default highlight language to shell ...

There are many places where sphinx complains that blocks cannot
be hilghlighted in 'c' and in fact I am not aware of any C code
snippets in the documentation, so change the default highlighting
style to shell which fits our needs much better. With this we
get rid of many warnings while building the documentation.

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

Documentation: socfpga: Fix numbered list ...

This is no code block, change to numbered list.

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

Documentation: Change many code blocks to no highlight ...

Several blocks cannot be sensibly highlighted, so change the highliting
to 'none'. Fixes many warnings in building the documentation.

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

Documentation: arm-qemu-vexpress: Fix too short underline ...

Fixes sphinx warning about too short underline.

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

common: globalvar: fix removing multiple nvvars with wildcards ...

nvvar_remove takes wildcards, so it can remove multiple variables. This
means we cannot return after the first loop iteration, but instead must
continue.

Fixes: 609d3edc3ad9 (common: globvar: let nvvar_remove() report non-existing variable)

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

dts: update to v4.15-rc1 ...

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

net/e1000: implement protect and unprotect for attached flash ...

Some supported flash devices (e.g. SST25VF040) are write protected after
power up. If the device holds a valid firmware image the i210 can handle
that just fine. If however there is no firmware programmed, a procedure
is needed to remove this protection before an image can be flashed.

So implement the needed callbacks to make the commands protect and
unprotect do the right thing.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: i.MX: bbu-internal: fix typos ...

Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: i.MX: bbu-internal: fix comment ...

Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

net/e1000: expand timeout for flash erasure ...

Erasing the whole flash takes approximately 7s on one of my test
machines. Expand the timeout accordingly.

Note however that it is in general not allowed to hold the flash
semaphore for so long and "firmware might implement a timeout
mechanism and take ownership of the relevant [lock]" after one second.
So a chip erase should better only be done when firmware doesn't make
use of the flash.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

net/e1000: indicate in error messages where the failure occured ...

There used to be four places that all emit the same error message. Even
if in a given context not all four of them can be relevant, there are
always two possible locations where the message can origin from.

So make the output slightly different in all places to ease future
debugging.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

net/e1000: don't access the (simulated) eeprom when it is invalid ...

The shadow RAM that is used to serve read requests from the eeprom
interface isn't valid in all cases. Catch these by returning an error in
the eeprom read function and make eeprom validation dependant on
working access.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

net/e1000: log flash/invm status at probe time ...

Provide some info about flash/eeprom state at boot up

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

net/e1000: don't fail to bind on uninitialized flash ...

When the flash doesn't hold a valid firmware image there are still
some things (like accessing the flash) possible. Don't return an error
code in this case but return 0 instead. This way the driver is
regularily bound and just doesn't provide a network interface.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

net/e1000: provide device for accessing emulated eeprom ...

This device uses e1000_read_eeprom to provide access to the emulated
eeprom on e1000-igb. Only reading is implemented for now.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

net/e1000: fix size of invm device ...

The iNVM storage is 2 Kib containing 64 32bit words (0-63).

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>