> +#ifdef CONFIG_PPC_PMAC
> + /* Necessary on some machines if fw-ohci was loaded/ unloaded before */
> + if (machine_is(powermac)) {
> + struct device_node *ofn = pci_device_to_OF_node(dev);
> +
> + if (ofn) {
> + pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 1);
> + pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 1);
> + }
> + }
> +#endif /* CONFIG_PPC_PMAC */
I -think- that the hunk above can be removed if you just call
pci_enable_device(). I have a hook in the arch pcibios_enable_device()
that detects the internal firewire and does the calls. Can you verify it
works ?
> +#ifdef CONFIG_PPC_PMAC
> + /* On UniNorth, power down the cable and turn off the chip clock
> + * to save power on laptops */
> + if (machine_is(powermac)) {
> + struct device_node* ofn = pci_device_to_OF_node(dev);
> +
> + if (ofn) {
> + pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 0);
> + pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 0);
> + }
> + }
> +#endif /* CONFIG_PPC_PMAC */
Unfortunately, I don't have the pending hook here for disable so you
need to keep that one for now.
> kfree(&ohci->card);
>
> fw_notify("Removed fw-ohci device.\n");
> @@ -2211,6 +2241,16 @@ static int pci_suspend(struct pci_dev *p
> if (err)
> fw_error("pci_set_power_state failed with %d\n", err);
>
> +/* PowerMac suspend code comes last */
> +#ifdef CONFIG_PPC_PMAC
> + if (machine_is(powermac)) {
> + struct device_node *ofn = pci_device_to_OF_node(pdev);
> +
> + if (ofn)
> + pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 0);
> + }
> +#endif /* CONFIG_PPC_PMAC */
I wonder why we don't do the cable power thingy here...
Cheers,
Ben.
_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-dev
