From b997e22d921eae9b73f5e5aa9b9fa1ed86cca8b1 Mon Sep 17 00:00:00 2001 From: Guillaume LECERF Date: Sat, 24 Apr 2010 17:57:57 +0200 Subject: [PATCH] --- yaml --- r: 195951 b: refs/heads/master c: ad7026fef6c771fc88ecbcb111876fc050b1a4d0 h: refs/heads/master i: 195949: 513d16fd48a54dafd635c4be28bc38982afadcf7 195947: c20aba7a1065d0f9368cd4e3901c96085112eccc 195943: 11104031b20e736e7b108e43d3f5bf1fa62e53f9 195935: c166d6765bb19f7bf93cf42d99968652a101b153 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/chips/cfi_probe.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 69727a0dbf79..338a35419e16 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8473044d644553ca3c939249490d1c5ef5f6d4e6 +refs/heads/master: ad7026fef6c771fc88ecbcb111876fc050b1a4d0 diff --git a/trunk/drivers/mtd/chips/cfi_probe.c b/trunk/drivers/mtd/chips/cfi_probe.c index f657d16cb98c..045dc100496c 100644 --- a/trunk/drivers/mtd/chips/cfi_probe.c +++ b/trunk/drivers/mtd/chips/cfi_probe.c @@ -158,6 +158,7 @@ static int __xipram cfi_chip_setup(struct map_info *map, __u32 base = 0; int num_erase_regions = cfi_read_query(map, base + (0x10 + 28)*ofs_factor); int i; + int addr_unlock1 = 0x555, addr_unlock2 = 0x2AA; xip_enable(base, map, cfi); #ifdef DEBUG_CFI @@ -214,9 +215,9 @@ static int __xipram cfi_chip_setup(struct map_info *map, * back into Read Mode, which is a nop in this case). */ cfi_send_gen_cmd(0xf0, 0, base, map, cfi, cfi->device_type, NULL); - cfi_send_gen_cmd(0xaa, 0x555, base, map, cfi, cfi->device_type, NULL); - cfi_send_gen_cmd(0x55, 0x2aa, base, map, cfi, cfi->device_type, NULL); - cfi_send_gen_cmd(0x90, 0x555, base, map, cfi, cfi->device_type, NULL); + cfi_send_gen_cmd(0xaa, addr_unlock1, base, map, cfi, cfi->device_type, NULL); + cfi_send_gen_cmd(0x55, addr_unlock2, base, map, cfi, cfi->device_type, NULL); + cfi_send_gen_cmd(0x90, addr_unlock1, base, map, cfi, cfi->device_type, NULL); cfi->mfr = cfi_read_query16(map, base); cfi->id = cfi_read_query16(map, base + ofs_factor);