Commit 8541d8f725c6 for kernel

commit 8541d8f725c673db3bd741947f27974358b2e163
Merge: a436a0b847c0 b2a4fe0960ae
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Apr 17 17:57:04 2026 -0700

    Merge tag 'mtd/for-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux

    Pull MTD updates from Miquel Raynal:
     "MTD changes:

       - mtdconcat finally makes it in, after several years of being merged
         and reverted

       - Baikal SoC support is being removed, so MTD bits are being removed
         as well

       - misc cleanups

      NAND changes:

       - SunXi driver support for new versions of the Allwinner NAND
         controller.

       - DT-binding improvements and cleanups.

       - A few fixes (Realtek ECC and Winbond SPI NAND), aside with the
         usual load of misc changes.

      SPI NOR fixes:

       - Enable die erase on MT35XU02GCBA. We knew this flash needed this
         fixup since 7f77c561e227 ("mtd: spi-nor: micron-st: add TODO for
         fixing mt35xu02gcba") but did not add it due to lack of hardware to
         test on.

       - Fix locking on some Winbond w25q series flashes.

       - Fix Auto Address Increment (AAI) writes on SST that flashes that
         start on odd address. The write enable latch needs to be set again
         after the single byte program"

    * tag 'mtd/for-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux: (44 commits)
      mtd: spinand: winbond: Declare the QE bit on W25NxxJW
      mtd: spi-nor: micron-st: Enable die erase support for MT35XU02GCBA
      mtd: spi-nor: winbond: Fix locking support for w25q256jw
      mtd: spi-nor: sst: Fix write enable before AAI sequence
      mtd: spi-nor: winbond: Fix locking support for w25q64jvm
      mtd: spi-nor: winbond: Fix locking support for w25q256jwm
      dt-bindings: mtd: mxc-nand: add missing compatible string and ref to nand-controller-legacy.yaml
      dt-bindings: mtd: gpmi-nand: ref to nand-controller-legacy.yaml
      dt-bindings: mtd: refactor NAND bindings and add nand-controller-legacy.yaml
      mtd: spinand: winbond: Clarify when to enable the HS bit
      mtd: rawnand: sunxi: introduce maximize variable user data length
      mtd: rawnand: sunxi: fix typos in comments
      mtd: rawnand: sunxi: change error prone variable name
      mtd: rawnand: sunxi: remove dead code
      mtd: rawnand: sunxi: make the code more self-explanatory
      mtd: rawnand: sunxi: replace hard coded value by a define - take2
      mtd: rawnand: sunxi: do not count BBM bytes twice
      mtd: rawnand: sunxi: fix sunxi_nfc_hw_ecc_read_extra_oob
      mtd: rawnand: sunxi: sunxi_nand_ooblayout_free code clarification
      mtd: cmdlinepart: use a flexible array member
      ...

diff --cc drivers/mtd/spi-nor/core.c
index 1eee519c01e5,e6c1fda61f57..5dd0b3cb5250
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
@@@ -2393,10 -2393,10 +2393,10 @@@ static int spi_nor_spimem_check_readop(
  	/* convert the dummy cycles to the number of bytes */
  	op.dummy.nbytes = (read->num_mode_clocks + read->num_wait_states) *
  			  op.dummy.buswidth / 8;
- 	if (spi_nor_protocol_is_dtr(nor->read_proto))
+ 	if (spi_nor_protocol_is_dtr(read->proto))
  		op.dummy.nbytes *= 2;

 -	return spi_nor_spimem_check_op(nor, &op);
 +	return spi_nor_spimem_check_read_pp_op(nor, &op);
  }

  /**