Commit 6a3cd6f1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

USB ohci driver update

add PMAC changes found in -dj tree
parent a616c214
......@@ -83,7 +83,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
......@@ -2731,8 +2732,8 @@ ohci_pci_suspend (struct pci_dev *dev, u32 state)
/* 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);
if (of_node)
pmac_call_feature(PMAC_FTR_USB_ENABLE, of_node, 0, 0);
}
#endif
return 0;
......@@ -2761,8 +2762,8 @@ ohci_pci_resume (struct pci_dev *dev)
/* 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);
if (of_node)
pmac_call_feature(PMAC_FTR_USB_ENABLE, of_node, 0, 1);
}
#endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment