diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-07-13 01:33:09 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-07-13 12:40:00 -0400 |
commit | 6fec2e1727049ce6a404f4af61461d860594d5db (patch) | |
tree | 7d2e1da9afe1a3a64af364b5e0ea7ae4e01fab86 | |
parent | 33f60da0dad0884256f888c19303e16c95d2086d (diff) |
[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>
-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 043302b7fe58..eea2092bde8d 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) | |||
131 | /* The Pb1200 development board uses external MUX for PSC0 to | 131 | /* The Pb1200 development board uses external MUX for PSC0 to |
132 | support SMB/SPI. bcsr->resets bit 12: 0=SMB 1=SPI | 132 | support SMB/SPI. bcsr->resets bit 12: 0=SMB 1=SPI |
133 | */ | 133 | */ |
134 | #if defined(CONFIG_AU1XXX_PSC_SPI) && defined(CONFIG_I2C_AU1550) | 134 | #ifdef CONFIG_I2C_AU1550 |
135 | #error I2C and SPI are mutually exclusive. Both are physically connected to PSC0.\ | ||
136 | Refer to Pb1200/Db1200 documentation. | ||
137 | #elif defined( CONFIG_AU1XXX_PSC_SPI ) | ||
138 | bcsr->resets |= BCSR_RESETS_PCS0MUX; | ||
139 | /*Hard Coding Value to enable Temp Sensors [bit 14] Value for SOC Au1200. Pls refer documentation*/ | ||
140 | bcsr->resets =0x900f; | ||
141 | #elif defined( CONFIG_I2C_AU1550 ) | ||
142 | bcsr->resets &= (~BCSR_RESETS_PCS0MUX); | 135 | bcsr->resets &= (~BCSR_RESETS_PCS0MUX); |
143 | #endif | 136 | #endif |
144 | au_sync(); | 137 | au_sync(); |