/[linux-patches]/genpatches-2.6/trunk/2.6.14/1805_ppc-powerbook-5-8.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.14/1805_ppc-powerbook-5-8.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 292 - (show annotations) (download) (as text)
Tue Jan 31 21:50:53 2006 UTC (14 years, 9 months ago) by johnm
File MIME type: text/x-diff
File size: 3836 byte(s)
Large update - thanks goes to Kerin Millar for the legwork.
1 From: Olof Johansson <olof@lixom.net>
2 Date: Mon, 14 Nov 2005 00:06:48 +0000 (-0800)
3 Subject: [PATCH] ppc: add support for new powerbooks
4 X-Git-Tag: v2.6.15-rc2
5 X-Git-Url: http://www.kernel.org/git/gitweb.cgi?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=7fce260a6bf75080ef61408504add5618f90e41b
6
7 [PATCH] ppc: add support for new powerbooks
8
9 Enablement patch for the new PowerBooks (late 2005 edition).
10
11 This enables the ATA controller, Gigabit ethernet and basic AGP setup.
12 Bluetooth works out-of-the box after running hid2hci.
13
14 Still remaining is to get the touchpad to work, the simple change of just
15 adding the new USB ids isn't enough.
16
17 Signed-off-by: Olof Johansson <olof@lixom.net>
18 Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
19 Signed-off-by: Andrew Morton <akpm@osdl.org>
20 Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 ---
22
23 --- a/arch/ppc/platforms/pmac_feature.c
24 +++ b/arch/ppc/platforms/pmac_feature.c
25 @@ -2317,6 +2317,14 @@ static struct pmac_mb_def pmac_mb_defs[]
26 PMAC_TYPE_UNKNOWN_INTREPID, intrepid_features,
27 PMAC_MB_MAY_SLEEP | PMAC_MB_HAS_FW_POWER | PMAC_MB_MOBILE,
28 },
29 + { "PowerBook5,8", "PowerBook G4 15\"",
30 + PMAC_TYPE_UNKNOWN_INTREPID, intrepid_features,
31 + PMAC_MB_MAY_SLEEP | PMAC_MB_HAS_FW_POWER | PMAC_MB_MOBILE,
32 + },
33 + { "PowerBook5,9", "PowerBook G4 17\"",
34 + PMAC_TYPE_UNKNOWN_INTREPID, intrepid_features,
35 + PMAC_MB_MAY_SLEEP | PMAC_MB_HAS_FW_POWER | PMAC_MB_MOBILE,
36 + },
37 { "PowerBook6,1", "PowerBook G4 12\"",
38 PMAC_TYPE_UNKNOWN_INTREPID, intrepid_features,
39 PMAC_MB_MAY_SLEEP | PMAC_MB_HAS_FW_POWER | PMAC_MB_MOBILE,
40 --- a/drivers/char/agp/uninorth-agp.c
41 +++ b/drivers/char/agp/uninorth-agp.c
42 @@ -557,6 +557,10 @@ static struct agp_device_ids uninorth_ag
43 .device_id = PCI_DEVICE_ID_APPLE_U3H_AGP,
44 .chipset_name = "U3H",
45 },
46 + {
47 + .device_id = PCI_DEVICE_ID_APPLE_IPID2_AGP,
48 + .chipset_name = "UniNorth/Intrepid2",
49 + },
50 };
51
52 static int __devinit agp_uninorth_probe(struct pci_dev *pdev,
53 --- a/drivers/ide/ppc/pmac.c
54 +++ b/drivers/ide/ppc/pmac.c
55 @@ -1667,11 +1667,16 @@ static struct macio_driver pmac_ide_maci
56 };
57
58 static struct pci_device_id pmac_ide_pci_match[] = {
59 - { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_ATA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
60 - { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_IPID_ATA100, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
61 - { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_K2_ATA100, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
62 + { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_ATA,
63 + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
64 + { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_IPID_ATA100,
65 + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
66 + { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_K2_ATA100,
67 + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
68 { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_SH_ATA,
69 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
70 + { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_IPID2_ATA,
71 + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
72 };
73
74 static struct pci_driver pmac_ide_pci_driver = {
75 --- a/drivers/net/sungem.c
76 +++ b/drivers/net/sungem.c
77 @@ -128,6 +128,8 @@ static struct pci_device_id gem_pci_tbl[
78 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
79 { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_SH_SUNGEM,
80 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
81 + { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_IPID2_GMAC,
82 + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
83 {0, }
84 };
85
86 --- a/include/linux/pci_ids.h
87 +++ b/include/linux/pci_ids.h
88 @@ -805,6 +805,10 @@
89 #define PCI_DEVICE_ID_APPLE_SH_SUNGEM 0x0051
90 #define PCI_DEVICE_ID_APPLE_U3L_AGP 0x0058
91 #define PCI_DEVICE_ID_APPLE_U3H_AGP 0x0059
92 +#define PCI_DEVICE_ID_APPLE_IPID2_AGP 0x0066
93 +#define PCI_DEVICE_ID_APPLE_IPID2_ATA 0x0069
94 +#define PCI_DEVICE_ID_APPLE_IPID2_FW 0x006a
95 +#define PCI_DEVICE_ID_APPLE_IPID2_GMAC 0x006b
96 #define PCI_DEVICE_ID_APPLE_TIGON3 0x1645
97
98 #define PCI_VENDOR_ID_YAMAHA 0x1073

  ViewVC Help
Powered by ViewVC 1.1.20