From: rmallon@gmail.com (Ryan Mallon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 02/19] ARM: at91/at91x40: remove use of at91_sys_read/write
Date: Thu, 23 Feb 2012 14:59:01 +1100 [thread overview]
Message-ID: <4F45B985.1000204@gmail.com> (raw)
In-Reply-To: <20120223032503.GA20176@game.jcrosoft.org>
On 23/02/12 14:25, Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 09:22 Thu 23 Feb , Ryan Mallon wrote:
>> On 22/02/12 20:39, Nicolas Ferre wrote:
>>
>>> From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
>>>
>>> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
>>> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
>>> ---
>>> arch/arm/mach-at91/at91x40.c | 2 +-
>>> arch/arm/mach-at91/at91x40_time.c | 28 +++++++++++++++++-----------
>>> arch/arm/mach-at91/include/mach/at91x40.h | 18 +++++++++---------
>>> 3 files changed, 27 insertions(+), 21 deletions(-)
>>>
>>> diff --git a/arch/arm/mach-at91/at91x40.c b/arch/arm/mach-at91/at91x40.c
>>> index 0154b7f..5400a1d 100644
>>> --- a/arch/arm/mach-at91/at91x40.c
>>> +++ b/arch/arm/mach-at91/at91x40.c
>>> @@ -44,7 +44,7 @@ static void at91x40_idle(void)
>>> * Disable the processor clock. The processor will be automatically
>>> * re-enabled by an interrupt or by a reset.
>>> */
>>> - at91_sys_write(AT91_PS_CR, AT91_PS_CR_CPU);
>>> + __raw_writel(AT91_PS_CR_CPU, AT91_PS_CR);
>>
>>
>> This doesn't seem to be equivalent, at91_sys_write does:
>>
>> void __iomem *addr = (void __iomem *)AT91_VA_BASE_SYS;
>> __raw_writel(value, addr + reg_offset);
>>
>> and this patch doesn't redefine AT91_PS_CR. Was it broken before this
>> patch? What am I missing?
> this is right
> #define AT91_PS_CR (AT91_PS + 0) /* PS Control register */
That doesn't answer my question.
The old, at91_sys_write, version was writing to (using __raw_writel):
AT91_VA_BASE_SYS + AT91_PS_CR
The new version is writing, also using __raw_writel, to:
AT91_PS_CR
The value of AT91_PS_CR is not changed in this patch. Assuming that
AT91_VA_BASE_SYS for at91x40 (which at a quick glance it is not), then
the old and the new version of the code are not writing to the same
address.
Was it previously incorrect, or is it incorrect now?
~Ryan
next prev parent reply other threads:[~2012-02-23 3:59 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-22 9:39 [PATCH v2 00/19] at91 first cleanup series for 3.4 Nicolas Ferre
2012-02-22 9:39 ` [PATCH v2 01/19] ARM: at91: factorise duplicated at91sam9 idle Nicolas Ferre
2012-02-22 9:39 ` [PATCH v2 02/19] ARM: at91/at91x40: remove use of at91_sys_read/write Nicolas Ferre
2012-02-22 14:36 ` Arnd Bergmann
2012-02-22 16:26 ` Jean-Christophe PLAGNIOL-VILLARD
2012-02-22 22:22 ` Ryan Mallon
2012-02-23 3:25 ` Jean-Christophe PLAGNIOL-VILLARD
2012-02-23 3:59 ` Ryan Mallon [this message]
2012-02-23 6:01 ` Jean-Christophe PLAGNIOL-VILLARD
2012-02-23 9:23 ` Ryan Mallon
2012-02-22 9:39 ` [PATCH v2 03/19] ARM: at91: make matrix register base soc independent Nicolas Ferre
2012-02-22 22:17 ` Ryan Mallon
2012-02-23 3:26 ` Jean-Christophe PLAGNIOL-VILLARD
2012-02-22 9:39 ` [PATCH v2 04/19] ARM: at91: make ST (System Timer) " Nicolas Ferre
2012-02-22 22:24 ` Ryan Mallon
2012-02-22 9:39 ` [PATCH v2 05/19] ARM: at91/ST: remove not needed casts Nicolas Ferre
2012-02-22 22:24 ` Ryan Mallon
2012-02-22 9:39 ` [PATCH v2 06/19] ARM: at91/pm_slowclock: rename register to named define Nicolas Ferre
2012-02-22 9:50 ` Russell King - ARM Linux
2012-02-22 17:34 ` Jean-Christophe PLAGNIOL-VILLARD
2012-02-22 9:39 ` [PATCH v2 07/19] ARM: at91/pm_slowclock: function slow_clock() accepts parameters Nicolas Ferre
2012-02-22 9:52 ` Russell King - ARM Linux
2012-02-22 12:58 ` Jean-Christophe PLAGNIOL-VILLARD
2012-02-22 13:18 ` Russell King - ARM Linux
2012-02-22 13:57 ` Jean-Christophe PLAGNIOL-VILLARD
2012-02-22 9:39 ` [PATCH v2 08/19] ARM: at91: move at91rm9200 sdramc defines to at91rm9200_sdramc.h Nicolas Ferre
2012-02-22 9:39 ` [PATCH v2 09/19] ARM: at91: make sdram/ddr register base soc independent Nicolas Ferre
2012-02-22 22:33 ` Ryan Mallon
2012-02-23 8:56 ` Nicolas Ferre
2012-02-23 9:58 ` Nicolas Ferre
2012-02-23 10:51 ` Ryan Mallon
2012-02-23 13:47 ` Nicolas Ferre
2012-02-22 9:39 ` [PATCH v2 10/19] ARM: at91/pm_slowclock: add runtime detection of memory contoller Nicolas Ferre
2012-02-22 9:39 ` [PATCH v2 11/19] ARM: at91/PMC: make register base soc independent Nicolas Ferre
2012-02-22 22:50 ` Ryan Mallon
2012-02-23 8:38 ` Nicolas Ferre
2012-02-23 9:22 ` Ryan Mallon
2012-02-22 9:39 ` [PATCH v2 12/19] ARM: at91/rtc-at91sam9: each SoC can select the RTT device to use Nicolas Ferre
2012-02-22 14:50 ` Arnd Bergmann
2012-02-22 16:24 ` Jean-Christophe PLAGNIOL-VILLARD
2012-02-22 16:47 ` Arnd Bergmann
2012-02-22 17:07 ` Jean-Christophe PLAGNIOL-VILLARD
2012-02-22 17:25 ` Arnd Bergmann
2012-02-22 18:02 ` Jean-Christophe PLAGNIOL-VILLARD
2012-02-22 9:39 ` [PATCH v2 13/19] ARM: at91:rtc/rtc-at91sam9: ioremap register bank Nicolas Ferre
2012-02-22 9:39 ` [PATCH v2 14/19] ARM: at91/rtc-at91sam9: pass the GPBR to use via resources Nicolas Ferre
2012-02-22 9:39 ` [PATCH v2 15/19] ARM: at91: finally drop at91_sys_read/write Nicolas Ferre
2012-02-22 9:39 ` [PATCH v2 16/19] ARM: at91: merge SRAM Memory banks thanks to mirroring Nicolas Ferre
2012-02-22 23:13 ` Ryan Mallon
2012-02-23 3:28 ` Jean-Christophe PLAGNIOL-VILLARD
2012-02-22 9:39 ` [PATCH v2 17/19] Atmel: move console default platform_device to serial driver Nicolas Ferre
2012-02-22 9:39 ` [PATCH v2 18/19] ARM: at91/board-dt: drop default console Nicolas Ferre
2012-02-22 9:39 ` [PATCH v2 19/19] ARM: at91/board-dt: move at91_initialize() to init_irq() Nicolas Ferre
2012-02-22 9:48 ` Russell King - ARM Linux
2012-02-22 13:03 ` Jean-Christophe PLAGNIOL-VILLARD
2012-02-22 16:15 ` [PATCH 0/2] ARM: at91: two additional patches to cleanup series Nicolas Ferre
2012-02-22 16:15 ` [PATCH 1/2] ARM: at91: add at91sam9g25ek.dts in Makefile.boot Nicolas Ferre
2012-02-22 16:15 ` [PATCH 2/2] ARM: at91: properly sort dtb files " Nicolas Ferre
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=4F45B985.1000204@gmail.com \
--to=rmallon@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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 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).