[PATCH] mtd: brcmnand: Add support for v6.2 controllers

devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* [PATCH] mtd: brcmnand: Add support for v6.2 controllers
@ 2016-03-10 23:34 Florian Fainelli
       [not found] ` <1457652859-767-1-git-send-email-f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
  0 siblings, 1 reply; 4+ messages in thread
From: Florian Fainelli @ 2016-03-10 23:34 UTC (permalink / raw)
  To: linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
  Cc: Florian Fainelli, Kamal Dasu, Rob Herring, Pawel Moll,
	Mark Rutland, Ian Campbell, Kumar Gala, Brian Norris,
	David Woodhouse, Simon Arlott,
	open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
	open list, open list:BROADCOM STB NAND FLASH DRIVER

Document and match the brcm,brcmnand-v6.2 compatible string, the controller has
a register layout identical to the v6.0 version and supports prefetch. Update the
command shift logic to account for v6.2 controller which are the first ones to
use a shift of 0 (6.1 used a shift of 24).

Signed-off-by: Kamal Dasu <kdasu.kdev-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Signed-off-by: Florian Fainelli <f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt | 1 +
 drivers/mtd/nand/brcmnand/brcmnand.c                    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt
index c2546ced9c02..deb24cbdda82 100644
--- a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt
+++ b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt
@@ -24,6 +24,7 @@ Required properties:
                          brcm,brcmnand-v5.0
                          brcm,brcmnand-v6.0
                          brcm,brcmnand-v6.1
+                         brcm,brcmnand-v6.2
                          brcm,brcmnand-v7.0
                          brcm,brcmnand-v7.1
                          brcm,brcmnand
diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c
index e0528397306a..0b7a698cc233 100644
--- a/drivers/mtd/nand/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/brcmnand/brcmnand.c
@@ -601,7 +601,7 @@ static void brcmnand_wr_corr_thresh(struct brcmnand_host *host, u8 val)
 
 static inline int brcmnand_cmd_shift(struct brcmnand_controller *ctrl)
 {
-	if (ctrl->nand_version < 0x0700)
+	if (ctrl->nand_version < 0x0602)
 		return 24;
 	return 0;
 }
@@ -2115,6 +2115,7 @@ static const struct of_device_id brcmnand_of_match[] = {
 	{ .compatible = "brcm,brcmnand-v5.0" },
 	{ .compatible = "brcm,brcmnand-v6.0" },
 	{ .compatible = "brcm,brcmnand-v6.1" },
+	{ .compatible = "brcm,brcmnand-v6.2" },
 	{ .compatible = "brcm,brcmnand-v7.0" },
 	{ .compatible = "brcm,brcmnand-v7.1" },
 	{},
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply related	[flat|nested] 4+ messages in thread

[parent not found: <1457652859-767-1-git-send-email-f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>]

* Re: [PATCH] mtd: brcmnand: Add support for v6.2 controllers
       [not found] ` <1457652859-767-1-git-send-email-f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
@ 2016-03-18 16:40   ` Rob Herring
  2016-04-04  6:53   ` Brian Norris
  1 sibling, 0 replies; 4+ messages in thread
From: Rob Herring @ 2016-03-18 16:40 UTC (permalink / raw)
  To: Florian Fainelli
  Cc: linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Kamal Dasu,
	Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Brian Norris,
	David Woodhouse, Simon Arlott,
	open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
	open list, open list:BROADCOM STB NAND FLASH DRIVER

On Thu, Mar 10, 2016 at 03:34:16PM -0800, Florian Fainelli wrote:
> Document and match the brcm,brcmnand-v6.2 compatible string, the controller has
> a register layout identical to the v6.0 version and supports prefetch. Update the
> command shift logic to account for v6.2 controller which are the first ones to
> use a shift of 0 (6.1 used a shift of 24).
> 
> Signed-off-by: Kamal Dasu <kdasu.kdev-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Signed-off-by: Florian Fainelli <f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
>  Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt | 1 +
>  drivers/mtd/nand/brcmnand/brcmnand.c                    | 3 ++-
>  2 files changed, 3 insertions(+), 1 deletion(-)

Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] mtd: brcmnand: Add support for v6.2 controllers
       [not found] ` <1457652859-767-1-git-send-email-f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
  2016-03-18 16:40   ` Rob Herring
@ 2016-04-04  6:53   ` Brian Norris
  2016-04-04 21:48     ` Boris Brezillon
  1 sibling, 1 reply; 4+ messages in thread
From: Brian Norris @ 2016-04-04  6:53 UTC (permalink / raw)
  To: Florian Fainelli
  Cc: linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Kamal Dasu,
	Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
	David Woodhouse, Simon Arlott,
	open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
	open list, open list:BROADCOM STB NAND FLASH DRIVER,
	Boris Brezillon, Richard Weinberger

+ Boris, Richard

On Thu, Mar 10, 2016 at 03:34:16PM -0800, Florian Fainelli wrote:
> Document and match the brcm,brcmnand-v6.2 compatible string, the controller has
> a register layout identical to the v6.0 version and supports prefetch. Update the
> command shift logic to account for v6.2 controller which are the first ones to
> use a shift of 0 (6.1 used a shift of 24).

Ah yes, another blip in the ever-shifting register layout of this
controller. Fun!

> Signed-off-by: Kamal Dasu <kdasu.kdev-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Signed-off-by: Florian Fainelli <f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

Acked-by: Brian Norris <computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

