Merge branch 'for-next/imx'

Merge branch 'for-next/e1000'

Merge branch 'for-next/dts'

Merge branch 'for-next/bootm'

Merge branch 'for-next/arm'

Merge branch 'for-next/aiodev'

Release v2016.06.0 ...

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

Fix genphy_restart_aneg() for Micrel's ksz9031. ...

Commit da89ee8f2e04 ("Center FLP timing at 16ms") breaks
genphy_restart_aneg() for Micrel's ksz9031. According to the
datasheet, the ksz9031 requires a wait of 1ms after clearing
the PDOWN bit and before read/write access to any PHY registers.

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

dts: update to v4.7-rc2 ...

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

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

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

MIPS: dts: add generated files to clean rule ...

This commit is based on Sascha's ARM commits:

    commit a9e7e68
    Author: Sascha Hauer <s.hauer@pengutronix.de>
    Date:   Fri Dec 11 08:02:02 2015 +0100

        ARM: dts: Add *.dtb.lzo to clean files

    commit f5b552f
    Author: Sascha Hauer <s.hauer@pengutronix.de>
    Date:   Fri May 9 09:11:49 2014 +0200

        ARM: dts: Add generated files to clean rule

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

dts: update to v4.6 ...

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

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

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

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

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

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

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

dts: update to v4.6-rc4 ...

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

dts: update to v4.6-rc3 ...

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

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

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

dts: update to v4.5 ...

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

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

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

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

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

e1000: Expose i210's external flash as MTD ...

Add code needed to access SPI-NOR flash attached to i210 as a regular
MTD device.

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

e1000: Expose i210's iNVM as a cdev ...

Add code needed to expose iNVM memory on the chip as a cdev. The
driver also registers a dummy "invm" device that exposes "locked"
property which is used to implement iNMV line locking feature.

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

e1000: Add a "poll register" function ...

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

e1000: Add EEPROM access locking for i210 ...

As per datasheet (section 4.6 p. 147) accessing EEPROM on i210
requires software to hold a corresponding lock bit in SW_FW_SYNC
register.

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

e1000: Properly release SW_FW_SYNC semaphore bits ...

As described in the datasheet Software/Firmware synchronisation bits
are expected to be released by the software after it is done using
it. Add a porper subroutine to do that instead of relying on the
Firmware clearing those bits due to timeout.

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

e1000: Refactor Flash/EEPROM reading code ...

Refactor Flash/EEPROM reading code to use vtable with pointers to
small, specialized functions based on the flash class instead of big
monolithic funtions whose behaviour is driven by a number of flags and
variables.

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

e1000: Remove unnecessary intialization ...

We always call e1000_init_eeprom_params() as a part of probing, so
there's no need check if it needs to be called in e1000_read_eeprom().

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

e1000: Fix a bug in e1000_probe() ...

There are several reasons why that code in e1000_probe had to be
changed:

 - It reads from chip variant specific register (present only on
   i210) in a chip variant agnostic codepath

 - It makes no sense to check for FLUPD bit to make a decision weither
   to validate EEPROM or not since its function per datasheet is:

   " ... Flash Update.

     Writing 1b to this bit causes the content of the internal 4 KB
     shadow RAM to be written into one of the first two 4 KB sectors
     of the Flash device (Sector 0 or Sector 1). The bit is
     self-cleared immediately... "

   and it is only through sheer serendipity the defined value for
   bitmask for FLUPD is equivalent to bitmask for FLASH_DETECTED bit
   which is the bit we actually care about and need to test against
   (FLUPD for i210 has a different bitmask)

Fix those problems by replacing the i210 specific check inside of
e1000_validate_eeprom_checksum() with a chip agnostic one and using
correct bitmask.

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

e1000: Consolidate Microwire EEPROM init code ...

All of the chips that bitbang Microwire to access EEPROM appear to be
configured in the same way, so move common code into a separate
function and make use of it.

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