mirror of
https://github.com/torvalds/linux.git
synced 2026-11-07 06:17:02 +01:00
mtd: rawnand: qcom: make config_nand_page_write() more generic
The function gets a 'nand_chip' pointer as a parameter but it is only used to extract a pointer to the nand controller's private structure from that. In order to make the function more generic, change the declaration to get a 'qcom_nandc_controller' pointer directly, and update the callers accordingly. While at it, also change the function name to use a 'qcom_nandc' prefix. No functional changes intended. This is in preparation of moving the function into the 'qpic_common' code to allow reusing it from the 'spi-qpic-snand' driver. Signed-off-by: Gabor Juhos <j4g8y7@gmail.com> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
This commit is contained in:
parent
5c80d1392c
commit
ee88ebffcd
|
|
@ -365,10 +365,8 @@ config_nand_single_cw_page_read(struct nand_chip *chip,
|
|||
* Helper to prepare DMA descriptors used to configure registers needed for
|
||||
* before writing a NAND page.
|
||||
*/
|
||||
static void config_nand_page_write(struct nand_chip *chip)
|
||||
static void qcom_nandc_config_page_write(struct qcom_nand_controller *nandc)
|
||||
{
|
||||
struct qcom_nand_controller *nandc = get_qcom_nand_controller(chip);
|
||||
|
||||
qcom_write_reg_dma(nandc, &nandc->regs->addr0, NAND_ADDR0, 2, 0);
|
||||
qcom_write_reg_dma(nandc, &nandc->regs->cfg0, NAND_DEV0_CFG0, 3, 0);
|
||||
if (!nandc->props->qpic_version2)
|
||||
|
|
@ -989,7 +987,7 @@ static int qcom_nandc_write_page(struct nand_chip *chip, const u8 *buf,
|
|||
|
||||
host->use_ecc = true;
|
||||
update_rw_regs(host, ecc->steps, false, 0);
|
||||
config_nand_page_write(chip);
|
||||
qcom_nandc_config_page_write(nandc);
|
||||
|
||||
for (i = 0; i < ecc->steps; i++) {
|
||||
int data_size, oob_size;
|
||||
|
|
@ -1059,7 +1057,7 @@ static int qcom_nandc_write_page_raw(struct nand_chip *chip,
|
|||
|
||||
host->use_ecc = false;
|
||||
update_rw_regs(host, ecc->steps, false, 0);
|
||||
config_nand_page_write(chip);
|
||||
qcom_nandc_config_page_write(nandc);
|
||||
|
||||
for (i = 0; i < ecc->steps; i++) {
|
||||
int data_size1, data_size2, oob_size1, oob_size2;
|
||||
|
|
@ -1143,7 +1141,7 @@ static int qcom_nandc_write_oob(struct nand_chip *chip, int page)
|
|||
set_address(host, host->cw_size * (ecc->steps - 1), page);
|
||||
update_rw_regs(host, 1, false, 0);
|
||||
|
||||
config_nand_page_write(chip);
|
||||
qcom_nandc_config_page_write(nandc);
|
||||
qcom_write_data_dma(nandc, FLASH_BUF_ACC,
|
||||
nandc->data_buffer, data_size + oob_size, 0);
|
||||
config_nand_cw_write(chip);
|
||||
|
|
@ -1219,7 +1217,7 @@ static int qcom_nandc_block_markbad(struct nand_chip *chip, loff_t ofs)
|
|||
set_address(host, host->cw_size * (ecc->steps - 1), page);
|
||||
update_rw_regs(host, 1, false, ecc->steps - 1);
|
||||
|
||||
config_nand_page_write(chip);
|
||||
qcom_nandc_config_page_write(nandc);
|
||||
qcom_write_data_dma(nandc, FLASH_BUF_ACC,
|
||||
nandc->data_buffer, host->cw_size, 0);
|
||||
config_nand_cw_write(chip);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user