Commit 87f39f04 authored by David Brownell's avatar David Brownell Committed by David Woodhouse

[MTD] support driver model updates

Follow-on patch to the previous driver model patch for the MTD
framework.  This one makes various MTD drivers connect to the
driver model tree, so /sys/devices/virtual/mtd/* nodes are no
longer present ... mostly drivers used on boards I have handy.

Based on a patch from Kay Sievers.
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 694bb7fc
...@@ -672,6 +672,8 @@ static int __devinit m25p_probe(struct spi_device *spi) ...@@ -672,6 +672,8 @@ static int __devinit m25p_probe(struct spi_device *spi)
flash->mtd.erasesize = info->sector_size; flash->mtd.erasesize = info->sector_size;
} }
flash->mtd.dev.parent = &spi->dev;
dev_info(&spi->dev, "%s (%lld Kbytes)\n", info->name, dev_info(&spi->dev, "%s (%lld Kbytes)\n", info->name,
(long long)flash->mtd.size >> 10); (long long)flash->mtd.size >> 10);
......
...@@ -664,6 +664,8 @@ add_dataflash_otp(struct spi_device *spi, char *name, ...@@ -664,6 +664,8 @@ add_dataflash_otp(struct spi_device *spi, char *name,
device->write = dataflash_write; device->write = dataflash_write;
device->priv = priv; device->priv = priv;
device->dev.parent = &spi->dev;
if (revision >= 'c') if (revision >= 'c')
otp_tag = otp_setup(device, revision); otp_tag = otp_setup(device, revision);
......
...@@ -115,6 +115,8 @@ static int __init omapflash_probe(struct platform_device *pdev) ...@@ -115,6 +115,8 @@ static int __init omapflash_probe(struct platform_device *pdev)
} }
info->mtd->owner = THIS_MODULE; info->mtd->owner = THIS_MODULE;
info->mtd->dev.parent = &pdev->dev;
#ifdef CONFIG_MTD_PARTITIONS #ifdef CONFIG_MTD_PARTITIONS
err = parse_mtd_partitions(info->mtd, part_probes, &info->parts, 0); err = parse_mtd_partitions(info->mtd, part_probes, &info->parts, 0);
if (err > 0) if (err > 0)
......
...@@ -147,6 +147,7 @@ static int physmap_flash_probe(struct platform_device *dev) ...@@ -147,6 +147,7 @@ static int physmap_flash_probe(struct platform_device *dev)
devices_found++; devices_found++;
} }
info->mtd[i]->owner = THIS_MODULE; info->mtd[i]->owner = THIS_MODULE;
info->mtd[i]->dev.parent = &dev->dev;
} }
if (devices_found == 1) { if (devices_found == 1) {
......
...@@ -224,6 +224,7 @@ static int platram_probe(struct platform_device *pdev) ...@@ -224,6 +224,7 @@ static int platram_probe(struct platform_device *pdev)
} }
info->mtd->owner = THIS_MODULE; info->mtd->owner = THIS_MODULE;
info->mtd->dev.parent = &pdev->dev;
platram_setrw(info, PLATRAM_RW); platram_setrw(info, PLATRAM_RW);
......
...@@ -343,6 +343,8 @@ static int __init nand_davinci_probe(struct platform_device *pdev) ...@@ -343,6 +343,8 @@ static int __init nand_davinci_probe(struct platform_device *pdev)
info->mtd.name = dev_name(&pdev->dev); info->mtd.name = dev_name(&pdev->dev);
info->mtd.owner = THIS_MODULE; info->mtd.owner = THIS_MODULE;
info->mtd.dev.parent = &pdev->dev;
info->chip.IO_ADDR_R = vaddr; info->chip.IO_ADDR_R = vaddr;
info->chip.IO_ADDR_W = vaddr; info->chip.IO_ADDR_W = vaddr;
info->chip.chip_delay = 0; info->chip.chip_delay = 0;
......
...@@ -866,6 +866,7 @@ static int __init mxcnd_probe(struct platform_device *pdev) ...@@ -866,6 +866,7 @@ static int __init mxcnd_probe(struct platform_device *pdev)
mtd = &host->mtd; mtd = &host->mtd;
mtd->priv = this; mtd->priv = this;
mtd->owner = THIS_MODULE; mtd->owner = THIS_MODULE;
mtd->dev.parent = &pdev->dev;
/* 50 us command delay time */ /* 50 us command delay time */
this->chip_delay = 5; this->chip_delay = 5;
......
...@@ -676,6 +676,8 @@ static int __devinit omap2_onenand_probe(struct platform_device *pdev) ...@@ -676,6 +676,8 @@ static int __devinit omap2_onenand_probe(struct platform_device *pdev)
c->mtd.priv = &c->onenand; c->mtd.priv = &c->onenand;
c->mtd.owner = THIS_MODULE; c->mtd.owner = THIS_MODULE;
c->mtd.dev.parent = &pdev->dev;
if (c->dma_channel >= 0) { if (c->dma_channel >= 0) {
struct onenand_chip *this = &c->onenand; struct onenand_chip *this = &c->onenand;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment