From: Miquel Raynal <miquel.raynal@bootlin.com>
Date: Mon, 5 Dec 2022 14:40:59 +0000 (+0100)
Subject: Merge tag 'spi-nor/for-6.2' into mtd/next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a34506e08db7ccce160a259e4b00b1e307486c59;p=linux.git

Merge tag 'spi-nor/for-6.2' into mtd/next

SPI NOR core changes:
* Add support for flash reset using the dt reset-gpios property.
* Update hwcaps.mask to include 8D-8D-8D read and page program ops
  when xSPI profile 1.0 table is defined.
* Bypass zero erase size in spi_nor_find_best_erase_type().
* Fix select_uniform_erase to skip 0 erase size
* Add generic flash driver. If a flash is not found in the flash_info
  array, fall back to the generic flash driver which is described solely
  by the flash's SFDP tables.
* Fix the number of bytes for the dummy cycles in
  spi_nor_spimem_check_readop().
* Introduce SPI_NOR_QUAD_PP flag, as PP_1_1_4 is not SFDP discoverable.

SPI NOR manufacturer drivers changes:
* Spansion:
  - use PARSE_SFDP for s28hs512t,
  - add support for s28hl512t, s28hl01gt, and s28hs01gt.
* Gigadevice: Replace default_init() with post_bfpt() for gd25q256.
* Micron - ST: Enable locking for mt25qu256a.
* Winbond: Add support for W25Q512NW-IQ.
* ISSI: Use PARSE_SFDP and SPI_NOR_QUAD_PP.

Fix merge conflict in the jedec,spi-nor bindings.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---

a34506e08db7ccce160a259e4b00b1e307486c59
diff --cc Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml
index 6cc491083650a,8a843b9b86731..3fe981b14e2cb
--- a/Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml
+++ b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml
@@@ -70,6 -70,26 +70,12 @@@ properties
        be used on such systems, to denote the absence of a reliable reset
        mechanism.
  
+   reset-gpios:
+     description:
+       A GPIO line connected to the RESET (active low) signal of the device.
+       If "broken-flash-reset" is present then having this property does not
+       make any difference.
+ 
 -  partitions:
 -    type: object
 -
 -  '#address-cells': true
 -  '#size-cells': true
 -
 -patternProperties:
 -  # Note: use 'partitions' node for new users
 -  '^partition@':
 -    type: object
 -
 -  "^otp(-[0-9]+)?$":
 -    type: object
 -
  unevaluatedProperties: false
  
  examples: