Skip to contentSkip to conversation

ppc32: pmac support update

PATCH New Benjamin Herrenschmidt 1 participant 1 message May 5, 2004 PowerPC

lore
Share & tools
lore

Benjamin Herrenschmidt

author
#0 lore raw

PATCH 1/1 ppc32: pmac support update

Hi !

This patch adds some initial support for the latest model of iBook G4 (still need some work on the clock chip at least and some radeonfb updates that I'll send later along with other fixes for this driver).

It also removes a useless delay and fixes detection of the airport card on the "Windtunnel" class desktop G4 machines.

Please apply,
Ben.

arch/ppc/kernel/cputable.c +11 -0
diff -urN linux-2.5/arch/ppc/kernel/cputable.c linuxppc-2.5-benh/arch/ppc/kernel/cputable.c
@@ -323,6 +323,17 @@
 	32, 32,
 	__setup_cpu_745x
     },
+    {	/* 7447A */
+    	0xffff0000, 0x80030000, "7447A",
+	CPU_FTR_COMMON |
+    	CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | CPU_FTR_CAN_NAP |
+	CPU_FTR_L2CR | CPU_FTR_ALTIVEC_COMP |
+	CPU_FTR_HPTE_TABLE | CPU_FTR_SPEC7450 | CPU_FTR_NAP_DISABLE_L2_PR |
+	CPU_FTR_HAS_HIGH_BATS,
+	COMMON_PPC | PPC_FEATURE_ALTIVEC_COMP,
+	32, 32,
+	__setup_cpu_745x
+    },
     {	/* 82xx (8240, 8245, 8260 are all 603e cores) */
 	0x7fff0000, 0x00810000, "82xx",
 	CPU_FTR_COMMON |
arch/ppc/platforms/pmac_feature.c +5 -2
diff -urN linux-2.5/arch/ppc/platforms/pmac_feature.c linuxppc-2.5-benh/arch/ppc/platforms/pmac_feature.c
@@ -578,7 +578,6 @@
 
 	/* Let things settle */
 	(void)MACIO_IN32(HEATHROW_FCR);
-	mdelay(1);
 }
 
 static void __pmac

@@ -2102,7 +2101,7 @@
 		0,
 	},
 	{	"PowerMac3,6",			"PowerMac G4 Windtunnel",
-		PMAC_TYPE_WINDTUNNEL,		rackmac_features,
+		PMAC_TYPE_WINDTUNNEL,		core99_features,
 		0,
 	},
 	{	"PowerBook5,1",			"PowerBook G4 17\"",

@@ -2129,6 +2128,10 @@
 		PMAC_TYPE_UNKNOWN_INTREPID,	intrepid_features,
 		PMAC_MB_HAS_FW_POWER | PMAC_MB_MOBILE,
 	},
+	{	"PowerBook6,5",			"iBook G4",
+		PMAC_TYPE_UNKNOWN_INTREPID,	intrepid_features,
+		PMAC_MB_HAS_FW_POWER | PMAC_MB_MOBILE,
+	},
 #else /* CONFIG_POWER4 */
 	{	"PowerMac7,2",			"PowerMac G5",
 		PMAC_TYPE_POWERMAC_G5,		g5_features,