> ---
>  Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt | 1 +
>  drivers/mtd/nand/brcmnand/brcmnand.c                    | 3 ++-
>  2 files changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt
> index c2546ced9c02..deb24cbdda82 100644
> --- a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt
> +++ b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt
> @@ -24,6 +24,7 @@ Required properties:
>                           brcm,brcmnand-v5.0
>                           brcm,brcmnand-v6.0
>                           brcm,brcmnand-v6.1
> +                         brcm,brcmnand-v6.2
>                           brcm,brcmnand-v7.0
>                           brcm,brcmnand-v7.1
>                           brcm,brcmnand
> diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c
> index e0528397306a..0b7a698cc233 100644
> --- a/drivers/mtd/nand/brcmnand/brcmnand.c
> +++ b/drivers/mtd/nand/brcmnand/brcmnand.c
> @@ -601,7 +601,7 @@ static void brcmnand_wr_corr_thresh(struct brcmnand_host *host, u8 val)
>  
>  static inline int brcmnand_cmd_shift(struct brcmnand_controller *ctrl)
>  {
> -	if (ctrl->nand_version < 0x0700)
> +	if (ctrl->nand_version < 0x0602)
>  		return 24;
>  	return 0;
>  }
> @@ -2115,6 +2115,7 @@ static const struct of_device_id brcmnand_of_match[] = {
>  	{ .compatible = "brcm,brcmnand-v5.0" },
>  	{ .compatible = "brcm,brcmnand-v6.0" },
>  	{ .compatible = "brcm,brcmnand-v6.1" },
> +	{ .compatible = "brcm,brcmnand-v6.2" },
>  	{ .compatible = "brcm,brcmnand-v7.0" },
>  	{ .compatible = "brcm,brcmnand-v7.1" },
>  	{},
> -- 
> 2.1.0
> 
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] mtd: brcmnand: Add support for v6.2 controllers
  2016-04-04  6:53   ` Brian Norris
@ 2016-04-04 21:48     ` Boris Brezillon
  0 siblings, 0 replies; 4+ messages in thread
From: Boris Brezillon @ 2016-04-04 21:48 UTC (permalink / raw)
  To: Brian Norris
  Cc: Florian Fainelli, linux-mtd, Kamal Dasu, Rob Herring, Pawel Moll,
	Mark Rutland, Ian Campbell, Kumar Gala, David Woodhouse,
	Simon Arlott,
	open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
	open list, open list:BROADCOM STB NAND FLASH DRIVER,
	Richard Weinberger

On Sun, 3 Apr 2016 23:53:53 -0700
Brian Norris <computersforpeace@gmail.com> wrote:

> + Boris, Richard
> 
> On Thu, Mar 10, 2016 at 03:34:16PM -0800, Florian Fainelli wrote:
> > Document and match the brcm,brcmnand-v6.2 compatible string, the controller has
> > a register layout identical to the v6.0 version and supports prefetch. Update the
> > command shift logic to account for v6.2 controller which are the first ones to
> > use a shift of 0 (6.1 used a shift of 24).
> 
> Ah yes, another blip in the ever-shifting register layout of this
> controller. Fun!
> 
> > Signed-off-by: Kamal Dasu <kdasu.kdev@gmail.com>
> > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
> 
> Acked-by: Brian Norris <computersforpeace@gmail.com>

Applied.

Thanks,

Boris

> 
> > ---
> >  Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt | 1 +
> >  drivers/mtd/nand/brcmnand/brcmnand.c                    | 3 ++-
> >  2 files changed, 3 insertions(+), 1 deletion(-)
> > 
> > diff --git a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt
> > index c2546ced9c02..deb24cbdda82 100644
> > --- a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt
> > +++ b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt
> > @@ -24,6 +24,7 @@ Required properties:
> >                           brcm,brcmnand-v5.0
> >                           brcm,brcmnand-v6.0
> >                           brcm,brcmnand-v6.1
> > +                         brcm,brcmnand-v6.2
> >                           brcm,brcmnand-v7.0
> >                           brcm,brcmnand-v7.1
> >                           brcm,brcmnand
> > diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c
> > index e0528397306a..0b7a698cc233 100644
> > --- a/drivers/mtd/nand/brcmnand/brcmnand.c
> > +++ b/drivers/mtd/nand/brcmnand/brcmnand.c
> > @@ -601,7 +601,7 @@ static void brcmnand_wr_corr_thresh(struct brcmnand_host *host, u8 val)
> >  
> >  static inline int brcmnand_cmd_shift(struct brcmnand_controller *ctrl)
> >  {
> > -	if (ctrl->nand_version < 0x0700)
> > +	if (ctrl->nand_version < 0x0602)
> >  		return 24;
> >  	return 0;
> >  }
> > @@ -2115,6 +2115,7 @@ static const struct of_device_id brcmnand_of_match[] = {
> >  	{ .compatible = "brcm,brcmnand-v5.0" },
> >  	{ .compatible = "brcm,brcmnand-v6.0" },
> >  	{ .compatible = "brcm,brcmnand-v6.1" },
> > +	{ .compatible = "brcm,brcmnand-v6.2" },
> >  	{ .compatible = "brcm,brcmnand-v7.0" },
> >  	{ .compatible = "brcm,brcmnand-v7.1" },
> >  	{},
> > -- 
> > 2.1.0
> > 



-- 
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-04-04 21:48 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-10 23:34 [PATCH] mtd: brcmnand: Add support for v6.2 controllers Florian Fainelli
     [not found] ` <1457652859-767-1-git-send-email-f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-03-18 16:40   ` Rob Herring
2016-04-04  6:53   ` Brian Norris
2016-04-04 21:48     ` Boris Brezillon

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).