From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tom Rix <tom@bumblecow.com>
Date: Sun, 18 Apr 2010 10:14:21 -0500
Subject: [U-Boot] [PATCH 1/2] PXA: Add UP2OCR register bit definitions
In-Reply-To: <1271600309-4824-1-git-send-email-marek.vasut@gmail.com>
References: <1271600309-4824-1-git-send-email-marek.vasut@gmail.com>
Message-ID: <4BCB21CD.6050000@bumblecow.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Marek Vasut wrote:
> This register is used on PXA to control the USB Port2 operation (USB Port2 is
> the host port).
> 
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> ---
>  arch/arm/include/asm/arch-pxa/pxa-regs.h |   20 ++++++++++++++++----
>  1 files changed, 16 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/include/asm/arch-pxa/pxa-regs.h b/arch/arm/include/asm/arch-pxa/pxa-regs.h
> index a25d4c5..06711f7 100644
> --- a/arch/arm/include/asm/arch-pxa/pxa-regs.h
> +++ b/arch/arm/include/asm/arch-pxa/pxa-regs.h
> @@ -992,10 +992,6 @@ typedef void		(*ExcpHndlr) (void) ;
>  #define UHCHIE		__REG(0x4C000068)
>  #define UHCHIT		__REG(0x4C00006C)
>  
> -#if defined(CONFIG_CPU_MONAHANS)
> -#define UP2OCR		__REG(0x40600020)
> -#endif

Previously this was only defined for CPU_MONAHANS.
If this really is a common register, add a comment to
the commit log.

Be aware that the preferred method of register access
is through structure member elements.  In this case,
this is a trival change so I do not believe converting
the access is warranted.  But it will likely be in the
future.

> -
>  #define UHCHR_FSBIR	(1<<0)
>  #define UHCHR_FHR	(1<<1)
>  #define UHCHR_CGR	(1<<2)
> @@ -1015,6 +1011,22 @@ typedef void		(*ExcpHndlr) (void) ;
>  #define UHCHIE_HBAIE	(1<<8)
>  #define UHCHIE_RWIE	(1<<7)
>  
> +#define UP2OCR		__REG(0x40600020)
> +
> +#define	UP2OCR_HXOE	(1<<17)
> +#define	UP2OCR_HXS	(1<<16)
> +#define	UP2OCR_IDON	(1<<10)
> +#define	UP2OCR_EXSUS	(1<<9)
> +#define	UP2OCR_EXSP	(1<<8)
> +#define	UP2OCR_DMSTATE	(1<<7)
> +#define	UP2OCR_VPM	(1<<6)
> +#define	UP2OCR_DPSTATE	(1<<5)
> +#define	UP2OCR_DPPUE	(1<<4)
> +#define	UP2OCR_DMPDE	(1<<3)
> +#define	UP2OCR_DPPDE	(1<<2)
> +#define	UP2OCR_CPVPE	(1<<1)
> +#define	UP2OCR_CPVEN	(1<<0)

For readability, change the tab after #define to a space.
This is an issue in the 2/2 patch as well

Tom

> +
>  #endif
>  
>  /*