Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754397AbZFYHmT (ORCPT ); Thu, 25 Jun 2009 03:42:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753189AbZFYHmM (ORCPT ); Thu, 25 Jun 2009 03:42:12 -0400 Received: from mail-ew0-f210.google.com ([209.85.219.210]:44087 "EHLO mail-ew0-f210.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752449AbZFYHmL (ORCPT ); Thu, 25 Jun 2009 03:42:11 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=pDZjpsW+r6eOt5PfsJ+cxs05geOmpXtSRi59fSQxIJMTMmE714FPzfwiGlzOJ8Ghta 5VNUtl1YpsMLcSggp46NM81iLDUdOZksIjD0BWtv7ilGkD22Z8Qv3TrXINDoMevX9jbc e+9pGIKTgcfMoj8LiDQ5UN2Tj571qhnTa3aes= MIME-Version: 1.0 Date: Thu, 25 Jun 2009 09:42:12 +0200 Message-ID: Subject: Add support for the SST 39VF3202, 39VF6401B and 39VF6402B flash chips From: Yegor Yefremov To: linux-kernel@vger.kernel.org Cc: dwmw2@infradead.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4035 Lines: 127 Add support for the SST 39VF3202, 39VF6401B and 39VF6402B flash chips - extend struct amd_flash_info to enable 8 erase regions for 8Mb flash chips - change erase block command to 0x50 due to the differences between 39VF6401/02 and 39VF6401B/02B chips Signed-off-by: Yegor Yefremov Index: linus/drivers/mtd/chips/cfi_cmdset_0002.c =================================================================== --- linus.orig/drivers/mtd/chips/cfi_cmdset_0002.c +++ linus/drivers/mtd/chips/cfi_cmdset_0002.c @@ -50,6 +50,8 @@ #define SST49LF004B 0x0060 #define SST49LF040B 0x0050 #define SST49LF008A 0x005a +#define SST39VF6401B 0x236D +#define SST39VF6402B 0x236C #define AT49BV6416 0x00d6 static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *); @@ -1629,7 +1631,11 @@ static int __xipram do_erase_oneblock(st cfi_send_gen_cmd(0x80, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL); cfi_send_gen_cmd(0xAA, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL); cfi_send_gen_cmd(0x55, cfi->addr_unlock2, chip->start, map, cfi, cfi->device_type, NULL); - map_write(map, CMD(0x30), adr); + + if (cfi->mfr == MANUFACTURER_SST && (cfi->id == SST39VF6401B || cfi->id == SST39VF6402B)) + map_write(map, CMD(0x50), adr); + else + map_write(map, CMD(0x30), adr); chip->state = FL_ERASING; chip->erase_suspended = 0; Index: linus/drivers/mtd/chips/jedec_probe.c =================================================================== --- linus.orig/drivers/mtd/chips/jedec_probe.c +++ linus/drivers/mtd/chips/jedec_probe.c @@ -160,6 +160,9 @@ #define SST39LF160 0x2782 #define SST39VF1601 0x234b #define SST39VF3201 0x235b +#define SST39VF3202 0x235a +#define SST39VF6401B 0x236D +#define SST39VF6402B 0x236C #define SST39LF512 0x00D4 #define SST39LF010 0x00D5 #define SST39LF020 0x00D6 @@ -273,7 +276,7 @@ struct amd_flash_info { const uint8_t dev_size; const uint8_t nr_regions; const uint16_t cmd_set; - const uint32_t regions[6]; + const uint32_t regions[8]; const uint8_t devtypes; /* Bitmask for x8, x16 etc. */ const uint8_t uaddr; /* unlock addrs for 8, 16, 32, 64 */ }; @@ -1519,6 +1522,59 @@ static const struct amd_flash_info jedec ERASEINFO(0x1000,256) } }, { + .mfr_id = MANUFACTURER_SST, /* should be CFI */ + .dev_id = SST39VF3202, + .name = "SST 39VF3202", + .devtypes = CFI_DEVICETYPE_X16, + .uaddr = MTD_UADDR_0xAAAA_0x5555, + .dev_size = SIZE_4MiB, + .cmd_set = P_ID_AMD_STD, + .nr_regions = 4, + .regions = { + ERASEINFO(0x1000,256), + ERASEINFO(0x1000,256), + ERASEINFO(0x1000,256), + ERASEINFO(0x1000,256) + } + }, { + .mfr_id = MANUFACTURER_SST, /* should be CFI */ + .dev_id = SST39VF6401B, + .name = "SST 39VF6401B", + .devtypes = CFI_DEVICETYPE_X16, + .uaddr = MTD_UADDR_0x0AAA_0x0555, + .dev_size = SIZE_8MiB, + .cmd_set = P_ID_AMD_STD, + .nr_regions = 8, + .regions = { + ERASEINFO(0x1000,256), + ERASEINFO(0x1000,256), + ERASEINFO(0x1000,256), + ERASEINFO(0x1000,256), + ERASEINFO(0x1000,256), + ERASEINFO(0x1000,256), + ERASEINFO(0x1000,256), + ERASEINFO(0x1000,256), + } + }, { + .mfr_id = MANUFACTURER_SST, /* should be CFI */ + .dev_id = SST39VF6402B, + .name = "SST 39VF6402B", + .devtypes = CFI_DEVICETYPE_X16, + .uaddr = MTD_UADDR_0x0AAA_0x0555, + .dev_size = SIZE_8MiB, + .cmd_set = P_ID_AMD_STD, + .nr_regions = 8, + .regions = { + ERASEINFO(0x1000,256), + ERASEINFO(0x1000,256), + ERASEINFO(0x1000,256), + ERASEINFO(0x1000,256), + ERASEINFO(0x1000,256), + ERASEINFO(0x1000,256), + ERASEINFO(0x1000,256), + ERASEINFO(0x1000,256), + } + }, { .mfr_id = MANUFACTURER_SST, .dev_id = SST36VF3203, .name = "SST 36VF3203", -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/