Merge branch 'master' of github:OpenIPC/openipc-2.1

pull/33/head
Igor Zalatov (via Araneus server) 2021-06-19 19:29:24 +03:00
commit a2958406c5
3 changed files with 15 additions and 2 deletions

View File

@ -0,0 +1,13 @@
--- 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_QUAD_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 */

View File

@ -28,7 +28,7 @@ Isp_x =0
Isp_y =0
Isp_W =2592
Isp_H =1520
Isp_FrameRate=30
Isp_FrameRate=25
Isp_Bayer =0 ;BAYER_RGGB=0, BAYER_GRBG=1, BAYER_GBRG=2, BAYER_BGGR=3

View File

@ -29,7 +29,7 @@ Isp_x =0
Isp_y =0
Isp_W =2592
Isp_H =1520
Isp_FrameRate=30
Isp_FrameRate=25
Isp_Bayer =0 ;BAYER_RGGB=0, BAYER_GRBG=1, BAYER_GBRG=2, BAYER_BGGR=3