github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 17:47:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

mtd: rawnand: ndfc: use ioread32be/iowrite32be and allow COMPILE_TEST

Browse Source 
Replace ppc4xx-specific in_be32/out_be32 with generic ioread32be/
iowrite32be to make the driver portable. Add COMPILE_TEST dependency
to get build coverage on non-ppc4xx architectures.

While at it, replace 4xx with 44x. The latter was removed a while ago
and is only kept for compatibility.

Assisted-by: opencode:big-pickle
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
This commit is contained in:
Rosen Penev 2026-06-01 19:07:23 -07:00 committed by Miquel Raynal
parent 19ed11aee9
commit 4f2692a538
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mtd/nand/raw/Kconfig
View File

@ -71,7 +71,7 @@ config MTD_NAND_AU1550
config MTD_NAND_NDFC config MTD_NAND_NDFC
tristate "IBM/MCC 4xx NAND controller" tristate "IBM/MCC 4xx NAND controller"
depends on 4xx depends on 44x || COMPILE_TEST
select MTD_NAND_ECC_SW_HAMMING select MTD_NAND_ECC_SW_HAMMING
select MTD_NAND_ECC_SW_HAMMING_SMC select MTD_NAND_ECC_SW_HAMMING_SMC
help help

20
drivers/mtd/nand/raw/ndfc.c
View File

@ -44,13 +44,13 @@ static void ndfc_select_chip(struct nand_chip *nchip, int chip)
uint32_t ccr; uint32_t ccr;
struct ndfc_controller *ndfc = nand_get_controller_data(nchip); struct ndfc_controller *ndfc = nand_get_controller_data(nchip);
ccr = in_be32(ndfc->ndfcbase + NDFC_CCR); ccr = ioread32be(ndfc->ndfcbase + NDFC_CCR);
if (chip >= 0) { if (chip >= 0) {
ccr &= ~NDFC_CCR_BS_MASK; ccr &= ~NDFC_CCR_BS_MASK;
ccr |= NDFC_CCR_BS(chip + ndfc->chip_select); ccr |= NDFC_CCR_BS(chip + ndfc->chip_select);
} else } else
ccr |= NDFC_CCR_RESET_CE; ccr |= NDFC_CCR_RESET_CE;
out_be32(ndfc->ndfcbase + NDFC_CCR, ccr); iowrite32be(ccr, ndfc->ndfcbase + NDFC_CCR);
} }
static void ndfc_hwcontrol(struct nand_chip *chip, int cmd, unsigned int ctrl) static void ndfc_hwcontrol(struct nand_chip *chip, int cmd, unsigned int ctrl)
@ -70,7 +70,7 @@ static int ndfc_ready(struct nand_chip *chip)
{ {
struct ndfc_controller *ndfc = nand_get_controller_data(chip); struct ndfc_controller *ndfc = nand_get_controller_data(chip);
return in_be32(ndfc->ndfcbase + NDFC_STAT) & NDFC_STAT_IS_READY; return ioread32be(ndfc->ndfcbase + NDFC_STAT) & NDFC_STAT_IS_READY;
} }
static void ndfc_enable_hwecc(struct nand_chip *chip, int mode) static void ndfc_enable_hwecc(struct nand_chip *chip, int mode)
@ -78,9 +78,9 @@ static void ndfc_enable_hwecc(struct nand_chip *chip, int mode)
uint32_t ccr; uint32_t ccr;
struct ndfc_controller *ndfc = nand_get_controller_data(chip); struct ndfc_controller *ndfc = nand_get_controller_data(chip);
ccr = in_be32(ndfc->ndfcbase + NDFC_CCR); ccr = ioread32be(ndfc->ndfcbase + NDFC_CCR);
ccr |= NDFC_CCR_RESET_ECC; ccr |= NDFC_CCR_RESET_ECC;
out_be32(ndfc->ndfcbase + NDFC_CCR, ccr); iowrite32be(ccr, ndfc->ndfcbase + NDFC_CCR);
wmb(); wmb();
} }
@ -92,7 +92,7 @@ static int ndfc_calculate_ecc(struct nand_chip *chip,
uint8_t *p = (uint8_t *)&ecc; uint8_t *p = (uint8_t *)&ecc;
wmb(); wmb();
ecc = in_be32(ndfc->ndfcbase + NDFC_ECC); ecc = ioread32be(ndfc->ndfcbase + NDFC_ECC);
/* The NDFC uses Smart Media (SMC) bytes order */ /* The NDFC uses Smart Media (SMC) bytes order */
ecc_code[0] = p[1]; ecc_code[0] = p[1];
ecc_code[1] = p[2]; ecc_code[1] = p[2];
@ -114,7 +114,7 @@ static void ndfc_read_buf(struct nand_chip *chip, uint8_t *buf, int len)
uint32_t *p = (uint32_t *) buf; uint32_t *p = (uint32_t *) buf;
for(;len > 0; len -= 4) for(;len > 0; len -= 4)
*p++ = in_be32(ndfc->ndfcbase + NDFC_DATA); *p++ = ioread32be(ndfc->ndfcbase + NDFC_DATA);
} }
static void ndfc_write_buf(struct nand_chip *chip, const uint8_t *buf, int len) static void ndfc_write_buf(struct nand_chip *chip, const uint8_t *buf, int len)
@ -123,7 +123,7 @@ static void ndfc_write_buf(struct nand_chip *chip, const uint8_t *buf, int len)
uint32_t *p = (uint32_t *) buf; uint32_t *p = (uint32_t *) buf;
for(;len > 0; len -= 4) for(;len > 0; len -= 4)
out_be32(ndfc->ndfcbase + NDFC_DATA, *p++); iowrite32be(*p++, ndfc->ndfcbase + NDFC_DATA);
} }
/* /*
@ -223,13 +223,13 @@ static int ndfc_probe(struct platform_device *ofdev)
if (reg) if (reg)
ccr |= be32_to_cpup(reg); ccr |= be32_to_cpup(reg);
out_be32(ndfc->ndfcbase + NDFC_CCR, ccr); iowrite32be(ccr, ndfc->ndfcbase + NDFC_CCR);
/* Set the bank settings if given */ /* Set the bank settings if given */
reg = of_get_property(ofdev->dev.of_node, "bank-settings", NULL); reg = of_get_property(ofdev->dev.of_node, "bank-settings", NULL);
if (reg) { if (reg) {
int offset = NDFC_BCFG0 + (ndfc->chip_select << 2); int offset = NDFC_BCFG0 + (ndfc->chip_select << 2);
out_be32(ndfc->ndfcbase + offset, be32_to_cpup(reg)); iowrite32be(be32_to_cpup(reg), ndfc->ndfcbase + offset);
} }
err = ndfc_chip_init(ndfc, ofdev->dev.of_node); err = ndfc_chip_init(ndfc, ofdev->dev.of_node);