forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mtd: lpc32xx_mlc: Cleanup after DT-only conversion

Browse source 
The LPC32xx's DT-only conversion of the MLC NAND driver makes NAND config via
platform_data obsolete. Dropped by this patch.

Further, the driver really needs CONFIG_OF, which is already reflected by the
dependency on ARCH_LPC32XX which depends on CONFIG_OF. So also dropping
CONFIG_OF ifdefs.

There is still platform_data necessary to supply the dma_filter callback for
the dma engine. This is a completely different data structure than the old
platform_data for NAND config, so renaming some old "pdata" variable to "ncfg"
to prevent confusion with the new platform data.

Signed-off-by: Roland Stigge <stigge@antcom.de>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Roland Stigge 2012-08-24 15:06:52 +02:00 • committed by David Woodhouse
parent 10594f6787
commit 62beee20b1
1 changed files with 17 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

44
drivers/mtd/nand/lpc32xx_mlc.c
View file

@ -621,43 +621,36 @@ out1:
return -ENXIO; return -ENXIO;
} }
#ifdef CONFIG_OF
static struct lpc32xx_nand_cfg_mlc *lpc32xx_parse_dt(struct device *dev) static struct lpc32xx_nand_cfg_mlc *lpc32xx_parse_dt(struct device *dev)
{ {
struct lpc32xx_nand_cfg_mlc *pdata; struct lpc32xx_nand_cfg_mlc *ncfg;
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); ncfg = devm_kzalloc(dev, sizeof(*ncfg), GFP_KERNEL);
if (!pdata) { if (!ncfg) {
dev_err(dev, "could not allocate memory for platform data\n"); dev_err(dev, "could not allocate memory for platform data\n");
return NULL; return NULL;
} }
of_property_read_u32(np, "nxp,tcea-delay", &pdata->tcea_delay); of_property_read_u32(np, "nxp,tcea-delay", &ncfg->tcea_delay);
of_property_read_u32(np, "nxp,busy-delay", &pdata->busy_delay); of_property_read_u32(np, "nxp,busy-delay", &ncfg->busy_delay);
of_property_read_u32(np, "nxp,nand-ta", &pdata->nand_ta); of_property_read_u32(np, "nxp,nand-ta", &ncfg->nand_ta);
of_property_read_u32(np, "nxp,rd-high", &pdata->rd_high); of_property_read_u32(np, "nxp,rd-high", &ncfg->rd_high);
of_property_read_u32(np, "nxp,rd-low", &pdata->rd_low); of_property_read_u32(np, "nxp,rd-low", &ncfg->rd_low);
of_property_read_u32(np, "nxp,wr-high", &pdata->wr_high); of_property_read_u32(np, "nxp,wr-high", &ncfg->wr_high);
of_property_read_u32(np, "nxp,wr-low", &pdata->wr_low); of_property_read_u32(np, "nxp,wr-low", &ncfg->wr_low);
if (!pdata->tcea_delay || !pdata->busy_delay || !pdata->nand_ta || if (!ncfg->tcea_delay || !ncfg->busy_delay || !ncfg->nand_ta ||
!pdata->rd_high || !pdata->rd_low || !pdata->wr_high || !ncfg->rd_high || !ncfg->rd_low || !ncfg->wr_high ||
!pdata->wr_low) { !ncfg->wr_low) {
dev_err(dev, "chip parameters not specified correctly\n"); dev_err(dev, "chip parameters not specified correctly\n");
return NULL; return NULL;
} }
pdata->wp_gpio = of_get_named_gpio(np, "gpios", 0); ncfg->wp_gpio = of_get_named_gpio(np, "gpios", 0);
return pdata; return ncfg;
} }
#else
static struct lpc32xx_nand_cfg_mlc *lpc32xx_parse_dt(struct device *dev)
{
return NULL;
}
#endif
/* /*
* Probe for NAND controller * Probe for NAND controller
@ -695,10 +688,9 @@ static int __devinit lpc32xx_nand_probe(struct platform_device *pdev)
nand_chip = &host->nand_chip; nand_chip = &host->nand_chip;
if (pdev->dev.of_node) if (pdev->dev.of_node)
host->ncfg = lpc32xx_parse_dt(&pdev->dev); host->ncfg = lpc32xx_parse_dt(&pdev->dev);
else
host->ncfg = pdev->dev.platform_data;
if (!host->ncfg) { if (!host->ncfg) {
dev_err(&pdev->dev, "Missing platform data\n"); dev_err(&pdev->dev,
"Missing or bad NAND config from device tree\n");
return -ENOENT; return -ENOENT;
} }
if (host->ncfg->wp_gpio == -EPROBE_DEFER) if (host->ncfg->wp_gpio == -EPROBE_DEFER)
@ -907,13 +899,11 @@ static int lpc32xx_nand_suspend(struct platform_device *pdev, pm_message_t pm)
#define lpc32xx_nand_suspend NULL #define lpc32xx_nand_suspend NULL
#endif #endif
#if defined(CONFIG_OF)
static const struct of_device_id lpc32xx_nand_match[] = { static const struct of_device_id lpc32xx_nand_match[] = {
{ .compatible = "nxp,lpc3220-mlc" }, { .compatible = "nxp,lpc3220-mlc" },
{ /* sentinel */ }, { /* sentinel */ },
}; };
MODULE_DEVICE_TABLE(of, lpc32xx_nand_match); MODULE_DEVICE_TABLE(of, lpc32xx_nand_match);
#endif
static struct platform_driver lpc32xx_nand_driver = { static struct platform_driver lpc32xx_nand_driver = {
.probe = lpc32xx_nand_probe, .probe = lpc32xx_nand_probe,