diff options
| author | Tom Rini <[email protected]> | 2024-10-31 10:50:25 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-10-31 10:50:25 -0600 |
| commit | 1d147b74f437fb0e85821e8271fe52bc5fd30194 (patch) | |
| tree | 4d414c85d51bf8899be050e77a774a9d830dcc06 /include/linux | |
| parent | d4c8b8750b564ee83303160414607e17b6873fe2 (diff) | |
| parent | 43423cdc5dc174468546c7c48f771fe26fe6d101 (diff) | |
Merge patch series "mtd: spi-nor: Remove recently added nor->addr_width == 3 test"
Tom Rini <[email protected]> says:
In the patch series "spi-nor: Add parallel and stacked memories support"
a number of issues have since been raised about problems that now exist
on a large number of previously working platforms. Marek Vasut has gone
and identified a number of issues and this series is the starting point
of attempting to address them and fix the problems with previously
existing platforms.
Link: https://patchwork.ozlabs.org/project/uboot/list/?series=429932&state=*
Link: https://lore.kernel.org/r/[email protected]
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mtd/spi-nor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index 655a6d197ea..b8b207f7b5c 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -308,7 +308,7 @@ enum spi_nor_option_flags { SNOR_F_BROKEN_RESET = BIT(6), SNOR_F_SOFT_RESET = BIT(7), SNOR_F_IO_MODE_EN_VOLATILE = BIT(8), -#if defined(CONFIG_SPI_ADVANCE) +#if defined(CONFIG_SPI_STACKED_PARALLEL) SNOR_F_HAS_STACKED = BIT(9), SNOR_F_HAS_PARALLEL = BIT(10), #else |