File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -447,18 +447,21 @@ u32 nandc_flash_init(void __iomem *nandc_addr)
447447 id_byte [0 ][1 ] != 0xDC &&
448448 id_byte [0 ][1 ] != 0xD3 &&
449449 id_byte [0 ][1 ] != 0x48 &&
450+ id_byte [0 ][1 ] != 0xA1 &&
451+ id_byte [0 ][1 ] != 0xAA &&
452+ id_byte [0 ][1 ] != 0xAC &&
450453 id_byte [0 ][1 ] != 0x6A )
451454 return FTL_UNSUPPORTED_FLASH ;
452455 }
453456 }
454457 if (id_byte [0 ][0 ] == 0x98 && (id_byte [0 ][4 ] & 0x80 ))
455458 g_nand_ecc_en = 1 ;
456459 nand_para .nand_id [1 ] = id_byte [0 ][1 ];
457- if (id_byte [0 ][1 ] == 0xDA ) {
460+ if (id_byte [0 ][1 ] == 0xDA || id_byte [ 0 ][ 1 ] == 0xAA || id_byte [ 0 ][ 1 ] == 0x6A ) {
458461 nand_para .plane_per_die = 2 ;
459- nand_para .nand_id [1 ] = 0xDA ;
460- } else if (id_byte [0 ][1 ] == 0xDC ) {
461- nand_para .nand_id [1 ] = 0xDC ;
462+ nand_para .nand_id [1 ] = id_byte [ 0 ][ 1 ] ;
463+ } else if (id_byte [0 ][1 ] == 0xDC || id_byte [ 0 ][ 1 ] == 0xAC ) {
464+ nand_para .nand_id [1 ] = id_byte [ 0 ][ 1 ] ;
462465 if ((id_byte [0 ][0 ] == 0x2C && id_byte [0 ][3 ] == 0xA6 ) ||
463466 (id_byte [0 ][0 ] == 0xC2 && id_byte [0 ][3 ] == 0xA2 )) {
464467 nand_para .plane_per_die = 2 ;
You can’t perform that action at this time.
0 commit comments