From 363f67d8aa9c952746862b48e3d2e8ef6100af3c Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Sat, 11 Nov 2006 00:22:35 +0100 Subject: [PATCH] --- yaml --- r: 43460 b: refs/heads/master c: 48cfae44b4d6c7ca843d611a93ed2f94b59bcb38 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ieee1394/ohci1394.c | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 187ae7841426..e619c9775b75 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58272c1c0330f5f899f130d45ce845ca085de044 +refs/heads/master: 48cfae44b4d6c7ca843d611a93ed2f94b59bcb38 diff --git a/trunk/drivers/ieee1394/ohci1394.c b/trunk/drivers/ieee1394/ohci1394.c index b8e922b65e2e..453d0be694e4 100644 --- a/trunk/drivers/ieee1394/ohci1394.c +++ b/trunk/drivers/ieee1394/ohci1394.c @@ -3215,6 +3215,19 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev, struct ti_ohci *ohci; /* shortcut to currently handled device */ resource_size_t ohci_base; +#ifdef CONFIG_PPC_PMAC + /* Necessary on some machines if ohci1394 was loaded/ unloaded before */ + if (machine_is(powermac)) { + struct device_node *of_node = pci_device_to_OF_node(dev); + + if (of_node) { + pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, of_node, + 0, 1); + pmac_call_feature(PMAC_FTR_1394_ENABLE, of_node, 0, 1); + } + } +#endif /* CONFIG_PPC_PMAC */ + if (pci_enable_device(dev)) FAIL(-ENXIO, "Failed to enable OHCI hardware"); pci_set_master(dev); @@ -3503,10 +3516,8 @@ static void ohci1394_pci_remove(struct pci_dev *pdev) #endif #ifdef CONFIG_PPC_PMAC - /* On UniNorth, power down the cable and turn off the chip - * clock when the module is removed to save power on - * laptops. Turning it back ON is done by the arch code when - * pci_enable_device() is called */ + /* On UniNorth, power down the cable and turn off the chip clock + * to save power on laptops */ { struct device_node* of_node;