From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
To: Domen Puncer <domen.puncer@ultra.si>, Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Subject: Re: [patch 1/8] au1xxx: psc fixes + add au1200 adresses
Date: Fri, 23 Jun 2006 16:57:28 +0400 [thread overview]
Message-ID: <449BE538.5030203@ru.mvista.com> (raw)
In-Reply-To: <20060623095831.GA31017@domen.ultra.si>
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
next prev parent reply other threads:[~2006-06-23 12:58 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-23 9:57 [patch 0/8] au1xxx: make linux-mips more useful for au1200 users Domen Puncer
2006-06-23 9:58 ` [patch 1/8] au1xxx: psc fixes + add au1200 adresses Domen Puncer
2006-06-23 11:15 ` Ralf Baechle
2006-06-23 12:57 ` Sergei Shtylyov [this message]
2006-06-23 13:54 ` Domen Puncer
2006-06-23 15:37 ` Ralf Baechle
2006-06-23 9:58 ` [patch 2/8] au1xxx: I2C fixes Domen Puncer
2006-06-23 10:26 ` Ralf Baechle
2006-06-23 16:13 ` Sergei Shtylyov
2006-06-23 9:59 ` [patch 3/8] au1xxx: I2C support for au1200 Domen Puncer
2006-06-23 10:26 ` Ralf Baechle
2006-06-23 9:59 ` [patch 4/8] au1xxx: dbdma, no sleeping under spin_lock Domen Puncer
2006-06-23 11:16 ` Ralf Baechle
2006-06-23 10:00 ` [patch 5/8] au1xxx: export dbdma functions Domen Puncer
2006-06-23 10:33 ` Ralf Baechle
2006-06-23 13:52 ` Domen Puncer
2006-06-24 19:06 ` Sergei Shtylyov
2006-06-23 10:00 ` [patch 6/8] au1xxx: oss sound support for au1200 Domen Puncer
2006-06-23 10:01 ` [patch 7/8] au1xxx: compile fixes for OHCI " Domen Puncer
2006-06-23 10:56 ` Ralf Baechle
2006-06-23 10:01 ` [patch 8/8] au1xxx: pcmcia: fix __init called from non-init Domen Puncer
2006-06-23 11:07 ` Ralf Baechle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=449BE538.5030203@ru.mvista.com \
--to=sshtylyov@ru.mvista.com \
--cc=domen.puncer@ultra.si \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox