linux-mips
[Top] [All Lists]

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

To: Domen Puncer <domen.puncer@ultra.si>, Ralf Baechle <ralf@linux-mips.org>
Subject: Re: [patch 1/8] au1xxx: psc fixes + add au1200 adresses
From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date: Fri, 23 Jun 2006 16:57:28 +0400
Cc: linux-mips@linux-mips.org
In-reply-to: <20060623095831.GA31017@domen.ultra.si>
Organization: MontaVista Software Inc.
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <20060623095703.GA30980@domen.ultra.si> <20060623095831.GA31017@domen.ultra.si>
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mozilla/5.0 (X11; U; Linux i686; rv:1.7.2) Gecko/20040803
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

<Prev in Thread] Current Thread [Next in Thread>