diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2007-07-13 06:33:09 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2007-07-13 17:40:00 +0100 |
| commit | 6fec2e1727049ce6a404f4af61461d860594d5db (patch) | |
| tree | 7d2e1da9afe1a3a64af364b5e0ea7ae4e01fab86 /arch/mips | |
| parent | 33f60da0dad0884256f888c19303e16c95d2086d (diff) | |
| download | linux-3.10-6fec2e1727049ce6a404f4af61461d860594d5db.tar.gz linux-3.10-6fec2e1727049ce6a404f4af61461d860594d5db.tar.bz2 linux-3.10-6fec2e1727049ce6a404f4af61461d860594d5db.zip | |
[MIPS] Alchemy: Remove code wrapped by dead symbol CONFIG_AU1XXX_PSC_SPI
Noticed by Robert P. J. Day (rpjday@mindspring.com).
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/au1000/pb1200/board_setup.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/mips/au1000/pb1200/board_setup.c b/arch/mips/au1000/pb1200/board_setup.c index 043302b7fe5..eea2092bde8 100644 --- a/arch/mips/au1000/pb1200/board_setup.c +++ b/arch/mips/au1000/pb1200/board_setup.c @@ -131,14 +131,7 @@ void __init board_setup(void) /* The Pb1200 development board uses external MUX for PSC0 to support SMB/SPI. bcsr->resets bit 12: 0=SMB 1=SPI */ -#if defined(CONFIG_AU1XXX_PSC_SPI) && defined(CONFIG_I2C_AU1550) - #error I2C and SPI are mutually exclusive. Both are physically connected to PSC0.\ - Refer to Pb1200/Db1200 documentation. -#elif defined( CONFIG_AU1XXX_PSC_SPI ) - bcsr->resets |= BCSR_RESETS_PCS0MUX; - /*Hard Coding Value to enable Temp Sensors [bit 14] Value for SOC Au1200. Pls refer documentation*/ - bcsr->resets =0x900f; -#elif defined( CONFIG_I2C_AU1550 ) +#ifdef CONFIG_I2C_AU1550 bcsr->resets &= (~BCSR_RESETS_PCS0MUX); #endif au_sync(); |