Merge branch 'for-next/mtd'

mtd: spi-nor: mostly drop lock/unlock code ...

The lock/unlock code is broken beyond repair.

First of all the algorithm doesn't work properly. SPI NOR flashes
can only protect a certain amount of blocks from the end of the device
which is incompatible to the protect(start,len) API we have. The
algorithm tries to be clever by doing protection only when it does
not protect unrelated blocks and unprotection only when it does not
unprotect unrelated blocks. This breaks for example when some code
protects the last blocks (which may contain the bootloader), then
protects the blocks before the last ones (which may contain the
environment). Then if we try to overwrite the bootloader this won't
work since it would unprotect the environment aswell, so the driver
will not unprotect anything resulting in a failed erase/write later.

Then the protection behaviour is different between different flashes.
Some have three protection bits, some have four. For some the smallest
protection are is 1/16 of the device, others have 1/256 or 1/64. Some
have a bit which selects the lower area instead of upper area for
protection. The position of this bit differs on different flashes.

This patch removes the lock code completely and always unprotects
the whole device. This way we can unprotect a device for writing to
it and never protect it again.

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

mtd: m25p80: make it possible to use large blocks if desired ...

Some SPI NOR flashes support 4K erase blocks. 4K erase blocks do not
work with UBIFS which needs a minimum erase block size of 15360 bytes.
Also bigger sectors are faster to erase. This patch adds a device tree
option to use the bigger blocks instead of the default 4K blocks.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>

mtd: nand: mrvl-nand: create initial empty bbt ...

When creating an initial bad blocks table, create it empty. This is
necessary because when the bad block table blocks are not
initialized (all ff) while some partitions are, all the blocks which
have an OOB data not beginning with 0xff 0xff will be marked as bad
blocks in the initial bad blocks scan.

As a consequence, any existing blocks are impossible to erase
anymore. Fix this by fixing the BBT creation flag.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

spi-nor: Align spi_nor_ids[] with kernel 4.1 ...

Sync the spi_nor_ids[] struct with the one from kernel 4.1.

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

Merge branch 'for-next/misc'

mtd: nand_base: replace ifdef with IS_ENABLE ...

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

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>

mtd: of: put master offset into partition name ...

Partition names should be partition@<offset> with <offset> being the
offset in the master mtd, and not a counting number.

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

mtd: core: Check partitions for empty string ...

Make setting partitions a litte bit more robust.

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

Merge branch 'for-next/blspec'

Merge branch 'for-next/mtd' ...

Conflicts:
	drivers/mtd/core.c

Merge branch 'for-next/misc'

Merge branch 'for-next/imx-bbu-nand-fcb' ...

Conflicts:
	common/Kconfig

Merge branch 'for-next/cfi-flash'

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>

mtd: m25p80: make flash_name const ...

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

mtd: Make devname argument to add_mtd_device const ...

add_mtd_device duplicates the string where necessary, so make it
const.

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

ubi: Lower 'already attached' message to debug level ...

The caller will show a message, no need to do this in UBI. This
is for the case when mtd_detect calls ubi_attach_mtd_dev. mtd_detect
does not know whether this is already attached and it's not an error.

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

mtd: detect ubi devices automatically ...

Hook UBI attachment into the mtd class devices detect function. This
makes it possible to attach ubi devices with 'detect nand0.root'.

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

ubi: Use preditable device names ...

Instead of naming all ubi devices and cdev names ubi<num> append
'.ubi' to the original mtd name. This makes ubi device and cdev
names predictable. With this ubi0 becomes nand0.root.ubi. Also
do the same for volume names, so ubi0.root becomes nand0.root.ubi.root.

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>

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>