Skip to contentSkip to conversation

MTD: support driver model updates

PATCH In review David Brownell 3 participants 7 messages Mar 26, 2009 – Apr 1, 2009 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

PATCH 2/2 MTD: support driver model updates

From: David Brownell <[email protected]>

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.

---
 drivers/mtd/devices/m25p80.c        |    2 ++
 drivers/mtd/devices/mtd_dataflash.c |    2 ++
 drivers/mtd/maps/omap_nor.c         |    2 ++
 drivers/mtd/maps/physmap.c          |    1 +
 drivers/mtd/maps/plat-ram.c         |    1 +
 drivers/mtd/nand/davinci_nand.c     |    2 ++
 drivers/mtd/nand/mxc_nand.c         |    1 +
 drivers/mtd/onenand/omap2.c         |    2 ++
 8 files changed, 13 insertions(+)
drivers/mtd/devices/m25p80.c +2 -0
@@ -678,6 +678,8 @@ static int __devinit m25p_probe(struct s
 		flash->mtd.erasesize = info->sector_size;
 	}
 
+	flash->mtd.dev.parent = &spi->dev;
+
 	dev_info(&spi->dev, "%s (%lld Kbytes)\n", info->name,
 			(long long)flash->mtd.size >> 10);
 
drivers/mtd/devices/mtd_dataflash.c +2 -0
@@ -670,6 +670,8 @@ add_dataflash_otp(struct spi_device *spi
 	device->write = dataflash_write;
 	device->priv = priv;
 
+	device->dev.parent = &spi->dev;
+
 	if (revision >= 'c')
 		otp_tag = otp_setup(device, revision);
 
drivers/mtd/maps/omap_nor.c +2 -0
@@ -115,6 +115,8 @@ static int __init omapflash_probe(struct
 	}
 	info->mtd->owner = THIS_MODULE;
 
+	info->mtd->dev.parent = &pdev->dev;
+
 #ifdef CONFIG_MTD_PARTITIONS
 	err = parse_mtd_partitions(info->mtd, part_probes, &info->parts, 0);
 	if (err > 0)
drivers/mtd/maps/physmap.c +1 -0
@@ -147,6 +147,7 @@ static int physmap_flash_probe(struct pl
 			devices_found++;
 		}
 		info->mtd[i]->owner = THIS_MODULE;
+		info->mtd[i]->dev.parent = &dev->dev;
 	}
 
 	if (devices_found == 1) {
drivers/mtd/maps/plat-ram.c +1 -0
@@ -224,6 +224,7 @@ static int platram_probe(struct platform
 	}
 
 	info->mtd->owner = THIS_MODULE;
+	info->mtd->dev.parent = &pdev->dev;
 
 	platram_setrw(info, PLATRAM_RW);
 
drivers/mtd/nand/davinci_nand.c +2 -0
@@ -358,6 +358,8 @@ static int __init nand_davinci_probe(str
 	info->mtd.name		= dev_name(&pdev->dev);
 	info->mtd.owner		= THIS_MODULE;
 
+	info->mtd.dev.parent	= &pdev->dev;
+
 	info->chip.IO_ADDR_R	= vaddr;
 	info->chip.IO_ADDR_W	= vaddr;
 	info->chip.chip_delay	= 0;
drivers/mtd/nand/mxc_nand.c +1 -0
@@ -866,6 +866,7 @@ static int __init mxcnd_probe(struct pla
 	mtd = &host->mtd;
 	mtd->priv = this;
 	mtd->owner = THIS_MODULE;
+	mtd->dev.parent = &pdev->dev;
 
 	/* 50 us command delay time */
 	this->chip_delay = 5;
drivers/mtd/onenand/omap2.c +2 -0
@@ -672,6 +672,8 @@ static int __devinit omap2_onenand_probe
 	c->mtd.priv = &c->onenand;
 	c->mtd.owner = THIS_MODULE;
 
+	c->mtd.dev.parent = &pdev->dev;
+
 	if (c->dma_channel >= 0) {
 		struct onenand_chip *this = &c->onenand;
 
#2 lore raw
Quoted 8 lines · David Brownell

From: David Brownell <[email protected]>

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.

...

drivers/mtd/nand/mxc_nand.c static int __init mxcnd_probe(struct pla · line 869

Quoted 7 lines
drivers/mtd/nand/mxc_nand.c +1 -0
@@ -866,6 +866,7 @@ static int __init mxcnd_probe(struct pla
 	mtd = &host->mtd;
 	mtd->priv = this;
 	mtd->owner = THIS_MODULE;
+	mtd->dev.parent = &pdev->dev;

Could this be done for all NANDs in nand_base.c instead?

Signature · 2 lines
Best regards,
Artem Bityutskiy (Битюцкий Артём)
#3 lore raw
Quoted 9 lines · Artem Bityutskiy

drivers/mtd/nand/mxc_nand.c static int __init mxcnd_probe(struct pla · line 869

Quoted 7 lines
drivers/mtd/nand/mxc_nand.c +1 -0
@@ -866,6 +866,7 @@ static int __init mxcnd_probe(struct pla
       mtd = &host->mtd;
       mtd->priv = this;
       mtd->owner = THIS_MODULE;
+     mtd->dev.parent = &pdev->dev;

Could this be done for all NANDs in nand_base.c instead?

By adding the device as a parameter to nand_scan(), and presumably nand_scan_ident() ... which is a more invasive API change, and would require a "flag day" to convert all drivers.

My default assumption for API changes is to avoid flag days. They can be done, yes, but I don't see a compelling reason to choose one here.

- Dave

#4 lore raw
Quoted 11 lines · David Brownell
Quoted 9 lines · Artem Bityutskiy

drivers/mtd/nand/mxc_nand.c static int __init mxcnd_probe(struct pla · line 869

Quoted 7 lines
drivers/mtd/nand/mxc_nand.c +1 -0
@@ -866,6 +866,7 @@ static int __init mxcnd_probe(struct pla
      mtd = &host->mtd;
      mtd->priv = this;
      mtd->owner = THIS_MODULE;
+     mtd->dev.parent = &pdev->dev;

Could this be done for all NANDs in nand_base.c instead?

Quoted 8 lines

By adding the device as a parameter to nand_scan(), and presumably nand_scan_ident() ... which is a more invasive API change, and would require a "flag day" to convert all drivers.

My default assumption for API changes is to avoid flag days. They can be done, yes, but I don't see a compelling reason to choose one here.

OK. MTD long needs sysfs, and I'm very happy with this patches, even though they are not 100% complete. Good start anyway.

Signature · 2 lines
Best regards,
Artem Bityutskiy (Битюцкий Артём)
#5 lore raw
Quoted 5 lines · Artem Bityutskiy

OK. MTD long needs sysfs, and I'm very happy with this patches, even though they are not 100% complete. Good start anyway.

Thanks. I'll expect someone to handle getting these merged through the MTD tree, then.

And I'll be rather surprised if no more attributes appear by the time this gets to mainline! :)

- Dave

#6 lore raw
Quoted 9 lines · David Brownell
Quoted 5 lines · Artem Bityutskiy

OK. MTD long needs sysfs, and I'm very happy with this patches, even though they are not 100% complete. Good start anyway.

Thanks. I'll expect someone to handle getting these merged through the MTD tree, then.

David Woodhouse maintains the MTD tree. He saw your patches, not sure when he takes them.

Quoted 2 lines

And I'll be rather surprised if no more attributes appear by the time this gets to mainline! :)

If he merges them during this merge window, then this might not be the case :-)

Signature · 2 lines
Best regards,
Artem Bityutskiy (Битюцкий Артём)