Subject: [PATCH 1/2] ARM: at91: make x40s use free of at91_sys_read/write

From: [email-masked] (Jean-Christophe PLAGNIOL-VILLARD)
Date: Fri, 9 Dec 2011 19:47:01 +0100

On 09:10 Fri 09 Dec     , Ryan Mallon wrote:
> On 09/12/11 01:41, Jean-Christophe PLAGNIOL-VILLARD wrote:
> 
> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email-masked]>
> > Cc: Nicolas Ferre <[email-masked]>
> > ---
> >  arch/arm/mach-at91/at91x40_time.c         |   28 +++++++++++++++++-----------
> >  arch/arm/mach-at91/include/mach/at91x40.h |   18 +++++++++---------
> >  arch/arm/mach-at91/include/mach/system.h  |    2 +-
> >  3 files changed, 27 insertions(+), 21 deletions(-)
> > 
> > diff --git a/arch/arm/mach-at91/at91x40_time.c b/arch/arm/mach-at91/at91x40_time.c
> > index dfff289..6ca680a 100644
> > --- a/arch/arm/mach-at91/at91x40_time.c
> > +++ b/arch/arm/mach-at91/at91x40_time.c
> > @@ -28,6 +28,12 @@
> >  #include <asm/mach/time.h>
> >  #include <mach/at91_tc.h>
> >  
> > +#define at91_tc_read(field) \
> > +	__raw_readl(AT91_TC + field)
> > +
> > +#define at91_tc_write(field, value) \
> > +	__raw_writel(value, AT91_TC + field);
> > +
> 
> 
> Can we make these functions please. They will get inlined anyway, but we
> get the added benefits of type checking. Also you have a spurious
> semicolon on the second #define.
> 
> >  /*
> >   *	3 counter/timer units present.
> >   */
> > @@ -37,12 +43,12 @@
> >  
> >  static unsigned long at91x40_gettimeoffset(void)
> >  {
> > -	return (at91_sys_read(AT91_TC + AT91_TC_CLK1BASE + AT91_TC_CV) * 1000000 / (AT91X40_MASTER_CLOCK / 128));
> > +	return (at91_tc_read(AT91_TC_CLK1BASE + AT91_TC_CV) * 1000000 / (AT91X40_MASTER_CLOCK / 128));
> >  }
> 
> 
> It is a good chance to split this line to fit in 80 characters while you
> are editing it.
not the scope of the patch
change done by script
> 
> >  
> >  static irqreturn_t at91x40_timer_interrupt(int irq, void *dev_id)
> >  {
> > -	at91_sys_read(AT91_TC + AT91_TC_CLK1BASE + AT91_TC_SR);
> > +	at91_tc_read(AT91_TC_CLK1BASE + AT91_TC_SR);
> >  	timer_tick();
> >  	return IRQ_HANDLED;
> >  }
> > @@ -57,20 +63,20 @@ void __init at91x40_timer_init(void)
> >  {
> >  	unsigned int v;
> >  
> > -	at91_sys_write(AT91_TC + AT91_TC_BCR, 0);
> > -	v = at91_sys_read(AT91_TC + AT91_TC_BMR);
> > +	at91_tc_write(AT91_TC_BCR, 0);
> > +	v = at91_tc_read(AT91_TC_BMR);
> >  	v = (v & ~AT91_TC_TC1XC1S) | AT91_TC_TC1XC1S_NONE;
> > -	at91_sys_write(AT91_TC + AT91_TC_BMR, v);
> > +	at91_tc_write(AT91_TC_BMR, v);
> >  
> > -	at91_sys_write(AT91_TC + AT91_TC_CLK1BASE + AT91_TC_CCR, AT91_TC_CLKDIS);
> > -	at91_sys_write(AT91_TC + AT91_TC_CLK1BASE + AT91_TC_CMR, (AT91_TC_TIMER_CLOCK4 | AT91_TC_CPCTRG));
> > -	at91_sys_write(AT91_TC + AT91_TC_CLK1BASE + AT91_TC_IDR, 0xffffffff);
> > -	at91_sys_write(AT91_TC + AT91_TC_CLK1BASE + AT91_TC_RC, (AT91X40_MASTER_CLOCK / 128) / HZ - 1);
> > -	at91_sys_write(AT91_TC + AT91_TC_CLK1BASE + AT91_TC_IER, (1<<4));
> > +	at91_tc_write(AT91_TC_CLK1BASE + AT91_TC_CCR, AT91_TC_CLKDIS);
> > +	at91_tc_write(AT91_TC_CLK1BASE + AT91_TC_CMR, (AT91_TC_TIMER_CLOCK4 | AT91_TC_CPCTRG));
> > +	at91_tc_write(AT91_TC_CLK1BASE + AT91_TC_IDR, 0xffffffff);
> > +	at91_tc_write(AT91_TC_CLK1BASE + AT91_TC_RC, (AT91X40_MASTER_CLOCK / 128) / HZ - 1);
> > +	at91_tc_write(AT91_TC_CLK1BASE + AT91_TC_IER, (1<<4));
> 
> 
> Same here, some of these lines look over 80 characters. Good chance to
> fix them.
> 
> >  
> >  	setup_irq(AT91X40_ID_TC1, &at91x40_timer_irq);
> >  
> > -	at91_sys_write(AT91_TC + AT91_TC_CLK1BASE + AT91_TC_CCR, (AT91_TC_SWTRG | AT91_TC_CLKEN));
> > +	at91_tc_write(AT91_TC_CLK1BASE + AT91_TC_CCR, (AT91_TC_SWTRG | AT91_TC_CLKEN));
> 
> 
> and here.
> 
> >  }
> >  
> >  struct sys_timer at91x40_timer = {
> > diff --git a/arch/arm/mach-at91/include/mach/at91x40.h b/arch/arm/mach-at91/include/mach/at91x40.h
> > index a57829f..9068021 100644
> > --- a/arch/arm/mach-at91/include/mach/at91x40.h
> > +++ b/arch/arm/mach-at91/include/mach/at91x40.h
> > @@ -28,18 +28,18 @@
> >  #define AT91X40_ID_IRQ2		18	/* External IRQ 2 */
> >  
> >  /*
> > - * System Peripherals (offset from AT91_BASE_SYS)
> > + * System Peripherals
> >   */
> >  #define AT91_BASE_SYS	0xffc00000
> >  
> > -#define AT91_EBI	(0xffe00000 - AT91_BASE_SYS)	/* External Bus Interface */
> > -#define AT91_SF		(0xfff00000 - AT91_BASE_SYS)	/* Special Function */
> > -#define AT91_USART1	(0xfffcc000 - AT91_BASE_SYS)	/* USART 1 */
> > -#define AT91_USART0	(0xfffd0000 - AT91_BASE_SYS)	/* USART 0 */
> > -#define AT91_TC		(0xfffe0000 - AT91_BASE_SYS)	/* Timer Counter */
> > -#define AT91_PIOA	(0xffff0000 - AT91_BASE_SYS)	/* PIO Controller A */
> > -#define AT91_PS		(0xffff4000 - AT91_BASE_SYS)	/* Power Save */
> > -#define AT91_WD		(0xffff8000 - AT91_BASE_SYS)	/* Watchdog Timer */
> > +#define AT91_EBI	0xffe00000	/* External Bus Interface */
> > +#define AT91_SF		0xfff00000	/* Special Function */
> > +#define AT91_USART1	0xfffcc000	/* USART 1 */
> > +#define AT91_USART0	0xfffd0000	/* USART 0 */
> > +#define AT91_TC		0xfffe0000	/* Timer Counter */
> > +#define AT91_PIOA	0xffff0000	/* PIO Controller A */
> > +#define AT91_PS		0xffff4000	/* Power Save */
> > +#define AT91_WD		0xffff8000	/* Watchdog Timer */
> >  
> >  /*
> >   * The AT91x40 series doesn't have a debug unit like the other AT91 parts.
> > diff --git a/arch/arm/mach-at91/include/mach/system.h b/arch/arm/mach-at91/include/mach/system.h
> > index 36af14b..a3c0fc0 100644
> > --- a/arch/arm/mach-at91/include/mach/system.h
> > +++ b/arch/arm/mach-at91/include/mach/system.h
> > @@ -33,7 +33,7 @@ static inline void arch_idle(void)
> >  	 * re-enabled by an interrupt or by a reset.
> >  	 */
> >  #ifdef AT91_PS
> > -	at91_sys_write(AT91_PS_CR, AT91_PS_CR_CPU);
> > +	__raw_writel(AT91_PS_CR_CPU, AT91_PS_CR);
> >  #else
> >  	at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK);
> 
> 
> Is this one changed in another patch?
no the AT91_PS is x40 specific

Best Regards,
J.