Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 207791
b: refs/heads/master
c: a99d179
h: refs/heads/master
i:
  207789: b0f284a
  207787: 44728e0
  207783: 5c61950
  207775: 580e551
v: v3
  • Loading branch information
Chuanxiao Dong authored and David Woodhouse committed Aug 5, 2010
1 parent abbc9d2 commit ca0c07b
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 50 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bdca6daee20daf9c14f272fe1ab07990e881e518
refs/heads/master: a99d17966cfa65cd1767cbddb209166c18fedc74
102 changes: 53 additions & 49 deletions trunk/drivers/mtd/nand/denali.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ static const uint32_t reset_complete[4] = {INTR_STATUS0__RST_COMP,
INTR_STATUS3__RST_COMP};

/* specifies the debug level of the driver */
static int nand_debug_level = 0;
static int nand_debug_level;

/* forward declarations */
static void clear_interrupts(struct denali_nand_info *denali);
Expand Down Expand Up @@ -991,7 +991,7 @@ static void denali_irq_enable(struct denali_nand_info *denali,
*/
static inline uint32_t denali_irq_detected(struct denali_nand_info *denali)
{
return (read_interrupt_status(denali) & DENALI_IRQ_ALL);
return read_interrupt_status(denali) & DENALI_IRQ_ALL;
}

/* Interrupts are cleared by writing a 1 to the appropriate status bit */
Expand Down Expand Up @@ -1172,9 +1172,12 @@ static int denali_send_pipeline_cmd(struct denali_nand_info *denali,
uint32_t addr = 0x0, cmd = 0x0, page_count = 1, irq_status = 0,
irq_mask = 0;

if (op == DENALI_READ) irq_mask = INTR_STATUS0__LOAD_COMP;
else if (op == DENALI_WRITE) irq_mask = 0;
else BUG();
if (op == DENALI_READ)
irq_mask = INTR_STATUS0__LOAD_COMP;
else if (op == DENALI_WRITE)
irq_mask = 0;
else
BUG();

setup_ecc_for_xfer(denali, ecc_en, transfer_spare);

Expand Down Expand Up @@ -1448,7 +1451,8 @@ static void denali_enable_dma(struct denali_nand_info *denali, bool en)
{
uint32_t reg_val = 0x0;

if (en) reg_val = DMA_ENABLE__FLAG;
if (en)
reg_val = DMA_ENABLE__FLAG;

denali_write32(reg_val, denali->flash_reg + DMA_ENABLE);
ioread32(denali->flash_reg + DMA_ENABLE);
Expand Down Expand Up @@ -1721,47 +1725,47 @@ static void denali_cmdfunc(struct mtd_info *mtd, unsigned int cmd, int col,
printk(KERN_INFO "cmdfunc: 0x%x %d %d\n", cmd, col, page);
#endif
switch (cmd) {
case NAND_CMD_PAGEPROG:
break;
case NAND_CMD_STATUS:
read_status(denali);
break;
case NAND_CMD_READID:
reset_buf(denali);
if (denali->flash_bank < denali->total_used_banks) {
/* write manufacturer information into nand
buffer for NAND subsystem to fetch.
*/
write_byte_to_buf(denali,
denali->dev_info.wDeviceMaker);
write_byte_to_buf(denali,
denali->dev_info.wDeviceID);
write_byte_to_buf(denali,
denali->dev_info.bDeviceParam0);
write_byte_to_buf(denali,
denali->dev_info.bDeviceParam1);
write_byte_to_buf(denali,
denali->dev_info.bDeviceParam2);
} else {
int i;
for (i = 0; i < 5; i++)
write_byte_to_buf(denali, 0xff);
}
break;
case NAND_CMD_READ0:
case NAND_CMD_SEQIN:
denali->page = page;
break;
case NAND_CMD_RESET:
reset_bank(denali);
break;
case NAND_CMD_READOOB:
/* TODO: Read OOB data */
break;
default:
printk(KERN_ERR ": unsupported command"
" received 0x%x\n", cmd);
break;
case NAND_CMD_PAGEPROG:
break;
case NAND_CMD_STATUS:
read_status(denali);
break;
case NAND_CMD_READID:
reset_buf(denali);
if (denali->flash_bank < denali->total_used_banks) {
/* write manufacturer information into nand
buffer for NAND subsystem to fetch.
*/
write_byte_to_buf(denali,
denali->dev_info.wDeviceMaker);
write_byte_to_buf(denali,
denali->dev_info.wDeviceID);
write_byte_to_buf(denali,
denali->dev_info.bDeviceParam0);
write_byte_to_buf(denali,
denali->dev_info.bDeviceParam1);
write_byte_to_buf(denali,
denali->dev_info.bDeviceParam2);
} else {
int i;
for (i = 0; i < 5; i++)
write_byte_to_buf(denali, 0xff);
}
break;
case NAND_CMD_READ0:
case NAND_CMD_SEQIN:
denali->page = page;
break;
case NAND_CMD_RESET:
reset_bank(denali);
break;
case NAND_CMD_READOOB:
/* TODO: Read OOB data */
break;
default:
printk(KERN_ERR ": unsupported command"
" received 0x%x\n", cmd);
break;
}
}

Expand Down Expand Up @@ -1807,7 +1811,7 @@ static void denali_hw_init(struct denali_nand_info *denali)
}

/* ECC layout for SLC devices. Denali spec indicates SLC fixed at 4 bytes */
#define ECC_BYTES_SLC 4 * (2048 / ECC_SECTOR_SIZE)
#define ECC_BYTES_SLC (4 * (2048 / ECC_SECTOR_SIZE))
static struct nand_ecclayout nand_oob_slc = {
.eccbytes = 4,
.eccpos = { 0, 1, 2, 3 }, /* not used */
Expand All @@ -1819,7 +1823,7 @@ static struct nand_ecclayout nand_oob_slc = {
}
};

#define ECC_BYTES_MLC 14 * (2048 / ECC_SECTOR_SIZE)
#define ECC_BYTES_MLC (14 * (2048 / ECC_SECTOR_SIZE))
static struct nand_ecclayout nand_oob_mlc_14bit = {
.eccbytes = 14,
.eccpos = { 0, 1, 2, 3, 5, 6, 7, 8, 9, 10, 11, 12, 13 }, /* not used */
Expand Down

0 comments on commit ca0c07b

Please sign in to comment.