On Fri, Jan 18, 2002 at 04:35:27PM -0800, David Brownell wrote:
> This patch is against 2.5.2-pre11 but it should work
> fine against the current 2.5.3-pre stuff too.
And here's a patch that adds the PMAC changes that went into the
2.4.18-pre2 of usb-ohci.c to the ohci-hcd driver.
thanks,
greg k-h
diff -Nru a/drivers/usb/hcd/ohci-hcd.c b/drivers/usb/hcd/ohci-hcd.c
--- a/drivers/usb/hcd/ohci-hcd.c Sun Jan 20 16:30:41 2002
+++ b/drivers/usb/hcd/ohci-hcd.c Sun Jan 20 16:30:41 2002
@@ -93,7 +93,8 @@
#include <asm/unaligned.h>
#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
@@ -698,12 +699,12 @@
pci_write_config_word (hcd->pdev, 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 (hcd->pdev);
- 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 (hcd->pdev);
+ if (of_node)
+ pmac_call_feature(PMAC_FTR_USB_ENABLE, of_node, 0, 0);
}
#endif
return 0;
@@ -756,12 +757,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 (hcd->pdev);
- 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 (hcd->pdev);
+ if (of_node)
+ pmac_call_feature (PMAC_FTR_USB_ENABLE, of_node, 0, 1);
}
#endif
/* did we suspend, or were we powered off? */
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
