aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79/files/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/ath79/files/drivers')
-rw-r--r--target/linux/ath79/files/drivers/mtd/nand/raw/ar934x_nand.c110
-rw-r--r--target/linux/ath79/files/drivers/mtd/nand/raw/nand_rb4xx.c46
2 files changed, 0 insertions, 156 deletions
diff --git a/target/linux/ath79/files/drivers/mtd/nand/raw/ar934x_nand.c b/target/linux/ath79/files/drivers/mtd/nand/raw/ar934x_nand.c
index b35343c8d9..5f0026b475 100644
--- a/target/linux/ath79/files/drivers/mtd/nand/raw/ar934x_nand.c
+++ b/target/linux/ath79/files/drivers/mtd/nand/raw/ar934x_nand.c
@@ -631,19 +631,11 @@ static void ar934x_nfc_read_status(struct ar934x_nfc *nfc)
nfc->buf[0] = status;
}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)
-static void ar934x_nfc_cmdfunc(struct mtd_info *mtd, unsigned int command,
- int column, int page_addr)
-{
- struct ar934x_nfc *nfc = mtd_to_ar934x_nfc(mtd);
- struct nand_chip *nand = &nfc->nand_chip;
-#else
static void ar934x_nfc_cmdfunc(struct nand_chip *nand, unsigned int command,
int column, int page_addr)
{
struct mtd_info *mtd = nand_to_mtd(nand);
struct ar934x_nfc *nfc = nand->priv;
-#endif
nfc->read_id = false;
if (command != NAND_CMD_PAGEPROG)
@@ -748,28 +740,16 @@ static void ar934x_nfc_cmdfunc(struct nand_chip *nand, unsigned int command,
}
}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)
-static int ar934x_nfc_dev_ready(struct mtd_info *mtd)
-{
- struct ar934x_nfc *nfc = mtd_to_ar934x_nfc(mtd);
-#else
static int ar934x_nfc_dev_ready(struct nand_chip *chip)
{
struct ar934x_nfc *nfc = chip->priv;
-#endif
return __ar934x_nfc_dev_ready(nfc);
}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)
-static u8 ar934x_nfc_read_byte(struct mtd_info *mtd)
-{
- struct ar934x_nfc *nfc = mtd_to_ar934x_nfc(mtd);
-#else
static u8 ar934x_nfc_read_byte(struct nand_chip *chip)
{
struct ar934x_nfc *nfc = chip->priv;
-#endif
u8 data;
WARN_ON(nfc->buf_index >= nfc->buf_size);
@@ -784,15 +764,9 @@ static u8 ar934x_nfc_read_byte(struct nand_chip *chip)
return data;
}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)
-static void ar934x_nfc_write_buf(struct mtd_info *mtd, const u8 *buf, int len)
-{
- struct ar934x_nfc *nfc = mtd_to_ar934x_nfc(mtd);
-#else
static void ar934x_nfc_write_buf(struct nand_chip *chip, const u8 *buf, int len)
{
struct ar934x_nfc *nfc = chip->priv;
-#endif
int i;
WARN_ON(nfc->buf_index + len > nfc->buf_size);
@@ -810,15 +784,9 @@ static void ar934x_nfc_write_buf(struct nand_chip *chip, const u8 *buf, int len)
}
}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)
-static void ar934x_nfc_read_buf(struct mtd_info *mtd, u8 *buf, int len)
-{
- struct ar934x_nfc *nfc = mtd_to_ar934x_nfc(mtd);
-#else
static void ar934x_nfc_read_buf(struct nand_chip *chip, u8 *buf, int len)
{
struct ar934x_nfc *nfc = chip->priv;
-#endif
int buf_index;
int i;
@@ -853,18 +821,11 @@ static inline void ar934x_nfc_disable_hwecc(struct ar934x_nfc *nfc)
nfc->ctrl_reg |= AR934X_NFC_CTRL_CUSTOM_SIZE_EN;
}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)
-static int ar934x_nfc_read_oob(struct mtd_info *mtd, struct nand_chip *chip,
- int page)
-{
- struct ar934x_nfc *nfc = mtd_to_ar934x_nfc(mtd);
-#else
static int ar934x_nfc_read_oob(struct nand_chip *chip,
int page)
{
struct ar934x_nfc *nfc = chip->priv;
struct mtd_info *mtd = ar934x_nfc_to_mtd(nfc);
-#endif
int err;
nfc_dbg(nfc, "read_oob: page:%d\n", page);
@@ -879,18 +840,11 @@ static int ar934x_nfc_read_oob(struct nand_chip *chip,
return 0;
}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)
-static int ar934x_nfc_write_oob(struct mtd_info *mtd, struct nand_chip *chip,
- int page)
-{
- struct ar934x_nfc *nfc = mtd_to_ar934x_nfc(mtd);
-#else
static int ar934x_nfc_write_oob(struct nand_chip *chip,
int page)
{
struct ar934x_nfc *nfc = chip->priv;
struct mtd_info *mtd = ar934x_nfc_to_mtd(nfc);
-#endif
nfc_dbg(nfc, "write_oob: page:%d\n", page);
memcpy(nfc->buf, chip->oob_poi, mtd->oobsize);
@@ -899,20 +853,12 @@ static int ar934x_nfc_write_oob(struct nand_chip *chip,
page, mtd->oobsize);
}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)
-static int ar934x_nfc_read_page_raw(struct mtd_info *mtd,
- struct nand_chip *chip, u8 *buf,
- int oob_required, int page)
-{
- struct ar934x_nfc *nfc = mtd_to_ar934x_nfc(mtd);
-#else
static int ar934x_nfc_read_page_raw(
struct nand_chip *chip, u8 *buf,
int oob_required, int page)
{
struct ar934x_nfc *nfc = chip->priv;
struct mtd_info *mtd = ar934x_nfc_to_mtd(nfc);
-#endif
int len;
int err;
@@ -934,18 +880,11 @@ static int ar934x_nfc_read_page_raw(
return 0;
}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)
-static int ar934x_nfc_read_page(struct mtd_info *mtd, struct nand_chip *chip,
- u8 *buf, int oob_required, int page)
-{
- struct ar934x_nfc *nfc = mtd_to_ar934x_nfc(mtd);
-#else
static int ar934x_nfc_read_page(struct nand_chip *chip,
u8 *buf, int oob_required, int page)
{
struct ar934x_nfc *nfc = chip->priv;
struct mtd_info *mtd = ar934x_nfc_to_mtd(nfc);
-#endif
u32 ecc_ctrl;
int max_bitflips = 0;
bool ecc_failed;
@@ -1014,20 +953,12 @@ static int ar934x_nfc_read_page(struct nand_chip *chip,
return max_bitflips;
}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)
-static int ar934x_nfc_write_page_raw(struct mtd_info *mtd,
- struct nand_chip *chip, const u8 *buf,
- int oob_required, int page)
-{
- struct ar934x_nfc *nfc = mtd_to_ar934x_nfc(mtd);
-#else
static int ar934x_nfc_write_page_raw(
struct nand_chip *chip, const u8 *buf,
int oob_required, int page)
{
struct ar934x_nfc *nfc = chip->priv;
struct mtd_info *mtd = ar934x_nfc_to_mtd(nfc);
-#endif
int len;
nfc_dbg(nfc, "write_page_raw: page:%d oob:%d\n", page, oob_required);
@@ -1043,18 +974,11 @@ static int ar934x_nfc_write_page_raw(
return ar934x_nfc_send_write(nfc, NAND_CMD_PAGEPROG, 0, page, len);
}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)
-static int ar934x_nfc_write_page(struct mtd_info *mtd, struct nand_chip *chip,
- const u8 *buf, int oob_required, int page)
-{
- struct ar934x_nfc *nfc = mtd_to_ar934x_nfc(mtd);
-#else
static int ar934x_nfc_write_page(struct nand_chip *chip,
const u8 *buf, int oob_required, int page)
{
struct ar934x_nfc *nfc = chip->priv;
struct mtd_info *mtd = ar934x_nfc_to_mtd(nfc);
-#endif
int err;
nfc_dbg(nfc, "write_page: page:%d oob:%d\n", page, oob_required);
@@ -1062,11 +986,7 @@ static int ar934x_nfc_write_page(struct nand_chip *chip,
/* write OOB first */
if (oob_required &&
!is_all_ff(chip->oob_poi, mtd->oobsize)) {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)
- err = ar934x_nfc_write_oob(mtd, chip, page);
-#else
err = ar934x_nfc_write_oob(chip, page);
-#endif
if (err)
return err;
}
@@ -1176,11 +1096,7 @@ static int ar934x_nfc_init_tail(struct mtd_info *mtd)
{
struct ar934x_nfc *nfc = mtd_to_ar934x_nfc(mtd);
struct nand_chip *chip = &nfc->nand_chip;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
- u64 chipsize = chip->chipsize;
-#else
u64 chipsize = nanddev_target_size(&chip->base);
-#endif
u32 ctrl;
u32 t;
int err;
@@ -1427,13 +1343,8 @@ static int ar934x_nfc_attach_chip(struct nand_chip *nand)
static u64 ar934x_nfc_dma_mask = DMA_BIT_MASK(32);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)
-static void ar934x_nfc_cmd_ctrl(struct mtd_info *mtd, int dat,
- unsigned int ctrl)
-#else
static void ar934x_nfc_cmd_ctrl(struct nand_chip *chip, int dat,
unsigned int ctrl)
-#endif
{
WARN_ON(dat != NAND_CMD_NONE);
}
@@ -1504,15 +1415,6 @@ static int ar934x_nfc_probe(struct platform_device *pdev)
nand_set_controller_data(nand, nfc);
nand_set_flash_node(nand, pdev->dev.of_node);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)
- nand->chip_delay = 25;
- nand->dev_ready = ar934x_nfc_dev_ready;
- nand->cmdfunc = ar934x_nfc_cmdfunc;
- nand->cmd_ctrl = ar934x_nfc_cmd_ctrl; /* dummy */
- nand->read_byte = ar934x_nfc_read_byte;
- nand->write_buf = ar934x_nfc_write_buf;
- nand->read_buf = ar934x_nfc_read_buf;
-#else
nand->legacy.chip_delay = 25;
nand->legacy.dev_ready = ar934x_nfc_dev_ready;
nand->legacy.cmdfunc = ar934x_nfc_cmdfunc;
@@ -1520,7 +1422,6 @@ static int ar934x_nfc_probe(struct platform_device *pdev)
nand->legacy.read_byte = ar934x_nfc_read_byte;
nand->legacy.write_buf = ar934x_nfc_write_buf;
nand->legacy.read_buf = ar934x_nfc_read_buf;
-#endif
nand->ecc.mode = NAND_ECC_HW; /* default */
nand->priv = nfc;
platform_set_drvdata(pdev, nfc);
@@ -1535,16 +1436,8 @@ static int ar934x_nfc_probe(struct platform_device *pdev)
goto err_free_buf;
}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 130)
- nand->dummy_controller.ops = &ar934x_nfc_controller_ops;
- ret = nand_scan(mtd, 1);
-#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)
- nand->dummy_controller.ops = &ar934x_nfc_controller_ops;
- ret = nand_scan(nand, 1);
-#else
nand->legacy.dummy_controller.ops = &ar934x_nfc_controller_ops;
ret = nand_scan(nand, 1);
-#endif
if (ret) {
dev_err(&pdev->dev, "nand_scan failed, err:%d\n", ret);
goto err_free_buf;
@@ -1566,9 +1459,6 @@ err_free_buf:
static int ar934x_nfc_remove(struct platform_device *pdev)
{
struct ar934x_nfc *nfc;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)
- struct mtd_info *mtd;
-#endif
nfc = platform_get_drvdata(pdev);
if (nfc) {
diff --git a/target/linux/ath79/files/drivers/mtd/nand/raw/nand_rb4xx.c b/target/linux/ath79/files/drivers/mtd/nand/raw/nand_rb4xx.c
index 382af09978..50bd69f6a4 100644
--- a/target/linux/ath79/files/drivers/mtd/nand/raw/nand_rb4xx.c
+++ b/target/linux/ath79/files/drivers/mtd/nand/raw/nand_rb4xx.c
@@ -81,15 +81,9 @@ static const struct mtd_ooblayout_ops rb4xx_nand_ecclayout_ops = {
.free = rb4xx_ooblayout_free,
};
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,20,0)
-static uint8_t rb4xx_nand_read_byte(struct mtd_info *mtd)
-{
- struct rb4xx_nand *nand = mtd->priv;
-#else
static u8 rb4xx_nand_read_byte(struct nand_chip *chip)
{
struct rb4xx_nand *nand = chip->priv;
-#endif
struct rb4xx_cpld *cpld = nand->cpld;
u8 data;
int ret;
@@ -101,45 +95,26 @@ static u8 rb4xx_nand_read_byte(struct nand_chip *chip)
return data;
}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,20,0)
-static void rb4xx_nand_write_buf(struct mtd_info *mtd, const uint8_t *buf,
- int len)
-{
- struct rb4xx_nand *nand = mtd->priv;
-#else
static void rb4xx_nand_write_buf(struct nand_chip *chip, const u8 *buf, int len)
{
struct rb4xx_nand *nand = chip->priv;
-#endif
struct rb4xx_cpld *cpld = nand->cpld;
cpld->write_nand(cpld, buf, len);
}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,20,0)
-static void rb4xx_nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)
-{
- struct rb4xx_nand *nand = mtd->priv;
-#else
static void rb4xx_nand_read_buf(struct nand_chip *chip, u8 *buf, int len)
{
struct rb4xx_nand *nand = chip->priv;
-#endif
struct rb4xx_cpld *cpld = nand->cpld;
cpld->read_nand(cpld, buf, len);
}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,20,0)
-static void rb4xx_nand_cmd_ctrl(struct mtd_info *mtd, int dat, unsigned int ctrl)
-{
- struct rb4xx_nand *nand = mtd->priv;
-#else
static void rb4xx_nand_cmd_ctrl(struct nand_chip *chip, int dat,
unsigned int ctrl)
{
struct rb4xx_nand *nand = chip->priv;
-#endif
struct rb4xx_cpld *cpld = nand->cpld;
u8 data = dat;
@@ -153,15 +128,9 @@ static void rb4xx_nand_cmd_ctrl(struct nand_chip *chip, int dat,
cpld->write_nand(cpld, &data, 1);
}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,20,0)
-static int rb4xx_nand_dev_ready(struct mtd_info *mtd)
-{
- struct rb4xx_nand *nand = mtd->priv;
-#else
static int rb4xx_nand_dev_ready(struct nand_chip *chip)
{
struct rb4xx_nand *nand = chip->priv;
-#endif
return gpiod_get_value_cansleep(nand->rdy);
}
@@ -224,20 +193,6 @@ static int rb4xx_nand_probe(struct platform_device *pdev)
nand->chip.options = NAND_NO_SUBPAGE_WRITE;
nand->chip.priv = nand;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,20,0)
- nand->chip.read_byte = rb4xx_nand_read_byte;
- nand->chip.write_buf = rb4xx_nand_write_buf;
- nand->chip.read_buf = rb4xx_nand_read_buf;
- nand->chip.cmd_ctrl = rb4xx_nand_cmd_ctrl;
- nand->chip.dev_ready = rb4xx_nand_dev_ready;
- nand->chip.chip_delay = 25;
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,19,130)
- ret = nand_scan(mtd, 1);
-#else
- ret = nand_scan(&nand->chip, 1);
-#endif
-#else
nand->chip.legacy.read_byte = rb4xx_nand_read_byte;
nand->chip.legacy.write_buf = rb4xx_nand_write_buf;
nand->chip.legacy.read_buf = rb4xx_nand_read_buf;
@@ -246,7 +201,6 @@ static int rb4xx_nand_probe(struct platform_device *pdev)
nand->chip.legacy.chip_delay = 25;
ret = nand_scan(&nand->chip, 1);
-#endif
if (ret)
return -ENXIO;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 07:09:47 +0000