]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[MIPS] Alchemy: Remove code wrapped by dead symbol CONFIG_AU1XXX_PSC_SPI
authorRalf Baechle <ralf@linux-mips.org>
Fri, 13 Jul 2007 05:33:09 +0000 (06:33 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Fri, 13 Jul 2007 16:40:00 +0000 (17:40 +0100)
Noticed by Robert P. J. Day (rpjday@mindspring.com).

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/au1000/pb1200/board_setup.c

index 043302b7fe589d7eabc873d7d5172c05c6473381..eea2092bde8dfe801fb06fac0b4251c108dad153 100644 (file)
@@ -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();