[PATCH 0/3] omap2: Assorted GPMC cleanups

[PATCH 0/3] omap2: Assorted GPMC cleanups

[Ezequiel Garcia]

(I'm CCing the MTD list, because GPMC is the memory controller
used for NOR, NAND and OneNAND devices).

Hi all,

Just a small patchset containing two small cleanups and a minor fix
for the GPMC memory controller. The first two are cleanups and can
be considered as preparation work for the fix.

The fix is patch 3/3: "Move legacy GPMC width setting". It makes
explicit use of the DT property "gpmc,device-width" and removes the
subsequent (and redundant) setting of the GPMC width, based in the
NAND bus widht.

Tested in AM335x (using DT) so I'd appreciate if someone can test using
a board-file, on a device with NAND flash.

Jon: If you happen to read this, I'd like if you could take a look at
patch 1/3, since you were the last to touch that part of the code.

Thanks!

Ezequiel Garcia (3):
  omap2: gpmc: Move initialization outside the gpmc_t condition
  omap2: gpmc: Introduce gpmc_set_legacy()
  omap2: gpmc: Move legacy GPMC width setting

 arch/arm/mach-omap2/gpmc-nand.c | 50 +++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 22 deletions(-)

-- 
1.8.1.5

[PATCH 1/3] omap2: gpmc: Move initialization outside the gpmc_t condition

[Ezequiel Garcia]

This commit moves a bunch of initialization previously enclosed
under a 'if (gpmc_t)' check, to be outside such condition.

These initializations are not related to gpmc_t (timings) in any way
so it's nonsense to enclose them under such check.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
 arch/arm/mach-omap2/gpmc-nand.c | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/arch/arm/mach-omap2/gpmc-nand.c b/arch/arm/mach-omap2/gpmc-nand.c
index 662c7fd..d66b856 100644
--- a/arch/arm/mach-omap2/gpmc-nand.c
+++ b/arch/arm/mach-omap2/gpmc-nand.c
@@ -98,32 +98,32 @@ int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data,
 			dev_err(dev, "Unable to set gpmc timings: %d\n", err);
 			return err;
 		}
+	}
 
-		if (gpmc_nand_data->of_node) {
-			gpmc_read_settings_dt(gpmc_nand_data->of_node, &s);
-		} else {
-			/* Enable RD PIN Monitoring Reg */
-			if (gpmc_nand_data->dev_ready) {
-				s.wait_on_read = true;
-				s.wait_on_write = true;
-			}
+	if (gpmc_nand_data->of_node) {
+		gpmc_read_settings_dt(gpmc_nand_data->of_node, &s);
+	} else {
+		/* Enable RD PIN Monitoring Reg */
+		if (gpmc_nand_data->dev_ready) {
+			s.wait_on_read = true;
+			s.wait_on_write = true;
 		}
+	}
 
-		s.device_nand = true;
+	s.device_nand = true;
 
-		if (gpmc_nand_data->devsize == NAND_BUSWIDTH_16)
-			s.device_width = GPMC_DEVWIDTH_16BIT;
-		else
-			s.device_width = GPMC_DEVWIDTH_8BIT;
+	if (gpmc_nand_data->devsize == NAND_BUSWIDTH_16)
+		s.device_width = GPMC_DEVWIDTH_16BIT;
+	else
+		s.device_width = GPMC_DEVWIDTH_8BIT;
 
-		err = gpmc_cs_program_settings(gpmc_nand_data->cs, &s);
-		if (err < 0)
-			goto out_free_cs;
+	err = gpmc_cs_program_settings(gpmc_nand_data->cs, &s);
+	if (err < 0)
+		goto out_free_cs;
 
-		err = gpmc_configure(GPMC_CONFIG_WP, 0);
-		if (err < 0)
-			goto out_free_cs;
-	}
+	err = gpmc_configure(GPMC_CONFIG_WP, 0);
+	if (err < 0)
+		goto out_free_cs;
 
 	gpmc_update_nand_reg(&gpmc_nand_data->reg, gpmc_nand_data->cs);
 
-- 
1.8.1.5

[PATCH 2/3] omap2: gpmc: Introduce gpmc_set_legacy()

[Ezequiel Garcia]

Introduce a helper function to complete the setting of some GPMC
parameters, only used when the gpmc is probed from a board file.
As such, it will go away once the DT conversion is completed.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
 arch/arm/mach-omap2/gpmc-nand.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/arch/arm/mach-omap2/gpmc-nand.c b/arch/arm/mach-omap2/gpmc-nand.c
