Merge branch 'for-next/dts'

Merge branch 'for-next/clk'

Merge branch 'for-next/arm'

Release v2017.07.0 ...

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

ARM: socfpga: remove unused fpgaintf setup ...

The disable bits for the ethernet interfaces between FPGA and HPS are read
and configured, but never written back.
The configuration itself doesn't make that much sense however. So instead of
writing it back to the register, remove the whole read-modify operation altogether.

Reported-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: omap: Fix error printing ...

Presumably the code wanted to print the error with the %d format
specifier. Actually pass the error code by using PTR_ERR() and not
IS_ERR(). While at it use %ld to print a unsigned long variable to
get rid of a compiler warning.

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

ARM: omap: phytec-phycore-omap4460: Fix compiler warning ...

Use IS_ENABLED() rather than #ifdef to get rid of unused variable
warning.

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

pinctrl: at91: Bail out if atmel,pins property does not exist ...

Do not blindly assume that a device node has a atmel,pins property.
Instead, test it for being NULL before using it. This also silences
a compiler warning when the driver is compiled without OF support.

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

dts: update to v4.12-rc7 ...

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

dts: update to v4.12-rc6 ...

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

ARM: dts: i.MX6: fix usdhc3 pinmuxing on tqma6x ...

The usdhc3 pin group wrongly referred the SD4 pads instead of the SD3 pads.
This leads to issues when muxing the SD4_CMD and SD4_CLK pads for uart3.

This regression was introduced by code refactoring in commit a5207a6 ("ARM:
dts: i.MX6: drop usage of pin group defines").

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

i.MX: clk: Remove imx_clk_pllv3_locked() ...

Remove imx_clk_pllv3_locked() which was introduced for the sake of
Vybrid platform. The same effect (waiting on 'locked' bit) can be
achived with vanilla clk_pllv3_enable/disable, which make said
function unnecessary.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

i.MX: clk-pllv3: Do not touch PLL_BYPASS bit ...

Do not touch PLL_BYPASS bit as a part of clk_pll3_enable/disable
execution. For a number of platforms (e.g. Vybrid, i.MX6SL) PLL_BYPASS
is specified as a bit controlling a clock MUX represented by a
dedicated 'struct clk'. Altering that bit as a part of
clk_pll3_enable/disable is equivalent to calling clk_set_parent() and
it makes in the following code:

clk_enable(clk_disable(<some pll>))

change clock chain instead of being a no-op.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

clk-vf610: Mark all of CCSR muxes with CLK_OPS_PARENT_ENABLE ...

As per VYBRIDRM.pdf, p. 673:

"... When switching clock sources on GL MUX, both active and target
clock sources must be active..."

So mark all of the clock muxes controlled by CCM_CSSR with
CLK_OPS_PARENT_ENABLE to satisfy that requirement. Experiment shows
that failing to do so would result in failure (in some cases CPU
hang).

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

scripts/kwbimage: support empty binary.0 files ...

While it doesn't make sense to use empty binary headers on a machine for
first stage, it is convenient to support this for build testing.

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

clk: let clk_get return errors from of_clk_get_by_name ...

When of_clk_get_by_name fails with -ENODEV it's fine to continue with
clk_get_sys. Other errors (e.g. -EPROBE_DEFER) should be returned however.

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

pci: mvebu: terminate error message with a newline ...

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

dts: update to v4.12-rc5 ...

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

Merge branch 'for-next/state'

Merge branch 'for-next/misd'

Merge branch 'for-next/misc'

Merge branch 'for-next/mips'

Merge branch 'for-next/imx'

Merge branch 'for-next/gpio'

Merge branch 'for-next/dts'

Merge branch 'for-next/directory-links'

Merge branch 'for-next/arm'

Revert "nv: Do not create globalvars from nvvars" ...

This reverts commit 35d8e85.

Revert "globalvar: remove code for unqualified globalvars" ...

This reverts commit e4f8105.

Revert "globalvar: make globalvar functions more consistent" ...

This reverts commit 1b4a05c.