Merge branch 'for-next/misc'

Merge branch 'for-next/mips'

mtd: core: Fix printing partitions in hex ...

When printing the partition size with "0x" prefix the value has to
be displayed in hex.

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

mtd: nand: omap_gpmc: fix: remove bch4 string extant ...

Remove an erroneous bch4 string leftover that
leads to a false ecc mode mapping.

BCH4 support was previously removed by Teresa Remmet:
d316cda 'mtd: nand: omap_gpmc: Remove BCH4 support'

Signed-off-by: Heinrich Toews <heinrich.toews@wago.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: cfi-flash: fix write_buff() for 64 bit systems ...

write_buff() uses ~(flash_info.portwidth - 1) to mask lower bits of addr. This
causes higher 32 bits of addr to be discarded on a 64 bit system, since
flash_info.portwidth is 32 bits long (unsigned int) and addr is 64 bits long
(unsigned long).

Signed-off-by: Peter Mamonov <pmamonov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: nand: nand_omap_gpmc: Fix ecc steps ...

The eccsteps where set wrong for OMAP_ECC_BCH8_CODE_HW_ROMCODE.
So the ECC was only corrected for the first 512 bytes chunk of a 2k page.

Moved out the ecc step iteration out of the correcting loop to make
it more alike the generic nand functions. And made sure that
the ECC is caclulated for all chunks.

This patch is based on work of Sascha Hauer.

Fixes commit dec7b4d2bf9c ("mtd: nand_omap_gpmc: fix BCH error correction").

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

Merge branch 'for-next/mtd'

rename file_operations -> cdev_operations ...

Linux also has struct file_operations which are something different.
Rename our file_operations to cdev_operations which better matches
what we have.

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

mtd: spi-nor: add manufacturer IDs for ISSI and Winbond ...

This patch includes new NOR flash IDs to support flashes from the
manufacturers ISSI and Winbond
- ISSI IS25LP128-JBLA3 and IS25LP128-JBLE
- Winbond W25Q128JVSIM

Signed-off-by: michael grassmann <m.grassmann@phytec.de>
Signed-off-by: Christian Hemp <c.hemp@phytec.de>

mtd: nand: Add Winbond manufacturer ID ...

Add Winbond 0xef manufacturer ID for NAND flashes to support Winbond as
an additional manufacturer.

Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
Signed-off-by: Christian Hemp <c.hemp@phytec.de>

mtd: spi-nor: add support for w25q16dw ...

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

mtd: spi-nor: mx25l3205d/mx25l6405d: append SECT_4K ...

This is a port of Linux kernel commit

    | commit 0501f2e
    | Author: Andreas Fenkart <afenkart@gmail.com>
    | Date:   Thu Nov 5 10:04:23 2015 +0100
    |
    |     mtd: spi-nor: mx25l3205d/mx25l6405d: append SECT_4K
    |
    |     according datasheet both chips can erase 4kByte sectors individually
    |
    |     Signed-off-by: Andreas Fenkart <andreas.fenkart@dev.digitalstrom.org>
    |     Signed-off-by: Brian Norris <computersforpeace@gmail.com>

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

mtd: m25p80: make it possible to use 4K erase block ...

We already have the MTD_SPI_NOR_USE_4K_SECTORS option handling in C code
for 4K erase block support. Alas this 4K erase block support code
can't be used because the MTD_SPI_NOR_USE_4K_SECTORS option support
is missed in Kconfig.

This patch imports necessary Kconfig MTD_SPI_NOR_USE_4K_SECTORS option
declaration from linux v4.11-rc8.

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

UBI: attach: add missing newline at end of pr_err() ...

This patch adds the missing newline at the end of the pr_err()
statement.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

remove checks for xzalloc() returning NULL ...

xzalloc() either returns memory or panics, so checking for NULL is useless.

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

mtd: nand: nand_mxs: Don't call get/set features on chips which do not support it ...

Older versions of the ONFI spec do not support get/set features, so
do not call these commands when they are not available.

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

mtd: nand: Only call ONFI get/set features on supported chips ...

Older versions of the ONFI spec do not support get/set features, so
do not call these commands when they are not available.

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

mtd: nand-mxs: improve error messages ...

This commit adds the return value of the failing function to one message
and makes the other unique.

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

Merge branch 'for-next/mtd'

mtd: dataflash: Add flash_info for AT45DB641E ...

This is a backport of kernel commit
67e4145

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

mtd: dataflash: Make use of "extened device information" ...

In anticipation of supporting chips that need it, extend the size of
struct flash_info's 'jedec_id' field to make room 2 byte of extended
device information as well as add code to fetch this data during
jedec_probe().

This is a backport of kernel commit
1da8869

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

mtd: dataflash: Get rid of loop counter in jedec_probe() ...

"For" loop in jedec_probe can be simplified to not need counter
'i'. Convert the code and get rid of the variable.

This is a backport of kernel commit
a296a1b

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

mtd: dataflash: Replace pr_debug, printk with dev_* functions ...

Lion's share of calls to pr_debug in this driver follow the pattern of
pr_debug("%s <message>", dev_name(<dev>), <arguments>), which should
be semantically identical to dev_dbg(<dev>, "<message>", <arguments>),
so replace such occurencies to simplify the code.

Convert the small minority of pr_debug that do not follow pattern from
above to use dev_dbg as well, for the sake of consistency.

Convert similar patter of printk(KERN_ERR, "%s: ...", dev_name(...),
...) to use dev_err instead.

No functional change intended.

This is a backport of kernel commit
02f6286

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

mtd: dataflash: Improve coding style in jedec_probe() ...

Change the following:

   - Replace indentation between type and name of local variable from
     tabs to spaces

   - Replace magic number 0x1F with CFI_MFR_ATMEL macro

   - Replace variable 'tmp' with 'ret' and 'i' where appropriate

   - Reformat multi-line comments and add newlines where appropriate

No functional change intended.

This is a backport of kernel commit
41c9c66

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

mtd: dataflash: Replace C99 types with their kernel counterparts ...

No functional change intended.

This is a backport of kernel commit
c41e43c

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

mtd: spi-nor: sync definition of Spansion chips from Linux ...

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

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

This reverts commit 1b4a05c.

mtd: only build mtdraw_raw_to_mtd_offset when write support is enabled ...

mtdraw_raw_to_mtd_offset() is only used from mtdraw_erase(), so will
only be referenced when MTD write support is enabled. This fixes a
harmless warning.

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

Merge branch 'for-next/parameter-types'

mtd: spi-nor: cadence: change devicetree bindings to upstream ...

Upstream devicetree bindings where changed to use "cdns,is-decoded-cs"
instead of "external-decoder". Use it.
Also, get rid of the clock-names "qspi_clk" dependency.

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