index d66b856..9dd40e7 100644
--- a/arch/arm/mach-omap2/gpmc-nand.c
+++ b/arch/arm/mach-omap2/gpmc-nand.c
@@ -65,6 +65,17 @@ static bool gpmc_hwecc_bch_capable(enum omap_ecc ecc_opt)
 	return 1;
 }
 
+/* This function will go away once the device-tree convertion is complete */
+static void gpmc_set_legacy(struct omap_nand_platform_data *gpmc_nand_data,
+			    struct gpmc_settings *s)
+{
+	/* Enable RD PIN Monitoring Reg */
+	if (gpmc_nand_data->dev_ready) {
+		s->wait_on_read = true;
+		s->wait_on_write = true;
+	}
+}
+
 int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data,
 		   struct gpmc_timings *gpmc_t)
 {
@@ -100,15 +111,10 @@ int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data,
 		}
 	}
 
-	if (gpmc_nand_data->of_node) {
+	if (gpmc_nand_data->of_node)
 		gpmc_read_settings_dt(gpmc_nand_data->of_node, &s);
-	} else {
-		/* Enable RD PIN Monitoring Reg */
-		if (gpmc_nand_data->dev_ready) {
-			s.wait_on_read = true;
-			s.wait_on_write = true;
-		}
-	}
+	else
+		gpmc_set_legacy(gpmc_nand_data, &s);
 
 	s.device_nand = true;
 
-- 
1.8.1.5

[PATCH 3/3] omap2: gpmc: Move legacy GPMC width setting

[Ezequiel Garcia]

After the introduction of gpmc_set_legacy(), move the GPMC width setting
to be done inside it. Currently, in the DT probed case, this is (wrongly)
done twice: first at gpmc_read_settings_dt(), and then based in the
NAND width setting.
Fix this and use only the value obtained from the DT.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
 arch/arm/mach-omap2/gpmc-nand.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-omap2/gpmc-nand.c b/arch/arm/mach-omap2/gpmc-nand.c
index 9dd40e7..174caec 100644
--- a/arch/arm/mach-omap2/gpmc-nand.c
+++ b/arch/arm/mach-omap2/gpmc-nand.c
@@ -74,6 +74,11 @@ static void gpmc_set_legacy(struct omap_nand_platform_data *gpmc_nand_data,
 		s->wait_on_read = true;
 		s->wait_on_write = true;
 	}
+
+	if (gpmc_nand_data->devsize == NAND_BUSWIDTH_16)
+		s->device_width = GPMC_DEVWIDTH_16BIT;
+	else
+		s->device_width = GPMC_DEVWIDTH_8BIT;
 }
 
 int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data,
@@ -118,11 +123,6 @@ int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data,
 
 	s.device_nand = true;
 
-	if (gpmc_nand_data->devsize == NAND_BUSWIDTH_16)
-		s.device_width = GPMC_DEVWIDTH_16BIT;
-	else
-		s.device_width = GPMC_DEVWIDTH_8BIT;
-
 	err = gpmc_cs_program_settings(gpmc_nand_data->cs, &s);
 	if (err < 0)
 		goto out_free_cs;
-- 
1.8.1.5

Re: [PATCH 0/3] omap2: Assorted GPMC cleanups

[Ezequiel Garcia]

On Sun, Oct 27, 2013 at 09:51:45PM -0300, Ezequiel Garcia wrote:
> (I'm CCing the MTD list, because GPMC is the memory controller
> used for NOR, NAND and OneNAND devices).
> 
> Hi all,
> 
> Just a small patchset containing two small cleanups and a minor fix
> for the GPMC memory controller. The first two are cleanups and can
> be considered as preparation work for the fix.
> 
> The fix is patch 3/3: "Move legacy GPMC width setting". It makes
> explicit use of the DT property "gpmc,device-width" and removes the
> subsequent (and redundant) setting of the GPMC width, based in the
> NAND bus widht.
> 
> Tested in AM335x (using DT) so I'd appreciate if someone can test using
> a board-file, on a device with NAND flash.
> 
> Jon: If you happen to read this, I'd like if you could take a look at
> patch 1/3, since you were the last to touch that part of the code.
> 
> Thanks!
> 
> Ezequiel Garcia (3):
>   omap2: gpmc: Move initialization outside the gpmc_t condition
>   omap2: gpmc: Introduce gpmc_set_legacy()
>   omap2: gpmc: Move legacy GPMC width setting
> 
>  arch/arm/mach-omap2/gpmc-nand.c | 50 +++++++++++++++++++++++------------------
>  1 file changed, 28 insertions(+), 22 deletions(-)
> 

