Skip to contentSkip to conversation

Partially revert "mtd: nand: pxa3xx: Introduce 'marvell, armada370-nand' compatible string"

PATCH New Ezequiel Garcia 3 participants 7 messages Dec 9, 2013 – Dec 18, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Partially revert "mtd: nand: pxa3xx: Introduce 'marvell, armada370-nand' compatible string"

This reverts c0f3b8643a6fa2461d70760ec49d21d2b031d611.

The "armada370-nand" compatible support is not complete, and it was mistake to add it. Revert it and pospone the support until the infrastructure is in place.

Cc stable at vger.kernel.org

---
Note this won't apply to v3.12 as it is, although fixing it should be easy.

 drivers/mtd/nand/pxa3xx_nand.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/mtd/nand/pxa3xx_nand.c +0 -4
index 3d143fe..ebcf693 100644
@@ -333,10 +333,6 @@ static struct of_device_id pxa3xx_nand_dt_ids[] = {
 		.compatible = "marvell,pxa3xx-nand",
 		.data       = (void *)PXA3XX_NAND_VARIANT_PXA,
 	},
-	{
-		.compatible = "marvell,armada370-nand",
-		.data       = (void *)PXA3XX_NAND_VARIANT_ARMADA370,
-	},
 	{}
 };
 MODULE_DEVICE_TABLE(of, pxa3xx_nand_dt_ids);
Signature · 1 line
1.8.1.5
#1 lore raw

PATCH 1/1 Partially revert "mtd: nand: pxa3xx: Introduce 'marvell,armada370-nand' compatible string"

Quoted 8 lines · Ezequiel Garcia

This reverts c0f3b8643a6fa2461d70760ec49d21d2b031d611.

The "armada370-nand" compatible support is not complete, and it was mistake to add it. Revert it and pospone the support until the infrastructure is in place.

Cc stable at vger.kernel.org

thx,

Jason.

#2 lore raw

PATCH 1/1 Partially revert "mtd: nand: pxa3xx: Introduce 'marvell,armada370-nand' compatible string"

Quoted 12 lines · Jason Cooper
Quoted 8 lines · Ezequiel Garcia

This reverts c0f3b8643a6fa2461d70760ec49d21d2b031d611.

The "armada370-nand" compatible support is not complete, and it was mistake to add it. Revert it and pospone the support until the infrastructure is in place.

Cc stable at vger.kernel.org

Brian:

What are your plans regarding this? Where will you be merging it?

As soon as you take this somewhere, I'll send another one adding the compatible back, for v3.14.

Signature · 3 lines
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com
#3 lore raw

PATCH 1/1 Partially revert "mtd: nand: pxa3xx: Introduce 'marvell,armada370-nand' compatible string"

In reply to Ezequiel Garcia
Quoted 1 line · Ezequiel Garcia

This reverts c0f3b8643a6fa2461d70760ec49d21d2b031d611.

Modified to say "partially reverts".

Quoted 9 lines

The "armada370-nand" compatible support is not complete, and it was mistake to add it. Revert it and pospone the support until the infrastructure is in place.

Cc stable at vger.kernel.org

---
Note this won't apply to v3.12 as it is, although fixing it should be easy.

Pushed this patch to linux-mtd.git, noting -stable for 3.12+.

Ezequiel,

Please double-check linux-mtd.git to ensure it fits your liking.

Brian

#4 lore raw

PATCH 1/1 Partially revert "mtd: nand: pxa3xx: Introduce 'marvell,armada370-nand' compatible string"

Hi Brian,

Quoted 10 lines · Brian Norris
Quoted 1 line · Ezequiel Garcia

This reverts c0f3b8643a6fa2461d70760ec49d21d2b031d611.

Modified to say "partially reverts".

Quoted 5 lines

The "armada370-nand" compatible support is not complete, and it was mistake to add it. Revert it and pospone the support until the infrastructure is in place.

Quoted 7 lines
Quoted 4 lines
Cc stable at vger.kernel.org

---
Note this won't apply to v3.12 as it is, although fixing it should be easy.

Pushed this patch to linux-mtd.git, noting -stable for 3.12+.

Just to have some context, this compatible was removed because it was wrongly added and it doesn't belong at v3.12 and v3.13.

Now the revert is in place in v3.13-rc4 and it should be queued for v3.12.x, so we are good. Thanks for taking care of it!

On the other side, all the work needed for the driver to work OK on Armada 370/XP SoC is already in l2-mtd.git master, and I have some fixes ready to support 2048B pages.

In conclusion, I think it's safe to add the compatible on top of such work, and queue it for v3.14.

How should I send a patch to re-add this compatible? Do you plan to rebase l2-mtd.git master on top of v3.13-rc4 or so?

Signature · 3 lines
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com
#5 lore raw

PATCH 1/1 Partially revert "mtd: nand: pxa3xx: Introduce 'marvell,armada370-nand' compatible string"

Hi Ezequiel,

Quoted 6 lines · Ezequiel Garcia

Just to have some context, this compatible was removed because it was wrongly added and it doesn't belong at v3.12 and v3.13.

Now the revert is in place in v3.13-rc4 and it should be queued for v3.12.x, so we are good. Thanks for taking care of it!

Quoted 6 lines

On the other side, all the work needed for the driver to work OK on Armada 370/XP SoC is already in l2-mtd.git master, and I have some fixes ready to support 2048B pages.

In conclusion, I think it's safe to add the compatible on top of such work, and queue it for v3.14.

Let's get any last patches in, and add the compatible string last. Please resend any remaining patches, since I think you have at least one which you mislabeled as necessary for 3.13.

Quoted 2 lines

How should I send a patch to re-add this compatible? Do you plan to rebase l2-mtd.git master on top of v3.13-rc4 or so?

l2-mtd.git is currently rebased on top of the last changes I sent to Linus, so you can send any patches off the current tree. If I rebase onto -rc4, that shouldn't make any difference to your changes.

Brian

#6 lore raw

PATCH 1/1 Partially revert "mtd: nand: pxa3xx: Introduce 'marvell,armada370-nand' compatible string"

Quoted 13 lines · Brian Norris

Hi Ezequiel,

Quoted 10 lines · Ezequiel Garcia

Just to have some context, this compatible was removed because it was wrongly added and it doesn't belong at v3.12 and v3.13.

Now the revert is in place in v3.13-rc4 and it should be queued for v3.12.x, so we are good. Thanks for taking care of it!

On the other side, all the work needed for the driver to work OK on Armada 370/XP SoC is already in l2-mtd.git master, and I have some fixes ready to support 2048B pages.

Quoted 7 lines
Quoted 2 lines

In conclusion, I think it's safe to add the compatible on top of such work, and queue it for v3.14.

Let's get any last patches in, and add the compatible string last. Please resend any remaining patches, since I think you have at least one which you mislabeled as necessary for 3.13.

OK, I've just submitted the patches for 3.14. FWIW, I don't have any other pending stuff for this driver, except the re-adding the compatible.

Thanks,

Signature · 3 lines
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com