Commit 33bf5519 authored by Olof Johansson's avatar Olof Johansson Committed by Boris Brezillon
Browse files

mtd: rawnand: qcom: Namespace prefix some commands 



PAGE_READ is used by RISC-V arch code included through mm headers,
and it makes sense to bring in a prefix on these in the driver.

drivers/mtd/nand/raw/qcom_nandc.c:153: warning: "PAGE_READ" redefined
 #define PAGE_READ   0x2
In file included from include/linux/memremap.h:7,
                 from include/linux/mm.h:27,
                 from include/linux/scatterlist.h:8,
                 from include/linux/dma-mapping.h:11,
                 from drivers/mtd/nand/raw/qcom_nandc.c:17:
arch/riscv/include/asm/pgtable.h:48: note: this is the location of the previous definition

Caught by riscv allmodconfig.

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
Reviewed-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
parent 5d1e9c22

drivers/mtd/nand/raw/qcom_nandc.c

+16 −16
Original line number Diff line number Diff line
@@ -150,15 +150,15 @@ 
#define	NAND_VERSION_MINOR_SHIFT	16



/* NAND OP_CMDs */

#define	PAGE_READ			0x2

#define	PAGE_READ_WITH_ECC		0x3

#define	PAGE_READ_WITH_ECC_SPARE	0x4

#define	PROGRAM_PAGE			0x6

#define	PAGE_PROGRAM_WITH_ECC		0x7

#define	PROGRAM_PAGE_SPARE		0x9

#define	BLOCK_ERASE			0xa

#define	FETCH_ID			0xb

#define	RESET_DEVICE			0xd

#define	OP_PAGE_READ			0x2

#define	OP_PAGE_READ_WITH_ECC		0x3

#define	OP_PAGE_READ_WITH_ECC_SPARE	0x4

#define	OP_PROGRAM_PAGE			0x6

#define	OP_PAGE_PROGRAM_WITH_ECC	0x7

#define	OP_PROGRAM_PAGE_SPARE		0x9

#define	OP_BLOCK_ERASE			0xa

#define	OP_FETCH_ID			0xb

#define	OP_RESET_DEVICE			0xd



/* Default Value for NAND_DEV_CMD_VLD */

#define NAND_DEV_CMD_VLD_VAL		(READ_START_VLD | WRITE_START_VLD | \
@@ -692,11 +692,11 @@ static void update_rw_regs(struct qcom_nand_host *host, int num_cw, bool read) 


	if (read) {

		if (host->use_ecc)

			cmd = PAGE_READ_WITH_ECC | PAGE_ACC | LAST_PAGE;

			cmd = OP_PAGE_READ_WITH_ECC | PAGE_ACC | LAST_PAGE;

		else

			cmd = PAGE_READ | PAGE_ACC | LAST_PAGE;

			cmd = OP_PAGE_READ | PAGE_ACC | LAST_PAGE;

	} else {

			cmd = PROGRAM_PAGE | PAGE_ACC | LAST_PAGE;

		cmd = OP_PROGRAM_PAGE | PAGE_ACC | LAST_PAGE;

	}



	if (host->use_ecc) {
@@ -1170,7 +1170,7 @@ static int nandc_param(struct qcom_nand_host *host) 
	 * in use. we configure the controller to perform a raw read of 512

	 * bytes to read onfi params

	 */

	nandc_set_reg(nandc, NAND_FLASH_CMD, PAGE_READ | PAGE_ACC | LAST_PAGE);

	nandc_set_reg(nandc, NAND_FLASH_CMD, OP_PAGE_READ | PAGE_ACC | LAST_PAGE);

	nandc_set_reg(nandc, NAND_ADDR0, 0);

	nandc_set_reg(nandc, NAND_ADDR1, 0);

	nandc_set_reg(nandc, NAND_DEV0_CFG0, 0 << CW_PER_PAGE
@@ -1224,7 +1224,7 @@ static int erase_block(struct qcom_nand_host *host, int page_addr) 
	struct qcom_nand_controller *nandc = get_qcom_nand_controller(chip);



	nandc_set_reg(nandc, NAND_FLASH_CMD,

		      BLOCK_ERASE | PAGE_ACC | LAST_PAGE);

		      OP_BLOCK_ERASE | PAGE_ACC | LAST_PAGE);

	nandc_set_reg(nandc, NAND_ADDR0, page_addr);

	nandc_set_reg(nandc, NAND_ADDR1, 0);

	nandc_set_reg(nandc, NAND_DEV0_CFG0,
@@ -1255,7 +1255,7 @@ static int read_id(struct qcom_nand_host *host, int column) 
	if (column == -1)

		return 0;



	nandc_set_reg(nandc, NAND_FLASH_CMD, FETCH_ID);

	nandc_set_reg(nandc, NAND_FLASH_CMD, OP_FETCH_ID);

	nandc_set_reg(nandc, NAND_ADDR0, column);

	nandc_set_reg(nandc, NAND_ADDR1, 0);

	nandc_set_reg(nandc, NAND_FLASH_CHIP_SELECT,
@@ -1276,7 +1276,7 @@ static int reset(struct qcom_nand_host *host) 
	struct nand_chip *chip = &host->chip;

	struct qcom_nand_controller *nandc = get_qcom_nand_controller(chip);



	nandc_set_reg(nandc, NAND_FLASH_CMD, RESET_DEVICE);

	nandc_set_reg(nandc, NAND_FLASH_CMD, OP_RESET_DEVICE);

	nandc_set_reg(nandc, NAND_EXEC_CMD, 1);



	write_reg_dma(nandc, NAND_FLASH_CMD, 1, NAND_BAM_NEXT_SGL);

CRA Git | Maintained and supported by SUSTech CRA and CCSE