The following patch updates the pmac-specific Power Management code
of the usb-ohci driver. I've already sent it to Marcelo, I'm copying
it here for completeness and for the maintainer not to be surprised
of seeing that popping up in 2.4.18-preX ;)
Regards,
Ben.
diff -uNr --exclude-from=diff_exclude linux-2.4.18-pre2/drivers/usb/usb-
ohci.c linux-2.4.18-pre2.ppc/drivers/usb/usb-ohci.c
--- linux-2.4.18-pre2/drivers/usb/usb-ohci.c Fri Dec 21 18:41:55 2001
+++ linux-2.4.18-pre2.ppc/drivers/usb/usb-ohci.c Tue Jan 8 10:38:15 2002
@@ -76,7 +76,8 @@
#ifdef CONFIG_PMAC_PBOOK
-#include <asm/feature.h>
+#include <asm/machdep.h>
+#include <asm/pmac_feature.h>
#include <asm/pci-bridge.h>
#ifndef CONFIG_PM
#define CONFIG_PM
@@ -2699,12 +2700,12 @@
pci_write_config_word (dev, PCI_COMMAND, cmd);
#ifdef CONFIG_PMAC_PBOOK
{
- struct device_node *of_node;
+ struct device_node *of_node;
- /* Disable USB PAD & cell clock */
- of_node = pci_device_to_OF_node (ohci->ohci_dev);
- if (of_node && _machine == _MACH_Pmac)
- feature_set_usb_power (of_node, 0);
+ /* Disable USB PAD & cell clock */
+ of_node = pci_device_to_OF_node (ohci->ohci_dev);
+ if (of_node)
+ pmac_call_feature(PMAC_FTR_USB_ENABLE, of_node, 0, 0);
}
#endif
return 0;
@@ -2729,12 +2730,12 @@
#ifdef CONFIG_PMAC_PBOOK
{
- struct device_node *of_node;
+ struct device_node *of_node;
- /* Re-enable USB PAD & cell clock */
- of_node = pci_device_to_OF_node (ohci->ohci_dev);
- if (of_node && _machine == _MACH_Pmac)
- feature_set_usb_power (of_node, 1);
+ /* Re-enable USB PAD & cell clock */
+ of_node = pci_device_to_OF_node (ohci->ohci_dev);
+ if (of_node)
+ pmac_call_feature(PMAC_FTR_USB_ENABLE, of_node, 0, 1);
}
#endif
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
