From: marek.vasut@gmail.com (Marek Vasut)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 01/13] ARM: pxa: Introduce pxa[23]xx_map_io
Date: Sun, 10 Oct 2010 20:16:44 +0200 [thread overview]
Message-ID: <201010102016.44962.marek.vasut@gmail.com> (raw)
In-Reply-To: <4CB16D75.7030707@compulab.co.il>
Dne Ne 10. ??jna 2010 09:38:29 Igor Grinberg napsal(a):
> Hi Marek,
>
> On 10/10/10 00:39, Marek Vasut wrote:
> > This patch introduces pxa2xx_map_io() and pxa3xx_map_io() to distinguish
> > between PXA2xx and PXA3xx memory mapping.
> >
> > Also, fixup for platforms broken after introducing pxa2xx_map_io() and
> > pxa3xx_map_io() is included.
> >
> > Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> > ---
> > diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
> > index 1cd99cb..3fa9c02 100644
> > --- a/arch/arm/mach-pxa/spitz.c
> > +++ b/arch/arm/mach-pxa/spitz.c
> > @@ -27,6 +27,7 @@
> >
> > #include <linux/mtd/sharpsl.h>
> > #include <linux/input/matrix_keypad.h>
> > #include <linux/regulator/machine.h>
> >
> > +#include <linux/io.h>
> >
> > #include <asm/setup.h>
> > #include <asm/mach-types.h>
> >
> > @@ -44,6 +45,7 @@
> >
> > #include <mach/pxa2xx_spi.h>
> > #include <mach/spitz.h>
> > #include <mach/sharpsl_pm.h>
> >
> > +#include <mach/pxa-smemc.h>
> >
> > #include <plat/i2c.h>
> >
> > @@ -930,8 +932,8 @@ static void spitz_poweroff(void)
> >
> > static void spitz_restart(char mode, const char *cmd)
> > {
> >
> > /* Bootloader magic for a reboot */
> >
> > - if ((MSC0 & 0xffff0000) == 0x7ff00000)
> > - MSC0 = (MSC0 & 0xffff) | 0x7ee00000;
> > + if ((__raw_readl(MSC0) & 0xffff0000) == 0x7ff00000)
> > + __raw_writel((__raw_readl(MSC0) & 0xffff) | 0x7ee00000, MSC0);
>
> I believe, this is not related to the subject...
Thanks a lot, I got this fixed in my tree, will send a v2.
prev parent reply other threads:[~2010-10-10 18:16 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-09 22:39 [PATCH 01/13] ARM: pxa: Introduce pxa[23]xx_map_io Marek Vasut
2010-10-09 22:39 ` [PATCH 02/13] ARM: pxa: Access SMEMC via virtual addresses Marek Vasut
2010-10-10 0:31 ` Haojian Zhuang
2010-10-10 2:03 ` Marek Vasut
2010-10-09 22:39 ` [PATCH 03/13] ARM: pxa: Toradex Colibri PXA270 CF support Marek Vasut
2010-10-09 22:39 ` [PATCH 04/13] ARM: pxa: Push Colibri evalboard MFP into module files Marek Vasut
2010-10-09 22:39 ` [PATCH 05/13] ARM: pxa: Add M41T00 RTC support into Colibri evalboard Marek Vasut
2010-10-09 22:39 ` [PATCH 06/13] ARM: pxa: Rename " Marek Vasut
2010-10-09 22:39 ` [PATCH 07/13] ARM: pxa: Colibri PXA320 PCMCIA driver Marek Vasut
2010-10-09 22:39 ` [PATCH 08/13] ARM: pxa: Modularize Palm Tungsten|C Marek Vasut
2010-10-09 22:39 ` [PATCH 09/13] UCB1400: Pass ucb1400-gpio data through ac97 bus Marek Vasut
2010-10-09 22:39 ` [PATCH 10/13] ARM: pxa: Correct touch IRQ passing to UCB1400 on vpac270 Marek Vasut
2010-10-09 22:39 ` [PATCH 11/13] ARM: pxa: Pass GPIO offset to ucb1400-gpio on PalmTC Marek Vasut
2010-10-09 22:39 ` [PATCH 12/13] ARM: pxa: Add gpio-leds and vibrator support to PalmTC Marek Vasut
2010-10-10 0:34 ` Haojian Zhuang
2010-10-10 2:04 ` Marek Vasut
2010-10-09 22:39 ` [PATCH 13/13] ARM: pxa: Fix pxa2xx-flash section mismatch Marek Vasut
2010-10-10 0:32 ` Haojian Zhuang
2010-10-10 2:05 ` Marek Vasut
2010-10-10 7:38 ` [PATCH 01/13] ARM: pxa: Introduce pxa[23]xx_map_io Igor Grinberg
2010-10-10 18:16 ` Marek Vasut [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=201010102016.44962.marek.vasut@gmail.com \
--to=marek.vasut@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).