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

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

[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
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
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(-)

diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index 3d143fe..ebcf693 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -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);
-- 
1.8.1.5

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

[Jason Cooper]

On Mon, Dec 09, 2013 at 06:36:26PM -0300, Ezequiel Garcia wrote:
> 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
> Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>

Acked-by: Jason Cooper <jason@lakedaemon.net>

thx,

Jason.

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

[Ezequiel Garcia]

On Mon, Dec 09, 2013 at 04:40:35PM -0500, Jason Cooper wrote:
> On Mon, Dec 09, 2013 at 06:36:26PM -0300, Ezequiel Garcia wrote:
> > 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
> > Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> 
> Acked-by: Jason Cooper <jason@lakedaemon.net>
> 

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.
-- 
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com

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

[Brian Norris]

On Mon, Dec 09, 2013 at 06:36:26PM -0300, Ezequiel Garcia wrote:
> This reverts c0f3b8643a6fa2461d70760ec49d21d2b031d611.

Modified to say "partially reverts".

> 
> 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
> Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> ---
> 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

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

[Ezequiel Garcia]

Hi Brian,

On Thu, Dec 12, 2013 at 03:07:15PM -0800, Brian Norris wrote:
> On Mon, Dec 09, 2013 at 06:36:26PM -0300, Ezequiel Garcia wrote:
> > This reverts c0f3b8643a6fa2461d70760ec49d21d2b031d611.
> 
> Modified to say "partially reverts".
> 
> > 
> > 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
> > Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> > ---
> > 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?
-- 
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com

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

[Brian Norris]

Hi Ezequiel,

On Tue, Dec 17, 2013 at 09:42:45PM -0300, Ezequiel Garcia wrote:
> 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.

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.

> 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

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

[Ezequiel Garcia]

On Tue, Dec 17, 2013 at 11:12:58PM -0800, Brian Norris wrote:
> Hi Ezequiel,
> 
> On Tue, Dec 17, 2013 at 09:42:45PM -0300, Ezequiel Garcia wrote:
> > 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.
> 
> 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,
-- 
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com