diff options
author | Olof Johansson <olof@lixom.net> | 2005-11-13 19:06:48 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-13 21:14:13 -0500 |
commit | 7fce260a6bf75080ef61408504add5618f90e41b (patch) | |
tree | 358032ca46888df92641bd32d0b88d5d2a1213d2 /drivers/ide/ppc | |
parent | 50c85a19e7b3928b5b5188524c44ffcbacdd4e35 (diff) |
[PATCH] ppc: add support for new powerbooks
Enablement patch for the new PowerBooks (late 2005 edition).
This enables the ATA controller, Gigabit ethernet and basic AGP setup.
Bluetooth works out-of-the box after running hid2hci.
Still remaining is to get the touchpad to work, the simple change of just
adding the new USB ids isn't enough.
Signed-off-by: Olof Johansson <olof@lixom.net>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/ide/ppc')
-rw-r--r-- | drivers/ide/ppc/pmac.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index b3e65a65d202..136911a86e84 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c | |||
@@ -1667,11 +1667,16 @@ static struct macio_driver pmac_ide_macio_driver = | |||
1667 | }; | 1667 | }; |
1668 | 1668 | ||
1669 | static struct pci_device_id pmac_ide_pci_match[] = { | 1669 | static struct pci_device_id pmac_ide_pci_match[] = { |
1670 | { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_ATA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | 1670 | { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_ATA, |
1671 | { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_IPID_ATA100, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | 1671 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, |
1672 | { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_K2_ATA100, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | 1672 | { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_IPID_ATA100, |
1673 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | ||
1674 | { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_K2_ATA100, | ||
1675 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | ||
1673 | { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_SH_ATA, | 1676 | { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_SH_ATA, |
1674 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | 1677 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, |
1678 | { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_IPID2_ATA, | ||
1679 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | ||
1675 | }; | 1680 | }; |
1676 | 1681 | ||
1677 | static struct pci_driver pmac_ide_pci_driver = { | 1682 | static struct pci_driver pmac_ide_pci_driver = { |