aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/devices/m25p80.c2
-rw-r--r--drivers/mtd/devices/mtd_dataflash.c2
-rw-r--r--drivers/mtd/maps/omap_nor.c2
-rw-r--r--drivers/mtd/maps/physmap.c1
-rw-r--r--drivers/mtd/maps/plat-ram.c1
-rw-r--r--drivers/mtd/nand/davinci_nand.c2
-rw-r--r--drivers/mtd/nand/mxc_nand.c1
-rw-r--r--drivers/mtd/onenand/omap2.c2
8 files changed, 13 insertions, 0 deletions
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 98b0faf6696d..8185b1f3e5e6 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -672,6 +672,8 @@ static int __devinit m25p_probe(struct spi_device *spi)
672 flash->mtd.erasesize = info->sector_size; 672 flash->mtd.erasesize = info->sector_size;
673 } 673 }
674 674
675 flash->mtd.dev.parent = &spi->dev;
676
675 dev_info(&spi->dev, "%s (%lld Kbytes)\n", info->name, 677 dev_info(&spi->dev, "%s (%lld Kbytes)\n", info->name,
676 (long long)flash->mtd.size >> 10); 678 (long long)flash->mtd.size >> 10);
677 679
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
index d95f74a93bce..62dee54af0a5 100644
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
@@ -664,6 +664,8 @@ add_dataflash_otp(struct spi_device *spi, char *name,
664 device->write = dataflash_write; 664 device->write = dataflash_write;
665 device->priv = priv; 665 device->priv = priv;
666 666
667 device->dev.parent = &spi->dev;
668
667 if (revision >= 'c') 669 if (revision >= 'c')
668 otp_tag = otp_setup(device, revision); 670 otp_tag = otp_setup(device, revision);
669 671
diff --git a/drivers/mtd/maps/omap_nor.c b/drivers/mtd/maps/omap_nor.c
index 7e50e9b1b781..a24478102b11 100644
--- a/drivers/mtd/maps/omap_nor.c
+++ b/drivers/mtd/maps/omap_nor.c
@@ -115,6 +115,8 @@ static int __init omapflash_probe(struct platform_device *pdev)
115 } 115 }
116 info->mtd->owner = THIS_MODULE; 116 info->mtd->owner = THIS_MODULE;
117 117
118 info->mtd->dev.parent = &pdev->dev;
119
118#ifdef CONFIG_MTD_PARTITIONS 120#ifdef CONFIG_MTD_PARTITIONS
119 err = parse_mtd_partitions(info->mtd, part_probes, &info->parts, 0); 121 err = parse_mtd_partitions(info->mtd, part_probes, &info->parts, 0);
120 if (err > 0) 122 if (err > 0)
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index 229718222db7..29a901157352 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -147,6 +147,7 @@ static int physmap_flash_probe(struct platform_device *dev)
147 devices_found++; 147 devices_found++;
148 } 148 }
149 info->mtd[i]->owner = THIS_MODULE; 149 info->mtd[i]->owner = THIS_MODULE;
150 info->mtd[i]->dev.parent = &dev->dev;
150 } 151 }
151 152
152 if (devices_found == 1) { 153 if (devices_found == 1) {
diff --git a/drivers/mtd/maps/plat-ram.c b/drivers/mtd/maps/plat-ram.c
index e7dd9c8a965e..49c9ece76477 100644
--- a/drivers/mtd/maps/plat-ram.c
+++ b/drivers/mtd/maps/plat-ram.c
@@ -224,6 +224,7 @@ static int platram_probe(struct platform_device *pdev)
224 } 224 }
225 225
226 info->mtd->owner = THIS_MODULE; 226 info->mtd->owner = THIS_MODULE;
227 info->mtd->dev.parent = &pdev->dev;
227 228
228 platram_setrw(info, PLATRAM_RW); 229 platram_setrw(info, PLATRAM_RW);
229 230
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
index 81f7ecd23c60..0119220de7d0 100644
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@ -343,6 +343,8 @@ static int __init nand_davinci_probe(struct platform_device *pdev)
343 info->mtd.name = dev_name(&pdev->dev); 343 info->mtd.name = dev_name(&pdev->dev);
344 info->mtd.owner = THIS_MODULE; 344 info->mtd.owner = THIS_MODULE;
345 345
346 info->mtd.dev.parent = &pdev->dev;
347
346 info->chip.IO_ADDR_R = vaddr; 348 info->chip.IO_ADDR_R = vaddr;
347 info->chip.IO_ADDR_W = vaddr; 349 info->chip.IO_ADDR_W = vaddr;
348 info->chip.chip_delay = 0; 350 info->chip.chip_delay = 0;
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 21fd4f1c4806..bfde74a9ba6b 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -866,6 +866,7 @@ static int __init mxcnd_probe(struct platform_device *pdev)
866 mtd = &host->mtd; 866 mtd = &host->mtd;
867 mtd->priv = this; 867 mtd->priv = this;
868 mtd->owner = THIS_MODULE; 868 mtd->owner = THIS_MODULE;
869 mtd->dev.parent = &pdev->dev;
869 870
870 /* 50 us command delay time */ 871 /* 50 us command delay time */
871 this->chip_delay = 5; 872 this->chip_delay = 5;
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index 2c199b30ab58..f2e9de1414df 100644
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -676,6 +676,8 @@ static int __devinit omap2_onenand_probe(struct platform_device *pdev)
676 c->mtd.priv = &c->onenand; 676 c->mtd.priv = &c->onenand;
677 c->mtd.owner = THIS_MODULE; 677 c->mtd.owner = THIS_MODULE;
678 678
679 c->mtd.dev.parent = &pdev->dev;
680
679 if (c->dma_channel >= 0) { 681 if (c->dma_channel >= 0) {
680 struct onenand_chip *this = &c->onenand; 682 struct onenand_chip *this = &c->onenand;
681 683