diff mbox series

[v4,5/6] arm: dts: pxa: use reworked NAND controller driver

Message ID 20180219223557.2458-6-miquel.raynal@bootlin.com
State Accepted
Delegated to: Boris Brezillon
Headers show
Series Use the reworked Marvell NAND controller with all boards | expand

Commit Message

Miquel Raynal Feb. 19, 2018, 10:35 p.m. UTC 
Use the new bindings of the reworked Marvell NAND controller driver.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
 arch/arm/boot/dts/pxa3xx.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Boris Brezillon Feb. 22, 2018, 9:46 a.m. UTC | #1 
+Arnd and the LAKML

Hi Miquel,

Please try to Cc the LAKML and the arm-soc maintainers when you send DT
changes.

Arnd, Robert, I'd like to apply this patch through the MTD tree since
it depends on patch 1 of this series ("mtd: nand: use Marvell reworked
NAND controller driver with all platforms").
Otherwise, I can leave it to Robert for 4.18.

Let me know what you prefer.

Thanks,

Boris

On Mon, 19 Feb 2018 23:35:56 +0100
Miquel Raynal <miquel.raynal@bootlin.com> wrote:

> Use the new bindings of the reworked Marvell NAND controller driver.
> 
> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
> ---
>  arch/arm/boot/dts/pxa3xx.dtsi | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
> index 55c75b67351c..982d1a62661d 100644
> --- a/arch/arm/boot/dts/pxa3xx.dtsi
> +++ b/arch/arm/boot/dts/pxa3xx.dtsi
> @@ -117,15 +117,15 @@
>  			status = "disabled";
>  		};
>  
> -		nand0: nand@43100000 {
> -			compatible = "marvell,pxa3xx-nand";
> +		nand_controller: nand-controller@43100000 {
> +			compatible = "marvell,pxa3xx-nand-controller";
>  			reg = <0x43100000 90>;
>  			interrupts = <45>;
>  			clocks = <&clks CLK_NAND>;
>  			dmas = <&pdma 97 3>;
>  			dma-names = "data";
>  			#address-cells = <1>;
> -			#size-cells = <1>;	
> +			#size-cells = <0>;
>  			status = "disabled";
>  		};
>
Robert Jarzmik Feb. 27, 2018, 8:09 p.m. UTC | #2 
Boris Brezillon <boris.brezillon@bootlin.com> writes:

> +Arnd and the LAKML
>
> Hi Miquel,
>
> Please try to Cc the LAKML and the arm-soc maintainers when you send DT
> changes.
>
> Arnd, Robert, I'd like to apply this patch through the MTD tree since
> it depends on patch 1 of this series ("mtd: nand: use Marvell reworked
> NAND controller driver with all platforms").
> Otherwise, I can leave it to Robert for 4.18.

This one looks conflict free, so I have no objection if you carry it through
your tree.

Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>

Cheers.

--
Robert
Boris Brezillon Feb. 27, 2018, 8:42 p.m. UTC | #3 
Hi Robert,

On Tue, 27 Feb 2018 21:09:51 +0100
Robert Jarzmik <robert.jarzmik@free.fr> wrote:

> Boris Brezillon <boris.brezillon@bootlin.com> writes:
> 
> > +Arnd and the LAKML
> >
> > Hi Miquel,
> >
> > Please try to Cc the LAKML and the arm-soc maintainers when you send DT
> > changes.
> >
> > Arnd, Robert, I'd like to apply this patch through the MTD tree since
> > it depends on patch 1 of this series ("mtd: nand: use Marvell reworked
> > NAND controller driver with all platforms").
> > Otherwise, I can leave it to Robert for 4.18.  
> 
> This one looks conflict free, so I have no objection if you carry it through
> your tree.

Already prepared an immutable branch with all patches of this series
for you to pull in the pxa tree:

The following changes since commit 7928b2cbe55b2a410a0f5c1f154610059c57b1b2:

  Linux 4.16-rc1 (2018-02-11 15:04:29 -0800)

are available in the git repository at:

  git://git.infradead.org/linux-mtd.git nand/pxa3xx-removal

for you to fetch changes up to fa4d26b6f00e2c3460c2cc070f467c74d163bf40:

  MAINTAINERS: remove entry for deleted pxa3xx_nand driver (2018-02-23 22:12:15 +0100)

----------------------------------------------------------------
Miquel Raynal (6):
      mtd: nand: use Marvell reworked NAND controller driver with all platforms
      mtd: nand: remove deprecated pxa3xx_nand driver
      mtd: nand: remove useless fields from pxa3xx NAND platform data
      dt-bindings: mtd: remove pxa3xx NAND controller documentation
      arm: dts: pxa: use reworked NAND controller driver
      MAINTAINERS: remove entry for deleted pxa3xx_nand driver

 Documentation/devicetree/bindings/mtd/pxa3xx-nand.txt |   50 -
 MAINTAINERS                                           |    6 -
 arch/arm/boot/dts/pxa3xx.dtsi                         |    6 +-
 arch/arm/configs/cm_x300_defconfig                    |    2 +-
 arch/arm/configs/pxa3xx_defconfig                     |    3 +-
 arch/arm/configs/pxa_defconfig                        |    2 +-
 arch/arm/configs/raumfeld_defconfig                   |    2 +-
 arch/arm/mach-mmp/ttc_dkb.c                           |    4 +-
 arch/arm/mach-pxa/cm-x300.c                           |    8 +-
 arch/arm/mach-pxa/colibri-pxa3xx.c                    |    8 +-
 arch/arm/mach-pxa/colibri.h                           |    2 +-
 arch/arm/mach-pxa/littleton.c                         |   10 +-
 arch/arm/mach-pxa/mxm8x10.c                           |   10 +-
 arch/arm/mach-pxa/raumfeld.c                          |    6 +-
 arch/arm/mach-pxa/zylonite.c                          |   10 +-
 drivers/mtd/nand/Kconfig                              |   11 -
 drivers/mtd/nand/Makefile                             |    1 -
 drivers/mtd/nand/marvell_nand.c                       |    3 +-
 drivers/mtd/nand/pxa3xx_nand.c                        | 2105 ------------------------------------------
 include/linux/platform_data/mtd-nand-pxa3xx.h         |   43 +-
 20 files changed, 43 insertions(+), 2249 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/mtd/pxa3xx-nand.txt
 delete mode 100644 drivers/mtd/nand/pxa3xx_nand.c


> 
> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>

Unfortunately I didn't have your ack when I prepared the branch, so it's
not there. Let me know if this is a problem.

Regards,

Boris
Robert Jarzmik Feb. 27, 2018, 10 p.m. UTC | #4 
Boris Brezillon <boris.brezillon@bootlin.com> writes:

>> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
>
> Unfortunately I didn't have your ack when I prepared the branch, so it's
> not there. Let me know if this is a problem.
No it's not.

Cheers.
Miquel Raynal March 1, 2018, 9:04 a.m. UTC | #5 
Hi Robert,

On Tue, 27 Feb 2018 21:42:45 +0100, Boris Brezillon
<boris.brezillon@bootlin.com> wrote:

> Hi Robert,
> 
> On Tue, 27 Feb 2018 21:09:51 +0100
> Robert Jarzmik <robert.jarzmik@free.fr> wrote:
> 
> > Boris Brezillon <boris.brezillon@bootlin.com> writes:
> >   
> > > +Arnd and the LAKML
> > >
> > > Hi Miquel,
> > >
> > > Please try to Cc the LAKML and the arm-soc maintainers when you send DT
> > > changes.
> > >
> > > Arnd, Robert, I'd like to apply this patch through the MTD tree since
> > > it depends on patch 1 of this series ("mtd: nand: use Marvell reworked
> > > NAND controller driver with all platforms").
> > > Otherwise, I can leave it to Robert for 4.18.    
> > 
> > This one looks conflict free, so I have no objection if you carry it through
> > your tree.  
> 
> Already prepared an immutable branch with all patches of this series
> for you to pull in the pxa tree:
> 
> The following changes since commit 7928b2cbe55b2a410a0f5c1f154610059c57b1b2:
> 
>   Linux 4.16-rc1 (2018-02-11 15:04:29 -0800)
> 
> are available in the git repository at:
> 
>   git://git.infradead.org/linux-mtd.git nand/pxa3xx-removal
> 
> for you to fetch changes up to fa4d26b6f00e2c3460c2cc070f467c74d163bf40:
> 
>   MAINTAINERS: remove entry for deleted pxa3xx_nand driver (2018-02-23 22:12:15 +0100)
> 

As you may know, this commit:

    mtd: nand: remove useless fields from pxa3xx NAND platform data

currently breaks linux-next build as I forgot to patch files in the
mach-mmp directory.

I sent a fix for that yesterday to linux-arm-kernel@ and Boris:

    arm: mmp: Fix build issue due to PXA NAND pdata structure changes

but maybe, it would be better to squash the fix directly in Boris'
immutable branch if you did not pull it already?

Thanks and sorry for the mistake,
Miquèl
Boris Brezillon March 1, 2018, 4:57 p.m. UTC | #6 
On Thu, 1 Mar 2018 10:04:46 +0100
Miquel Raynal <miquel.raynal@bootlin.com> wrote:

> Hi Robert,
> 
> On Tue, 27 Feb 2018 21:42:45 +0100, Boris Brezillon
> <boris.brezillon@bootlin.com> wrote:
> 
> > Hi Robert,
> > 
> > On Tue, 27 Feb 2018 21:09:51 +0100
> > Robert Jarzmik <robert.jarzmik@free.fr> wrote:
> >   
> > > Boris Brezillon <boris.brezillon@bootlin.com> writes:
> > >     
> > > > +Arnd and the LAKML
> > > >
> > > > Hi Miquel,
> > > >
> > > > Please try to Cc the LAKML and the arm-soc maintainers when you send DT
> > > > changes.
> > > >
> > > > Arnd, Robert, I'd like to apply this patch through the MTD tree since
> > > > it depends on patch 1 of this series ("mtd: nand: use Marvell reworked
> > > > NAND controller driver with all platforms").
> > > > Otherwise, I can leave it to Robert for 4.18.      
> > > 
> > > This one looks conflict free, so I have no objection if you carry it through
> > > your tree.    
> > 
> > Already prepared an immutable branch with all patches of this series
> > for you to pull in the pxa tree:
> > 
> > The following changes since commit 7928b2cbe55b2a410a0f5c1f154610059c57b1b2:
> > 
> >   Linux 4.16-rc1 (2018-02-11 15:04:29 -0800)
> > 
> > are available in the git repository at:
> > 
> >   git://git.infradead.org/linux-mtd.git nand/pxa3xx-removal
> > 
> > for you to fetch changes up to fa4d26b6f00e2c3460c2cc070f467c74d163bf40:
> > 
> >   MAINTAINERS: remove entry for deleted pxa3xx_nand driver (2018-02-23 22:12:15 +0100)
> >   
> 
> As you may know, this commit:
> 
>     mtd: nand: remove useless fields from pxa3xx NAND platform data
> 
> currently breaks linux-next build as I forgot to patch files in the
> mach-mmp directory.
> 
> I sent a fix for that yesterday to linux-arm-kernel@ and Boris:
> 
>     arm: mmp: Fix build issue due to PXA NAND pdata structure changes
> 
> but maybe, it would be better to squash the fix directly in Boris'
> immutable branch if you did not pull it already?

I guess Miquel meant squash it into the commit introducing the
regression ("mtd: nand: remove useless fields from pxa3xx NAND platform
data"), and I agree, if you haven't pulled the branch yet, I'd prefer to
create a new one addressing the issue. I could also add your Acked-by
at the same time ;-).

Thanks,

Boris
Robert Jarzmik March 1, 2018, 8:46 p.m. UTC | #7 
Boris Brezillon <boris.brezillon@bootlin.com> writes:

> On Thu, 1 Mar 2018 10:04:46 +0100
> Miquel Raynal <miquel.raynal@bootlin.com> wrote:
> I guess Miquel meant squash it into the commit introducing the
> regression ("mtd: nand: remove useless fields from pxa3xx NAND platform
> data"), and I agree, if you haven't pulled the branch yet, I'd prefer to
> create a new one addressing the issue. I could also add your Acked-by
> at the same time ;-).
Lucky you, I was going to pull this Saturday, you still can make that change.

Cheers.
Boris Brezillon March 5, 2018, 5:46 p.m. UTC | #8 
On Thu, 01 Mar 2018 21:46:18 +0100
Robert Jarzmik <robert.jarzmik@free.fr> wrote:

> Boris Brezillon <boris.brezillon@bootlin.com> writes:
> 
> > On Thu, 1 Mar 2018 10:04:46 +0100
> > Miquel Raynal <miquel.raynal@bootlin.com> wrote:
> > I guess Miquel meant squash it into the commit introducing the
> > regression ("mtd: nand: remove useless fields from pxa3xx NAND platform
> > data"), and I agree, if you haven't pulled the branch yet, I'd prefer to
> > create a new one addressing the issue. I could also add your Acked-by
> > at the same time ;-).  
> Lucky you, I was going to pull this Saturday, you still can make that change.

Here is the new PR:

The following changes since commit 7928b2cbe55b2a410a0f5c1f154610059c57b1b2:

  Linux 4.16-rc1 (2018-02-11 15:04:29 -0800)

are available in the git repository at:

  git://git.infradead.org/linux-mtd.git tags/nand/pxa3xx-removal

for you to fetch changes up to 048a4663a2a4b1b784f1c284d30873901148f009:

  MAINTAINERS: remove entry for deleted pxa3xx_nand driver (2018-03-02 22:46:39 +0100)

----------------------------------------------------------------
Remove the pxa3xx_nand driver (replaced by marvell_nand).

----------------------------------------------------------------
Miquel Raynal (6):
      mtd: nand: use Marvell reworked NAND controller driver with all platforms
      mtd: nand: remove deprecated pxa3xx_nand driver
      mtd: nand: remove useless fields from pxa3xx NAND platform data
      dt-bindings: mtd: remove pxa3xx NAND controller documentation
      arm: dts: pxa: use reworked NAND controller driver
      MAINTAINERS: remove entry for deleted pxa3xx_nand driver

 Documentation/devicetree/bindings/mtd/pxa3xx-nand.txt |   50 -
 MAINTAINERS                                           |    6 -
 arch/arm/boot/dts/pxa3xx.dtsi                         |    6 +-
 arch/arm/configs/cm_x300_defconfig                    |    2 +-
 arch/arm/configs/pxa3xx_defconfig                     |    3 +-
 arch/arm/configs/pxa_defconfig                        |    2 +-
 arch/arm/configs/raumfeld_defconfig                   |    2 +-
 arch/arm/mach-mmp/aspenite.c                          |    6 +-
 arch/arm/mach-mmp/ttc_dkb.c                           |    9 +-
 arch/arm/mach-pxa/cm-x300.c                           |    8 +-
 arch/arm/mach-pxa/colibri-pxa3xx.c                    |    8 +-
 arch/arm/mach-pxa/colibri.h                           |    2 +-
 arch/arm/mach-pxa/littleton.c                         |   10 +-
 arch/arm/mach-pxa/mxm8x10.c                           |   10 +-
 arch/arm/mach-pxa/raumfeld.c                          |    6 +-
 arch/arm/mach-pxa/zylonite.c                          |   10 +-
 drivers/mtd/nand/Kconfig                              |   11 -
 drivers/mtd/nand/Makefile                             |    1 -
 drivers/mtd/nand/marvell_nand.c                       |    3 +-
 drivers/mtd/nand/pxa3xx_nand.c                        | 2105 ------------------------------------------
 include/linux/platform_data/mtd-nand-pxa3xx.h         |   43 +-
 21 files changed, 46 insertions(+), 2257 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/mtd/pxa3xx-nand.txt
 delete mode 100644 drivers/mtd/nand/pxa3xx_nand.c
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
index 55c75b67351c..982d1a62661d 100644
--- a/arch/arm/boot/dts/pxa3xx.dtsi
+++ b/arch/arm/boot/dts/pxa3xx.dtsi
@@ -117,15 +117,15 @@ 
 			status = "disabled";
 		};
 
-		nand0: nand@43100000 {
-			compatible = "marvell,pxa3xx-nand";
+		nand_controller: nand-controller@43100000 {
+			compatible = "marvell,pxa3xx-nand-controller";
 			reg = <0x43100000 90>;
 			interrupts = <45>;
 			clocks = <&clks CLK_NAND>;
 			dmas = <&pdma 97 3>;
 			dma-names = "data";
 			#address-cells = <1>;
-			#size-cells = <1>;	
+			#size-cells = <0>;
 			status = "disabled";
 		};