|
@@ -163,6 +163,9 @@
|
|
|
#define NAND_DEV_CMD_VLD_VAL (READ_START_VLD | WRITE_START_VLD | \
|
|
|
ERASE_START_VLD | SEQ_READ_START_VLD)
|
|
|
|
|
|
+/* NAND_CTRL bits */
|
|
|
+#define BAM_MODE_EN BIT(0)
|
|
|
+
|
|
|
/*
|
|
|
* the NAND controller performs reads/writes with ECC in 516 byte chunks.
|
|
|
* the driver calls the chunks 'step' or 'codeword' interchangeably
|
|
@@ -1042,7 +1045,8 @@ static int read_id(struct qcom_nand_host *host, int column)
|
|
|
nandc_set_reg(nandc, NAND_FLASH_CMD, FETCH_ID);
|
|
|
nandc_set_reg(nandc, NAND_ADDR0, column);
|
|
|
nandc_set_reg(nandc, NAND_ADDR1, 0);
|
|
|
- nandc_set_reg(nandc, NAND_FLASH_CHIP_SELECT, DM_EN);
|
|
|
+ nandc_set_reg(nandc, NAND_FLASH_CHIP_SELECT,
|
|
|
+ nandc->props->is_bam ? 0 : DM_EN);
|
|
|
nandc_set_reg(nandc, NAND_EXEC_CMD, 1);
|
|
|
|
|
|
write_reg_dma(nandc, NAND_FLASH_CMD, 4, NAND_BAM_NEXT_SGL);
|
|
@@ -2414,12 +2418,19 @@ static void qcom_nandc_unalloc(struct qcom_nand_controller *nandc)
|
|
|
/* one time setup of a few nand controller registers */
|
|
|
static int qcom_nandc_setup(struct qcom_nand_controller *nandc)
|
|
|
{
|
|
|
+ u32 nand_ctrl;
|
|
|
+
|
|
|
/* kill onenand */
|
|
|
nandc_write(nandc, SFLASHC_BURST_CFG, 0);
|
|
|
nandc_write(nandc, NAND_DEV_CMD_VLD, NAND_DEV_CMD_VLD_VAL);
|
|
|
|
|
|
- /* enable ADM DMA */
|
|
|
- nandc_write(nandc, NAND_FLASH_CHIP_SELECT, DM_EN);
|
|
|
+ /* enable ADM or BAM DMA */
|
|
|
+ if (nandc->props->is_bam) {
|
|
|
+ nand_ctrl = nandc_read(nandc, NAND_CTRL);
|
|
|
+ nandc_write(nandc, NAND_CTRL, nand_ctrl | BAM_MODE_EN);
|
|
|
+ } else {
|
|
|
+ nandc_write(nandc, NAND_FLASH_CHIP_SELECT, DM_EN);
|
|
|
+ }
|
|
|
|
|
|
/* save the original values of these registers */
|
|
|
nandc->cmd1 = nandc_read(nandc, NAND_DEV_CMD1);
|