Commit 6208274d authored by Richard Genoud's avatar Richard Genoud Committed by Miquel Raynal
Browse files

mtd: rawnand: sunxi: introduce reg_spare_area in sunxi_nfc_caps 



The H6/H616 spare area register is not at the same offset as the
A10/A23 one, so move its offset into sunxi_nfc_caps.

No functional change.

Signed-off-by: default avatarRichard Genoud <richard.genoud@bootlin.com>
Reviewed-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent ee61bba4

drivers/mtd/nand/raw/sunxi_nand.c

+7 −2
Original line number Diff line number Diff line
@@ -54,7 +54,8 @@ 
#define NFC_REG_ECC_ERR_CNT(nfc, x)	((nfc->caps->reg_ecc_err_cnt + (x)) & ~0x3)

#define NFC_REG_A10_USER_DATA	0x0050

#define NFC_REG_USER_DATA(nfc, x)	(nfc->caps->reg_user_data + ((x) * 4))

#define NFC_REG_SPARE_AREA	0x00A0

#define NFC_REG_SPARE_AREA(nfc) (nfc->caps->reg_spare_area)

#define NFC_REG_A10_SPARE_AREA	0x00A0

#define NFC_REG_PAT_ID(nfc) (nfc->caps->reg_pat_id)

#define NFC_REG_A10_PAT_ID	0x00A4

#define NFC_REG_MDMA_ADDR	0x00C0
@@ -239,6 +240,7 @@ static inline struct sunxi_nand_chip *to_sunxi_nand(struct nand_chip *nand) 
 * @reg_io_data:	I/O data register

 * @reg_ecc_err_cnt:	ECC error counter register

 * @reg_user_data:	User data register

 * @reg_spare_area:	Spare Area Register

 * @reg_pat_id:		Pattern ID Register

 * @reg_pat_found:	Data Pattern Status Register

 * @random_en_mask:	RANDOM_EN mask in NFC_ECC_CTL register
@@ -255,6 +257,7 @@ struct sunxi_nfc_caps { 
	unsigned int reg_io_data;

	unsigned int reg_ecc_err_cnt;

	unsigned int reg_user_data;

	unsigned int reg_spare_area;

	unsigned int reg_pat_id;

	unsigned int reg_pat_found;

	unsigned int random_en_mask;
@@ -477,7 +480,7 @@ static void sunxi_nfc_select_chip(struct nand_chip *nand, unsigned int cs) 
	if (sel->rb >= 0)

		ctl |= NFC_RB_SEL(sel->rb);



	writel(mtd->writesize, nfc->regs + NFC_REG_SPARE_AREA);

	writel(mtd->writesize, nfc->regs + NFC_REG_SPARE_AREA(nfc));



	if (nfc->clk_rate != sunxi_nand->clk_rate) {

		clk_set_rate(nfc->mod_clk, sunxi_nand->clk_rate);
@@ -2236,6 +2239,7 @@ static const struct sunxi_nfc_caps sunxi_nfc_a10_caps = { 
	.reg_io_data = NFC_REG_A10_IO_DATA,

	.reg_ecc_err_cnt = NFC_REG_A10_ECC_ERR_CNT,

	.reg_user_data = NFC_REG_A10_USER_DATA,

	.reg_spare_area = NFC_REG_A10_SPARE_AREA,

	.reg_pat_id = NFC_REG_A10_PAT_ID,

	.reg_pat_found = NFC_REG_ECC_ST,

	.random_en_mask = BIT(9),
@@ -2253,6 +2257,7 @@ static const struct sunxi_nfc_caps sunxi_nfc_a23_caps = { 
	.reg_io_data = NFC_REG_A23_IO_DATA,

	.reg_ecc_err_cnt = NFC_REG_A10_ECC_ERR_CNT,

	.reg_user_data = NFC_REG_A10_USER_DATA,

	.reg_spare_area = NFC_REG_A10_SPARE_AREA,

	.reg_pat_id = NFC_REG_A10_PAT_ID,

	.reg_pat_found = NFC_REG_ECC_ST,

	.random_en_mask = BIT(9),