From: Jon Hunter <jon-hunter@ti.com>
To: Mark Jackson <mpfj-list@mimc.co.uk>
Cc: linux-omap@vger.kernel.org, Tony Lindgren <tony@atomide.com>
Subject: Re: [PATCH v2] ARM: OMAP: Clear GPMC bits when applying new setting.
Date: Wed, 6 Mar 2013 16:53:11 -0600 [thread overview]
Message-ID: <5137C8D7.8010209@ti.com> (raw)
In-Reply-To: <5137C592.6070503@ti.com>
On 03/06/2013 04:39 PM, Jon Hunter wrote:
>
> On 03/05/2013 04:13 AM, Mark Jackson wrote:
>> When setting the GPMC device type, make sure any previous
>> bits are cleared down, before applying the new setting.
>>
>> Signed-off-by: Mark Jackson <mpfj@newflow.co.uk>
>> ---
>> Changes in v2:
>> - Change mux type to 2 bits
>> - Add extra mux types in gpmc.h
>>
>> arch/arm/mach-omap2/gpmc.c | 4 ++++
>> arch/arm/mach-omap2/gpmc.h | 5 ++++-
>> 2 files changed, 8 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
>> index 410e1ba..479369c 100644
>> --- a/arch/arm/mach-omap2/gpmc.c
>> +++ b/arch/arm/mach-omap2/gpmc.c
>> @@ -613,6 +613,10 @@ int gpmc_cs_configure(int cs, int cmd, int wval)
>>
>> case GPMC_CONFIG_DEV_TYPE:
>> regval = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1);
>> + /* clear 4 target bits */
>> + regval &= ~(GPMC_CONFIG1_DEVICETYPE(3) |
>> + GPMC_CONFIG1_MUXTYPE(3));
>> + /* set the proper value */
>> regval |= GPMC_CONFIG1_DEVICETYPE(wval);
>> if (wval == GPMC_DEVICETYPE_NOR)
>> regval |= GPMC_CONFIG1_MUXADDDATA;
>> diff --git a/arch/arm/mach-omap2/gpmc.h b/arch/arm/mach-omap2/gpmc.h
>> index fe0a844..f79cbde 100644
>> --- a/arch/arm/mach-omap2/gpmc.h
>> +++ b/arch/arm/mach-omap2/gpmc.h
>> @@ -58,7 +58,10 @@
>> #define GPMC_CONFIG1_DEVICESIZE_16 GPMC_CONFIG1_DEVICESIZE(1)
>> #define GPMC_CONFIG1_DEVICETYPE(val) ((val & 3) << 10)
>> #define GPMC_CONFIG1_DEVICETYPE_NOR GPMC_CONFIG1_DEVICETYPE(0)
>> -#define GPMC_CONFIG1_MUXADDDATA (1 << 9)
>> +#define GPMC_CONFIG1_MUXTYPE(val) ((val & 3) << 8)
>> +#define GPMC_CONFIG1_MUXNONMUX GPMC_CONFIG1_MUXTYPE(0)
>> +#define GPMC_CONFIG1_MUXAAD GPMC_CONFIG1_MUXTYPE(1)
>> +#define GPMC_CONFIG1_MUXADDDATA GPMC_CONFIG1_MUXTYPE(2)
>> #define GPMC_CONFIG1_TIME_PARA_GRAN (1 << 4)
>> #define GPMC_CONFIG1_FCLK_DIV(val) (val & 3)
>> #define GPMC_CONFIG1_FCLK_DIV2 (GPMC_CONFIG1_FCLK_DIV(1))
>
> Thanks for updating. I do plan to get rid of the part of the
> gpmc_cs_configure() function [1]. However, I will pull in and based my
> series on top of this.
Just updated changelog to add a comment about the change in
the bit fields in case anyone asks ...
>From 476acdd9049badc3971b1f1f3df200748dd9a196 Mon Sep 17 00:00:00 2001
From: Mark Jackson <mpfj-list@mimc.co.uk>
Date: Tue, 5 Mar 2013 10:13:40 +0000
Subject: [PATCH] ARM: OMAP: Clear GPMC bits when applying new setting.
When setting the GPMC device type, make sure any previous
bits are cleared down, before applying the new setting.
For OMAP4+ devices MUXADDDATA is a 2-bit field (bits 9:8)
where as for OMAP2/3 devices it was only a one bit field
(bit 9). For OMAP2/3 devices bit 8 is reserved and the
OMAP documentation says to write a 0 to this bit. So
clearing bit 8 on OMAP2/3 devices should not be a problem.
Hence update the code to handle both bits 8 and 9 for all
devices.
Signed-off-by: Mark Jackson <mpfj@newflow.co.uk>
[jon-hunter@ti.com: updated changelog]
Signed-off-by: Jon Hunter <jon-hunter@ti.com>
---
arch/arm/mach-omap2/gpmc.c | 4 ++++
arch/arm/mach-omap2/gpmc.h | 5 ++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index 410e1ba..479369c 100644
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -613,6 +613,10 @@ int gpmc_cs_configure(int cs, int cmd, int wval)
case GPMC_CONFIG_DEV_TYPE:
regval = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1);
+ /* clear 4 target bits */
+ regval &= ~(GPMC_CONFIG1_DEVICETYPE(3) |
+ GPMC_CONFIG1_MUXTYPE(3));
+ /* set the proper value */
regval |= GPMC_CONFIG1_DEVICETYPE(wval);
if (wval == GPMC_DEVICETYPE_NOR)
regval |= GPMC_CONFIG1_MUXADDDATA;
diff --git a/arch/arm/mach-omap2/gpmc.h b/arch/arm/mach-omap2/gpmc.h
index fe0a844..f79cbde 100644
--- a/arch/arm/mach-omap2/gpmc.h
+++ b/arch/arm/mach-omap2/gpmc.h
@@ -58,7 +58,10 @@
#define GPMC_CONFIG1_DEVICESIZE_16 GPMC_CONFIG1_DEVICESIZE(1)
#define GPMC_CONFIG1_DEVICETYPE(val) ((val & 3) << 10)
#define GPMC_CONFIG1_DEVICETYPE_NOR GPMC_CONFIG1_DEVICETYPE(0)
-#define GPMC_CONFIG1_MUXADDDATA (1 << 9)
+#define GPMC_CONFIG1_MUXTYPE(val) ((val & 3) << 8)
+#define GPMC_CONFIG1_MUXNONMUX GPMC_CONFIG1_MUXTYPE(0)
+#define GPMC_CONFIG1_MUXAAD GPMC_CONFIG1_MUXTYPE(1)
+#define GPMC_CONFIG1_MUXADDDATA GPMC_CONFIG1_MUXTYPE(2)
#define GPMC_CONFIG1_TIME_PARA_GRAN (1 << 4)
#define GPMC_CONFIG1_FCLK_DIV(val) (val & 3)
#define GPMC_CONFIG1_FCLK_DIV2 (GPMC_CONFIG1_FCLK_DIV(1))
--
1.7.10.4
prev parent reply other threads:[~2013-03-06 22:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-05 10:13 [PATCH v2] ARM: OMAP: Clear GPMC bits when applying new setting Mark Jackson
2013-03-06 22:39 ` Jon Hunter
2013-03-06 22:53 ` Jon Hunter [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5137C8D7.8010209@ti.com \
--to=jon-hunter@ti.com \
--cc=linux-omap@vger.kernel.org \
--cc=mpfj-list@mimc.co.uk \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.