[Gc-linux-cvs] linux/arch/powerpc/kernel cputable.c, 1.9, 1.10 dma.c, 1.1, 1.2 head_32.S, 1.10, 1.11 udbg.c, 1.6, 1.7

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

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

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


Index: udbg.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/kernel/udbg.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** udbg.c	25 Oct 2009 18:45:35 -0000	1.6
--- udbg.c	25 Oct 2009 18:50:26 -0000	1.7
***************
*** 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.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dma.c	25 Oct 2009 18:45:35 -0000	1.1
--- dma.c	25 Oct 2009 18:50:26 -0000	1.2
***************
*** 33,36 ****
--- 33,39 ----
  	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)
***************
*** 60,63 ****
--- 63,68 ----
  {
  #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.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** head_32.S	25 Oct 2009 18:45:35 -0000	1.10
--- head_32.S	25 Oct 2009 18:50:26 -0000	1.11
***************
*** 165,168 ****
--- 165,171 ----
  	bl	setup_cpm_bat
  #endif
+ #ifdef CONFIG_PPC_EARLY_DEBUG_USBGECKO
+ 	bl	setup_usbgecko_bat
+ #endif
  
  /*
***************
*** 1294,1297 ****
--- 1297,1318 ----
  #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.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** cputable.c	25 Oct 2009 18:45:35 -0000	1.9
--- cputable.c	25 Oct 2009 18:50:26 -0000	1.10
***************
*** 691,699 ****
  		.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,
--- 691,699 ----
  		.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,
***************
*** 706,716 ****
  		.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,
--- 706,716 ----
  		.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,