1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-18 15:12:47 +02:00
openwrt-xburst/target/linux/au1000/patches-2.6.32/005-mtx1_fix_pci.patch
florian cd6d6cbaf0 [au1000] fix line wrapped patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22040 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-07-01 22:28:05 +00:00

36 lines
933 B
Diff

diff --git a/arch/mips/alchemy/mtx-1/board_setup.c b/arch/mips/alchemy/mtx-1/board_setup.c
index 45b61c9..17140ac 100644
--- a/arch/mips/alchemy/mtx-1/board_setup.c
+++ b/arch/mips/alchemy/mtx-1/board_setup.c
@@ -56,8 +56,6 @@ void __init board_setup(void)
}
#endif
- alchemy_gpio2_enable();
-
#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
/* Enable USB power switch */
alchemy_gpio_direction_output(204, 0);
@@ -92,20 +90,12 @@ void __init board_setup(void)
int
mtx1_pci_idsel(unsigned int devsel, int assert)
{
-#define MTX_IDSEL_ONLY_0_AND_3 0
-#if MTX_IDSEL_ONLY_0_AND_3
- if (devsel != 0 && devsel != 3) {
- printk(KERN_ERR "*** not 0 or 3\n");
- return 0;
- }
-#endif
-
if (assert && devsel != 0)
/* Suppress signal to Cardbus */
gpio_set_value(1, 0); /* set EXT_IO3 OFF */
else
gpio_set_value(1, 1); /* set EXT_IO3 ON */
- au_sync_udelay(1);
+ udelay(1);
return 1;
}