From: Pawel Moll <pawel.moll@arm.com>
To: Mike Turquette <mturquette@ti.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>
Subject: Re: linux-next: manual merge of the clk tree with the arm-soc tree
Date: Tue, 30 Oct 2012 10:39:14 +0000 [thread overview]
Message-ID: <1351593554.2831.8.camel@hornet> (raw)
In-Reply-To: <20121030101140.18780.69840@nucleus>
On Tue, 2012-10-30 at 10:11 +0000, Mike Turquette wrote:
> > diff --cc arch/arm/include/asm/hardware/sp810.h
> > index 2cdcf44,afd7e91..0000000
> > --- a/arch/arm/include/asm/hardware/sp810.h
> > +++ b/arch/arm/include/asm/hardware/sp810.h
> > @@@ -50,6 -50,14 +50,8 @@@
> > #define SCPCELLID2 0xFF8
> > #define SCPCELLID3 0xFFC
> >
> > -#define SCCTRL_TIMEREN0SEL_REFCLK (0 << 15)
> > -#define SCCTRL_TIMEREN0SEL_TIMCLK (1 << 15)
> > -
> > -#define SCCTRL_TIMEREN1SEL_REFCLK (0 << 17)
> > -#define SCCTRL_TIMEREN1SEL_TIMCLK (1 << 17)
> > -
> > + #define SCCTRL_TIMERENnSEL_SHIFT(n) (15 + ((n) * 2))
> > +
> > static inline void sysctl_soft_reset(void __iomem *base)
> > {
> > /* switch to slow mode */
>
> Pawel,
>
> Does this look OK for you?
Yes, it's correct.
Thanks!
Paweł
WARNING: multiple messages have this Message-ID (diff)
From: pawel.moll@arm.com (Pawel Moll)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the clk tree with the arm-soc tree
Date: Tue, 30 Oct 2012 10:39:14 +0000 [thread overview]
Message-ID: <1351593554.2831.8.camel@hornet> (raw)
In-Reply-To: <20121030101140.18780.69840@nucleus>
On Tue, 2012-10-30 at 10:11 +0000, Mike Turquette wrote:
> > diff --cc arch/arm/include/asm/hardware/sp810.h
> > index 2cdcf44,afd7e91..0000000
> > --- a/arch/arm/include/asm/hardware/sp810.h
> > +++ b/arch/arm/include/asm/hardware/sp810.h
> > @@@ -50,6 -50,14 +50,8 @@@
> > #define SCPCELLID2 0xFF8
> > #define SCPCELLID3 0xFFC
> >
> > -#define SCCTRL_TIMEREN0SEL_REFCLK (0 << 15)
> > -#define SCCTRL_TIMEREN0SEL_TIMCLK (1 << 15)
> > -
> > -#define SCCTRL_TIMEREN1SEL_REFCLK (0 << 17)
> > -#define SCCTRL_TIMEREN1SEL_TIMCLK (1 << 17)
> > -
> > + #define SCCTRL_TIMERENnSEL_SHIFT(n) (15 + ((n) * 2))
> > +
> > static inline void sysctl_soft_reset(void __iomem *base)
> > {
> > /* switch to slow mode */
>
> Pawel,
>
> Does this look OK for you?
Yes, it's correct.
Thanks!
Pawe?
next prev parent reply other threads:[~2012-10-30 10:39 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-30 4:06 linux-next: manual merge of the clk tree with the arm-soc tree Stephen Rothwell
2012-10-30 4:06 ` Stephen Rothwell
2012-10-30 4:06 ` Stephen Rothwell
2012-10-30 10:11 ` Mike Turquette
2012-10-30 10:11 ` Mike Turquette
2012-10-30 10:39 ` Pawel Moll [this message]
2012-10-30 10:39 ` Pawel Moll
-- strict thread matches above, loose matches on Subject: below --
2024-07-11 23:58 Stephen Rothwell
2024-07-12 7:00 ` Drew Fustini
2016-11-22 8:41 Stephen Rothwell
2016-11-22 8:41 ` Stephen Rothwell
2016-11-22 9:36 ` Geert Uytterhoeven
2016-11-22 9:36 ` Geert Uytterhoeven
2016-11-22 23:59 ` Stephen Rothwell
2016-11-22 23:59 ` Stephen Rothwell
2016-03-01 3:57 Stephen Rothwell
2016-03-01 3:57 ` Stephen Rothwell
2016-03-01 3:57 ` Stephen Rothwell
2016-03-01 4:00 ` Stephen Rothwell
2016-03-01 4:00 ` Stephen Rothwell
2016-03-01 4:00 ` Stephen Rothwell
2016-03-01 8:38 ` Nicolas Ferre
2016-03-01 8:38 ` Nicolas Ferre
2016-03-01 8:38 ` Nicolas Ferre
2015-02-03 5:31 Stephen Rothwell
2015-02-03 5:31 ` Stephen Rothwell
2015-02-03 5:31 ` Stephen Rothwell
2015-02-03 18:25 ` Mike Turquette
2015-02-03 18:25 ` Mike Turquette
2015-02-03 5:28 Stephen Rothwell
2015-02-03 5:28 ` Stephen Rothwell
2015-02-03 5:28 ` Stephen Rothwell
2014-01-13 5:06 Stephen Rothwell
2014-01-13 5:06 ` Stephen Rothwell
2014-01-13 5:06 ` Stephen Rothwell
2014-01-26 20:59 ` Tomasz Figa
2014-01-26 20:59 ` Tomasz Figa
2014-01-26 21:05 ` Tomasz Figa
2014-01-26 21:05 ` Tomasz Figa
2013-06-17 7:27 Stephen Rothwell
2013-06-17 7:27 ` Stephen Rothwell
2013-06-17 7:27 ` Stephen Rothwell
2013-06-17 18:49 ` Mike Turquette
2013-06-17 18:49 ` Mike Turquette
2013-04-19 7:27 Stephen Rothwell
2013-04-19 7:27 ` Stephen Rothwell
2013-04-19 7:27 ` Stephen Rothwell
2013-04-19 9:47 ` Pawel Moll
2013-04-19 9:47 ` Pawel Moll
2013-02-02 12:27 Stephen Rothwell
2013-02-02 12:27 ` Stephen Rothwell
2013-02-02 12:27 ` Stephen Rothwell
2013-02-04 17:54 ` Mike Turquette
2013-02-04 17:54 ` Mike Turquette
2012-11-28 6:12 Stephen Rothwell
2012-11-28 6:12 ` Stephen Rothwell
2012-11-28 6:12 ` Stephen Rothwell
2012-09-10 6:14 Stephen Rothwell
2012-09-10 6:14 ` Stephen Rothwell
2012-09-10 6:14 ` Stephen Rothwell
2012-09-10 15:24 ` Linus Walleij
2012-09-10 15:24 ` Linus Walleij
2012-09-10 16:51 ` Mike Turquette
2012-09-10 16:51 ` Mike Turquette
2012-07-13 5:14 Stephen Rothwell
2012-07-13 5:14 ` Stephen Rothwell
2012-07-13 5:14 ` Stephen Rothwell
2012-07-13 15:10 ` Rob Herring
2012-07-13 15:10 ` Rob Herring
2012-07-13 17:27 ` Mike Turquette
2012-07-13 17:27 ` Mike Turquette
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=1351593554.2831.8.camel@hornet \
--to=pawel.moll@arm.com \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mturquette@ti.com \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
/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.