[Gc-linux-cvs] linux/arch/powerpc/kernel cputable.c, 1.12, 1.13 dma.c, 1.4, 1.5 head_32.S, 1.13, 1.14 udbg.c, 1.8, 1.9

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/arch/powerpc/kernel
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/arch/powerpc/kernel

Modified Files:
	cputable.c dma.c head_32.S udbg.c 
Log Message:
Merge gc-linux-v2.6.31.


Index: udbg.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/kernel/udbg.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** udbg.c	25 Oct 2009 18:53:45 -0000	1.8
--- udbg.c	25 Oct 2009 18:59:27 -0000	1.9
***************
*** 61,64 ****
--- 61,66 ----
  #elif defined(CONFIG_PPC_EARLY_DEBUG_CPM)
  	udbg_init_cpm();
+ #elif defined(CONFIG_PPC_EARLY_DEBUG_USBGECKO)
+ 	udbg_init_usbgecko();
  #endif
  

Index: dma.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/kernel/dma.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dma.c	25 Oct 2009 18:56:55 -0000	1.4
--- dma.c	25 Oct 2009 18:59:27 -0000	1.5
***************
*** 34,37 ****
--- 34,40 ----
  	void *ret;
  #ifdef CONFIG_NOT_COHERENT_CACHE
+ 	if (dma_alloc_from_coherent(dev, size, dma_handle, &ret))
+ 		return ret;
+ 
  	ret = __dma_alloc_coherent(dev, size, dma_handle, flag);
  	if (ret == NULL)
***************
*** 61,64 ****
--- 64,69 ----
  {
  #ifdef CONFIG_NOT_COHERENT_CACHE
+ 	if (dma_release_from_coherent(dev, get_order(size), vaddr))
+ 		return;
  	__dma_free_coherent(size, vaddr);
  #else

Index: head_32.S
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/kernel/head_32.S,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** head_32.S	25 Oct 2009 18:56:55 -0000	1.13
--- head_32.S	25 Oct 2009 18:59:27 -0000	1.14
***************
*** 165,168 ****
--- 165,171 ----
  	bl	setup_cpm_bat
  #endif
+ #ifdef CONFIG_PPC_EARLY_DEBUG_USBGECKO
+ 	bl	setup_usbgecko_bat
+ #endif
  
  /*
***************
*** 1204,1207 ****
--- 1207,1228 ----
  #endif
  
+ #ifdef CONFIG_PPC_EARLY_DEBUG_USBGECKO
+ setup_usbgecko_bat:
+ 	/* prepare a BAT for early io */
+ 	lis	r8, 0x0c00
+ 	ori	r8, r8, 0x002a	/* uncached, guarded ,rw */
+ 	lis	r11, 0xcc00
+ 	ori	r11, r11, 0x3	/* 128K */
+ #ifdef CONFIG_WII
+ 	oris	r8, r8, 0x0100
+ 	oris	r11, r11, 0x0100
+ #endif
+ 	mtspr	SPRN_DBAT1L, r8
+ 	mtspr	SPRN_DBAT1U, r11
+ 	sync
+ 	isync
+ 	blr
+ #endif
+ 
  #ifdef CONFIG_8260
  /* Jump into the system reset for the rom.

Index: cputable.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/kernel/cputable.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** cputable.c	25 Oct 2009 18:56:55 -0000	1.12
--- cputable.c	25 Oct 2009 18:59:27 -0000	1.13
***************
*** 693,701 ****
  		.platform		= "ppc750",
  	},
! 	{	/* 750CL */
! 		.pvr_mask		= 0xfffff0f0,
! 		.pvr_value		= 0x00087010,
! 		.cpu_name		= "750CL",
! 		.cpu_features		= CPU_FTRS_750CL,
  		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,
  		.mmu_features		= MMU_FTR_HPTE_TABLE | MMU_FTR_USE_HIGH_BATS,
--- 693,701 ----
  		.platform		= "ppc750",
  	},
! 	{	/* 745/755 */
! 		.pvr_mask		= 0xfffff000,
! 		.pvr_value		= 0x00083000,
! 		.cpu_name		= "745/755",
! 		.cpu_features		= CPU_FTRS_750,
  		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,
  		.mmu_features		= MMU_FTR_HPTE_TABLE | MMU_FTR_USE_HIGH_BATS,
***************
*** 708,718 ****
  		.platform		= "ppc750",
  	},
! 	{	/* 745/755 */
! 		.pvr_mask		= 0xfffff000,
! 		.pvr_value		= 0x00083000,
! 		.cpu_name		= "745/755",
! 		.cpu_features		= CPU_FTRS_750,
  		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,
! 		.mmu_features		= MMU_FTR_HPTE_TABLE,
  		.icache_bsize		= 32,
  		.dcache_bsize		= 32,
--- 708,718 ----
  		.platform		= "ppc750",
  	},
! 	{	/* 750CL (and "Broadway") */
! 		.pvr_mask		= 0xfffff0e0,
! 		.pvr_value		= 0x00087000,
! 		.cpu_name		= "750CL",
! 		.cpu_features		= CPU_FTRS_750CL,
  		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,
! 		.mmu_features		= MMU_FTR_HPTE_TABLE | MMU_FTR_USE_HIGH_BATS,
  		.icache_bsize		= 32,
  		.dcache_bsize		= 32,