diff --git a/br-ext-chip-hisilicon/board/hi3516ev200/kernel/patches/13_add_spi_nor_ids.patch b/br-ext-chip-hisilicon/board/hi3516ev200/kernel/patches/13_add_spi_nor_ids.patch new file mode 100644 index 00000000..1a9c3960 --- /dev/null +++ b/br-ext-chip-hisilicon/board/hi3516ev200/kernel/patches/13_add_spi_nor_ids.patch @@ -0,0 +1,42 @@ +--- a/drivers/mtd/spi-nor/spi-nor.c 2021-10-13 19:11:27.986167869 +0300 +--- b/drivers/mtd/spi-nor/spi-nor.c 2021-10-13 19:12:00.874379209 +0300 +@@ -1245,7 +1245,7 @@ + { "mx25l3205d", INFO(0xc22016, 0, 64 * 1024, 64, 0) }, + { "mx25l3255e", INFO(0xc29e16, 0, 64 * 1024, 64, SECT_4K) }, + { "mx25l6436f", INFO(0xc22017, 0, 64 * 1024, 128, +- SPI_NOR_QUAD_READ), PARAMS(mxic), CLK_MHZ_2X(133) }, ++ SPI_NOR_DUAL_READ), CLK_MHZ_2X(133) }, + { "mx25l12835f", INFO(0xc22018, 0, 64 * 1024, 256, + SPI_NOR_QUAD_READ), PARAMS(mxic), CLK_MHZ_2X(84) }, + { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) }, +@@ -1299,13 +1299,13 @@ + PARAMS(micron_4k), CLK_MHZ_2X(80) }, + + /* XMC */ +- { "xm25qh64a", INFO(0x207017, 0, 64 * 1024, 128, SPI_NOR_QUAD_READ), ++ { "xm25qh64a", INFO(0x207017, 0, 64 * 1024, 128, SPI_NOR_DUAL_READ), + PARAMS(xmc), CLK_MHZ_2X(104) }, +- { "xm25qh64b", INFO(0x206017, 0, 64 * 1024, 128, SPI_NOR_QUAD_READ), ++ { "xm25qh64b", INFO(0x206017, 0, 64 * 1024, 128, SPI_NOR_DUAL_READ), + PARAMS(xmc), CLK_MHZ_2X(104) }, +- { "xm25qh128a", INFO(0x207018, 0, 64 * 1024, 256, SPI_NOR_QUAD_READ), ++ { "xm25qh128a", INFO(0x207018, 0, 64 * 1024, 256, SPI_NOR_DUAL_READ), + PARAMS(xmc), CLK_MHZ_2X(104) }, +- { "xm25qh128b", INFO(0x206018, 0, 64 * 1024, 256, SPI_NOR_QUAD_READ), ++ { "xm25qh128b", INFO(0x206018, 0, 64 * 1024, 256, SPI_NOR_DUAL_READ), + PARAMS(xmc), CLK_MHZ_2X(104) }, + + /* PMC */ +@@ -1464,6 +1464,12 @@ + + { "xm_xt25f64b-s", INFO(0x0b4017, 0, 64 * 1024, 128, + SPI_NOR_QUAD_READ), PARAMS(xtx), CLK_MHZ_2X(70) }, ++ ++ /* FM 3.3v */ ++ { "FM25Q64-SOB-T-G",INFO(0xa14017, 0, 64 * 1024, 128, ++ SPI_NOR_DUAL_READ), PARAMS(spansion), CLK_MHZ_2X(80) }, ++ { "FM25Q128-SOB-T-G",INFO(0xa14018, 0, 64 * 1024, 256, ++ SPI_NOR_DUAL_READ), PARAMS(spansion), CLK_MHZ_2X(80) }, + { }, + }; + diff --git a/br-ext-chip-hisilicon/board/hi3516ev200/kernel/patches/13_add_support_fm25q128a_flash.patch b/br-ext-chip-hisilicon/board/hi3516ev200/kernel/patches/13_add_support_fm25q128a_flash.patch deleted file mode 100644 index 3103ac3e..00000000 --- a/br-ext-chip-hisilicon/board/hi3516ev200/kernel/patches/13_add_support_fm25q128a_flash.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/mtd/spi-nor/spi-nor.c 2021-06-19 13:56:54.523168941 +0000 -+++ b/drivers/mtd/spi-nor/spi-nor.c 2021-06-19 14:02:43.947271771 +0000 -@@ -1217,6 +1217,10 @@ - SECT_4K | SPI_NOR_QUAD_READ), PARAMS(gd), CLK_MHZ_2X(120) }, - { "gd25q128", INFO(0xc84018, 0, 64 * 1024, 256, - SECT_4K | SPI_NOR_QUAD_READ), PARAMS(gd), CLK_MHZ_2X(80) }, -+ -+ { "fm25q128a", INFO(0xa14018, 0, 64 * 1024, 256, -+ SECT_4K | SPI_NOR_DUAL_READ), PARAMS(gd), CLK_MHZ_2X(80) }, -+ - { "gd25q256", INFO(0xc84019, 0, 64 * 1024, 512, - SECT_4K | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES), PARAMS(gd), CLK_MHZ_2X(80) }, - /* GigaDevice 1.8V */ diff --git a/br-ext-chip-hisilicon/board/hi3516ev200/kernel/patches/14_mx25l6433f_dual_read.patch b/br-ext-chip-hisilicon/board/hi3516ev200/kernel/patches/14_mx25l6433f_dual_read.patch deleted file mode 100644 index 2a1b44c7..00000000 --- a/br-ext-chip-hisilicon/board/hi3516ev200/kernel/patches/14_mx25l6433f_dual_read.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/drivers/mtd/spi-nor/spi-nor.c 2021-07-09 08:00:01.771026933 +0300 -+++ b/drivers/mtd/spi-nor/spi-nor.c 2021-07-09 08:04:33.973630596 +0300 -@@ -1249,7 +1249,7 @@ - { "mx25l3205d", INFO(0xc22016, 0, 64 * 1024, 64, 0) }, - { "mx25l3255e", INFO(0xc29e16, 0, 64 * 1024, 64, SECT_4K) }, - { "mx25l6436f", INFO(0xc22017, 0, 64 * 1024, 128, -- SPI_NOR_QUAD_READ), PARAMS(mxic), CLK_MHZ_2X(133) }, -+ SPI_NOR_DUAL_READ), CLK_MHZ_2X(133) }, - { "mx25l12835f", INFO(0xc22018, 0, 64 * 1024, 256, - SPI_NOR_QUAD_READ), PARAMS(mxic), CLK_MHZ_2X(84) }, - { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) }, diff --git a/br-ext-chip-hisilicon/board/hi3516ev200/kernel/patches/15_xmc_dual_read.patch b/br-ext-chip-hisilicon/board/hi3516ev200/kernel/patches/15_xmc_dual_read.patch deleted file mode 100644 index 63adb945..00000000 --- a/br-ext-chip-hisilicon/board/hi3516ev200/kernel/patches/15_xmc_dual_read.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/drivers/mtd/spi-nor/spi-nor.c 2021-08-24 08:00:01.771026933 +0300 -+++ b/drivers/mtd/spi-nor/spi-nor.c 2021-08-24 08:04:33.973630596 +0300 -@@ -1303,13 +1303,13 @@ - PARAMS(micron_4k), CLK_MHZ_2X(80) }, - - /* XMC */ -- { "xm25qh64a", INFO(0x207017, 0, 64 * 1024, 128, SPI_NOR_QUAD_READ), -+ { "xm25qh64a", INFO(0x207017, 0, 64 * 1024, 128, SPI_NOR_DUAL_READ), - PARAMS(xmc), CLK_MHZ_2X(104) }, -- { "xm25qh64b", INFO(0x206017, 0, 64 * 1024, 128, SPI_NOR_QUAD_READ), -+ { "xm25qh64b", INFO(0x206017, 0, 64 * 1024, 128, SPI_NOR_DUAL_READ), - PARAMS(xmc), CLK_MHZ_2X(104) }, -- { "xm25qh128a", INFO(0x207018, 0, 64 * 1024, 256, SPI_NOR_QUAD_READ), -+ { "xm25qh128a", INFO(0x207018, 0, 64 * 1024, 256, SPI_NOR_DUAL_READ), - PARAMS(xmc), CLK_MHZ_2X(104) }, -- { "xm25qh128b", INFO(0x206018, 0, 64 * 1024, 256, SPI_NOR_QUAD_READ), -+ { "xm25qh128b", INFO(0x206018, 0, 64 * 1024, 256, SPI_NOR_DUAL_READ), - PARAMS(xmc), CLK_MHZ_2X(104) }, - - /* PMC */