Re: [patch 1/8] au1xxx: psc fixes + add au1200 adresses

[Sergei Shtylyov <sshtylyov@ru.mvista.com>]

Hello.

Domen Puncer wrote:
> Based on Jordan Crusoe's i2c patch:
> - fix PSC3_BASE_ADDR to match au1550 databook
> - fix PSC_SMBTXRX_RSR
> - add PSC addresses for au1200

    That was my patch, originally. And (surprise!) it just went from the -mm 
tree to Linus. Congrats, now we're going to have a patch conflict. :-)

> Signed-off-by: Domen Puncer <domen.puncer@ultra.si>

> Index: linux-mailed/include/asm-mips/mach-au1x00/au1xxx_psc.h
> ===================================================================
> --- linux-mailed.orig/include/asm-mips/mach-au1x00/au1xxx_psc.h
> +++ linux-mailed/include/asm-mips/mach-au1x00/au1xxx_psc.h
> @@ -40,7 +40,12 @@
>  #define PSC0_BASE_ADDR		0xb1a00000
>  #define PSC1_BASE_ADDR		0xb1b00000
>  #define PSC2_BASE_ADDR		0xb0a00000
> -#define PSC3_BASE_ADDR		0xb0d00000
> +#define PSC3_BASE_ADDR		0xb0b00000
> +#endif
> +
> +#ifdef CONFIG_SOC_AU1200
> +#define PSC0_BASE_ADDR		0xb1a00000
> +#define PSC1_BASE_ADDR		0xb1b00000
>  #endif
>  
>  /* The PSC select and control registers are common to
> @@ -506,7 +511,7 @@ typedef struct	psc_smb {
>  
>  /* Transmit register control.
>  */
> -#define PSC_SMBTXRX_RSR		(1 << 30)
> +#define PSC_SMBTXRX_RSR		(1 << 28)
>  #define PSC_SMBTXRX_STP		(1 << 29)
>  #define PSC_SMBTXRX_DATAMASK	(0xff)

WBR, Sergei