Any comments about this?

Pekon? Maybe you can comment or otherwise ack the patches?

Thanks!
-- 
Ezequiel García, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 0/3] omap2: Assorted GPMC cleanups

[Tony Lindgren]

* Ezequiel Garcia <ezequiel.garcia@free-electrons.com> [131027 17:52]:
> (I'm CCing the MTD list, because GPMC is the memory controller
> used for NOR, NAND and OneNAND devices).
> 
> Hi all,
> 
> Just a small patchset containing two small cleanups and a minor fix
> for the GPMC memory controller. The first two are cleanups and can
> be considered as preparation work for the fix.
> 
> The fix is patch 3/3: "Move legacy GPMC width setting". It makes
> explicit use of the DT property "gpmc,device-width" and removes the
> subsequent (and redundant) setting of the GPMC width, based in the
> NAND bus widht.

Thanks and sorry for the delay. Applying these all into branch
omap-for-v3.14/fixes-not-urgent.

Regards,

Tony
 
> Tested in AM335x (using DT) so I'd appreciate if someone can test using
> a board-file, on a device with NAND flash.
> 
> Jon: If you happen to read this, I'd like if you could take a look at
> patch 1/3, since you were the last to touch that part of the code.
> 
> Thanks!
> 
> Ezequiel Garcia (3):
>   omap2: gpmc: Move initialization outside the gpmc_t condition
>   omap2: gpmc: Introduce gpmc_set_legacy()
>   omap2: gpmc: Move legacy GPMC width setting
> 
>  arch/arm/mach-omap2/gpmc-nand.c | 50 +++++++++++++++++++++++------------------
>  1 file changed, 28 insertions(+), 22 deletions(-)
> 
> -- 
> 1.8.1.5
> 

Re: [PATCH 0/3] omap2: Assorted GPMC cleanups

[Ezequiel Garcia]

On Wed, Jan 08, 2014 at 11:18:37AM -0800, Tony Lindgren wrote:
> * Ezequiel Garcia <ezequiel.garcia@free-electrons.com> [131027 17:52]:
> > (I'm CCing the MTD list, because GPMC is the memory controller
> > used for NOR, NAND and OneNAND devices).
> > 
> > Hi all,
> > 
> > Just a small patchset containing two small cleanups and a minor fix
> > for the GPMC memory controller. The first two are cleanups and can
> > be considered as preparation work for the fix.
> > 
> > The fix is patch 3/3: "Move legacy GPMC width setting". It makes
> > explicit use of the DT property "gpmc,device-width" and removes the
> > subsequent (and redundant) setting of the GPMC width, based in the
> > NAND bus widht.
> 
> Thanks and sorry for the delay. Applying these all into branch
> omap-for-v3.14/fixes-not-urgent.
> 

No problem. I'll give this a test/review next week.

Do we still need the board-file (legacy) workaround in this patchset?
I was actually waiting for you to clean-up completely that, before
re-sending the series, without the board-file workaround.
-- 
Ezequiel García, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 0/3] omap2: Assorted GPMC cleanups

[Tony Lindgren]

* Ezequiel Garcia <ezequiel.garcia@free-electrons.com> [140108 15:39]:
> On Wed, Jan 08, 2014 at 11:18:37AM -0800, Tony Lindgren wrote:
> > * Ezequiel Garcia <ezequiel.garcia@free-electrons.com> [131027 17:52]:
> > > (I'm CCing the MTD list, because GPMC is the memory controller
> > > used for NOR, NAND and OneNAND devices).
> > > 
> > > Hi all,
> > > 
> > > Just a small patchset containing two small cleanups and a minor fix
> > > for the GPMC memory controller. The first two are cleanups and can
> > > be considered as preparation work for the fix.
> > > 
> > > The fix is patch 3/3: "Move legacy GPMC width setting". It makes
> > > explicit use of the DT property "gpmc,device-width" and removes the
> > > subsequent (and redundant) setting of the GPMC width, based in the
> > > NAND bus widht.
> > 
> > Thanks and sorry for the delay. Applying these all into branch
> > omap-for-v3.14/fixes-not-urgent.
> > 
> 
> No problem. I'll give this a test/review next week.
> 
> Do we still need the board-file (legacy) workaround in this patchset?
> I was actually waiting for you to clean-up completely that, before
> re-sending the series, without the board-file workaround.

Yes we still need it for a little bit longer.

Regards,

Tony