Menu
▾
▴
gc-linux-cvs — CVS commit logs.
This list is closed, nobody may subscribe to it.
| 2004 |
Jan
(53) |
Feb
(78) |
Mar
(34) |
Apr
(26) |
May
(25) |
Jun
(34) |
Jul
(16) |
Aug
(16) |
Sep
(2) |
Oct
(58) |
Nov
(13) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(62) |
Feb
(4) |
Mar
(40) |
Apr
(9) |
May
(13) |
Jun
(26) |
Jul
(32) |
Aug
(24) |
Sep
(18) |
Oct
(18) |
Nov
(14) |
Dec
|
| 2006 |
Jan
(15) |
Feb
(2) |
Mar
(23) |
Apr
(2) |
May
(2) |
Jun
(13) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2007 |
Jan
(1) |
Feb
(45) |
Mar
|
Apr
(13) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
(31) |
Dec
(5) |
| 2008 |
Jan
(6) |
Feb
(34) |
Mar
(113) |
Apr
(40) |
May
(19) |
Jun
(5) |
Jul
(41) |
Aug
(13) |
Sep
(53) |
Oct
(4) |
Nov
(53) |
Dec
|
| 2009 |
Jan
(1) |
Feb
(29) |
Mar
(66) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(163) |
Nov
|
Dec
(91) |
|
From: Albert H. <he...@us...> - 2009-12-09 18:40:18
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/kernel In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21229/arch/powerpc/kernel Modified Files: cputable.c dma.c head_32.S Log Message: Forward to v2.6.32. Index: cputable.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/kernel/cputable.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** cputable.c 9 Dec 2009 18:18:06 -0000 1.14 --- cputable.c 9 Dec 2009 18:40:09 -0000 1.15 *************** *** 90,98 **** PPC_FEATURE_TRUE_LE | \ PPC_FEATURE_HAS_ALTIVEC_COMP) #define COMMON_USER_BOOKE (PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | \ PPC_FEATURE_BOOKE) static struct cpu_spec __initdata cpu_specs[] = { ! #ifdef CONFIG_PPC64 { /* Power3 */ .pvr_mask = 0xffff0000, --- 90,102 ---- PPC_FEATURE_TRUE_LE | \ PPC_FEATURE_HAS_ALTIVEC_COMP) + #ifdef CONFIG_PPC_BOOK3E_64 + #define COMMON_USER_BOOKE (COMMON_USER_PPC64 | PPC_FEATURE_BOOKE) + #else #define COMMON_USER_BOOKE (PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | \ PPC_FEATURE_BOOKE) + #endif static struct cpu_spec __initdata cpu_specs[] = { ! #ifdef CONFIG_PPC_BOOK3S_64 { /* Power3 */ .pvr_mask = 0xffff0000, *************** *** 509,513 **** .platform = "power4", } ! #endif /* CONFIG_PPC64 */ #ifdef CONFIG_PPC32 #if CLASSIC_PPC --- 513,518 ---- .platform = "power4", } ! #endif /* CONFIG_PPC_BOOK3S_64 */ ! #ifdef CONFIG_PPC32 #if CLASSIC_PPC *************** *** 707,710 **** --- 712,717 ---- .machine_check = machine_check_generic, .platform = "ppc750", + .oprofile_cpu_type = "ppc/750", + .oprofile_type = PPC_OPROFILE_G4, }, { /* 745/755 */ *************** *** 1631,1635 **** }, { /* 460EX */ ! .pvr_mask = 0xffff0002, .pvr_value = 0x13020002, .cpu_name = "460EX", --- 1638,1642 ---- }, { /* 460EX */ ! .pvr_mask = 0xffff0006, .pvr_value = 0x13020002, .cpu_name = "460EX", *************** *** 1643,1648 **** .platform = "ppc440", }, { /* 460GT */ ! .pvr_mask = 0xffff0002, .pvr_value = 0x13020000, .cpu_name = "460GT", --- 1650,1668 ---- .platform = "ppc440", }, + { /* 460EX Rev B */ + .pvr_mask = 0xffff0007, + .pvr_value = 0x13020004, + .cpu_name = "460EX Rev. B", + .cpu_features = CPU_FTRS_440x6, + .cpu_user_features = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU, + .mmu_features = MMU_FTR_TYPE_44x, + .icache_bsize = 32, + .dcache_bsize = 32, + .cpu_setup = __setup_cpu_460ex, + .machine_check = machine_check_440A, + .platform = "ppc440", + }, { /* 460GT */ ! .pvr_mask = 0xffff0006, .pvr_value = 0x13020000, .cpu_name = "460GT", *************** *** 1656,1659 **** --- 1676,1692 ---- .platform = "ppc440", }, + { /* 460GT Rev B */ + .pvr_mask = 0xffff0007, + .pvr_value = 0x13020005, + .cpu_name = "460GT Rev. B", + .cpu_features = CPU_FTRS_440x6, + .cpu_user_features = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU, + .mmu_features = MMU_FTR_TYPE_44x, + .icache_bsize = 32, + .dcache_bsize = 32, + .cpu_setup = __setup_cpu_460gt, + .machine_check = machine_check_440A, + .platform = "ppc440", + }, { /* 460SX */ .pvr_mask = 0xffffff00, *************** *** 1798,1801 **** --- 1831,1857 ---- #endif /* CONFIG_E500 */ #endif /* CONFIG_PPC32 */ + + #ifdef CONFIG_PPC_BOOK3E_64 + { /* This is a default entry to get going, to be replaced by + * a real one at some stage + */ + #define CPU_FTRS_BASE_BOOK3E (CPU_FTR_USE_TB | \ + CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_SMT | \ + CPU_FTR_NODSISRALIGN | CPU_FTR_NOEXECUTE) + .pvr_mask = 0x00000000, + .pvr_value = 0x00000000, + .cpu_name = "Book3E", + .cpu_features = CPU_FTRS_BASE_BOOK3E, + .cpu_user_features = COMMON_USER_PPC64, + .mmu_features = MMU_FTR_TYPE_3E | MMU_FTR_USE_TLBILX | + MMU_FTR_USE_TLBIVAX_BCAST | + MMU_FTR_LOCK_BCAST_INVAL, + .icache_bsize = 64, + .dcache_bsize = 64, + .num_pmcs = 0, + .machine_check = machine_check_generic, + .platform = "power6", + }, + #endif }; Index: dma.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/kernel/dma.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** dma.c 9 Dec 2009 18:18:06 -0000 1.6 --- dma.c 9 Dec 2009 18:40:09 -0000 1.7 *************** *** 8,11 **** --- 8,12 ---- #include <linux/device.h> #include <linux/dma-mapping.h> + #include <linux/dma-debug.h> #include <linux/lmb.h> #include <asm/bug.h> *************** *** 21,31 **** */ - unsigned long get_dma_direct_offset(struct device *dev) - { - if (dev) - return (unsigned long)dev->archdata.dma_data; - - return PCI_DRAM_OFFSET; - } void *dma_direct_alloc_coherent(struct device *dev, size_t size, --- 22,25 ---- *************** *** 37,41 **** if (ret == NULL) return NULL; ! *dma_handle += get_dma_direct_offset(dev); return ret; #else --- 31,35 ---- if (ret == NULL) return NULL; ! *dma_handle += get_dma_offset(dev); return ret; #else *************** *** 51,55 **** ret = page_address(page); memset(ret, 0, size); ! *dma_handle = virt_to_abs(ret) + get_dma_direct_offset(dev); return ret; --- 45,49 ---- ret = page_address(page); memset(ret, 0, size); ! *dma_handle = virt_to_abs(ret) + get_dma_offset(dev); return ret; *************** *** 75,79 **** for_each_sg(sgl, sg, nents, i) { ! sg->dma_address = sg_phys(sg) + get_dma_direct_offset(dev); sg->dma_length = sg->length; __dma_sync_page(sg_page(sg), sg->offset, sg->length, direction); --- 69,73 ---- for_each_sg(sgl, sg, nents, i) { ! sg->dma_address = sg_phys(sg) + get_dma_offset(dev); sg->dma_length = sg->length; __dma_sync_page(sg_page(sg), sg->offset, sg->length, direction); *************** *** 110,114 **** BUG_ON(dir == DMA_NONE); __dma_sync_page(page, offset, size, dir); ! return page_to_phys(page) + offset + get_dma_direct_offset(dev); } --- 104,108 ---- BUG_ON(dir == DMA_NONE); __dma_sync_page(page, offset, size, dir); ! return page_to_phys(page) + offset + get_dma_offset(dev); } *************** *** 141,145 **** #endif ! struct dma_mapping_ops dma_direct_ops = { .alloc_coherent = dma_direct_alloc_coherent, .free_coherent = dma_direct_free_coherent, --- 135,139 ---- #endif ! struct dma_map_ops dma_direct_ops = { .alloc_coherent = dma_direct_alloc_coherent, .free_coherent = dma_direct_free_coherent, *************** *** 157,158 **** --- 151,162 ---- }; EXPORT_SYMBOL(dma_direct_ops); + + #define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16) + + static int __init dma_init(void) + { + dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES); + + return 0; + } + fs_initcall(dma_init); Index: head_32.S =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/kernel/head_32.S,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** head_32.S 9 Dec 2009 18:18:06 -0000 1.15 --- head_32.S 9 Dec 2009 18:40:09 -0000 1.16 *************** *** 245,250 **** */ #define EXCEPTION_PROLOG \ ! mtspr SPRN_SPRG0,r10; \ ! mtspr SPRN_SPRG1,r11; \ mfcr r10; \ EXCEPTION_PROLOG_1; \ --- 245,250 ---- */ #define EXCEPTION_PROLOG \ ! mtspr SPRN_SPRG_SCRATCH0,r10; \ ! mtspr SPRN_SPRG_SCRATCH1,r11; \ mfcr r10; \ EXCEPTION_PROLOG_1; \ *************** *** 256,260 **** tophys(r11,r1); /* use tophys(r1) if kernel */ \ beq 1f; \ ! mfspr r11,SPRN_SPRG3; \ lwz r11,THREAD_INFO-THREAD(r11); \ addi r11,r11,THREAD_SIZE; \ --- 256,260 ---- tophys(r11,r1); /* use tophys(r1) if kernel */ \ beq 1f; \ ! mfspr r11,SPRN_SPRG_THREAD; \ lwz r11,THREAD_INFO-THREAD(r11); \ addi r11,r11,THREAD_SIZE; \ *************** *** 268,274 **** stw r12,GPR12(r11); \ stw r9,GPR9(r11); \ ! mfspr r10,SPRN_SPRG0; \ stw r10,GPR10(r11); \ ! mfspr r12,SPRN_SPRG1; \ stw r12,GPR11(r11); \ mflr r10; \ --- 268,274 ---- stw r12,GPR12(r11); \ stw r9,GPR9(r11); \ ! mfspr r10,SPRN_SPRG_SCRATCH0; \ stw r10,GPR10(r11); \ ! mfspr r12,SPRN_SPRG_SCRATCH1; \ stw r12,GPR11(r11); \ mflr r10; \ *************** *** 356,364 **** */ . = 0x200 ! mtspr SPRN_SPRG0,r10 ! mtspr SPRN_SPRG1,r11 mfcr r10 #ifdef CONFIG_PPC_CHRP ! mfspr r11,SPRN_SPRG2 cmpwi 0,r11,0 bne 7f --- 356,364 ---- */ . = 0x200 ! mtspr SPRN_SPRG_SCRATCH0,r10 ! mtspr SPRN_SPRG_SCRATCH1,r11 mfcr r10 #ifdef CONFIG_PPC_CHRP ! mfspr r11,SPRN_SPRG_RTAS cmpwi 0,r11,0 bne 7f *************** *** 368,372 **** addi r3,r1,STACK_FRAME_OVERHEAD #ifdef CONFIG_PPC_CHRP ! mfspr r4,SPRN_SPRG2 cmpwi cr1,r4,0 bne cr1,1f --- 368,372 ---- addi r3,r1,STACK_FRAME_OVERHEAD #ifdef CONFIG_PPC_CHRP ! mfspr r4,SPRN_SPRG_RTAS cmpwi cr1,r4,0 bne cr1,1f *************** *** 486,490 **** lis r1,PAGE_OFFSET@h /* check if kernel address */ cmplw 0,r1,r3 ! mfspr r2,SPRN_SPRG3 li r1,_PAGE_USER|_PAGE_PRESENT /* low addresses tested as user */ lwz r2,PGDIR(r2) --- 486,490 ---- lis r1,PAGE_OFFSET@h /* check if kernel address */ cmplw 0,r1,r3 ! mfspr r2,SPRN_SPRG_THREAD li r1,_PAGE_USER|_PAGE_PRESENT /* low addresses tested as user */ lwz r2,PGDIR(r2) *************** *** 560,564 **** lis r1,PAGE_OFFSET@h /* check if kernel address */ cmplw 0,r1,r3 ! mfspr r2,SPRN_SPRG3 li r1,_PAGE_USER|_PAGE_PRESENT /* low addresses tested as user */ lwz r2,PGDIR(r2) --- 560,564 ---- lis r1,PAGE_OFFSET@h /* check if kernel address */ cmplw 0,r1,r3 ! mfspr r2,SPRN_SPRG_THREAD li r1,_PAGE_USER|_PAGE_PRESENT /* low addresses tested as user */ lwz r2,PGDIR(r2) *************** *** 599,608 **** BEGIN_MMU_FTR_SECTION li r0,1 ! mfspr r1,SPRN_SPRG4 rlwinm r2,r3,20,27,31 /* Get Address bits 15:19 */ slw r0,r0,r2 xor r1,r0,r1 srw r0,r1,r2 ! mtspr SPRN_SPRG4,r1 mfspr r2,SPRN_SRR1 rlwimi r2,r0,31-14,14,14 --- 599,608 ---- BEGIN_MMU_FTR_SECTION li r0,1 ! mfspr r1,SPRN_SPRG_603_LRU rlwinm r2,r3,20,27,31 /* Get Address bits 15:19 */ slw r0,r0,r2 xor r1,r0,r1 srw r0,r1,r2 ! mtspr SPRN_SPRG_603_LRU,r1 mfspr r2,SPRN_SRR1 rlwimi r2,r0,31-14,14,14 *************** *** 644,648 **** lis r1,PAGE_OFFSET@h /* check if kernel address */ cmplw 0,r1,r3 ! mfspr r2,SPRN_SPRG3 li r1,_PAGE_RW|_PAGE_USER|_PAGE_PRESENT /* access flags */ lwz r2,PGDIR(r2) --- 644,648 ---- lis r1,PAGE_OFFSET@h /* check if kernel address */ cmplw 0,r1,r3 ! mfspr r2,SPRN_SPRG_THREAD li r1,_PAGE_RW|_PAGE_USER|_PAGE_PRESENT /* access flags */ lwz r2,PGDIR(r2) *************** *** 679,688 **** BEGIN_MMU_FTR_SECTION li r0,1 ! mfspr r1,SPRN_SPRG4 rlwinm r2,r3,20,27,31 /* Get Address bits 15:19 */ slw r0,r0,r2 xor r1,r0,r1 srw r0,r1,r2 ! mtspr SPRN_SPRG4,r1 mfspr r2,SPRN_SRR1 rlwimi r2,r0,31-14,14,14 --- 679,688 ---- BEGIN_MMU_FTR_SECTION li r0,1 ! mfspr r1,SPRN_SPRG_603_LRU rlwinm r2,r3,20,27,31 /* Get Address bits 15:19 */ slw r0,r0,r2 xor r1,r0,r1 srw r0,r1,r2 ! mtspr SPRN_SPRG_603_LRU,r1 mfspr r2,SPRN_SRR1 rlwimi r2,r0,31-14,14,14 *************** *** 865,871 **** addi r4,r4,THREAD /* phys address of our thread_struct */ CLR_TOP32(r4) ! mtspr SPRN_SPRG3,r4 li r3,0 ! mtspr SPRN_SPRG2,r3 /* 0 => not in RTAS */ /* enable MMU and jump to start_secondary */ --- 865,871 ---- addi r4,r4,THREAD /* phys address of our thread_struct */ CLR_TOP32(r4) ! mtspr SPRN_SPRG_THREAD,r4 li r3,0 ! mtspr SPRN_SPRG_RTAS,r3 /* 0 => not in RTAS */ /* enable MMU and jump to start_secondary */ *************** *** 948,954 **** addi r4,r4,THREAD /* init task's THREAD */ CLR_TOP32(r4) ! mtspr SPRN_SPRG3,r4 li r3,0 ! mtspr SPRN_SPRG2,r3 /* 0 => not in RTAS */ /* stack */ --- 948,954 ---- addi r4,r4,THREAD /* init task's THREAD */ CLR_TOP32(r4) ! mtspr SPRN_SPRG_THREAD,r4 li r3,0 ! mtspr SPRN_SPRG_RTAS,r3 /* 0 => not in RTAS */ /* stack */ |
|
From: Albert H. <he...@us...> - 2009-12-09 18:40:18
|
Update of /cvsroot/gc-linux/linux/include/asm-generic In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21229/include/asm-generic Modified Files: gpio.h Log Message: Forward to v2.6.32. Index: gpio.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/asm-generic/gpio.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** gpio.h 9 Dec 2009 18:18:07 -0000 1.8 --- gpio.h 9 Dec 2009 18:40:10 -0000 1.9 *************** *** 2,5 **** --- 2,6 ---- #define _ASM_GENERIC_GPIO_H + #include <linux/kernel.h> #include <linux/types.h> #include <linux/errno.h> *************** *** 142,145 **** --- 143,148 ---- */ extern int gpio_export(unsigned gpio, bool direction_may_change); + extern int gpio_export_link(struct device *dev, const char *name, + unsigned gpio); extern void gpio_unexport(unsigned gpio); *************** *** 186,189 **** --- 189,198 ---- } + static inline int gpio_export_link(struct device *dev, const char *name, + unsigned gpio) + { + return -ENOSYS; + } + static inline void gpio_unexport(unsigned gpio) { |
|
From: Albert H. <he...@us...> - 2009-12-09 18:40:18
|
Update of /cvsroot/gc-linux/linux/drivers/usb/host In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21229/drivers/usb/host Modified Files: Kconfig Makefile ehci-hcd.c ehci.h ohci-hcd.c ohci-q.c ohci.h Log Message: Forward to v2.6.32. Index: ohci-q.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/usb/host/ohci-q.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ohci-q.c 9 Dec 2009 18:18:07 -0000 1.5 --- ohci-q.c 9 Dec 2009 18:40:10 -0000 1.6 *************** *** 50,56 **** case PIPE_ISOCHRONOUS: ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs--; ! if (ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs == 0 ! && quirk_amdiso(ohci)) ! quirk_amd_pll(1); break; case PIPE_INTERRUPT: --- 50,59 ---- case PIPE_ISOCHRONOUS: ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs--; ! if (ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs == 0) { ! if (quirk_amdiso(ohci)) ! quirk_amd_pll(1); ! if (quirk_amdprefetch(ohci)) ! sb800_prefetch(ohci, 0); ! } break; case PIPE_INTERRUPT: *************** *** 419,423 **** /* FIXME usbcore changes dev->devnum before SET_ADDRESS ! * suceeds ... otherwise we wouldn't need "pipe". */ info = usb_pipedevice (pipe); --- 422,426 ---- /* FIXME usbcore changes dev->devnum before SET_ADDRESS ! * succeeds ... otherwise we wouldn't need "pipe". */ info = usb_pipedevice (pipe); *************** *** 681,687 **** urb->iso_frame_desc [cnt].length, urb, cnt); } ! if (ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs == 0 ! && quirk_amdiso(ohci)) ! quirk_amd_pll(0); periodic = ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs++ == 0 && ohci_to_hcd(ohci)->self.bandwidth_int_reqs == 0; --- 684,693 ---- urb->iso_frame_desc [cnt].length, urb, cnt); } ! if (ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs == 0) { ! if (quirk_amdiso(ohci)) ! quirk_amd_pll(0); ! if (quirk_amdprefetch(ohci)) ! sb800_prefetch(ohci, 1); ! } periodic = ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs++ == 0 && ohci_to_hcd(ohci)->self.bandwidth_int_reqs == 0; Index: ehci.h =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/usb/host/ehci.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ehci.h 9 Dec 2009 18:18:07 -0000 1.6 --- ehci.h 9 Dec 2009 18:40:10 -0000 1.7 *************** *** 38,42 **** #endif ! /* statistics can be kept for for tuning/monitoring */ struct ehci_stats { /* irq usage */ --- 38,42 ---- #endif ! /* statistics can be kept for tuning/monitoring */ struct ehci_stats { /* irq usage */ *************** *** 119,122 **** --- 119,123 ---- unsigned random_frame; unsigned long next_statechange; + ktime_t last_periodic_enable; u32 command; *************** *** 127,130 **** --- 128,133 ---- unsigned big_endian_desc:1; unsigned has_amcc_usb23:1; + unsigned need_io_watchdog:1; + unsigned broken_periodic:1; /* required for usb32 quirk */ *************** *** 136,139 **** --- 139,143 ---- #define OHCI_HCCTRL_LEN 0x4 __hc32 *ohci_hcctrl_reg; + unsigned has_hostpc:1; u8 sbrn; /* packed release number */ *************** *** 299,304 **** */ ! struct ehci_qh { ! /* first part defined by EHCI spec */ __hc32 hw_next; /* see EHCI 3.6.1 */ __hc32 hw_info1; /* see EHCI 3.6.2 */ --- 303,308 ---- */ ! /* first part defined by EHCI spec */ ! struct ehci_qh_hw { __hc32 hw_next; /* see EHCI 3.6.1 */ __hc32 hw_info1; /* see EHCI 3.6.2 */ *************** *** 318,322 **** --- 322,329 ---- __hc32 hw_buf [5]; __hc32 hw_buf_hi [5]; + } __attribute__ ((aligned(32))); + struct ehci_qh { + struct ehci_qh_hw *hw; /* the rest is HCD-private */ dma_addr_t qh_dma; /* address of qh */ *************** *** 337,340 **** --- 344,348 ---- unsigned stamp; + u8 needs_rescan; /* Dequeue during giveback */ u8 qh_state; #define QH_STATE_LINKED 1 /* HC sees this */ *************** *** 358,362 **** struct usb_device *dev; /* access to TT */ unsigned clearing_tt:1; /* Clear-TT-Buf in progress */ ! } __attribute__ ((aligned (32))); /*-------------------------------------------------------------------------*/ --- 366,370 ---- struct usb_device *dev; /* access to TT */ unsigned clearing_tt:1; /* Clear-TT-Buf in progress */ ! }; /*-------------------------------------------------------------------------*/ *************** *** 545,549 **** { if (ehci_is_TDI(ehci)) { ! switch ((portsc>>26)&3) { case 0: return 0; --- 553,557 ---- { if (ehci_is_TDI(ehci)) { ! switch ((portsc >> (ehci->has_hostpc ? 25 : 26)) & 3) { case 0: return 0; Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/usb/host/Kconfig,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Kconfig 9 Dec 2009 18:18:07 -0000 1.13 --- Kconfig 9 Dec 2009 18:40:10 -0000 1.14 *************** *** 114,117 **** --- 114,123 ---- OpenFirmware platform bus. + config USB_W90X900_EHCI + bool "W90X900(W90P910) EHCI support" + depends on USB_EHCI_HCD && ARCH_W90X900 + ---help--- + Enables support for the W90X900 USB controller + config USB_OXU210HP_HCD tristate "OXU210HP HCD support" *************** *** 154,157 **** --- 160,175 ---- module will be called isp1760. + config USB_ISP1362_HCD + tristate "ISP1362 HCD support" + depends on USB + default N + ---help--- + Supports the Philips ISP1362 chip as a host controller + + This driver does not support isochronous transfers. + + To compile this driver as a module, choose M here: the + module will be called isp1362-hcd. + config USB_OHCI_HCD tristate "OHCI HCD support" *************** *** 337,347 **** module will be called r8a66597-hcd. - config SUPERH_ON_CHIP_R8A66597 - boolean "Enable SuperH on-chip R8A66597 USB" - depends on USB_R8A66597_HCD && (CPU_SUBTYPE_SH7366 || CPU_SUBTYPE_SH7723 || CPU_SUBTYPE_SH7724) - help - This driver enables support for the on-chip R8A66597 in the - SH7366, SH7723 and SH7724 processors. - config USB_WHCI_HCD tristate "Wireless USB Host Controller Interface (WHCI) driver (EXPERIMENTAL)" --- 355,358 ---- Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/usb/host/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile 9 Dec 2009 18:18:07 -0000 1.10 --- Makefile 9 Dec 2009 18:40:10 -0000 1.11 *************** *** 22,25 **** --- 22,26 ---- obj-$(CONFIG_USB_OXU210HP_HCD) += oxu210hp-hcd.o obj-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o + obj-$(CONFIG_USB_ISP1362_HCD) += isp1362-hcd.o obj-$(CONFIG_USB_OHCI_HCD) += ohci-hcd.o obj-$(CONFIG_USB_UHCI_HCD) += uhci-hcd.o Index: ohci.h =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/usb/host/ohci.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ohci.h 9 Dec 2009 18:18:07 -0000 1.5 --- ohci.h 9 Dec 2009 18:40:10 -0000 1.6 *************** *** 403,406 **** --- 403,407 ---- #define OHCI_QUIRK_HUB_POWER 0x100 /* distrust firmware power/oc setup */ #define OHCI_QUIRK_AMD_ISO 0x200 /* ISO transfers*/ + #define OHCI_QUIRK_AMD_PREFETCH 0x400 /* pre-fetch for ISO transfer */ // there are also chip quirks/bugs in init logic *************** *** 434,437 **** --- 435,442 ---- return ohci->flags & OHCI_QUIRK_AMD_ISO; } + static inline int quirk_amdprefetch(struct ohci_hcd *ohci) + { + return ohci->flags & OHCI_QUIRK_AMD_PREFETCH; + } #else static inline int quirk_nec(struct ohci_hcd *ohci) *************** *** 447,450 **** --- 452,459 ---- return 0; } + static inline int quirk_amdprefetch(struct ohci_hcd *ohci) + { + return 0; + } #endif Index: ohci-hcd.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/usb/host/ohci-hcd.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ohci-hcd.c 9 Dec 2009 18:18:07 -0000 1.6 --- ohci-hcd.c 9 Dec 2009 18:40:10 -0000 1.7 *************** *** 35,39 **** #include <linux/dma-mapping.h> #include <linux/dmapool.h> - #include <linux/reboot.h> #include <linux/workqueue.h> #include <linux/debugfs.h> --- 35,38 ---- *************** *** 89,92 **** --- 88,92 ---- static void quirk_amd_pll(int state); static void amd_iso_dev_put(void); + static void sb800_prefetch(struct ohci_hcd *ohci, int on); #else static inline void quirk_amd_pll(int state) *************** *** 98,101 **** --- 98,105 ---- return; } + static inline void sb800_prefetch(struct ohci_hcd *ohci, int on) + { + return; + } #endif Index: ehci-hcd.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/usb/host/ehci-hcd.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ehci-hcd.c 9 Dec 2009 18:18:07 -0000 1.6 --- ehci-hcd.c 9 Dec 2009 18:40:10 -0000 1.7 *************** *** 29,35 **** #include <linux/init.h> #include <linux/timer.h> #include <linux/list.h> #include <linux/interrupt.h> - #include <linux/reboot.h> #include <linux/usb.h> #include <linux/moduleparam.h> --- 29,35 ---- #include <linux/init.h> #include <linux/timer.h> + #include <linux/ktime.h> #include <linux/list.h> #include <linux/interrupt.h> #include <linux/usb.h> #include <linux/moduleparam.h> *************** *** 128,131 **** --- 128,133 ---- switch (action) { case TIMER_IO_WATCHDOG: + if (!ehci->need_io_watchdog) + return; t = EHCI_IO_JIFFIES; break; *************** *** 240,243 **** --- 242,250 ---- u32 command = ehci_readl(ehci, &ehci->regs->command); + /* If the EHCI debug controller is active, special care must be + * taken before and after a host controller reset */ + if (ehci->debug && !dbgp_reset_prep()) + ehci->debug = NULL; + command |= CMD_RESET; dbg_cmd (ehci, "reset", command); *************** *** 248,251 **** --- 255,264 ---- CMD_RESET, 0, 250 * 1000); + if (ehci->has_hostpc) { + ehci_writel(ehci, USBMODE_EX_HC | USBMODE_EX_VBPS, + (u32 __iomem *)(((u8 *)ehci->regs) + USBMODE_EX)); + ehci_writel(ehci, TXFIFO_DEFAULT, + (u32 __iomem *)(((u8 *)ehci->regs) + TXFILLTUNING)); + } if (retval) return retval; *************** *** 254,257 **** --- 267,273 ---- tdi_reset (ehci); + if (ehci->debug) + dbgp_external_startup(); + return retval; } *************** *** 506,512 **** --- 522,533 ---- int retval; u32 hcc_params; + struct ehci_qh_hw *hw; spin_lock_init(&ehci->lock); + /* + * keep io watchdog by default, those good HCDs could turn off it later + */ + ehci->need_io_watchdog = 1; init_timer(&ehci->watchdog); ehci->watchdog.function = ehci_watchdog; *************** *** 545,554 **** */ ehci->async->qh_next.qh = NULL; ! ehci->async->hw_next = QH_NEXT(ehci, ehci->async->qh_dma); ! ehci->async->hw_info1 = cpu_to_hc32(ehci, QH_HEAD); ! ehci->async->hw_token = cpu_to_hc32(ehci, QTD_STS_HALT); ! ehci->async->hw_qtd_next = EHCI_LIST_END(ehci); ehci->async->qh_state = QH_STATE_LINKED; ! ehci->async->hw_alt_next = QTD_NEXT(ehci, ehci->async->dummy->qtd_dma); /* clear interrupt enables, set irq latency */ --- 566,576 ---- */ ehci->async->qh_next.qh = NULL; ! hw = ehci->async->hw; ! hw->hw_next = QH_NEXT(ehci, ehci->async->qh_dma); ! hw->hw_info1 = cpu_to_hc32(ehci, QH_HEAD); ! hw->hw_token = cpu_to_hc32(ehci, QTD_STS_HALT); ! hw->hw_qtd_next = EHCI_LIST_END(ehci); ehci->async->qh_state = QH_STATE_LINKED; ! hw->hw_alt_next = QTD_NEXT(ehci, ehci->async->dummy->qtd_dma); /* clear interrupt enables, set irq latency */ *************** *** 656,659 **** --- 678,682 ---- msleep(5); up_write(&ehci_cf_port_reset_rwsem); + ehci->last_periodic_enable = ktime_get_real(); temp = HC_VERSION(ehci_readl(ehci, &ehci->caps->hc_capbase)); *************** *** 851,860 **** end_unlink_async(ehci); ! /* if it's not linked then there's nothing to do */ ! if (qh->qh_state != QH_STATE_LINKED) ! ; /* defer till later if busy */ ! else if (ehci->reclaim) { struct ehci_qh *last; --- 874,889 ---- end_unlink_async(ehci); ! /* If the QH isn't linked then there's nothing we can do ! * unless we were called during a giveback, in which case ! * qh_completions() has to deal with it. ! */ ! if (qh->qh_state != QH_STATE_LINKED) { ! if (qh->qh_state == QH_STATE_COMPLETING) ! qh->needs_rescan = 1; ! return; ! } /* defer till later if busy */ ! if (ehci->reclaim) { struct ehci_qh *last; *************** *** 916,921 **** switch (qh->qh_state) { case QH_STATE_LINKED: intr_deschedule (ehci, qh); ! /* FALL THROUGH */ case QH_STATE_IDLE: qh_completions (ehci, qh); --- 945,951 ---- switch (qh->qh_state) { case QH_STATE_LINKED: + case QH_STATE_COMPLETING: intr_deschedule (ehci, qh); ! break; case QH_STATE_IDLE: qh_completions (ehci, qh); *************** *** 926,946 **** goto done; } - - /* reschedule QH iff another request is queued */ - if (!list_empty (&qh->qtd_list) - && HC_IS_RUNNING (hcd->state)) { - rc = qh_schedule(ehci, qh); - - /* An error here likely indicates handshake failure - * or no space left in the schedule. Neither fault - * should happen often ... - * - * FIXME kill the now-dysfunctional queued urbs - */ - if (rc != 0) - ehci_err(ehci, - "can't reschedule qh %p, err %d", - qh, rc); - } break; --- 956,959 ---- *************** *** 980,984 **** * accelerate iso completions ... so spin a while. */ ! if (qh->hw_info1 == 0) { ehci_vdbg (ehci, "iso delay\n"); goto idle_timeout; --- 993,997 ---- * accelerate iso completions ... so spin a while. */ ! if (qh->hw->hw_info1 == 0) { ehci_vdbg (ehci, "iso delay\n"); goto idle_timeout; *************** *** 989,992 **** --- 1002,1006 ---- switch (qh->qh_state) { case QH_STATE_LINKED: + case QH_STATE_COMPLETING: for (tmp = ehci->async->qh_next.qh; tmp && tmp != qh; *************** *** 1053,1057 **** if (!list_empty(&qh->qtd_list)) { WARN_ONCE(1, "clear_halt for a busy endpoint\n"); ! } else if (qh->qh_state == QH_STATE_LINKED) { /* The toggle value in the QH can't be updated --- 1067,1072 ---- if (!list_empty(&qh->qtd_list)) { WARN_ONCE(1, "clear_halt for a busy endpoint\n"); ! } else if (qh->qh_state == QH_STATE_LINKED || ! qh->qh_state == QH_STATE_COMPLETING) { /* The toggle value in the QH can't be updated *************** *** 1059,1068 **** * re-linking will call qh_refresh(). */ ! if (eptype == USB_ENDPOINT_XFER_BULK) { unlink_async(ehci, qh); ! } else { intr_deschedule(ehci, qh); - (void) qh_schedule(ehci, qh); - } } } --- 1074,1081 ---- * re-linking will call qh_refresh(). */ ! if (eptype == USB_ENDPOINT_XFER_BULK) unlink_async(ehci, qh); ! else intr_deschedule(ehci, qh); } } *************** *** 1118,1121 **** --- 1131,1144 ---- #endif + #ifdef CONFIG_USB_W90X900_EHCI + #include "ehci-w90x900.c" + #define PLATFORM_DRIVER ehci_hcd_w90x900_driver + #endif + + #ifdef CONFIG_ARCH_AT91 + #include "ehci-atmel.c" + #define PLATFORM_DRIVER ehci_atmel_driver + #endif + #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \ !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) |
|
From: Albert H. <he...@us...> - 2009-12-09 18:40:18
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/mm In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21229/arch/powerpc/mm Modified Files: pgtable_32.c Log Message: Forward to v2.6.32. Index: pgtable_32.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/mm/pgtable_32.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** pgtable_32.c 9 Dec 2009 18:18:06 -0000 1.9 --- pgtable_32.c 9 Dec 2009 18:40:09 -0000 1.10 *************** *** 143,147 **** /* we don't want to let _PAGE_USER and _PAGE_EXEC leak out */ ! flags &= ~(_PAGE_USER | _PAGE_EXEC | _PAGE_HWEXEC); return __ioremap_caller(addr, size, flags, __builtin_return_address(0)); --- 143,147 ---- /* we don't want to let _PAGE_USER and _PAGE_EXEC leak out */ ! flags &= ~(_PAGE_USER | _PAGE_EXEC); return __ioremap_caller(addr, size, flags, __builtin_return_address(0)); |
|
From: Albert H. <he...@us...> - 2009-12-09 18:40:18
|
Update of /cvsroot/gc-linux/linux/include/linux In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21229/include/linux Modified Files: fb.h gpio.h Log Message: Forward to v2.6.32. Index: gpio.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/linux/gpio.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** gpio.h 9 Dec 2009 18:18:07 -0000 1.7 --- gpio.h 9 Dec 2009 18:40:10 -0000 1.8 *************** *** 13,16 **** --- 13,18 ---- #include <linux/errno.h> + struct device; + /* * Some platforms don't support the GPIO programming interface. *************** *** 90,93 **** --- 92,104 ---- } + static inline int gpio_export_link(struct device *dev, const char *name, + unsigned gpio) + { + /* GPIO can never have been exported */ + WARN_ON(1); + return -EINVAL; + } + + static inline void gpio_unexport(unsigned gpio) { Index: fb.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/linux/fb.h,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** fb.h 9 Dec 2009 18:18:07 -0000 1.39 --- fb.h 9 Dec 2009 18:40:10 -0000 1.40 *************** *** 134,137 **** --- 134,138 ---- #define FB_ACCEL_NEOMAGIC_NM2360 97 /* NeoMagic NM2360 */ #define FB_ACCEL_NEOMAGIC_NM2380 98 /* NeoMagic NM2380 */ + #define FB_ACCEL_PXA3XX 99 /* PXA3xx */ #define FB_ACCEL_SAVAGE4 0x80 /* S3 Savage4 */ *************** *** 669,678 **** int (*fb_mmap)(struct fb_info *info, struct vm_area_struct *vma); - /* save current hardware state */ - void (*fb_save_state)(struct fb_info *info); - - /* restore saved state */ - void (*fb_restore_state)(struct fb_info *info); - /* get capability given var */ void (*fb_get_caps)(struct fb_info *info, struct fb_blit_caps *caps, --- 670,673 ---- |
|
From: Albert H. <he...@us...> - 2009-12-09 18:40:18
|
Update of /cvsroot/gc-linux/linux/drivers/usb In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21229/drivers/usb Modified Files: Kconfig Makefile Log Message: Forward to v2.6.32. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/usb/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Makefile 9 Dec 2009 18:18:07 -0000 1.11 --- Makefile 9 Dec 2009 18:40:10 -0000 1.12 *************** *** 17,20 **** --- 17,21 ---- obj-$(CONFIG_USB_XHCI_HCD) += host/ obj-$(CONFIG_USB_SL811_HCD) += host/ + obj-$(CONFIG_USB_ISP1362_HCD) += host/ obj-$(CONFIG_USB_U132_HCD) += host/ obj-$(CONFIG_USB_R8A66597_HCD) += host/ *************** *** 40,43 **** --- 41,45 ---- obj-$(CONFIG_USB) += misc/ + obj-y += early/ obj-$(CONFIG_USB_ATM) += atm/ Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/usb/Kconfig,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Kconfig 9 Dec 2009 18:18:07 -0000 1.12 --- Kconfig 9 Dec 2009 18:40:10 -0000 1.13 *************** *** 23,27 **** default y if ARM # SL-811 default y if SUPERH # r8a66597-hcd - default y if MICROBLAZE default PCI --- 23,26 ---- *************** *** 40,43 **** --- 39,43 ---- default y if ARCH_PNX4008 && I2C default y if MFD_TC6393XB + default y if ARCH_W90X900 # PPC: default y if STB03xxx *************** *** 59,62 **** --- 59,64 ---- default y if SOC_AU1200 default y if ARCH_IXP4XX + default y if ARCH_W90X900 + default y if ARCH_AT91SAM9G45 default PCI |
|
From: Albert H. <he...@us...> - 2009-12-09 18:40:18
|
Update of /cvsroot/gc-linux/linux/drivers/net In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21229/drivers/net Modified Files: Kconfig Makefile Log Message: Forward to v2.6.32. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** Makefile 9 Dec 2009 18:18:07 -0000 1.39 --- Makefile 9 Dec 2009 18:40:10 -0000 1.40 *************** *** 3,6 **** --- 3,10 ---- # + obj-$(CONFIG_MII) += mii.o + obj-$(CONFIG_MDIO) += mdio.o + obj-$(CONFIG_PHYLIB) += phy/ + obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o *************** *** 27,30 **** --- 31,35 ---- obj-$(CONFIG_JME) += jme.o obj-$(CONFIG_BE2NET) += benet/ + obj-$(CONFIG_VMXNET3) += vmxnet3/ gianfar_driver-objs := gianfar.o \ *************** *** 90,93 **** --- 95,99 ---- obj-$(CONFIG_KS8842) += ks8842.o obj-$(CONFIG_KS8851) += ks8851.o + obj-$(CONFIG_KS8851_MLL) += ks8851_mll.o obj-$(CONFIG_VIA_RHINE) += via-rhine.o obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o *************** *** 95,98 **** --- 101,105 ---- obj-$(CONFIG_RIONET) += rionet.o obj-$(CONFIG_SH_ETH) += sh_eth.o + obj-$(CONFIG_STMMAC_ETH) += stmmac/ # *************** *** 100,107 **** # - obj-$(CONFIG_MII) += mii.o - obj-$(CONFIG_MDIO) += mdio.o - obj-$(CONFIG_PHYLIB) += phy/ - obj-$(CONFIG_SUNDANCE) += sundance.o obj-$(CONFIG_HAMACHI) += hamachi.o --- 107,110 ---- *************** *** 138,141 **** --- 141,145 ---- obj-$(CONFIG_NE_H8300) += ne-h8300.o 8390.o obj-$(CONFIG_AX88796) += ax88796.o + obj-$(CONFIG_BCM63XX_ENET) += bcm63xx_enet.o obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o *************** *** 143,146 **** --- 147,151 ---- ll_temac-objs := ll_temac_main.o ll_temac_mdio.o obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o + obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o obj-$(CONFIG_QLA3XXX) += qla3xxx.o obj-$(CONFIG_QLGE) += qlge/ Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** Kconfig 9 Dec 2009 18:18:07 -0000 1.45 --- Kconfig 9 Dec 2009 18:40:10 -0000 1.46 *************** *** 210,214 **** config MACB tristate "Atmel MACB support" ! depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 || ARCH_AT91SAM9G20 || ARCH_AT91CAP9 select PHYLIB help --- 210,214 ---- config MACB tristate "Atmel MACB support" ! depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 || ARCH_AT91SAM9G20 || ARCH_AT91SAM9G45 || ARCH_AT91CAP9 select PHYLIB help *************** *** 976,980 **** config ETHOC tristate "OpenCores 10/100 Mbps Ethernet MAC support" ! depends on NET_ETHERNET && HAS_IOMEM select MII select PHYLIB --- 976,980 ---- config ETHOC tristate "OpenCores 10/100 Mbps Ethernet MAC support" ! depends on NET_ETHERNET && HAS_IOMEM && HAS_DMA select MII select PHYLIB *************** *** 1739,1742 **** --- 1739,1750 ---- SPI driver for Micrel KS8851 SPI attached network chip. + config KS8851_MLL + tristate "Micrel KS8851 MLL" + depends on HAS_IOMEM + select MII + help + This platform driver is for Micrel KS8851 Address/data bus + multiplexed network chip. + config VIA_RHINE tristate "VIA Rhine support" *************** *** 1777,1781 **** config CPMAC tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)" ! depends on NET_ETHERNET && EXPERIMENTAL && AR7 && BROKEN select PHYLIB help --- 1785,1789 ---- config CPMAC tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)" ! depends on NET_ETHERNET && EXPERIMENTAL && AR7 select PHYLIB help *************** *** 1876,1880 **** config FEC bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)" ! depends on M523x || M527x || M5272 || M528x || M520x || M532x || MACH_MX27 || ARCH_MX35 help Say Y here if you want to use the built-in 10/100 Fast ethernet --- 1884,1888 ---- config FEC bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)" ! depends on M523x || M527x || M5272 || M528x || M520x || M532x || MACH_MX27 || ARCH_MX35 || ARCH_MX25 help Say Y here if you want to use the built-in 10/100 Fast ethernet *************** *** 1929,1932 **** --- 1937,1955 ---- will be called atl2. + config XILINX_EMACLITE + tristate "Xilinx 10/100 Ethernet Lite support" + depends on PPC32 || MICROBLAZE + help + This driver supports the 10/100 Ethernet Lite from Xilinx. + + config BCM63XX_ENET + tristate "Broadcom 63xx internal mac support" + depends on BCM63XX + select MII + select PHYLIB + help + This driver supports the ethernet MACs in the Broadcom 63xx + MIPS chipset family (BCM63XX). + source "drivers/net/fs_enet/Kconfig" *************** *** 2370,2377 **** which is available on some Freescale SOCs. - config UGETH_MAGIC_PACKET - bool "Magic Packet detection support" - depends on UCC_GETH - config UGETH_TX_ON_DEMAND bool "Transmit on Demand support" --- 2393,2396 ---- *************** *** 2465,2468 **** --- 2484,2489 ---- will be called s6gmac. + source "drivers/net/stmmac/Kconfig" + endif # NETDEV_1000 *************** *** 2725,2728 **** --- 2746,2750 ---- select ZLIB_INFLATE select LIBCRC32C + select MDIO help This driver supports Broadcom NetXtremeII 10 gigabit Ethernet cards. *************** *** 3212,3214 **** --- 3234,3244 ---- lguest or QEMU based VMMs (like KVM or Xen). Say Y or M. + config VMXNET3 + tristate "VMware VMXNET3 ethernet driver" + depends on PCI && X86 && INET + help + This driver supports VMware's vmxnet3 virtual ethernet NIC. + To compile this driver as a module, choose M here: the + module will be called vmxnet3. + endif # NETDEVICES |
|
From: Albert H. <he...@us...> - 2009-12-09 18:40:18
|
Update of /cvsroot/gc-linux/linux/drivers/rtc In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21229/drivers/rtc Modified Files: Kconfig Makefile Log Message: Forward to v2.6.32. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/rtc/Makefile,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Makefile 9 Dec 2009 18:18:07 -0000 1.13 --- Makefile 9 Dec 2009 18:40:10 -0000 1.14 *************** *** 18,21 **** --- 18,22 ---- # Keep the list ordered. + obj-$(CONFIG_RTC_DRV_AB3100) += rtc-ab3100.o obj-$(CONFIG_RTC_DRV_AT32AP700X)+= rtc-at32ap700x.o obj-$(CONFIG_RTC_DRV_AT91RM9200)+= rtc-at91rm9200.o *************** *** 23,27 **** --- 24,30 ---- obj-$(CONFIG_RTC_DRV_AU1XXX) += rtc-au1xxx.o obj-$(CONFIG_RTC_DRV_BFIN) += rtc-bfin.o + obj-$(CONFIG_RTC_DRV_BQ4802) += rtc-bq4802.o obj-$(CONFIG_RTC_DRV_CMOS) += rtc-cmos.o + obj-$(CONFIG_RTC_DRV_COH901331) += rtc-coh901331.o obj-$(CONFIG_RTC_DRV_DM355EVM) += rtc-dm355evm.o obj-$(CONFIG_RTC_DRV_DS1216) += rtc-ds1216.o *************** *** 40,43 **** --- 43,47 ---- obj-$(CONFIG_RTC_DRV_EP93XX) += rtc-ep93xx.o obj-$(CONFIG_RTC_DRV_FM3130) += rtc-fm3130.o + obj-$(CONFIG_RTC_DRV_GENERIC) += rtc-generic.o obj-$(CONFIG_RTC_DRV_ISL1208) += rtc-isl1208.o obj-$(CONFIG_RTC_DRV_M41T80) += rtc-m41t80.o *************** *** 46,61 **** obj-$(CONFIG_RTC_DRV_M48T59) += rtc-m48t59.o obj-$(CONFIG_RTC_DRV_M48T86) += rtc-m48t86.o ! obj-$(CONFIG_RTC_DRV_BQ4802) += rtc-bq4802.o ! obj-$(CONFIG_RTC_DRV_SUN4V) += rtc-sun4v.o ! obj-$(CONFIG_RTC_DRV_STARFIRE) += rtc-starfire.o obj-$(CONFIG_RTC_DRV_MAX6900) += rtc-max6900.o obj-$(CONFIG_RTC_DRV_MAX6902) += rtc-max6902.o obj-$(CONFIG_RTC_DRV_MV) += rtc-mv.o obj-$(CONFIG_RTC_DRV_OMAP) += rtc-omap.o obj-$(CONFIG_RTC_DRV_PCF8563) += rtc-pcf8563.o obj-$(CONFIG_RTC_DRV_PCF8583) += rtc-pcf8583.o obj-$(CONFIG_RTC_DRV_PL030) += rtc-pl030.o obj-$(CONFIG_RTC_DRV_PL031) += rtc-pl031.o ! obj-$(CONFIG_RTC_DRV_GENERIC) += rtc-generic.o obj-$(CONFIG_RTC_DRV_PXA) += rtc-pxa.o obj-$(CONFIG_RTC_DRV_R9701) += rtc-r9701.o --- 50,66 ---- obj-$(CONFIG_RTC_DRV_M48T59) += rtc-m48t59.o obj-$(CONFIG_RTC_DRV_M48T86) += rtc-m48t86.o ! obj-$(CONFIG_RTC_MXC) += rtc-mxc.o obj-$(CONFIG_RTC_DRV_MAX6900) += rtc-max6900.o obj-$(CONFIG_RTC_DRV_MAX6902) += rtc-max6902.o obj-$(CONFIG_RTC_DRV_MV) += rtc-mv.o obj-$(CONFIG_RTC_DRV_OMAP) += rtc-omap.o + obj-$(CONFIG_RTC_DRV_PCAP) += rtc-pcap.o obj-$(CONFIG_RTC_DRV_PCF8563) += rtc-pcf8563.o obj-$(CONFIG_RTC_DRV_PCF8583) += rtc-pcf8583.o + obj-$(CONFIG_RTC_DRV_PCF2123) += rtc-pcf2123.o + obj-$(CONFIG_RTC_DRV_PCF50633) += rtc-pcf50633.o obj-$(CONFIG_RTC_DRV_PL030) += rtc-pl030.o obj-$(CONFIG_RTC_DRV_PL031) += rtc-pl031.o ! obj-$(CONFIG_RTC_DRV_PS3) += rtc-ps3.o obj-$(CONFIG_RTC_DRV_PXA) += rtc-pxa.o obj-$(CONFIG_RTC_DRV_R9701) += rtc-r9701.o *************** *** 69,73 **** --- 74,81 ---- obj-$(CONFIG_RTC_DRV_SA1100) += rtc-sa1100.o obj-$(CONFIG_RTC_DRV_SH) += rtc-sh.o + obj-$(CONFIG_RTC_DRV_STARFIRE) += rtc-starfire.o obj-$(CONFIG_RTC_DRV_STK17TA8) += rtc-stk17ta8.o + obj-$(CONFIG_RTC_DRV_STMP) += rtc-stmp3xxx.o + obj-$(CONFIG_RTC_DRV_SUN4V) += rtc-sun4v.o obj-$(CONFIG_RTC_DRV_TEST) += rtc-test.o obj-$(CONFIG_RTC_DRV_TWL4030) += rtc-twl4030.o *************** *** 75,80 **** obj-$(CONFIG_RTC_DRV_V3020) += rtc-v3020.o obj-$(CONFIG_RTC_DRV_VR41XX) += rtc-vr41xx.o obj-$(CONFIG_RTC_DRV_WM8350) += rtc-wm8350.o obj-$(CONFIG_RTC_DRV_X1205) += rtc-x1205.o - obj-$(CONFIG_RTC_DRV_PCF50633) += rtc-pcf50633.o - obj-$(CONFIG_RTC_DRV_PS3) += rtc-ps3.o --- 83,87 ---- obj-$(CONFIG_RTC_DRV_V3020) += rtc-v3020.o obj-$(CONFIG_RTC_DRV_VR41XX) += rtc-vr41xx.o + obj-$(CONFIG_RTC_DRV_WM831X) += rtc-wm831x.o obj-$(CONFIG_RTC_DRV_WM8350) += rtc-wm8350.o obj-$(CONFIG_RTC_DRV_X1205) += rtc-x1205.o Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/rtc/Kconfig,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Kconfig 9 Dec 2009 18:18:07 -0000 1.13 --- Kconfig 9 Dec 2009 18:40:10 -0000 1.14 *************** *** 379,382 **** --- 379,391 ---- will be called rtc-ds3234. + config RTC_DRV_PCF2123 + tristate "NXP PCF2123" + help + If you say yes here you get support for the NXP PCF2123 + RTC chip. + + This driver can also be built as a module. If so, the module + will be called rtc-pcf2123. + endif # SPI_MASTER *************** *** 501,504 **** --- 510,524 ---- will be called "rtc-m48t59". + config RTC_MXC + tristate "Freescale MXC Real Time Clock" + depends on ARCH_MXC + depends on RTC_CLASS + help + If you say yes here you get support for the Freescale MXC + RTC module. + + This driver can also be built as a module, if so, the module + will be called "rtc-mxc". + config RTC_DRV_BQ4802 tristate "TI BQ4802" *************** *** 519,522 **** --- 539,552 ---- will be called rtc-v3020. + config RTC_DRV_WM831X + tristate "Wolfson Microelectronics WM831x RTC" + depends on MFD_WM831X + help + If you say yes here you will get support for the RTC subsystem + of the Wolfson Microelectronics WM831X series PMICs. + + This driver can also be built as a module. If so, the module + will be called "rtc-wm831x". + config RTC_DRV_WM8350 tristate "Wolfson Microelectronics WM8350 RTC" *************** *** 536,539 **** --- 566,578 ---- NXP PCF50633 used in embedded systems. + config RTC_DRV_AB3100 + tristate "ST-Ericsson AB3100 RTC" + depends on AB3100_CORE + default y if AB3100_CORE + help + Select this to enable the ST-Ericsson AB3100 Mixed Signal IC RTC + support. This chip contains a battery- and capacitor-backed RTC. + + comment "on-CPU RTC drivers" *************** *** 760,762 **** --- 799,830 ---- will be called rtc-ps3. + config RTC_DRV_COH901331 + tristate "ST-Ericsson COH 901 331 RTC" + depends on ARCH_U300 + help + If you say Y here you will get access to ST-Ericsson + COH 901 331 RTC clock found in some ST-Ericsson Mobile + Platforms. + + This driver can also be built as a module. If so, the module + will be called "rtc-coh901331". + + + config RTC_DRV_STMP + tristate "Freescale STMP3xxx RTC" + depends on ARCH_STMP3XXX + help + If you say yes here you will get support for the onboard + STMP3xxx RTC. + + This driver can also be built as a module. If so, the module + will be called rtc-stmp3xxx. + + config RTC_DRV_PCAP + tristate "PCAP RTC" + depends on EZX_PCAP + help + If you say Y here you will get support for the RTC found on + the PCAP2 ASIC used on some Motorola phones. + endif # RTC_CLASS |
|
From: Albert H. <he...@us...> - 2009-12-09 18:40:18
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/boot In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21229/arch/powerpc/boot Modified Files: Makefile wrapper Log Message: Forward to v2.6.32. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/boot/Makefile,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile 9 Dec 2009 18:18:06 -0000 1.14 --- Makefile 9 Dec 2009 18:40:09 -0000 1.15 *************** *** 40,43 **** --- 40,44 ---- $(obj)/4xx.o: BOOTCFLAGS += -mcpu=405 $(obj)/ebony.o: BOOTCFLAGS += -mcpu=405 + $(obj)/cuboot-hotfoot.o: BOOTCFLAGS += -mcpu=405 $(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405 $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405 *************** *** 68,72 **** fsl-soc.c mpc8xx.c pq2.c src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c \ ! cuboot-ebony.c treeboot-ebony.c prpmc2800.c \ ps3-head.S ps3-hvcall.S ps3.c treeboot-bamboo.c cuboot-8xx.c \ cuboot-pq2.c cuboot-sequoia.c treeboot-walnut.c \ --- 69,73 ---- fsl-soc.c mpc8xx.c pq2.c src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c \ ! cuboot-ebony.c cuboot-hotfoot.c treeboot-ebony.c prpmc2800.c \ ps3-head.S ps3-hvcall.S ps3.c treeboot-bamboo.c cuboot-8xx.c \ cuboot-pq2.c cuboot-sequoia.c treeboot-walnut.c \ *************** *** 76,80 **** cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \ virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \ ! cuboot-acadia.c cuboot-amigaone.c src-boot := $(src-wlib) $(src-plat) empty.c --- 77,81 ---- cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \ virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \ ! cuboot-acadia.c cuboot-amigaone.c cuboot-kilauea.c src-boot := $(src-wlib) $(src-plat) empty.c *************** *** 191,194 **** --- 192,196 ---- # Board ports in arch/powerpc/platform/40x/Kconfig image-$(CONFIG_EP405) += dtbImage.ep405 + image-$(CONFIG_HOTFOOT) += cuImage.hotfoot image-$(CONFIG_WALNUT) += treeImage.walnut image-$(CONFIG_ACADIA) += cuImage.acadia Index: wrapper =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/boot/wrapper,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wrapper 9 Dec 2009 18:18:06 -0000 1.6 --- wrapper 9 Dec 2009 18:40:09 -0000 1.7 *************** *** 47,50 **** --- 47,51 ---- object=arch/powerpc/boot objbin=$object + dtc=scripts/dtc/dtc # directory for working files *************** *** 125,129 **** dtb="$platform.dtb" fi ! $object/dtc -O dtb -o "$dtb" -b 0 "$dts" fi --- 126,130 ---- dtb="$platform.dtb" fi ! $dtc -O dtb -o "$dtb" -b 0 "$dts" fi |
|
From: Albert H. <he...@us...> - 2009-12-09 18:40:18
|
Update of /cvsroot/gc-linux/linux/drivers/mmc/host In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21229/drivers/mmc/host Modified Files: Kconfig Makefile Log Message: Forward to v2.6.32. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/mmc/host/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile 9 Dec 2009 18:18:07 -0000 1.5 --- Makefile 9 Dec 2009 18:40:10 -0000 1.6 *************** *** 24,27 **** --- 24,28 ---- obj-$(CONFIG_MMC_ATMELMCI) += atmel-mci.o obj-$(CONFIG_MMC_TIFM_SD) += tifm_sd.o + obj-$(CONFIG_MMC_MSM7X00A) += msm_sdcc.o obj-$(CONFIG_MMC_MVSDIO) += mvsdio.o obj-$(CONFIG_MMC_SPI) += mmc_spi.o Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/mmc/host/Kconfig,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Kconfig 9 Dec 2009 18:18:07 -0000 1.5 --- Kconfig 9 Dec 2009 18:40:09 -0000 1.6 *************** *** 133,141 **** config MMC_OMAP_HS tristate "TI OMAP High Speed Multimedia Card Interface support" ! depends on ARCH_OMAP2430 || ARCH_OMAP3 help This selects the TI OMAP High Speed Multimedia card Interface. ! If you have an OMAP2430 or OMAP3 board with a Multimedia Card slot, ! say Y or M here. If unsure, say N. --- 133,141 ---- config MMC_OMAP_HS tristate "TI OMAP High Speed Multimedia Card Interface support" ! depends on ARCH_OMAP2430 || ARCH_OMAP3 || ARCH_OMAP4 help This selects the TI OMAP High Speed Multimedia card Interface. ! If you have an OMAP2430 or OMAP3 board or OMAP4 board with a ! Multimedia Card slot, say Y or M here. If unsure, say N. *************** *** 161,164 **** --- 161,170 ---- If unsure, say N. + choice + prompt "Atmel SD/MMC Driver" + default MMC_ATMELMCI if AVR32 + help + Choose which driver to use for the Atmel MCI Silicon + config MMC_AT91 tristate "AT91 SD/MMC Card Interface support" *************** *** 171,185 **** config MMC_ATMELMCI tristate "Atmel Multimedia Card Interface support" ! depends on AVR32 help This selects the Atmel Multimedia Card Interface driver. If ! you have an AT32 (AVR32) platform with a Multimedia Card ! slot, say Y or M here. If unsure, say N. config MMC_ATMELMCI_DMA bool "Atmel MCI DMA support (EXPERIMENTAL)" ! depends on MMC_ATMELMCI && DMA_ENGINE && EXPERIMENTAL help Say Y here to have the Atmel MCI driver use a DMA engine to --- 177,193 ---- config MMC_ATMELMCI tristate "Atmel Multimedia Card Interface support" ! depends on AVR32 || ARCH_AT91 help This selects the Atmel Multimedia Card Interface driver. If ! you have an AT32 (AVR32) or AT91 platform with a Multimedia ! Card slot, say Y or M here. If unsure, say N. + endchoice + config MMC_ATMELMCI_DMA bool "Atmel MCI DMA support (EXPERIMENTAL)" ! depends on MMC_ATMELMCI && AVR32 && DMA_ENGINE && EXPERIMENTAL help Say Y here to have the Atmel MCI driver use a DMA engine to *************** *** 200,203 **** --- 208,218 ---- If unsure, say N. + config MMC_MSM7X00A + tristate "Qualcomm MSM 7X00A SDCC Controller Support" + depends on MMC && ARCH_MSM + help + This provides support for the SD/MMC cell found in the + MSM 7X00A controllers from Qualcomm. + config MMC_MXC tristate "Freescale i.MX2/3 Multimedia Card Interface support" *************** *** 262,265 **** --- 277,321 ---- If unsure, say N. + config MMC_S3C_HW_SDIO_IRQ + bool "Hardware support for SDIO IRQ" + depends on MMC_S3C + help + Enable the hardware support for SDIO interrupts instead of using + the generic polling code. + + choice + prompt "Samsung S3C SD/MMC transfer code" + depends on MMC_S3C + + config MMC_S3C_PIO + bool "Use PIO transfers only" + help + Use PIO to transfer data between memory and the hardware. + + PIO is slower than DMA as it requires CPU instructions to + move the data. This has been the traditional default for + the S3C MCI driver. + + config MMC_S3C_DMA + bool "Use DMA transfers only (EXPERIMENTAL)" + depends on EXPERIMENTAL + help + Use DMA to transfer data between memory and the hardare. + + Currently, the DMA support in this driver seems to not be + working properly and needs to be debugged before this + option is useful. + + config MMC_S3C_PIODMA + bool "Support for both PIO and DMA (EXPERIMENTAL)" + help + Compile both the PIO and DMA transfer routines into the + driver and let the platform select at run-time which one + is best. + + See notes for the DMA option. + + endchoice + config MMC_SDRICOH_CS tristate "MMC/SD driver for Ricoh Bay1Controllers (EXPERIMENTAL)" |
|
From: Albert H. <he...@us...> - 2009-12-09 18:40:18
|
Update of /cvsroot/gc-linux/linux/sound/ppc In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21229/sound/ppc Modified Files: Kconfig Log Message: Forward to v2.6.32. Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/sound/ppc/Kconfig,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Kconfig 9 Dec 2009 18:18:07 -0000 1.23 --- Kconfig 9 Dec 2009 18:40:10 -0000 1.24 *************** *** 3,7 **** menuconfig SND_PPC bool "PowerPC sound devices" ! depends on PPC64 || PPC32 default y help --- 3,7 ---- menuconfig SND_PPC bool "PowerPC sound devices" ! depends on PPC default y help |
|
From: Albert H. <he...@us...> - 2009-12-09 18:40:18
|
Update of /cvsroot/gc-linux/linux/drivers/i2c/busses In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21229/drivers/i2c/busses Modified Files: Kconfig Makefile Log Message: Forward to v2.6.32. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/i2c/busses/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile 9 Dec 2009 18:18:07 -0000 1.10 --- Makefile 9 Dec 2009 18:40:09 -0000 1.11 *************** *** 3,6 **** --- 3,9 ---- # + # ACPI drivers + obj-$(CONFIG_I2C_SCMI) += i2c-scmi.o + # PC SMBus host controller drivers obj-$(CONFIG_I2C_ALI1535) += i2c-ali1535.o Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/i2c/busses/Kconfig,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Kconfig 9 Dec 2009 18:18:07 -0000 1.10 --- Kconfig 9 Dec 2009 18:40:09 -0000 1.11 *************** *** 114,118 **** config I2C_PIIX4 ! tristate "Intel PIIX4 and compatible (ATI/Serverworks/Broadcom/SMSC)" depends on PCI help --- 114,118 ---- config I2C_PIIX4 ! tristate "Intel PIIX4 and compatible (ATI/AMD/Serverworks/Broadcom/SMSC)" depends on PCI help *************** *** 129,132 **** --- 129,133 ---- ATI SB700 ATI SB800 + AMD Hudson-2 Serverworks OSB4 Serverworks CSB5 *************** *** 232,235 **** --- 233,252 ---- will be called i2c-viapro. + if ACPI + + comment "ACPI drivers" + + config I2C_SCMI + tristate "SMBus Control Method Interface" + help + This driver supports the SMBus Control Method Interface. It needs the + BIOS to declare ACPI control methods as described in the SMBus Control + Method Interface specification. + + To compile this driver as a module, choose M here: + the module will be called i2c-scmi. + + endif # ACPI + comment "Mac SMBus host controller drivers" depends on PPC_CHRP || PPC_PMAC *************** *** 461,466 **** config I2C_PXA ! tristate "Intel PXA2XX I2C adapter (EXPERIMENTAL)" ! depends on EXPERIMENTAL && ARCH_PXA help If you have devices in the PXA I2C bus, say yes to this option. --- 478,483 ---- config I2C_PXA ! tristate "Intel PXA2XX I2C adapter" ! depends on ARCH_PXA || ARCH_MMP help If you have devices in the PXA I2C bus, say yes to this option. |
|
From: Albert H. <he...@us...> - 2009-12-09 18:40:17
|
Update of /cvsroot/gc-linux/linux/arch/powerpc In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21229/arch/powerpc Modified Files: Kconfig Log Message: Forward to v2.6.32. Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/Kconfig,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Kconfig 9 Dec 2009 18:18:06 -0000 1.14 --- Kconfig 9 Dec 2009 18:40:08 -0000 1.15 *************** *** 50,53 **** --- 50,56 ---- def_bool PPC64 + config NEED_PER_CPU_EMBED_FIRST_CHUNK + def_bool PPC64 + config IRQ_PER_CPU bool *************** *** 121,130 **** select HAVE_ARCH_TRACEHOOK select HAVE_LMB ! select HAVE_DMA_ATTRS if PPC64 select USE_GENERIC_SMP_HELPERS if SMP select HAVE_OPROFILE select HAVE_SYSCALL_WRAPPERS if PPC64 select GENERIC_ATOMIC64 if PPC32 ! select HAVE_PERF_COUNTERS config EARLY_PRINTK --- 124,134 ---- select HAVE_ARCH_TRACEHOOK select HAVE_LMB ! select HAVE_DMA_ATTRS ! select HAVE_DMA_API_DEBUG select USE_GENERIC_SMP_HELPERS if SMP select HAVE_OPROFILE select HAVE_SYSCALL_WRAPPERS if PPC64 select GENERIC_ATOMIC64 if PPC32 ! select HAVE_PERF_EVENTS config EARLY_PRINTK *************** *** 308,315 **** than the bus address. Not all platforms support this. - config PPC_NEED_DMA_SYNC_OPS - def_bool y - depends on (NOT_COHERENT_CACHE || SWIOTLB) - config HOTPLUG_CPU bool "Support for enabling/disabling CPUs" --- 312,315 ---- *************** *** 386,392 **** --- 386,398 ---- config NODES_SHIFT int + default "8" if PPC64 default "4" depends on NEED_MULTIPLE_NODES + config MAX_ACTIVE_REGIONS + int + default "256" if PPC64 + default "32" + config ARCH_SELECT_MEMORY_MODEL def_bool y *************** *** 409,412 **** --- 415,422 ---- def_bool y + config SYS_SUPPORTS_HUGETLBFS + def_bool y + depends on PPC_BOOK3S_64 + source "mm/Kconfig" *************** *** 473,477 **** config PPC_64K_PAGES ! bool "64k page size" if 44x || PPC_STD_MMU_64 select PPC_HAS_HASH_64K if PPC_STD_MMU_64 --- 483,487 ---- config PPC_64K_PAGES ! bool "64k page size" if 44x || PPC_STD_MMU_64 || PPC_BOOK3E_64 select PPC_HAS_HASH_64K if PPC_STD_MMU_64 *************** *** 493,506 **** config FORCE_MAX_ZONEORDER int "Maximum zone order" ! range 9 64 if PPC_STD_MMU_64 && PPC_64K_PAGES ! default "9" if PPC_STD_MMU_64 && PPC_64K_PAGES ! range 13 64 if PPC_STD_MMU_64 && !PPC_64K_PAGES ! default "13" if PPC_STD_MMU_64 && !PPC_64K_PAGES ! range 9 64 if PPC_STD_MMU_32 && PPC_16K_PAGES ! default "9" if PPC_STD_MMU_32 && PPC_16K_PAGES ! range 7 64 if PPC_STD_MMU_32 && PPC_64K_PAGES ! default "7" if PPC_STD_MMU_32 && PPC_64K_PAGES ! range 5 64 if PPC_STD_MMU_32 && PPC_256K_PAGES ! default "5" if PPC_STD_MMU_32 && PPC_256K_PAGES range 11 64 default "11" --- 503,516 ---- config FORCE_MAX_ZONEORDER int "Maximum zone order" ! range 9 64 if PPC64 && PPC_64K_PAGES ! default "9" if PPC64 && PPC_64K_PAGES ! range 13 64 if PPC64 && !PPC_64K_PAGES ! default "13" if PPC64 && !PPC_64K_PAGES ! range 9 64 if PPC32 && PPC_16K_PAGES ! default "9" if PPC32 && PPC_16K_PAGES ! range 7 64 if PPC32 && PPC_64K_PAGES ! default "7" if PPC32 && PPC_64K_PAGES ! range 5 64 if PPC32 && PPC_256K_PAGES ! default "5" if PPC32 && PPC_256K_PAGES range 11 64 default "11" |
|
From: Albert H. <he...@us...> - 2009-12-09 18:40:17
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/include/asm In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21229/arch/powerpc/include/asm Modified Files: dma-mapping.h Log Message: Forward to v2.6.32. Index: dma-mapping.h =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/include/asm/dma-mapping.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** dma-mapping.h 9 Dec 2009 18:18:06 -0000 1.6 --- dma-mapping.h 9 Dec 2009 18:40:09 -0000 1.7 *************** *** 15,18 **** --- 15,19 ---- #include <linux/scatterlist.h> #include <linux/dma-attrs.h> + #include <linux/dma-debug.h> #include <asm/io.h> #include <asm/swiotlb.h> *************** *** 26,30 **** void *vaddr, dma_addr_t dma_handle); - extern unsigned long get_dma_direct_offset(struct device *dev); #ifdef CONFIG_NOT_COHERENT_CACHE --- 27,30 ---- *************** *** 65,120 **** /* - * DMA operations are abstracted for G5 vs. i/pSeries, PCI vs. VIO - */ - struct dma_mapping_ops { - void * (*alloc_coherent)(struct device *dev, size_t size, - dma_addr_t *dma_handle, gfp_t flag); - void (*free_coherent)(struct device *dev, size_t size, - void *vaddr, dma_addr_t dma_handle); - int (*map_sg)(struct device *dev, struct scatterlist *sg, - int nents, enum dma_data_direction direction, - struct dma_attrs *attrs); - void (*unmap_sg)(struct device *dev, struct scatterlist *sg, - int nents, enum dma_data_direction direction, - struct dma_attrs *attrs); - int (*dma_supported)(struct device *dev, u64 mask); - int (*set_dma_mask)(struct device *dev, u64 dma_mask); - dma_addr_t (*map_page)(struct device *dev, struct page *page, - unsigned long offset, size_t size, - enum dma_data_direction direction, - struct dma_attrs *attrs); - void (*unmap_page)(struct device *dev, - dma_addr_t dma_address, size_t size, - enum dma_data_direction direction, - struct dma_attrs *attrs); - int (*addr_needs_map)(struct device *dev, dma_addr_t addr, - size_t size); - #ifdef CONFIG_PPC_NEED_DMA_SYNC_OPS - void (*sync_single_range_for_cpu)(struct device *hwdev, - dma_addr_t dma_handle, unsigned long offset, - size_t size, - enum dma_data_direction direction); - void (*sync_single_range_for_device)(struct device *hwdev, - dma_addr_t dma_handle, unsigned long offset, - size_t size, - enum dma_data_direction direction); - void (*sync_sg_for_cpu)(struct device *hwdev, - struct scatterlist *sg, int nelems, - enum dma_data_direction direction); - void (*sync_sg_for_device)(struct device *hwdev, - struct scatterlist *sg, int nelems, - enum dma_data_direction direction); - #endif - }; - - /* * Available generic sets of operations */ #ifdef CONFIG_PPC64 ! extern struct dma_mapping_ops dma_iommu_ops; #endif ! extern struct dma_mapping_ops dma_direct_ops; ! static inline struct dma_mapping_ops *get_dma_ops(struct device *dev) { /* We don't handle the NULL dev case for ISA for now. We could --- 65,76 ---- /* * Available generic sets of operations */ #ifdef CONFIG_PPC64 ! extern struct dma_map_ops dma_iommu_ops; #endif ! extern struct dma_map_ops dma_direct_ops; ! static inline struct dma_map_ops *get_dma_ops(struct device *dev) { /* We don't handle the NULL dev case for ISA for now. We could *************** *** 129,140 **** } ! static inline void set_dma_ops(struct device *dev, struct dma_mapping_ops *ops) { dev->archdata.dma_ops = ops; } static inline int dma_supported(struct device *dev, u64 mask) { ! struct dma_mapping_ops *dma_ops = get_dma_ops(dev); if (unlikely(dma_ops == NULL)) --- 85,123 ---- } ! static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops) { dev->archdata.dma_ops = ops; } + /* + * get_dma_offset() + * + * Get the dma offset on configurations where the dma address can be determined + * from the physical address by looking at a simple offset. Direct dma and + * swiotlb use this function, but it is typically not used by implementations + * with an iommu. + */ + static inline dma_addr_t get_dma_offset(struct device *dev) + { + if (dev) + return dev->archdata.dma_data.dma_offset; + + return PCI_DRAM_OFFSET; + } + + static inline void set_dma_offset(struct device *dev, dma_addr_t off) + { + if (dev) + dev->archdata.dma_data.dma_offset = off; + } + + /* this will be removed soon */ + #define flush_write_buffers() + + #include <asm-generic/dma-mapping-common.h> + static inline int dma_supported(struct device *dev, u64 mask) { ! struct dma_map_ops *dma_ops = get_dma_ops(dev); if (unlikely(dma_ops == NULL)) *************** *** 150,154 **** static inline int dma_set_mask(struct device *dev, u64 dma_mask) { ! struct dma_mapping_ops *dma_ops = get_dma_ops(dev); if (unlikely(dma_ops == NULL)) --- 133,137 ---- static inline int dma_set_mask(struct device *dev, u64 dma_mask) { ! struct dma_map_ops *dma_ops = get_dma_ops(dev); if (unlikely(dma_ops == NULL)) *************** *** 162,426 **** } - /* - * map_/unmap_single actually call through to map/unmap_page now that all the - * dma_mapping_ops have been converted over. We just have to get the page and - * offset to pass through to map_page - */ - static inline dma_addr_t dma_map_single_attrs(struct device *dev, - void *cpu_addr, - size_t size, - enum dma_data_direction direction, - struct dma_attrs *attrs) - { - struct dma_mapping_ops *dma_ops = get_dma_ops(dev); - - BUG_ON(!dma_ops); - - return dma_ops->map_page(dev, virt_to_page(cpu_addr), - (unsigned long)cpu_addr % PAGE_SIZE, size, - direction, attrs); - } - - static inline void dma_unmap_single_attrs(struct device *dev, - dma_addr_t dma_addr, - size_t size, - enum dma_data_direction direction, - struct dma_attrs *attrs) - { - struct dma_mapping_ops *dma_ops = get_dma_ops(dev); - - BUG_ON(!dma_ops); - - dma_ops->unmap_page(dev, dma_addr, size, direction, attrs); - } - - static inline dma_addr_t dma_map_page_attrs(struct device *dev, - struct page *page, - unsigned long offset, size_t size, - enum dma_data_direction direction, - struct dma_attrs *attrs) - { - struct dma_mapping_ops *dma_ops = get_dma_ops(dev); - - BUG_ON(!dma_ops); - - return dma_ops->map_page(dev, page, offset, size, direction, attrs); - } - - static inline void dma_unmap_page_attrs(struct device *dev, - dma_addr_t dma_address, - size_t size, - enum dma_data_direction direction, - struct dma_attrs *attrs) - { - struct dma_mapping_ops *dma_ops = get_dma_ops(dev); - - BUG_ON(!dma_ops); - - dma_ops->unmap_page(dev, dma_address, size, direction, attrs); - } - - static inline int dma_map_sg_attrs(struct device *dev, struct scatterlist *sg, - int nents, enum dma_data_direction direction, - struct dma_attrs *attrs) - { - struct dma_mapping_ops *dma_ops = get_dma_ops(dev); - - BUG_ON(!dma_ops); - return dma_ops->map_sg(dev, sg, nents, direction, attrs); - } - - static inline void dma_unmap_sg_attrs(struct device *dev, - struct scatterlist *sg, - int nhwentries, - enum dma_data_direction direction, - struct dma_attrs *attrs) - { - struct dma_mapping_ops *dma_ops = get_dma_ops(dev); - - BUG_ON(!dma_ops); - dma_ops->unmap_sg(dev, sg, nhwentries, direction, attrs); - } - static inline void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag) { ! struct dma_mapping_ops *dma_ops = get_dma_ops(dev); ! ! BUG_ON(!dma_ops); ! return dma_ops->alloc_coherent(dev, size, dma_handle, flag); ! } ! ! static inline void dma_free_coherent(struct device *dev, size_t size, ! void *cpu_addr, dma_addr_t dma_handle) ! { ! struct dma_mapping_ops *dma_ops = get_dma_ops(dev); ! ! BUG_ON(!dma_ops); ! dma_ops->free_coherent(dev, size, cpu_addr, dma_handle); ! } ! ! static inline dma_addr_t dma_map_single(struct device *dev, void *cpu_addr, ! size_t size, ! enum dma_data_direction direction) ! { ! return dma_map_single_attrs(dev, cpu_addr, size, direction, NULL); ! } ! ! static inline void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, ! size_t size, ! enum dma_data_direction direction) ! { ! dma_unmap_single_attrs(dev, dma_addr, size, direction, NULL); ! } ! ! static inline dma_addr_t dma_map_page(struct device *dev, struct page *page, ! unsigned long offset, size_t size, ! enum dma_data_direction direction) ! { ! return dma_map_page_attrs(dev, page, offset, size, direction, NULL); ! } ! ! static inline void dma_unmap_page(struct device *dev, dma_addr_t dma_address, ! size_t size, ! enum dma_data_direction direction) ! { ! dma_unmap_page_attrs(dev, dma_address, size, direction, NULL); ! } ! ! static inline int dma_map_sg(struct device *dev, struct scatterlist *sg, ! int nents, enum dma_data_direction direction) ! { ! return dma_map_sg_attrs(dev, sg, nents, direction, NULL); ! } ! ! static inline void dma_unmap_sg(struct device *dev, struct scatterlist *sg, ! int nhwentries, ! enum dma_data_direction direction) ! { ! dma_unmap_sg_attrs(dev, sg, nhwentries, direction, NULL); ! } ! ! #ifdef CONFIG_PPC_NEED_DMA_SYNC_OPS ! static inline void dma_sync_single_for_cpu(struct device *dev, ! dma_addr_t dma_handle, size_t size, ! enum dma_data_direction direction) ! { ! struct dma_mapping_ops *dma_ops = get_dma_ops(dev); ! ! BUG_ON(!dma_ops); ! ! if (dma_ops->sync_single_range_for_cpu) ! dma_ops->sync_single_range_for_cpu(dev, dma_handle, 0, ! size, direction); ! } ! ! static inline void dma_sync_single_for_device(struct device *dev, ! dma_addr_t dma_handle, size_t size, ! enum dma_data_direction direction) ! { ! struct dma_mapping_ops *dma_ops = get_dma_ops(dev); BUG_ON(!dma_ops); ! if (dma_ops->sync_single_range_for_device) ! dma_ops->sync_single_range_for_device(dev, dma_handle, ! 0, size, direction); ! } ! ! static inline void dma_sync_sg_for_cpu(struct device *dev, ! struct scatterlist *sgl, int nents, ! enum dma_data_direction direction) ! { ! struct dma_mapping_ops *dma_ops = get_dma_ops(dev); ! BUG_ON(!dma_ops); ! if (dma_ops->sync_sg_for_cpu) ! dma_ops->sync_sg_for_cpu(dev, sgl, nents, direction); } ! static inline void dma_sync_sg_for_device(struct device *dev, ! struct scatterlist *sgl, int nents, ! enum dma_data_direction direction) { ! struct dma_mapping_ops *dma_ops = get_dma_ops(dev); BUG_ON(!dma_ops); ! if (dma_ops->sync_sg_for_device) ! dma_ops->sync_sg_for_device(dev, sgl, nents, direction); ! } ! ! static inline void dma_sync_single_range_for_cpu(struct device *dev, ! dma_addr_t dma_handle, unsigned long offset, size_t size, ! enum dma_data_direction direction) ! { ! struct dma_mapping_ops *dma_ops = get_dma_ops(dev); ! ! BUG_ON(!dma_ops); ! if (dma_ops->sync_single_range_for_cpu) ! dma_ops->sync_single_range_for_cpu(dev, dma_handle, ! offset, size, direction); } ! static inline void dma_sync_single_range_for_device(struct device *dev, ! dma_addr_t dma_handle, unsigned long offset, size_t size, ! enum dma_data_direction direction) { ! struct dma_mapping_ops *dma_ops = get_dma_ops(dev); ! BUG_ON(!dma_ops); ! if (dma_ops->sync_single_range_for_device) ! dma_ops->sync_single_range_for_device(dev, dma_handle, offset, ! size, direction); ! } ! #else /* CONFIG_PPC_NEED_DMA_SYNC_OPS */ ! static inline void dma_sync_single_for_cpu(struct device *dev, ! dma_addr_t dma_handle, size_t size, ! enum dma_data_direction direction) ! { } ! static inline void dma_sync_single_for_device(struct device *dev, ! dma_addr_t dma_handle, size_t size, ! enum dma_data_direction direction) { ! } ! static inline void dma_sync_sg_for_cpu(struct device *dev, ! struct scatterlist *sgl, int nents, ! enum dma_data_direction direction) ! { ! } ! static inline void dma_sync_sg_for_device(struct device *dev, ! struct scatterlist *sgl, int nents, ! enum dma_data_direction direction) ! { ! } ! static inline void dma_sync_single_range_for_cpu(struct device *dev, ! dma_addr_t dma_handle, unsigned long offset, size_t size, ! enum dma_data_direction direction) ! { } ! static inline void dma_sync_single_range_for_device(struct device *dev, ! dma_addr_t dma_handle, unsigned long offset, size_t size, ! enum dma_data_direction direction) { } - #endif ! static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) { ! #ifdef CONFIG_PPC64 ! return (dma_addr == DMA_ERROR_CODE); ! #else ! return 0; ! #endif } --- 145,212 ---- } static inline void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag) { ! struct dma_map_ops *dma_ops = get_dma_ops(dev); ! void *cpu_addr; BUG_ON(!dma_ops); ! cpu_addr = dma_ops->alloc_coherent(dev, size, dma_handle, flag); ! debug_dma_alloc_coherent(dev, size, *dma_handle, cpu_addr); ! return cpu_addr; } ! static inline void dma_free_coherent(struct device *dev, size_t size, ! void *cpu_addr, dma_addr_t dma_handle) { ! struct dma_map_ops *dma_ops = get_dma_ops(dev); BUG_ON(!dma_ops); ! debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); ! dma_ops->free_coherent(dev, size, cpu_addr, dma_handle); } ! static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) { ! struct dma_map_ops *dma_ops = get_dma_ops(dev); ! if (dma_ops->mapping_error) ! return dma_ops->mapping_error(dev, dma_addr); ! #ifdef CONFIG_PPC64 ! return (dma_addr == DMA_ERROR_CODE); ! #else ! return 0; ! #endif } ! static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) { ! #ifdef CONFIG_SWIOTLB ! struct dev_archdata *sd = &dev->archdata; ! if (sd->max_direct_dma_addr && addr + size > sd->max_direct_dma_addr) ! return 0; ! #endif ! if (!dev->dma_mask) ! return 0; ! return addr + size <= *dev->dma_mask; } ! static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr) { + return paddr + get_dma_offset(dev); } ! static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr) { ! return daddr - get_dma_offset(dev); } |
|
From: Albert H. <he...@us...> - 2009-12-09 18:18:21
|
Update of /cvsroot/gc-linux/linux/drivers In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv17071/drivers Modified Files: Kconfig Makefile Log Message: Rewind to v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/Makefile,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** Makefile 25 Oct 2009 18:59:27 -0000 1.34 --- Makefile 9 Dec 2009 18:18:06 -0000 1.35 *************** *** 104,109 **** obj-$(CONFIG_HID) += hid/ obj-$(CONFIG_PPC_PS3) += ps3/ - obj-$(CONFIG_GAMECUBE_EXI) += exi/ - obj-$(CONFIG_GAMECUBE_SI) += input/si/ obj-$(CONFIG_OF) += of/ obj-$(CONFIG_SSB) += ssb/ --- 104,107 ---- Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/Kconfig,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Kconfig 25 Oct 2009 18:59:27 -0000 1.10 --- Kconfig 9 Dec 2009 18:18:06 -0000 1.11 *************** *** 51,56 **** source "drivers/i2c/Kconfig" - source "drivers/exi/Kconfig" - source "drivers/spi/Kconfig" --- 51,54 ---- |
|
From: Albert H. <he...@us...> - 2009-12-09 18:18:20
|
Update of /cvsroot/gc-linux/linux/arch/powerpc In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv17071/arch/powerpc Modified Files: Kconfig Kconfig.debug Log Message: Rewind to v2.6.31. Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/Kconfig,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Kconfig 25 Oct 2009 18:59:27 -0000 1.13 --- Kconfig 9 Dec 2009 18:18:06 -0000 1.14 *************** *** 670,674 **** bool "PCI support" if PPC_PCI_CHOICE default y if !40x && !CPM2 && !8xx && !PPC_83xx \ ! && !PPC_85xx && !PPC_86xx && !GAMECUBE_COMMON default PCI_PERMEDIA if !4xx && !CPM2 && !8xx default PCI_QSPAN if !4xx && !CPM2 && 8xx --- 670,674 ---- bool "PCI support" if PPC_PCI_CHOICE default y if !40x && !CPM2 && !8xx && !PPC_83xx \ ! && !PPC_85xx && !PPC_86xx default PCI_PERMEDIA if !4xx && !CPM2 && !8xx default PCI_QSPAN if !4xx && !CPM2 && 8xx Index: Kconfig.debug =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/Kconfig.debug,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Kconfig.debug 25 Oct 2009 18:59:27 -0000 1.12 --- Kconfig.debug 9 Dec 2009 18:18:06 -0000 1.13 *************** *** 255,266 **** has run, and set up the CPM in a particular way. - config PPC_EARLY_DEBUG_USBGECKO - bool "Early debugging through the USB Gecko adapter" - depends on GAMECUBE_COMMON - select USBGECKO_UDBG - help - Select this to enable early debugging for Nintendo GameCube/Wii - consoles via an external USB Gecko adapter. - endchoice --- 255,258 ---- |
|
From: Albert H. <he...@us...> - 2009-12-09 18:18:17
|
Update of /cvsroot/gc-linux/linux/drivers/rtc In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv17071/drivers/rtc Modified Files: Kconfig Makefile Log Message: Rewind to v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/rtc/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile 25 Oct 2009 18:59:28 -0000 1.12 --- Makefile 9 Dec 2009 18:18:07 -0000 1.13 *************** *** 40,44 **** obj-$(CONFIG_RTC_DRV_EP93XX) += rtc-ep93xx.o obj-$(CONFIG_RTC_DRV_FM3130) += rtc-fm3130.o - obj-$(CONFIG_RTC_DRV_GCN) += rtc-gcn.o obj-$(CONFIG_RTC_DRV_ISL1208) += rtc-isl1208.o obj-$(CONFIG_RTC_DRV_M41T80) += rtc-m41t80.o --- 40,43 ---- Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/rtc/Kconfig,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Kconfig 25 Oct 2009 18:59:28 -0000 1.12 --- Kconfig 9 Dec 2009 18:18:07 -0000 1.13 *************** *** 536,549 **** NXP PCF50633 used in embedded systems. - config RTC_DRV_GCN - bool "Nintendo GameCube/Wii Real Time Clock and SRAM" - depends on GAMECUBE_EXI - default y - help - If you say yes to this option, support will be included for the - Real Time Clock and SRAM of the Nintendo GameCube/Wii. - - If in doubt, say Y here. - comment "on-CPU RTC drivers" --- 536,539 ---- |
|
From: Albert H. <he...@us...> - 2009-12-09 18:18:17
|
Update of /cvsroot/gc-linux/linux/kernel In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv17071/kernel Modified Files: kexec.c Log Message: Rewind to v2.6.31. Index: kexec.c =================================================================== RCS file: /cvsroot/gc-linux/linux/kernel/kexec.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** kexec.c 25 Oct 2009 18:59:28 -0000 1.5 --- kexec.c 9 Dec 2009 18:18:07 -0000 1.6 *************** *** 581,591 **** ! static inline int kimage_add_page_with_flags(struct kimage *image, ! unsigned long page, int flags) { int result; page &= PAGE_MASK; ! result = kimage_add_entry(image, page | (flags & ~PAGE_MASK)); if (result == 0) image->destination += PAGE_SIZE; --- 581,590 ---- ! static int kimage_add_page(struct kimage *image, unsigned long page) { int result; page &= PAGE_MASK; ! result = kimage_add_entry(image, page | IND_SOURCE); if (result == 0) image->destination += PAGE_SIZE; *************** *** 594,607 **** } - static int kimage_add_page(struct kimage *image, unsigned long page) - { - return kimage_add_page_with_flags(image, page, IND_SOURCE); - } - - static int kimage_add_page_noalloc(struct kimage *image, unsigned long page) - { - return kimage_add_page_with_flags(image, page, IND_SOURCE|IND_NOALLOC); - } - static void kimage_free_extra_pages(struct kimage *image) --- 593,596 ---- *************** *** 622,646 **** } - int kimage_add_preserved_region(struct kimage *image, unsigned long to, - unsigned long from, int length) - { - int result = 0; - - if (length > 0) { - result = kimage_set_destination(image, to); - if (result < 0) - goto out; - while (length > 0) { - result = kimage_add_page_noalloc(image, from); - if (result < 0) - goto out; - from += PAGE_SIZE; - length -= PAGE_SIZE; - } - } - out: - return result; - } - #define for_each_kimage_entry(image, ptr, entry) \ for (ptr = &image->head; (entry = *ptr) && !(entry & IND_DONE); \ --- 611,614 ---- *************** *** 674,682 **** */ ind = entry; - } else if (entry & IND_SOURCE) { - /* free only entries that we really allocated */ - if (!(entry & IND_NOALLOC)) - kimage_free_entry(entry); } } /* Free the final indirection page */ --- 642,648 ---- */ ind = entry; } + else if (entry & IND_SOURCE) + kimage_free_entry(entry); } /* Free the final indirection page */ |
|
From: Albert H. <he...@us...> - 2009-12-09 18:18:17
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/platforms In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv17071/arch/powerpc/platforms Modified Files: Kconfig.cputype Log Message: Rewind to v2.6.31. Index: Kconfig.cputype =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/platforms/Kconfig.cputype,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Kconfig.cputype 25 Oct 2009 18:59:27 -0000 1.13 --- Kconfig.cputype 9 Dec 2009 18:18:06 -0000 1.14 *************** *** 285,289 **** config NOT_COHERENT_CACHE bool ! depends on 4xx || 8xx || E200 || PPC_MPC512x || GAMECUBE_COMMON default y --- 285,289 ---- config NOT_COHERENT_CACHE bool ! depends on 4xx || 8xx || E200 || PPC_MPC512x default y |
|
From: Albert H. <he...@us...> - 2009-12-09 18:18:17
|
Update of /cvsroot/gc-linux/linux/include/asm-generic In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv17071/include/asm-generic Modified Files: gpio.h Log Message: Rewind to v2.6.31. Index: gpio.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/asm-generic/gpio.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** gpio.h 25 Oct 2009 18:59:28 -0000 1.7 --- gpio.h 9 Dec 2009 18:18:07 -0000 1.8 *************** *** 119,123 **** extern int gpio_direction_input(unsigned gpio); extern int gpio_direction_output(unsigned gpio, int value); - extern int gpio_direction_is_output(unsigned gpio); extern int gpio_get_value_cansleep(unsigned gpio); --- 119,122 ---- |
|
From: Albert H. <he...@us...> - 2009-12-09 18:18:17
|
Update of /cvsroot/gc-linux/linux/drivers/mmc/host In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv17071/drivers/mmc/host Modified Files: Kconfig Makefile Log Message: Rewind to v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/mmc/host/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 25 Oct 2009 18:59:28 -0000 1.4 --- Makefile 9 Dec 2009 18:18:07 -0000 1.5 *************** *** 17,21 **** obj-$(CONFIG_MMC_SDHCI_PLTFM) += sdhci-pltfm.o obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o - obj-$(CONFIG_MMC_SDHCI_MIPC) += sdhci-mipc.o obj-$(CONFIG_MMC_WBSD) += wbsd.o obj-$(CONFIG_MMC_AU1X) += au1xmmc.o --- 17,20 ---- Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/mmc/host/Kconfig,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Kconfig 25 Oct 2009 18:59:28 -0000 1.4 --- Kconfig 9 Dec 2009 18:18:07 -0000 1.5 *************** *** 120,134 **** YMMV. - config MMC_SDHCI_MIPC - tristate "Nintendo Wii SDHCI support via 'mini'" - depends on MMC_SDHCI && STARLET_MINI - select MMC_SDHCI_IO_ACCESSORS - help - This selects the Nintendo Wii Secure Digital Host Controller - Interface. The SDHC hardware is accessed via the 'mini' firmware - replacement for Starlet. - - If unsure, say N. - config MMC_OMAP tristate "TI OMAP Multimedia Card Interface support" --- 120,123 ---- |
|
From: Albert H. <he...@us...> - 2009-12-09 18:18:17
|
Update of /cvsroot/gc-linux/linux/drivers/video/logo In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv17071/drivers/video/logo Modified Files: Kconfig Makefile logo.c Log Message: Rewind to v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile 25 Oct 2009 18:59:28 -0000 1.12 --- Makefile 9 Dec 2009 18:18:07 -0000 1.13 *************** *** 8,12 **** obj-$(CONFIG_LOGO_BLACKFIN_VGA16) += logo_blackfin_vga16.o obj-$(CONFIG_LOGO_DEC_CLUT224) += logo_dec_clut224.o - obj-$(CONFIG_LOGO_GAMECUBE_CLUT224) += logo_gcn_clut224.o obj-$(CONFIG_LOGO_MAC_CLUT224) += logo_mac_clut224.o obj-$(CONFIG_LOGO_PARISC_CLUT224) += logo_parisc_clut224.o --- 8,11 ---- Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Kconfig,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Kconfig 25 Oct 2009 18:59:28 -0000 1.12 --- Kconfig 9 Dec 2009 18:18:07 -0000 1.13 *************** *** 43,51 **** default y - config LOGO_GAMECUBE_CLUT224 - bool "224-color GameCube Linux logo" - depends on GAMECUBE - default y - config LOGO_MAC_CLUT224 bool "224-color Macintosh Linux logo" --- 43,46 ---- Index: logo.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/logo.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** logo.c 25 Oct 2009 18:59:28 -0000 1.12 --- logo.c 9 Dec 2009 18:18:07 -0000 1.13 *************** *** 76,83 **** logo = &logo_dec_clut224; #endif - #ifdef CONFIG_LOGO_GAMECUBE_CLUT224 - /* GameCube Linux logo */ - logo = &logo_gcn_clut224; - #endif #ifdef CONFIG_LOGO_MAC_CLUT224 /* Macintosh Linux logo on m68k */ --- 76,79 ---- |
|
From: Albert H. <he...@us...> - 2009-12-09 18:18:17
|
Update of /cvsroot/gc-linux/linux/drivers/serial In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv17071/drivers/serial Modified Files: Kconfig Makefile Log Message: Rewind to v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/serial/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile 25 Oct 2009 18:59:28 -0000 1.12 --- Makefile 9 Dec 2009 18:18:07 -0000 1.13 *************** *** 80,82 **** obj-$(CONFIG_SERIAL_QE) += ucc_uart.o obj-$(CONFIG_SERIAL_TIMBERDALE) += timbuart.o - obj-$(CONFIG_SERIAL_USBGECKO) += usbgecko.o --- 80,81 ---- Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/serial/Kconfig,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Kconfig 25 Oct 2009 18:59:28 -0000 1.13 --- Kconfig 9 Dec 2009 18:18:07 -0000 1.14 *************** *** 1452,1467 **** Add support for UART controller on timberdale. - config SERIAL_USBGECKO - bool "USBGecko adapter on the Nintendo GameCube/Wii" - depends on GAMECUBE_EXI - select SERIAL_CORE - help - This is a driver for the USB Gecko adapter for the Nintendo GameCube - and Wii gaming consoles. It provides a console and a tty interface. - - If you have an adapter like this, say Y here, otherwise say N. - - To compile this driver as a module, choose M here: the - module will be called usbgecko. - endmenu --- 1452,1454 ---- |
|
From: Albert H. <he...@us...> - 2009-12-09 18:18:17
|
Update of /cvsroot/gc-linux/linux/drivers/misc In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv17071/drivers/misc Modified Files: Kconfig Makefile Log Message: Rewind to v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/misc/Makefile,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Makefile 25 Oct 2009 18:59:28 -0000 1.17 --- Makefile 9 Dec 2009 18:18:07 -0000 1.18 *************** *** 21,26 **** obj-$(CONFIG_ISL29003) += isl29003.o obj-$(CONFIG_C2PORT) += c2port/ - obj-$(CONFIG_GAMECUBE_GQR) += gcn-gqr.o - obj-$(CONFIG_GAMECUBE_MI) += gcn-mi.o obj-y += eeprom/ obj-y += cb710/ --- 21,24 ---- Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/misc/Kconfig,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Kconfig 25 Oct 2009 18:59:28 -0000 1.21 --- Kconfig 9 Dec 2009 18:18:07 -0000 1.22 *************** *** 56,81 **** interval timing. - config GAMECUBE_GQR - tristate "Nintendo GameCube/Wii Graphic Quantization Registers (GQR)" - depends on GAMECUBE_COMMON - help - This option enables device driver support for the Gekko/Broadway - processors' Graphic Quantization Registers. - These registers are used with the psql and psqst instructions. - The registers will appear in /proc/sys/gqr. - - config GAMECUBE_MI - tristate "Nintendo GameCube Memory Interface (MI)" - depends on GAMECUBE - help - If you say yes to this option, support will be included for the - Memory Interface (MI) of the Nintendo GameCube. - - The MI allows one to setup up to four protected memory regions, - catching invalid accesses to them. The MI catches out of bounds - memory accesses too. - - If in doubt, say N here. - config IBM_ASM tristate "Device driver for IBM RSA service processor" --- 56,59 ---- |
|
From: Albert H. <he...@us...> - 2009-12-09 18:18:17
|
Update of /cvsroot/gc-linux/linux/drivers/video In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv17071/drivers/video Modified Files: Kconfig Makefile Log Message: Rewind to v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/Makefile,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** Makefile 25 Oct 2009 18:59:28 -0000 1.36 --- Makefile 9 Dec 2009 18:18:07 -0000 1.37 *************** *** 127,131 **** obj-$(CONFIG_FB_CARMINE) += carminefb.o obj-$(CONFIG_FB_MB862XX) += mb862xx/ - obj-$(CONFIG_FB_GAMECUBE) += gcnfb.o # Platform or fallback drivers go here --- 127,130 ---- Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/Kconfig,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** Kconfig 25 Oct 2009 18:59:28 -0000 1.40 --- Kconfig 9 Dec 2009 18:18:07 -0000 1.41 *************** *** 1669,1691 **** endchoice - config FB_GAMECUBE - bool "Nintendo GameCube/Wii frame buffer" - depends on FB && GAMECUBE_COMMON - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT - help - This is the frame buffer device driver for the Nintendo GameCube. - - config WII_AVE_RVL - bool "Nintendo Wii audio/video encoder support" - depends on FB_GAMECUBE && WII - select I2C_GPIO - select I2C - default y - help - Say Y here to support the audio/video encoder found in the - Nintendo Wii video game console. - config FB_AU1100 bool "Au1100 LCD Driver" --- 1669,1672 ---- |
165 messages has been excluded from this view by a project administrator.
