aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/chips/cfi_probe.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/mtd/chips/cfi_probe.c b/drivers/mtd/chips/cfi_probe.c
index f657d16cb98c..045dc100496c 100644
--- a/drivers/mtd/chips/cfi_probe.c
+++ b/drivers/mtd/chips/cfi_probe.c
@@ -158,6 +158,7 @@ static int __xipram cfi_chip_setup(struct map_info *map,
158 __u32 base = 0; 158 __u32 base = 0;
159 int num_erase_regions = cfi_read_query(map, base + (0x10 + 28)*ofs_factor); 159 int num_erase_regions = cfi_read_query(map, base + (0x10 + 28)*ofs_factor);
160 int i; 160 int i;
161 int addr_unlock1 = 0x555, addr_unlock2 = 0x2AA;
161 162
162 xip_enable(base, map, cfi); 163 xip_enable(base, map, cfi);
163#ifdef DEBUG_CFI 164#ifdef DEBUG_CFI
@@ -214,9 +215,9 @@ static int __xipram cfi_chip_setup(struct map_info *map,
214 * back into Read Mode, which is a nop in this case). 215 * back into Read Mode, which is a nop in this case).
215 */ 216 */
216 cfi_send_gen_cmd(0xf0, 0, base, map, cfi, cfi->device_type, NULL); 217 cfi_send_gen_cmd(0xf0, 0, base, map, cfi, cfi->device_type, NULL);
217 cfi_send_gen_cmd(0xaa, 0x555, base, map, cfi, cfi->device_type, NULL); 218 cfi_send_gen_cmd(0xaa, addr_unlock1, base, map, cfi, cfi->device_type, NULL);
218 cfi_send_gen_cmd(0x55, 0x2aa, base, map, cfi, cfi->device_type, NULL); 219 cfi_send_gen_cmd(0x55, addr_unlock2, base, map, cfi, cfi->device_type, NULL);
219 cfi_send_gen_cmd(0x90, 0x555, base, map, cfi, cfi->device_type, NULL); 220 cfi_send_gen_cmd(0x90, addr_unlock1, base, map, cfi, cfi->device_type, NULL);
220 cfi->mfr = cfi_read_query16(map, base); 221 cfi->mfr = cfi_read_query16(map, base);
221 cfi->id = cfi_read_query16(map, base + ofs_factor); 222 cfi->id = cfi_read_query16(map, base + ofs_factor);
222 223