leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zynq: mtd: nand: Move zynq nand driver to driver model

Browse Source 
Move the zynq nand driver to driver model. Select DM_MTD if
zynq nand controller (NAND_ZYNQ) is selected.

Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Ashok Reddy Soma 2019-12-27 04:47:12 -07:00 committed by Michal Simek
parent c352f1e121
commit 45397a6ea3
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -281,6 +281,7 @@ endif
config NAND_ZYNQ config NAND_ZYNQ
bool "Support for Zynq Nand controller" bool "Support for Zynq Nand controller"
select SYS_NAND_SELF_INIT select SYS_NAND_SELF_INIT
select DM_MTD
imply CMD_NAND imply CMD_NAND
help help
This enables Nand driver support for Nand flash controller This enables Nand driver support for Nand flash controller

44
drivers/mtd/nand/raw/zynq_nand.c
View File

@ -17,6 +17,7 @@
#include <linux/mtd/nand_ecc.h> #include <linux/mtd/nand_ecc.h>
#include <asm/arch/hardware.h> #include <asm/arch/hardware.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <dm.h>
/* The NAND flash driver defines */ /* The NAND flash driver defines */
#define ZYNQ_NAND_CMD_PHASE 1 #define ZYNQ_NAND_CMD_PHASE 1
@ -124,18 +125,23 @@ struct zynq_nand_smc_regs {
ZYNQ_SMC_BASEADDR) ZYNQ_SMC_BASEADDR)
/* /*
* struct zynq_nand_info - Defines the NAND flash driver instance * struct nand_config - Defines the NAND flash driver instance
* @parts: Pointer to the mtd_partition structure * @parts: Pointer to the mtd_partition structure
* @nand_base: Virtual address of the NAND flash device * @nand_base: Virtual address of the NAND flash device
* @end_cmd_pending: End command is pending * @end_cmd_pending: End command is pending
* @end_cmd: End command * @end_cmd: End command
*/ */
struct zynq_nand_info { struct nand_config {
void __iomem *nand_base; void __iomem *nand_base;
u8 end_cmd_pending; u8 end_cmd_pending;
u8 end_cmd; u8 end_cmd;
}; };
struct zynq_nand_info {
struct udevice *dev;
struct nand_chip nand_chip;
};
/* /*
* struct zynq_nand_command_format - Defines NAND flash command format * struct zynq_nand_command_format - Defines NAND flash command format
* @start_cmd: First cycle command (Start command) * @start_cmd: First cycle command (Start command)
@ -782,7 +788,7 @@ static void zynq_nand_cmd_function(struct mtd_info *mtd, unsigned int command,
struct nand_chip *chip = mtd->priv; struct nand_chip *chip = mtd->priv;
const struct zynq_nand_command_format *curr_cmd = NULL; const struct zynq_nand_command_format *curr_cmd = NULL;
u8 addr_cycles = 0; u8 addr_cycles = 0;
struct zynq_nand_info *xnand = (struct zynq_nand_info *)chip->priv; struct nand_config *xnand = (struct nand_config *)chip->priv;
void *cmd_addr; void *cmd_addr;
unsigned long cmd_data = 0; unsigned long cmd_data = 0;
unsigned long cmd_phase_addr = 0; unsigned long cmd_phase_addr = 0;
@ -1046,9 +1052,11 @@ static int zynq_nand_check_is_16bit_bw_flash(void)
return is_16bit_bw; return is_16bit_bw;
} }
static int zynq_nand_init(struct nand_chip *nand_chip, int devnum) static int zynq_nand_probe(struct udevice *dev)
{ {
struct zynq_nand_info *xnand; struct zynq_nand_info *zynq = dev_get_priv(dev);
struct nand_chip *nand_chip = &zynq->nand_chip;
struct nand_config *xnand;
struct mtd_info *mtd; struct mtd_info *mtd;
unsigned long ecc_page_size; unsigned long ecc_page_size;
u8 maf_id, dev_id, i; u8 maf_id, dev_id, i;
@ -1059,7 +1067,7 @@ static int zynq_nand_init(struct nand_chip *nand_chip, int devnum)
int err = -1; int err = -1;
int is_16bit_bw; int is_16bit_bw;
xnand = calloc(1, sizeof(struct zynq_nand_info)); xnand = calloc(1, sizeof(struct nand_config));
if (!xnand) { if (!xnand) {
printf("%s: failed to allocate\n", __func__); printf("%s: failed to allocate\n", __func__);
goto fail; goto fail;
@ -1235,7 +1243,7 @@ static int zynq_nand_init(struct nand_chip *nand_chip, int devnum)
printf("%s: nand_scan_tail failed\n", __func__); printf("%s: nand_scan_tail failed\n", __func__);
goto fail; goto fail;
} }
if (nand_register(devnum, mtd)) if (nand_register(0, mtd))
goto fail; goto fail;
return 0; return 0;
fail: fail:
@ -1243,12 +1251,26 @@ fail:
return err; return err;
} }
static struct nand_chip nand_chip[CONFIG_SYS_MAX_NAND_DEVICE]; static const struct udevice_id zynq_nand_dt_ids[] = {
{.compatible = "arm,pl353-smc-r2p1",},
{ /* sentinel */ }
};
U_BOOT_DRIVER(zynq_nand) = {
.name = "zynq-nand",
.id = UCLASS_MTD,
.of_match = zynq_nand_dt_ids,
.probe = zynq_nand_probe,
.priv_auto_alloc_size = sizeof(struct zynq_nand_info),
};
void board_nand_init(void) void board_nand_init(void)
{ {
struct nand_chip *nand = &nand_chip[0]; struct udevice *dev;
int ret;
if (zynq_nand_init(nand, 0)) ret = uclass_get_device_by_driver(UCLASS_MTD,
puts("ZYNQ NAND init failed\n"); DM_GET_DRIVER(zynq_nand), &dev);
if (ret && ret != -ENODEV)
pr_err("Failed to initialize %s. (error %d)\n", dev->name, ret);
} }