Messages in this thread | | | Subject | Re: linux-next: manual merge of the clk tree with the arm-soc tree | From | Pawel Moll <> | Date | Tue, 30 Oct 2012 10:39:14 +0000 |
| |
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ł
-- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |