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-03-02 19:26:44
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/mm In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6933/arch/powerpc/mm Modified Files: pgtable_32.c Log Message: Merge v2.6.29-rc6. NOTE: Some of the Kconfig options and Makefile entries for the drivers marked as "broken" will disappear with this commit. Index: pgtable_32.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/mm/pgtable_32.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pgtable_32.c 1 Feb 2009 18:29:35 -0000 1.2 --- pgtable_32.c 2 Mar 2009 19:26:37 -0000 1.3 *************** *** 49,56 **** extern char etext[], _stext[]; - #ifdef CONFIG_SMP - extern void hash_page_sync(void); - #endif - #ifdef HAVE_BATS extern phys_addr_t v_mapped_by_bats(unsigned long va); --- 49,52 ---- *************** *** 66,71 **** #ifdef HAVE_TLBCAM extern unsigned int tlbcam_index; ! extern unsigned long v_mapped_by_tlbcam(unsigned long va); ! extern unsigned long p_mapped_by_tlbcam(unsigned long pa); #else /* !HAVE_TLBCAM */ #define v_mapped_by_tlbcam(x) (0UL) --- 62,67 ---- #ifdef HAVE_TLBCAM extern unsigned int tlbcam_index; ! extern phys_addr_t v_mapped_by_tlbcam(unsigned long va); ! extern unsigned long p_mapped_by_tlbcam(phys_addr_t pa); #else /* !HAVE_TLBCAM */ #define v_mapped_by_tlbcam(x) (0UL) *************** *** 73,82 **** #endif /* HAVE_TLBCAM */ ! #ifdef CONFIG_PTE_64BIT ! /* Some processors use an 8kB pgdir because they have 8-byte Linux PTEs. */ ! #define PGDIR_ORDER 1 ! #else ! #define PGDIR_ORDER 0 ! #endif pgd_t *pgd_alloc(struct mm_struct *mm) --- 69,73 ---- #endif /* HAVE_TLBCAM */ ! #define PGDIR_ORDER (32 + PGD_T_LOG2 - PGDIR_SHIFT) pgd_t *pgd_alloc(struct mm_struct *mm) *************** *** 84,88 **** pgd_t *ret; ! ret = (pgd_t *)__get_free_pages(GFP_KERNEL|__GFP_ZERO, PGDIR_ORDER); return ret; } --- 75,85 ---- pgd_t *ret; ! /* pgdir take page or two with 4K pages and a page fraction otherwise */ ! #ifndef CONFIG_PPC_4K_PAGES ! ret = (pgd_t *)kzalloc(1 << PGDIR_ORDER, GFP_KERNEL); ! #else ! ret = (pgd_t *)__get_free_pages(GFP_KERNEL|__GFP_ZERO, ! PGDIR_ORDER - PAGE_SHIFT); ! #endif return ret; } *************** *** 90,94 **** void pgd_free(struct mm_struct *mm, pgd_t *pgd) { ! free_pages((unsigned long)pgd, PGDIR_ORDER); } --- 87,95 ---- void pgd_free(struct mm_struct *mm, pgd_t *pgd) { ! #ifndef CONFIG_PPC_4K_PAGES ! kfree((void *)pgd); ! #else ! free_pages((unsigned long)pgd, PGDIR_ORDER - PAGE_SHIFT); ! #endif } *************** *** 126,146 **** } - void pte_free_kernel(struct mm_struct *mm, pte_t *pte) - { - #ifdef CONFIG_SMP - hash_page_sync(); - #endif - free_page((unsigned long)pte); - } - - void pte_free(struct mm_struct *mm, pgtable_t ptepage) - { - #ifdef CONFIG_SMP - hash_page_sync(); - #endif - pgtable_page_dtor(ptepage); - __free_page(ptepage); - } - void __iomem * ioremap(phys_addr_t addr, unsigned long size) --- 127,130 ---- *************** *** 195,198 **** --- 179,183 ---- p += _ISA_MEM_BASE; + #ifndef CONFIG_CRASH_DUMP /* * Don't allow anybody to remap normal RAM that we're using. *************** *** 214,217 **** --- 199,203 ---- } } + #endif if (size == 0) *************** *** 291,295 **** * hash table */ ! BUG_ON(pte_val(*pg) & (_PAGE_PRESENT | _PAGE_HASHPTE)); set_pte_at(&init_mm, va, pg, pfn_pte(pa >> PAGE_SHIFT, __pgprot(flags))); --- 277,282 ---- * hash table */ ! BUG_ON((pte_val(*pg) & (_PAGE_PRESENT | _PAGE_HASHPTE)) && ! flags); set_pte_at(&init_mm, va, pg, pfn_pte(pa >> PAGE_SHIFT, __pgprot(flags))); *************** *** 299,303 **** /* ! * Map in a big chunk of physical memory starting at KERNELBASE. */ void __init mapin_ram(void) --- 286,290 ---- /* ! * Map in a big chunk of physical memory starting at PAGE_OFFSET. */ void __init mapin_ram(void) *************** *** 308,312 **** s = mmu_mapin_ram(); ! v = KERNELBASE + s; p = memstart_addr + s; for (; s < total_lowmem; s += PAGE_SIZE) { --- 295,299 ---- s = mmu_mapin_ram(); ! v = PAGE_OFFSET + s; p = memstart_addr + s; for (; s < total_lowmem; s += PAGE_SIZE) { *************** *** 374,378 **** set_pte_at(&init_mm, address, kpte, mk_pte(page, prot)); wmb(); ! flush_HPTE(0, address, pmd_val(*kpmd)); pte_unmap(kpte); --- 361,369 ---- set_pte_at(&init_mm, address, kpte, mk_pte(page, prot)); wmb(); ! #ifdef CONFIG_PPC_STD_MMU ! flush_hash_pages(0, address, pmd_val(*kpmd), 1); ! #else ! flush_tlb_page(NULL, address); ! #endif pte_unmap(kpte); *************** *** 411,415 **** static int fixmaps; ! unsigned long FIXADDR_TOP = 0xfffff000; EXPORT_SYMBOL(FIXADDR_TOP); --- 402,406 ---- static int fixmaps; ! unsigned long FIXADDR_TOP = (-PAGE_SIZE); EXPORT_SYMBOL(FIXADDR_TOP); |
|
From: Albert H. <he...@us...> - 2009-03-02 19:26:44
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/platforms In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6933/arch/powerpc/platforms Modified Files: Kconfig.cputype Log Message: Merge v2.6.29-rc6. NOTE: Some of the Kconfig options and Makefile entries for the drivers marked as "broken" will disappear with this commit. Index: Kconfig.cputype =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/platforms/Kconfig.cputype,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Kconfig.cputype 1 Feb 2009 18:29:35 -0000 1.6 --- Kconfig.cputype 2 Mar 2009 19:26:37 -0000 1.7 *************** *** 196,200 **** config PPC_STD_MMU bool ! depends on 6xx || POWER3 || POWER4 || PPC64 default y --- 196,200 ---- config PPC_STD_MMU bool ! depends on 6xx || PPC64 default y *************** *** 203,209 **** depends on PPC_STD_MMU && PPC32 config PPC_MM_SLICES bool ! default y if HUGETLB_PAGE || PPC_64K_PAGES default n --- 203,217 ---- depends on PPC_STD_MMU && PPC32 + config PPC_STD_MMU_64 + def_bool y + depends on PPC_STD_MMU && PPC64 + + config PPC_MMU_NOHASH + def_bool y + depends on !PPC_STD_MMU + config PPC_MM_SLICES bool ! default y if HUGETLB_PAGE || (PPC_STD_MMU_64 && PPC_64K_PAGES) default n *************** *** 224,228 **** config SMP ! depends on PPC_STD_MMU bool "Symmetric multi-processing support" ---help--- --- 232,236 ---- config SMP ! depends on PPC_STD_MMU || FSL_BOOKE bool "Symmetric multi-processing support" ---help--- |
|
From: Albert H. <he...@us...> - 2009-03-02 19:26:44
|
Update of /cvsroot/gc-linux/linux/arch/powerpc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6933/arch/powerpc Modified Files: Kconfig Kconfig.debug Log Message: Merge v2.6.29-rc6. NOTE: Some of the Kconfig options and Makefile entries for the drivers marked as "broken" will disappear with this commit. Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/Kconfig,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Kconfig 1 Feb 2009 18:29:34 -0000 1.6 --- Kconfig 2 Mar 2009 19:26:36 -0000 1.7 *************** *** 109,112 **** --- 109,114 ---- bool default y + select HAVE_FTRACE_MCOUNT_RECORD + select HAVE_DYNAMIC_FTRACE select HAVE_FUNCTION_TRACER select ARCH_WANT_OPTIONAL_GPIOLIB *************** *** 122,125 **** --- 124,128 ---- select USE_GENERIC_SMP_HELPERS if SMP select HAVE_OPROFILE + select HAVE_SYSCALL_WRAPPERS if PPC64 config EARLY_PRINTK *************** *** 142,146 **** default y if PPC32 ! config SCHED_NO_NO_OMIT_FRAME_POINTER bool default y --- 145,149 ---- default y if PPC32 ! config SCHED_OMIT_FRAME_POINTER bool default y *************** *** 286,289 **** --- 289,296 ---- def_bool PPC64 + config PPC_NEED_DMA_SYNC_OPS + def_bool y + depends on NOT_COHERENT_CACHE + config HOTPLUG_CPU bool "Support for enabling/disabling CPUs" *************** *** 323,327 **** config CRASH_DUMP bool "Build a kdump crash kernel" ! depends on PPC_MULTIPLATFORM && PPC64 && RELOCATABLE help Build a kernel suitable for use as a kdump capture kernel. --- 330,335 ---- config CRASH_DUMP bool "Build a kdump crash kernel" ! depends on PPC64 || 6xx ! select RELOCATABLE if PPC64 help Build a kernel suitable for use as a kdump capture kernel. *************** *** 402,422 **** default n ! config PPC_64K_PAGES ! bool "64k page size" ! depends on PPC64 ! select PPC_HAS_HASH_64K help ! This option changes the kernel logical page size to 64k. On machines ! without processor support for 64k pages, the kernel will simulate ! them by loading each individual 4k page on demand transparently, ! while on hardware with such support, it will be used to map ! normal application pages. config FORCE_MAX_ZONEORDER int "Maximum zone order" ! range 9 64 if PPC_64K_PAGES ! default "9" if PPC_64K_PAGES ! range 13 64 if PPC64 && !PPC_64K_PAGES ! default "13" if PPC64 && !PPC_64K_PAGES range 11 64 default "11" --- 410,460 ---- default n ! choice ! prompt "Page size" ! default PPC_4K_PAGES help ! Select the kernel logical page size. Increasing the page size ! will reduce software overhead at each page boundary, allow ! hardware prefetch mechanisms to be more effective, and allow ! larger dma transfers increasing IO efficiency and reducing ! overhead. However the utilization of memory will increase. ! For example, each cached file will using a multiple of the ! page size to hold its contents and the difference between the ! end of file and the end of page is wasted. ! ! Some dedicated systems, such as software raid serving with ! accelerated calculations, have shown significant increases. ! ! If you configure a 64 bit kernel for 64k pages but the ! processor does not support them, then the kernel will simulate ! them with 4k pages, loading them on demand, but with the ! reduced software overhead and larger internal fragmentation. ! For the 32 bit kernel, a large page option will not be offered ! unless it is supported by the configured processor. ! ! If unsure, choose 4K_PAGES. ! ! config PPC_4K_PAGES ! bool "4k page size" ! ! config PPC_16K_PAGES ! bool "16k page size" if 44x ! ! config PPC_64K_PAGES ! bool "64k page size" if 44x || PPC_STD_MMU_64 ! select PPC_HAS_HASH_64K if PPC_STD_MMU_64 ! ! endchoice 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 11 64 default "11" *************** *** 438,442 **** config PPC_SUBPAGE_PROT bool "Support setting protections for 4k subpages" ! depends on PPC_64K_PAGES help This option adds support for a system call to allow user programs --- 476,480 ---- config PPC_SUBPAGE_PROT bool "Support setting protections for 4k subpages" ! depends on PPC_STD_MMU_64 && PPC_64K_PAGES help This option adds support for a system call to allow user programs *************** *** 839,846 **** source "fs/Kconfig" - # XXX source "arch/ppc/8xx_io/Kconfig" - - # XXX source "arch/ppc/8260_io/Kconfig" - source "arch/powerpc/sysdev/qe_lib/Kconfig" --- 877,880 ---- Index: Kconfig.debug =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/Kconfig.debug,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Kconfig.debug 1 Feb 2009 18:29:34 -0000 1.5 --- Kconfig.debug 2 Mar 2009 19:26:37 -0000 1.6 *************** *** 3,6 **** --- 3,15 ---- source "lib/Kconfig.debug" + config PRINT_STACK_DEPTH + int "Stack depth to print" if DEBUG_KERNEL + default 64 + help + This option allows you to set the stack depth that the kernel + prints in stack traces. This can be useful if your display is + too small and stack traces cause important information to + scroll off the screen. + config DEBUG_STACKOVERFLOW bool "Check for stack overflows" |
|
From: Albert H. <he...@us...> - 2009-03-02 19:26:44
|
Update of /cvsroot/gc-linux/linux/drivers In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6933/drivers Modified Files: Kconfig Makefile Log Message: Merge v2.6.29-rc6. NOTE: Some of the Kconfig options and Makefile entries for the drivers marked as "broken" will disappear with this commit. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/Makefile,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** Makefile 1 Feb 2009 18:29:35 -0000 1.27 --- Makefile 2 Mar 2009 19:26:37 -0000 1.28 *************** *** 19,22 **** --- 19,25 ---- obj-$(CONFIG_XEN) += xen/ + # regulators early, since some subsystems rely on them to initialize + obj-$(CONFIG_REGULATOR) += regulator/ + # char/ comes before serial/ etc so that the VT console is the boot-time # default. *************** *** 58,61 **** --- 61,65 ---- obj-$(CONFIG_TC) += tc/ obj-$(CONFIG_UWB) += uwb/ + obj-$(CONFIG_USB_OTG_UTILS) += usb/otg/ obj-$(CONFIG_USB) += usb/ obj-$(CONFIG_USB_MUSB_HDRC) += usb/musb/ *************** *** 103,106 **** obj-$(CONFIG_SSB) += ssb/ obj-$(CONFIG_VIRTIO) += virtio/ - obj-$(CONFIG_REGULATOR) += regulator/ obj-$(CONFIG_STAGING) += staging/ --- 107,110 ---- obj-$(CONFIG_SSB) += ssb/ obj-$(CONFIG_VIRTIO) += virtio/ obj-$(CONFIG_STAGING) += staging/ + obj-y += platform/ Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/Kconfig,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Kconfig 1 Feb 2009 18:29:35 -0000 1.4 --- Kconfig 2 Mar 2009 19:26:37 -0000 1.5 *************** *** 110,112 **** --- 110,114 ---- source "drivers/staging/Kconfig" + + source "drivers/platform/Kconfig" endmenu |
|
From: Albert H. <he...@us...> - 2009-03-02 19:26:43
|
Update of /cvsroot/gc-linux/linux/drivers/video In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6933/drivers/video Modified Files: Kconfig Makefile Log Message: Merge v2.6.29-rc6. NOTE: Some of the Kconfig options and Makefile entries for the drivers marked as "broken" will disappear with this commit. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/Makefile,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** Makefile 1 Feb 2009 18:29:35 -0000 1.29 --- Makefile 2 Mar 2009 19:26:37 -0000 1.30 *************** *** 29,33 **** # Hardware specific drivers go first ! obj-$(CONFIG_FB_AMIGA) += amifb.o c2p.o obj-$(CONFIG_FB_ARC) += arcfb.o obj-$(CONFIG_FB_CLPS711X) += clps711xfb.o --- 29,33 ---- # Hardware specific drivers go first ! obj-$(CONFIG_FB_AMIGA) += amifb.o c2p_planar.o obj-$(CONFIG_FB_ARC) += arcfb.o obj-$(CONFIG_FB_CLPS711X) += clps711xfb.o *************** *** 73,77 **** obj-$(CONFIG_FB_SGIVW) += sgivwfb.o obj-$(CONFIG_FB_ACORN) += acornfb.o ! obj-$(CONFIG_FB_ATARI) += atafb.o c2p.o atafb_mfb.o \ atafb_iplan2p2.o atafb_iplan2p4.o atafb_iplan2p8.o obj-$(CONFIG_FB_MAC) += macfb.o --- 73,77 ---- obj-$(CONFIG_FB_SGIVW) += sgivwfb.o obj-$(CONFIG_FB_ACORN) += acornfb.o ! obj-$(CONFIG_FB_ATARI) += atafb.o c2p_iplan2.o atafb_mfb.o \ atafb_iplan2p2.o atafb_iplan2p4.o atafb_iplan2p8.o obj-$(CONFIG_FB_MAC) += macfb.o *************** *** 125,129 **** obj-$(CONFIG_FB_MB862XX) += mb862xx/ obj-$(CONFIG_FB_GAMECUBE) += gcnfb.o - obj-$(CONFIG_FB_GAMECUBE_GX) += gcngx.o # Platform or fallback drivers go here --- 125,128 ---- *************** *** 135,138 **** --- 134,138 ---- obj-$(CONFIG_FB_BF54X_LQ043) += bf54x-lq043fb.o obj-$(CONFIG_FB_BFIN_T350MCQB) += bfin-t350mcqb-fb.o + obj-$(CONFIG_FB_MX3) += mx3fb.o # the test framebuffer is last Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/Kconfig,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** Kconfig 2 Mar 2009 18:47:21 -0000 1.33 --- Kconfig 2 Mar 2009 19:26:37 -0000 1.34 *************** *** 42,46 **** buffer devices. Please read <file:Documentation/fb/framebuffer.txt> and the Framebuffer-HOWTO at ! <http://www.tahallah.demon.co.uk/programming/prog.html> for more information. --- 42,46 ---- buffer devices. Please read <file:Documentation/fb/framebuffer.txt> and the Framebuffer-HOWTO at ! <http://www.munted.org.uk/programming/Framebuffer-HOWTO-1.2.html> for more information. *************** *** 363,367 **** config FB_ACORN bool "Acorn VIDC support" ! depends on (FB = y) && ARM && (ARCH_ACORN || ARCH_CLPS7500) select FB_CFB_FILLRECT select FB_CFB_COPYAREA --- 363,367 ---- config FB_ACORN bool "Acorn VIDC support" ! depends on (FB = y) && ARM && ARCH_ACORN select FB_CFB_FILLRECT select FB_CFB_COPYAREA *************** *** 1055,1061 **** config FB_I810 tristate "Intel 810/815 support (EXPERIMENTAL)" ! depends on FB && EXPERIMENTAL && PCI && X86_32 ! select AGP ! select AGP_INTEL select FB_MODE_HELPERS select FB_CFB_FILLRECT --- 1055,1059 ---- config FB_I810 tristate "Intel 810/815 support (EXPERIMENTAL)" ! depends on EXPERIMENTAL && FB && PCI && X86_32 && AGP_INTEL select FB_MODE_HELPERS select FB_CFB_FILLRECT *************** *** 1120,1126 **** config FB_INTEL tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support (EXPERIMENTAL)" ! depends on FB && EXPERIMENTAL && PCI && X86 ! select AGP ! select AGP_INTEL select FB_MODE_HELPERS select FB_CFB_FILLRECT --- 1118,1122 ---- config FB_INTEL tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support (EXPERIMENTAL)" ! depends on EXPERIMENTAL && FB && PCI && X86 && AGP_INTEL select FB_MODE_HELPERS select FB_CFB_FILLRECT *************** *** 1714,1723 **** This is the frame buffer device driver for the Nintendo GameCube. - config FB_GAMECUBE_GX - bool "Nintendo GameCube hardware accelerated graphics support" - depends on FB_GAMECUBE && GAMECUBE && BROKEN - help - Say Y here to support the 3D hardware found in the Nintendo GameCube. - config WII_AVE_RVL bool "Nintendo Wii audio/video encoder support" --- 1710,1713 ---- *************** *** 1843,1846 **** --- 1833,1841 ---- If unsure, say N. + config FB_PXA_OVERLAY + bool "Support PXA27x/PXA3xx Overlay(s) as framebuffer" + default n + depends on FB_PXA && (PXA27x || PXA3xx) + config FB_PXA_SMARTPANEL bool "PXA Smartpanel LCD support" *************** *** 1915,1922 **** tristate "SuperH Mobile LCDC framebuffer support" depends on FB && SUPERH ! select FB_CFB_FILLRECT ! select FB_CFB_COPYAREA ! select FB_CFB_IMAGEBLIT ! default m ---help--- Frame buffer driver for the on-chip SH-Mobile LCD controller. --- 1910,1918 ---- tristate "SuperH Mobile LCDC framebuffer support" depends on FB && SUPERH ! select FB_SYS_FILLRECT ! select FB_SYS_COPYAREA ! select FB_SYS_IMAGEBLIT ! select FB_SYS_FOPS ! select FB_DEFERRED_IO ---help--- Frame buffer driver for the on-chip SH-Mobile LCD controller. *************** *** 2047,2061 **** config FB_SH7760 ! bool "SH7760/SH7763 LCDC support" ! depends on FB && (CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7763) ! select FB_CFB_FILLRECT ! select FB_CFB_COPYAREA ! select FB_CFB_IMAGEBLIT ! help ! Support for the SH7760/SH7763 integrated (D)STN/TFT LCD Controller. ! Supports display resolutions up to 1024x1024 pixel, grayscale and ! color operation, with depths ranging from 1 bpp to 8 bpp monochrome ! and 8, 15 or 16 bpp color; 90 degrees clockwise display rotation for ! panels <= 320 pixel horizontal resolution. config FB_VIRTUAL --- 2043,2059 ---- config FB_SH7760 ! bool "SH7760/SH7763/SH7720/SH7721 LCDC support" ! depends on FB && (CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7763 \ ! || CPU_SUBTYPE_SH7720 || CPU_SUBTYPE_SH7721) ! select FB_CFB_FILLRECT ! select FB_CFB_COPYAREA ! select FB_CFB_IMAGEBLIT ! ---help--- ! Support for the SH7760/SH7763/SH7720/SH7721 integrated ! (D)STN/TFT LCD Controller. ! Supports display resolutions up to 1024x1024 pixel, grayscale and ! color operation, with depths ranging from 1 bpp to 8 bpp monochrome ! and 8, 15 or 16 bpp color; 90 degrees clockwise display rotation for ! panels <= 320 pixel horizontal resolution. config FB_VIRTUAL *************** *** 2141,2144 **** --- 2139,2154 ---- the bootloader. + config FB_MX3 + tristate "MX3 Framebuffer support" + depends on FB && MX3_IPU + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + default y + help + This is a framebuffer device for the i.MX31 LCD Controller. So + far only synchronous displays are supported. If you plan to use + an LCD display with your i.MX31 system, say Y here. + source "drivers/video/omap/Kconfig" |
|
From: Albert H. <he...@us...> - 2009-03-02 19:26:43
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/boot In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6933/arch/powerpc/boot Modified Files: Makefile Log Message: Merge v2.6.29-rc6. NOTE: Some of the Kconfig options and Makefile entries for the drivers marked as "broken" will disappear with this commit. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/boot/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile 1 Feb 2009 18:29:34 -0000 1.7 --- Makefile 2 Mar 2009 19:26:37 -0000 1.8 *************** *** 64,67 **** --- 64,68 ---- 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 \ cuboot-bamboo.c cuboot-mpc7448hpc2.c cuboot-taishan.c \ *************** *** 194,197 **** --- 195,199 ---- image-$(CONFIG_PPC_PS3) += dtbImage.ps3 image-$(CONFIG_PPC_CELLEB) += zImage.pseries + image-$(CONFIG_PPC_CELL_QPACE) += zImage.pseries image-$(CONFIG_PPC_CHRP) += zImage.chrp image-$(CONFIG_PPC_EFIKA) += zImage.chrp *************** *** 207,211 **** # Theses are default targets to build images which embed device tree blobs. # They are only required on boards which do not have FDT support in firmware. ! # Boards with newish u-boot firmare can use the uImage target above # --- 209,213 ---- # Theses are default targets to build images which embed device tree blobs. # They are only required on boards which do not have FDT support in firmware. ! # Boards with newish u-boot firmware can use the uImage target above # *************** *** 357,361 **** install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y)) ! sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $< # anything not in $(targets) --- 359,363 ---- install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y)) ! sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $^ # anything not in $(targets) |
|
From: Albert H. <he...@us...> - 2009-03-02 19:26:43
|
Update of /cvsroot/gc-linux/linux/drivers/misc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6933/drivers/misc Modified Files: Kconfig Makefile Log Message: Merge v2.6.29-rc6. NOTE: Some of the Kconfig options and Makefile entries for the drivers marked as "broken" will disappear with this commit. Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/misc/Kconfig,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Kconfig 1 Feb 2009 18:29:35 -0000 1.14 --- Kconfig 2 Mar 2009 19:26:37 -0000 1.15 *************** *** 110,121 **** say N here. - config EEPROM_93CX6 - tristate "EEPROM 93CX6 support" - ---help--- - This is a driver for the EEPROM chipsets 93c46 and 93c66. - The driver supports both read as well as write commands. - - If unsure, say N. - config SGI_IOC4 tristate "SGI IOC4 Base IO support" --- 110,113 ---- *************** *** 143,147 **** Interface support (MMC_TIFM_SD)'. ! To compile this driver as a module, choose M here: the module will be called tifm_core. --- 135,139 ---- Interface support (MMC_TIFM_SD)'. ! To compile this driver as a module, choose M here: the module will be called tifm_core. *************** *** 156,253 **** flash card format drivers, as outlined in the TIFM_CORE Help. ! To compile this driver as a module, choose M here: the module will be called tifm_7xx1. - config ACER_WMI - tristate "Acer WMI Laptop Extras (EXPERIMENTAL)" - depends on X86 - depends on EXPERIMENTAL - depends on ACPI - depends on LEDS_CLASS - depends on NEW_LEDS - depends on BACKLIGHT_CLASS_DEVICE - depends on SERIO_I8042 - depends on RFKILL - select ACPI_WMI - ---help--- - This is a driver for newer Acer (and Wistron) laptops. It adds - wireless radio and bluetooth control, and on some laptops, - exposes the mail LED and LCD backlight. - - For more information about this driver see - <file:Documentation/laptops/acer-wmi.txt> - - If you have an ACPI-WMI compatible Acer/ Wistron laptop, say Y or M - here. - - config ASUS_LAPTOP - tristate "Asus Laptop Extras (EXPERIMENTAL)" - depends on X86 - depends on ACPI - depends on EXPERIMENTAL && !ACPI_ASUS - depends on LEDS_CLASS - depends on NEW_LEDS - depends on BACKLIGHT_CLASS_DEVICE - ---help--- - This is the new Linux driver for Asus laptops. It may also support some - MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate - standard ACPI events that go through /proc/acpi/events. It also adds - support for video output switching, LCD backlight control, Bluetooth and - Wlan control, and most importantly, allows you to blink those fancy LEDs. - - For more information and a userspace daemon for handling the extra - buttons see <http://acpi4asus.sf.net/>. - - If you have an ACPI-compatible ASUS laptop, say Y or M here. - - config FUJITSU_LAPTOP - tristate "Fujitsu Laptop Extras" - depends on X86 - depends on ACPI - depends on INPUT - depends on BACKLIGHT_CLASS_DEVICE - ---help--- - This is a driver for laptops built by Fujitsu: - - * P2xxx/P5xxx/S6xxx/S7xxx series Lifebooks - * Possibly other Fujitsu laptop models - * Tested with S6410 and S7020 - - It adds support for LCD brightness control and some hotkeys. - - If you have a Fujitsu laptop, say Y or M here. - - config FUJITSU_LAPTOP_DEBUG - bool "Verbose debug mode for Fujitsu Laptop Extras" - depends on FUJITSU_LAPTOP - default n - ---help--- - Enables extra debug output from the fujitsu extras driver, at the - expense of a slight increase in driver size. - - If you are not sure, say N here. - - config TC1100_WMI - tristate "HP Compaq TC1100 Tablet WMI Extras (EXPERIMENTAL)" - depends on X86 && !X86_64 - depends on EXPERIMENTAL - depends on ACPI - select ACPI_WMI - ---help--- - This is a driver for the WMI extensions (wireless and bluetooth power - control) of the HP Compaq TC1100 tablet. - - config HP_WMI - tristate "HP WMI extras" - depends on ACPI_WMI - depends on INPUT - depends on RFKILL - help - Say Y here if you want to support WMI-based hotkeys on HP laptops and - to read data from WMI such as docking or ambient light sensor state. - - To compile this driver as a module, choose M here: the module will - be called hp-wmi. - config ICS932S401 tristate "Integrated Circuits ICS932S401" --- 148,154 ---- flash card format drivers, as outlined in the TIFM_CORE Help. ! To compile this driver as a module, choose M here: the module will be called tifm_7xx1. config ICS932S401 tristate "Integrated Circuits ICS932S401" *************** *** 260,427 **** will be called ics932s401. - config MSI_LAPTOP - tristate "MSI Laptop Extras" - depends on X86 - depends on ACPI - depends on BACKLIGHT_CLASS_DEVICE - ---help--- - This is a driver for laptops built by MSI (MICRO-STAR - INTERNATIONAL): - - MSI MegaBook S270 (MS-1013) - Cytron/TCM/Medion/Tchibo MD96100/SAM2000 - - It adds support for Bluetooth, WLAN and LCD brightness control. - - More information about this driver is available at - <http://0pointer.de/lennart/tchibo.html>. - - If you have an MSI S270 laptop, say Y or M here. - - config PANASONIC_LAPTOP - tristate "Panasonic Laptop Extras" - depends on X86 && INPUT && ACPI - depends on BACKLIGHT_CLASS_DEVICE - ---help--- - This driver adds support for access to backlight control and hotkeys - on Panasonic Let's Note laptops. - - If you have a Panasonic Let's note laptop (such as the R1(N variant), - R2, R3, R5, T2, W2 and Y2 series), say Y. - - config COMPAL_LAPTOP - tristate "Compal Laptop Extras" - depends on X86 - depends on ACPI - depends on BACKLIGHT_CLASS_DEVICE - ---help--- - This is a driver for laptops built by Compal: - - Compal FL90/IFL90 - Compal FL91/IFL91 - Compal FL92/JFL92 - Compal FT00/IFT00 - - It adds support for Bluetooth, WLAN and LCD brightness control. - - If you have an Compal FL9x/IFL9x/FT00 laptop, say Y or M here. - - config SONY_LAPTOP - tristate "Sony Laptop Extras" - depends on X86 && ACPI - select BACKLIGHT_CLASS_DEVICE - depends on INPUT - ---help--- - This mini-driver drives the SNC and SPIC devices present in the ACPI - BIOS of the Sony Vaio laptops. - - It gives access to some extra laptop functionalities like Bluetooth, - screen brightness control, Fn keys and allows powering on/off some - devices. - - Read <file:Documentation/laptops/sony-laptop.txt> for more information. - - config SONYPI_COMPAT - bool "Sonypi compatibility" - depends on SONY_LAPTOP - ---help--- - Build the sonypi driver compatibility code into the sony-laptop driver. - - config THINKPAD_ACPI - tristate "ThinkPad ACPI Laptop Extras" - depends on X86 && ACPI - select BACKLIGHT_LCD_SUPPORT - select BACKLIGHT_CLASS_DEVICE - select HWMON - select NVRAM - select INPUT - select NEW_LEDS - select LEDS_CLASS - select NET - select RFKILL - ---help--- - This is a driver for the IBM and Lenovo ThinkPad laptops. It adds - support for Fn-Fx key combinations, Bluetooth control, video - output switching, ThinkLight control, UltraBay eject and more. - For more information about this driver see - <file:Documentation/laptops/thinkpad-acpi.txt> and - <http://ibm-acpi.sf.net/> . - - This driver was formerly known as ibm-acpi. - - If you have an IBM or Lenovo ThinkPad laptop, say Y or M here. - - config THINKPAD_ACPI_DEBUG - bool "Verbose debug mode" - depends on THINKPAD_ACPI - default n - ---help--- - Enables extra debugging information, at the expense of a slightly - increase in driver size. - - If you are not sure, say N here. - - config THINKPAD_ACPI_DOCK - bool "Legacy Docking Station Support" - depends on THINKPAD_ACPI - depends on ACPI_DOCK=n - default n - ---help--- - Allows the thinkpad_acpi driver to handle docking station events. - This support was made obsolete by the generic ACPI docking station - support (CONFIG_ACPI_DOCK). It will allow locking and removing the - laptop from the docking station, but will not properly connect PCI - devices. - - If you are not sure, say N here. - - config THINKPAD_ACPI_BAY - bool "Legacy Removable Bay Support" - depends on THINKPAD_ACPI - default y - ---help--- - Allows the thinkpad_acpi driver to handle removable bays. It will - electrically disable the device in the bay, and also generate - notifications when the bay lever is ejected or inserted. - - If you are not sure, say Y here. - - config THINKPAD_ACPI_VIDEO - bool "Video output control support" - depends on THINKPAD_ACPI - default y - ---help--- - Allows the thinkpad_acpi driver to provide an interface to control - the various video output ports. - - This feature often won't work well, depending on ThinkPad model, - display state, video output devices in use, whether there is a X - server running, phase of the moon, and the current mood of - Schroedinger's cat. If you can use X.org's RandR to control - your ThinkPad's video output ports instead of this feature, - don't think twice: do it and say N here to save some memory. - - If you are not sure, say Y here. - - config THINKPAD_ACPI_HOTKEY_POLL - bool "Support NVRAM polling for hot keys" - depends on THINKPAD_ACPI - default y - ---help--- - Some thinkpad models benefit from NVRAM polling to detect a few of - the hot key press events. If you know your ThinkPad model does not - need to do NVRAM polling to support any of the hot keys you use, - unselecting this option will save about 1kB of memory. - - ThinkPads T40 and newer, R52 and newer, and X31 and newer are - unlikely to need NVRAM polling in their latest BIOS versions. - - NVRAM polling can detect at most the following keys: ThinkPad/Access - IBM, Zoom, Switch Display (fn+F7), ThinkLight, Volume up/down/mute, - Brightness up/down, Display Expand (fn+F8), Hibernate (fn+F12). - - If you are not sure, say Y here. The driver enables polling only if - it is strictly necessary to do so. - config ATMEL_SSC tristate "Device driver for Atmel SSC peripheral" --- 161,164 ---- *************** *** 436,464 **** If unsure, say N. - config INTEL_MENLOW - tristate "Thermal Management driver for Intel menlow platform" - depends on ACPI_THERMAL - select THERMAL - depends on X86 - ---help--- - ACPI thermal management enhancement driver on - Intel Menlow platform. - - If unsure, say N. - - config EEEPC_LAPTOP - tristate "Eee PC Hotkey Driver (EXPERIMENTAL)" - depends on X86 - depends on ACPI - depends on BACKLIGHT_CLASS_DEVICE - depends on HWMON - depends on EXPERIMENTAL - depends on RFKILL - ---help--- - This driver supports the Fn-Fx keys on Eee PC laptops. - It also adds the ability to switch camera/wlan on/off. - - If you have an Eee PC laptop, say Y or M here. - config ENCLOSURE_SERVICES tristate "Enclosure Services" --- 173,176 ---- *************** *** 521,525 **** --- 233,251 ---- you are unsure, say N. + config DELL_LAPTOP + tristate "Dell Laptop Extras (EXPERIMENTAL)" + depends on X86 + depends on DCDBAS + depends on EXPERIMENTAL + depends on BACKLIGHT_CLASS_DEVICE + depends on RFKILL + depends on POWER_SUPPLY + default n + ---help--- + This driver adds support for rfkill and backlight control to Dell + laptops. + source "drivers/misc/c2port/Kconfig" + source "drivers/misc/eeprom/Kconfig" endif # MISC_DEVICES Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/misc/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile 1 Feb 2009 18:29:35 -0000 1.10 --- Makefile 2 Mar 2009 19:26:37 -0000 1.11 *************** *** 2,20 **** # Makefile for misc devices that really don't fit anywhere else. # - obj- := misc.o # Dummy rule to force built-in.o to be made obj-$(CONFIG_IBM_ASM) += ibmasm/ obj-$(CONFIG_HDPU_FEATURES) += hdpuftrs/ - obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o - obj-$(CONFIG_EEEPC_LAPTOP) += eeepc-laptop.o - obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o - obj-$(CONFIG_COMPAL_LAPTOP) += compal-laptop.o - obj-$(CONFIG_ACER_WMI) += acer-wmi.o obj-$(CONFIG_ATMEL_PWM) += atmel_pwm.o obj-$(CONFIG_ATMEL_SSC) += atmel-ssc.o obj-$(CONFIG_ATMEL_TCLIB) += atmel_tclib.o - obj-$(CONFIG_HP_WMI) += hp-wmi.o obj-$(CONFIG_ICS932S401) += ics932s401.o - obj-$(CONFIG_TC1100_WMI) += tc1100-wmi.o obj-$(CONFIG_LKDTM) += lkdtm.o obj-$(CONFIG_TIFM_CORE) += tifm_core.o --- 2,12 ---- *************** *** 22,31 **** obj-$(CONFIG_PHANTOM) += phantom.o obj-$(CONFIG_SGI_IOC4) += ioc4.o - obj-$(CONFIG_SONY_LAPTOP) += sony-laptop.o - obj-$(CONFIG_THINKPAD_ACPI) += thinkpad_acpi.o - obj-$(CONFIG_FUJITSU_LAPTOP) += fujitsu-laptop.o - obj-$(CONFIG_PANASONIC_LAPTOP) += panasonic-laptop.o - obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o - obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o obj-$(CONFIG_KGDB_TESTS) += kgdbts.o --- 14,17 ---- *************** *** 36,37 **** --- 22,24 ---- obj-$(CONFIG_GAMECUBE_GQR) += gcn-gqr.o obj-$(CONFIG_GAMECUBE_MI) += gcn-mi.o + obj-y += eeprom/ |
|
From: Albert H. <he...@us...> - 2009-03-02 19:26:43
|
Update of /cvsroot/gc-linux/linux/fs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6933/fs Modified Files: Kconfig Makefile Log Message: Merge v2.6.29-rc6. NOTE: Some of the Kconfig options and Makefile entries for the drivers marked as "broken" will disappear with this commit. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/fs/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile 1 Feb 2009 18:29:35 -0000 1.12 --- Makefile 2 Mar 2009 19:26:37 -0000 1.13 *************** *** 21,26 **** obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o ! obj-$(CONFIG_INOTIFY) += inotify.o ! obj-$(CONFIG_INOTIFY_USER) += inotify_user.o obj-$(CONFIG_EPOLL) += eventpoll.o obj-$(CONFIG_ANON_INODES) += anon_inodes.o --- 21,25 ---- obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o ! obj-y += notify/ obj-$(CONFIG_EPOLL) += eventpoll.o obj-$(CONFIG_ANON_INODES) += anon_inodes.o *************** *** 56,63 **** obj-$(CONFIG_QFMT_V1) += quota_v1.o obj-$(CONFIG_QFMT_V2) += quota_v2.o obj-$(CONFIG_QUOTACTL) += quota.o - obj-$(CONFIG_DNOTIFY) += dnotify.o - obj-$(CONFIG_PROC_FS) += proc/ obj-y += partitions/ --- 55,61 ---- obj-$(CONFIG_QFMT_V1) += quota_v1.o obj-$(CONFIG_QFMT_V2) += quota_v2.o + obj-$(CONFIG_QUOTA_TREE) += quota_tree.o obj-$(CONFIG_QUOTACTL) += quota.o obj-$(CONFIG_PROC_FS) += proc/ obj-y += partitions/ *************** *** 77,80 **** --- 75,79 ---- obj-$(CONFIG_EXT2_FS) += ext2/ obj-$(CONFIG_CRAMFS) += cramfs/ + obj-$(CONFIG_SQUASHFS) += squashfs/ obj-y += ramfs/ obj-$(CONFIG_HUGETLBFS) += hugetlbfs/ *************** *** 84,88 **** obj-$(CONFIG_BFS_FS) += bfs/ obj-$(CONFIG_ISO9660_FS) += isofs/ - obj-$(CONFIG_GCDVD_FS) += gcdvdfs/ obj-$(CONFIG_HFSPLUS_FS) += hfsplus/ # Before hfs to find wrapped HFS+ obj-$(CONFIG_HFS_FS) += hfs/ --- 83,86 ---- *************** *** 123,125 **** --- 121,124 ---- obj-$(CONFIG_DEBUG_FS) += debugfs/ obj-$(CONFIG_OCFS2_FS) += ocfs2/ + obj-$(CONFIG_BTRFS_FS) += btrfs/ obj-$(CONFIG_GFS2_FS) += gfs2/ Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/fs/Kconfig,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Kconfig 1 Feb 2009 18:29:35 -0000 1.14 --- Kconfig 2 Mar 2009 19:26:37 -0000 1.15 *************** *** 28,166 **** default m if EXT2_FS_XATTR || EXT3_FS_XATTR || EXT4_FS_XATTR ! config REISERFS_FS ! tristate "Reiserfs support" ! help ! Stores not just filenames but the files themselves in a balanced ! tree. Uses journalling. ! ! Balanced trees are more efficient than traditional file system ! architectural foundations. [...1509 lines suppressed...] ! If you say Y here, you will get experimental support for ! Plan 9 resource sharing via the 9P2000 protocol. ! ! See <http://v9fs.sf.net> for more information. ! ! If unsure, say N. endif # NETWORK_FILESYSTEMS --- 265,275 ---- default y ! source "net/sunrpc/Kconfig" ! source "fs/smbfs/Kconfig" source "fs/cifs/Kconfig" source "fs/ncpfs/Kconfig" ! source "fs/coda/Kconfig" ! source "fs/afs/Kconfig" ! source "fs/9p/Kconfig" endif # NETWORK_FILESYSTEMS |
|
From: Albert H. <he...@us...> - 2009-03-02 19:26:43
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/kernel In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6933/arch/powerpc/kernel Modified Files: cputable.c head_32.S Log Message: Merge v2.6.29-rc6. NOTE: Some of the Kconfig options and Makefile entries for the drivers marked as "broken" will disappear with this commit. Index: head_32.S =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/kernel/head_32.S,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** head_32.S 1 Feb 2009 18:29:35 -0000 1.6 --- head_32.S 2 Mar 2009 19:26:37 -0000 1.7 *************** *** 32,35 **** --- 32,36 ---- #include <asm/asm-offsets.h> #include <asm/ptrace.h> + #include <asm/bug.h> /* 601 only have IBAT; cr0.eq is set on 601 when using this macro */ *************** *** 186,190 **** mr r26,r3 addis r4,r3,KERNELBASE@h /* current address of _start */ ! cmpwi 0,r4,0 /* are we already running at 0? */ bne relocate_kernel /* --- 187,192 ---- mr r26,r3 addis r4,r3,KERNELBASE@h /* current address of _start */ ! lis r5,PHYSICAL_START@h ! cmplw 0,r4,r5 /* already running at PHYSICAL_START? */ bne relocate_kernel /* *************** *** 814,818 **** /* * This code is jumped to from the startup code to copy ! * the kernel image to physical address 0. */ relocate_kernel: --- 816,820 ---- /* * This code is jumped to from the startup code to copy ! * the kernel image to physical address PHYSICAL_START. */ relocate_kernel: *************** *** 820,824 **** lwz r25,klimit@l(r9) addis r25,r25,-KERNELBASE@h ! li r3,0 /* Destination base address */ li r6,0 /* Destination offset */ li r5,0x4000 /* # bytes of memory to copy */ --- 822,826 ---- lwz r25,klimit@l(r9) addis r25,r25,-KERNELBASE@h ! lis r3,PHYSICAL_START@h /* Destination base address */ li r6,0 /* Destination offset */ li r5,0x4000 /* # bytes of memory to copy */ *************** *** 993,1002 **** LOAD_BAT(2,r3,r4,r5) LOAD_BAT(3,r3,r4,r5) ! BEGIN_FTR_SECTION LOAD_BAT(4,r3,r4,r5) LOAD_BAT(5,r3,r4,r5) LOAD_BAT(6,r3,r4,r5) LOAD_BAT(7,r3,r4,r5) ! END_FTR_SECTION_IFSET(CPU_FTR_HAS_HIGH_BATS) blr --- 995,1004 ---- LOAD_BAT(2,r3,r4,r5) LOAD_BAT(3,r3,r4,r5) ! BEGIN_MMU_FTR_SECTION LOAD_BAT(4,r3,r4,r5) LOAD_BAT(5,r3,r4,r5) LOAD_BAT(6,r3,r4,r5) LOAD_BAT(7,r3,r4,r5) ! END_MMU_FTR_SECTION_IFSET(MMU_FTR_USE_HIGH_BATS) blr *************** *** 1074,1080 **** /* * Set up the segment registers for a new context. */ ! _ENTRY(set_context) mulli r3,r3,897 /* multiply context by skew factor */ rlwinm r3,r3,4,8,27 /* VSID = (context & 0xfffff) << 4 */ --- 1076,1087 ---- /* + * void switch_mmu_context(struct mm_struct *prev, struct mm_struct *next); + * * Set up the segment registers for a new context. */ ! _ENTRY(switch_mmu_context) ! lwz r3,MMCONTEXTID(r4) ! cmpwi cr0,r3,0 ! blt- 4f mulli r3,r3,897 /* multiply context by skew factor */ rlwinm r3,r3,4,8,27 /* VSID = (context & 0xfffff) << 4 */ *************** *** 1087,1090 **** --- 1094,1098 ---- * The PGDIR is passed as second argument. */ + lwz r4,MM_PGD(r4) lis r5, KERNELBASE@h lwz r5, 0xf0(r5) *************** *** 1102,1105 **** --- 1110,1116 ---- isync blr + 4: trap + EMIT_BUG_ENTRY 4b,__FILE__,__LINE__,0 + blr /* *************** *** 1135,1139 **** mtspr SPRN_IBAT3U,r10 mtspr SPRN_IBAT3L,r10 ! BEGIN_FTR_SECTION /* Here's a tweak: at this point, CPU setup have * not been called yet, so HIGH_BAT_EN may not be --- 1146,1150 ---- mtspr SPRN_IBAT3U,r10 mtspr SPRN_IBAT3L,r10 ! BEGIN_MMU_FTR_SECTION /* Here's a tweak: at this point, CPU setup have * not been called yet, so HIGH_BAT_EN may not be *************** *** 1158,1162 **** mtspr SPRN_IBAT7U,r10 mtspr SPRN_IBAT7L,r10 ! END_FTR_SECTION_IFSET(CPU_FTR_HAS_HIGH_BATS) blr --- 1169,1173 ---- mtspr SPRN_IBAT7U,r10 mtspr SPRN_IBAT7L,r10 ! END_MMU_FTR_SECTION_IFSET(MMU_FTR_USE_HIGH_BATS) blr *************** *** 1182,1190 **** /* * Use the first pair of BAT registers to map the 1st 16MB ! * of RAM to KERNELBASE. From this point on we can't safely * call OF any more. */ initial_bats: ! lis r11,KERNELBASE@h mfspr r9,SPRN_PVR rlwinm r9,r9,16,16,31 /* r9 = 1 for 601, 4 for 604 */ --- 1193,1201 ---- /* * Use the first pair of BAT registers to map the 1st 16MB ! * of RAM to PAGE_OFFSET. From this point on we can't safely * call OF any more. */ initial_bats: ! lis r11,PAGE_OFFSET@h mfspr r9,SPRN_PVR rlwinm r9,r9,16,16,31 /* r9 = 1 for 601, 4 for 604 */ Index: cputable.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/kernel/cputable.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** cputable.c 1 Feb 2009 18:29:35 -0000 1.6 --- cputable.c 2 Mar 2009 19:26:37 -0000 1.7 *************** *** 20,23 **** --- 20,24 ---- #include <asm/cputable.h> #include <asm/prom.h> /* for PTRRELOC on ARCH=ppc */ + #include <asm/mmu.h> struct cpu_spec* cur_cpu_spec = NULL; *************** *** 95,98 **** --- 96,100 ---- .cpu_features = CPU_FTRS_POWER3, .cpu_user_features = COMMON_USER_PPC64|PPC_FEATURE_PPC_LE, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 128, .dcache_bsize = 128, *************** *** 110,113 **** --- 112,116 ---- .cpu_features = CPU_FTRS_POWER3, .cpu_user_features = COMMON_USER_PPC64|PPC_FEATURE_PPC_LE, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 128, .dcache_bsize = 128, *************** *** 125,128 **** --- 128,132 ---- .cpu_features = CPU_FTRS_RS64, .cpu_user_features = COMMON_USER_PPC64, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 128, .dcache_bsize = 128, *************** *** 140,143 **** --- 144,148 ---- .cpu_features = CPU_FTRS_RS64, .cpu_user_features = COMMON_USER_PPC64, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 128, .dcache_bsize = 128, *************** *** 155,158 **** --- 160,164 ---- .cpu_features = CPU_FTRS_RS64, .cpu_user_features = COMMON_USER_PPC64, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 128, .dcache_bsize = 128, *************** *** 170,173 **** --- 176,180 ---- .cpu_features = CPU_FTRS_RS64, .cpu_user_features = COMMON_USER_PPC64, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 128, .dcache_bsize = 128, *************** *** 185,188 **** --- 192,196 ---- .cpu_features = CPU_FTRS_POWER4, .cpu_user_features = COMMON_USER_POWER4, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 128, .dcache_bsize = 128, *************** *** 200,203 **** --- 208,212 ---- .cpu_features = CPU_FTRS_POWER4, .cpu_user_features = COMMON_USER_POWER4, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 128, .dcache_bsize = 128, *************** *** 216,219 **** --- 225,229 ---- .cpu_user_features = COMMON_USER_POWER4 | PPC_FEATURE_HAS_ALTIVEC_COMP, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 128, .dcache_bsize = 128, *************** *** 234,237 **** --- 244,248 ---- .cpu_user_features = COMMON_USER_POWER4 | PPC_FEATURE_HAS_ALTIVEC_COMP, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 128, .dcache_bsize = 128, *************** *** 252,255 **** --- 263,267 ---- .cpu_user_features = COMMON_USER_POWER4 | PPC_FEATURE_HAS_ALTIVEC_COMP, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 128, .dcache_bsize = 128, *************** *** 270,273 **** --- 282,286 ---- .cpu_user_features = COMMON_USER_POWER4 | PPC_FEATURE_HAS_ALTIVEC_COMP, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 128, .dcache_bsize = 128, *************** *** 288,291 **** --- 301,305 ---- .cpu_user_features = COMMON_USER_POWER4 | PPC_FEATURE_HAS_ALTIVEC_COMP, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 128, .dcache_bsize = 128, *************** *** 304,307 **** --- 318,322 ---- .cpu_features = CPU_FTRS_POWER5, .cpu_user_features = COMMON_USER_POWER5, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 128, .dcache_bsize = 128, *************** *** 324,327 **** --- 339,343 ---- .cpu_features = CPU_FTRS_POWER5, .cpu_user_features = COMMON_USER_POWER5_PLUS, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 128, .dcache_bsize = 128, *************** *** 340,343 **** --- 356,360 ---- .cpu_features = CPU_FTRS_POWER5, .cpu_user_features = COMMON_USER_POWER5_PLUS, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 128, .dcache_bsize = 128, *************** *** 357,360 **** --- 374,378 ---- .cpu_features = CPU_FTRS_POWER5, .cpu_user_features = COMMON_USER_POWER5_PLUS, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 128, .dcache_bsize = 128, *************** *** 370,373 **** --- 388,392 ---- .cpu_user_features = COMMON_USER_POWER6 | PPC_FEATURE_POWER6_EXT, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 128, .dcache_bsize = 128, *************** *** 389,392 **** --- 408,412 ---- .cpu_features = CPU_FTRS_POWER6, .cpu_user_features = COMMON_USER_POWER6, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 128, .dcache_bsize = 128, *************** *** 401,404 **** --- 421,425 ---- .cpu_features = CPU_FTRS_POWER7, .cpu_user_features = COMMON_USER_POWER7, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 128, .dcache_bsize = 128, *************** *** 413,416 **** --- 434,438 ---- .cpu_features = CPU_FTRS_POWER7, .cpu_user_features = COMMON_USER_POWER7, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 128, .dcache_bsize = 128, *************** *** 435,438 **** --- 457,461 ---- PPC_FEATURE_CELL | PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_SMT, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 128, .dcache_bsize = 128, *************** *** 450,453 **** --- 473,477 ---- .cpu_features = CPU_FTRS_PA6T, .cpu_user_features = COMMON_USER_PA6T, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 64, .dcache_bsize = 64, *************** *** 467,470 **** --- 491,495 ---- .cpu_features = CPU_FTRS_COMPATIBLE, .cpu_user_features = COMMON_USER_PPC64, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 128, .dcache_bsize = 128, *************** *** 484,487 **** --- 509,513 ---- .cpu_user_features = COMMON_USER | PPC_FEATURE_601_INSTR | PPC_FEATURE_UNIFIED_CACHE | PPC_FEATURE_NO_TB, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 495,498 **** --- 521,525 ---- .cpu_features = CPU_FTRS_603, .cpu_user_features = COMMON_USER | PPC_FEATURE_PPC_LE, + .mmu_features = 0, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 507,510 **** --- 534,538 ---- .cpu_features = CPU_FTRS_603, .cpu_user_features = COMMON_USER | PPC_FEATURE_PPC_LE, + .mmu_features = 0, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 519,522 **** --- 547,551 ---- .cpu_features = CPU_FTRS_603, .cpu_user_features = COMMON_USER | PPC_FEATURE_PPC_LE, + .mmu_features = 0, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 531,534 **** --- 560,564 ---- .cpu_features = CPU_FTRS_604, .cpu_user_features = COMMON_USER | PPC_FEATURE_PPC_LE, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 544,547 **** --- 574,578 ---- .cpu_features = CPU_FTRS_604, .cpu_user_features = COMMON_USER | PPC_FEATURE_PPC_LE, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 557,560 **** --- 588,592 ---- .cpu_features = CPU_FTRS_604, .cpu_user_features = COMMON_USER | PPC_FEATURE_PPC_LE, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 570,573 **** --- 602,606 ---- .cpu_features = CPU_FTRS_604, .cpu_user_features = COMMON_USER | PPC_FEATURE_PPC_LE, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 583,586 **** --- 616,620 ---- .cpu_features = CPU_FTRS_740_NOTAU, .cpu_user_features = COMMON_USER | PPC_FEATURE_PPC_LE, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 596,599 **** --- 630,634 ---- .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, *************** *** 609,612 **** --- 644,648 ---- .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, *************** *** 623,626 **** --- 659,663 ---- .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, *************** *** 637,640 **** --- 674,678 ---- .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, *************** *** 651,654 **** --- 689,693 ---- .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, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 665,668 **** --- 704,708 ---- .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, *************** *** 679,682 **** --- 719,723 ---- .cpu_features = CPU_FTRS_750FX1, .cpu_user_features = COMMON_USER | PPC_FEATURE_PPC_LE, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 693,696 **** --- 734,738 ---- .cpu_features = CPU_FTRS_750FX2, .cpu_user_features = COMMON_USER | PPC_FEATURE_PPC_LE, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 707,710 **** --- 749,753 ---- .cpu_features = CPU_FTRS_750FX, .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, *************** *** 721,724 **** --- 764,768 ---- .cpu_features = CPU_FTRS_750GX, .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, *************** *** 735,738 **** --- 779,783 ---- .cpu_features = CPU_FTRS_740, .cpu_user_features = COMMON_USER | PPC_FEATURE_PPC_LE, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 750,753 **** --- 795,799 ---- .cpu_user_features = COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 765,768 **** --- 811,815 ---- .cpu_user_features = COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 780,783 **** --- 827,831 ---- .cpu_user_features = COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 795,798 **** --- 843,847 ---- .cpu_user_features = COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 812,815 **** --- 861,865 ---- .cpu_user_features = COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 829,832 **** --- 879,883 ---- .cpu_user_features = COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 846,849 **** --- 897,901 ---- .cpu_user_features = COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE, + .mmu_features = MMU_FTR_HPTE_TABLE | MMU_FTR_USE_HIGH_BATS, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 863,866 **** --- 915,919 ---- .cpu_user_features = COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE, + .mmu_features = MMU_FTR_HPTE_TABLE | MMU_FTR_USE_HIGH_BATS, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 880,883 **** --- 933,937 ---- .cpu_user_features = COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE, + .mmu_features = MMU_FTR_HPTE_TABLE | MMU_FTR_USE_HIGH_BATS, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 897,900 **** --- 951,955 ---- .cpu_user_features = COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE, + .mmu_features = MMU_FTR_HPTE_TABLE | MMU_FTR_USE_HIGH_BATS, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 914,917 **** --- 969,973 ---- .cpu_user_features = COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE, + .mmu_features = MMU_FTR_HPTE_TABLE | MMU_FTR_USE_HIGH_BATS, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 930,933 **** --- 986,990 ---- .cpu_features = CPU_FTRS_7447, .cpu_user_features = COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE, + .mmu_features = MMU_FTR_HPTE_TABLE | MMU_FTR_USE_HIGH_BATS, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 947,950 **** --- 1004,1008 ---- .cpu_user_features = COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE, + .mmu_features = MMU_FTR_HPTE_TABLE | MMU_FTR_USE_HIGH_BATS, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 964,967 **** --- 1022,1026 ---- .cpu_user_features = COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE, + .mmu_features = MMU_FTR_HPTE_TABLE | MMU_FTR_USE_HIGH_BATS, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 980,983 **** --- 1039,1043 ---- .cpu_features = CPU_FTRS_82XX, .cpu_user_features = COMMON_USER, + .mmu_features = 0, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 992,995 **** --- 1052,1056 ---- .cpu_features = CPU_FTRS_G2_LE, .cpu_user_features = COMMON_USER, + .mmu_features = MMU_FTR_USE_HIGH_BATS, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1004,1007 **** --- 1065,1069 ---- .cpu_features = CPU_FTRS_E300, .cpu_user_features = COMMON_USER, + .mmu_features = MMU_FTR_USE_HIGH_BATS, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1016,1019 **** --- 1078,1082 ---- .cpu_features = CPU_FTRS_E300C2, .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU, + .mmu_features = MMU_FTR_USE_HIGH_BATS, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1028,1031 **** --- 1091,1095 ---- .cpu_features = CPU_FTRS_E300, .cpu_user_features = COMMON_USER, + .mmu_features = MMU_FTR_USE_HIGH_BATS, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1042,1045 **** --- 1106,1110 ---- .cpu_features = CPU_FTRS_E300, .cpu_user_features = COMMON_USER, + .mmu_features = MMU_FTR_USE_HIGH_BATS, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1057,1060 **** --- 1122,1126 ---- .cpu_features = CPU_FTRS_CLASSIC32, .cpu_user_features = COMMON_USER, + .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1072,1075 **** --- 1138,1142 ---- .cpu_features = CPU_FTRS_8XX, .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU, + .mmu_features = MMU_FTR_TYPE_8xx, .icache_bsize = 16, .dcache_bsize = 16, *************** *** 1084,1087 **** --- 1151,1155 ---- .cpu_features = CPU_FTRS_40X, .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU, + .mmu_features = MMU_FTR_TYPE_40x, .icache_bsize = 16, .dcache_bsize = 16, *************** *** 1096,1099 **** --- 1164,1168 ---- .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_NO_TB, + .mmu_features = MMU_FTR_TYPE_40x, .icache_bsize = 16, .dcache_bsize = 16, *************** *** 1107,1110 **** --- 1176,1180 ---- .cpu_features = CPU_FTRS_40X, .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU, + .mmu_features = MMU_FTR_TYPE_40x, .icache_bsize = 16, .dcache_bsize = 16, *************** *** 1119,1122 **** --- 1189,1193 ---- .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, + .mmu_features = MMU_FTR_TYPE_40x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1131,1134 **** --- 1202,1206 ---- .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, + .mmu_features = MMU_FTR_TYPE_40x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1143,1146 **** --- 1215,1219 ---- .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, + .mmu_features = MMU_FTR_TYPE_40x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1155,1158 **** --- 1228,1232 ---- .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, + .mmu_features = MMU_FTR_TYPE_40x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1167,1170 **** --- 1241,1245 ---- .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, + .mmu_features = MMU_FTR_TYPE_40x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1179,1182 **** --- 1254,1258 ---- .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, + .mmu_features = MMU_FTR_TYPE_40x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1191,1194 **** --- 1267,1271 ---- .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, + .mmu_features = MMU_FTR_TYPE_40x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1203,1206 **** --- 1280,1284 ---- .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, + .mmu_features = MMU_FTR_TYPE_40x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1214,1217 **** --- 1292,1296 ---- .cpu_features = CPU_FTRS_40X, .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU, + .mmu_features = MMU_FTR_TYPE_40x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1226,1229 **** --- 1305,1309 ---- .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, + .mmu_features = MMU_FTR_TYPE_40x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1238,1241 **** --- 1318,1322 ---- .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, + .mmu_features = MMU_FTR_TYPE_40x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1250,1253 **** --- 1331,1335 ---- .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, + .mmu_features = MMU_FTR_TYPE_40x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1262,1265 **** --- 1344,1348 ---- .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, + .mmu_features = MMU_FTR_TYPE_40x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1274,1277 **** --- 1357,1361 ---- .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, + .mmu_features = MMU_FTR_TYPE_40x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1287,1290 **** --- 1371,1375 ---- .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, + .mmu_features = MMU_FTR_TYPE_40x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1299,1302 **** --- 1384,1388 ---- .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC, + .mmu_features = MMU_FTR_TYPE_40x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1313,1316 **** --- 1399,1403 ---- .cpu_features = CPU_FTRS_44X, .cpu_user_features = COMMON_USER_BOOKE, + .mmu_features = MMU_FTR_TYPE_44x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1324,1327 **** --- 1411,1415 ---- .cpu_features = CPU_FTRS_44X, .cpu_user_features = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU, + .mmu_features = MMU_FTR_TYPE_44x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1336,1339 **** --- 1424,1428 ---- .cpu_features = CPU_FTRS_44X, .cpu_user_features = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU, + .mmu_features = MMU_FTR_TYPE_44x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1347,1350 **** --- 1436,1440 ---- .cpu_features = CPU_FTRS_44X, .cpu_user_features = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU, + .mmu_features = MMU_FTR_TYPE_44x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1359,1362 **** --- 1449,1453 ---- .cpu_features = CPU_FTRS_44X, .cpu_user_features = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU, + .mmu_features = MMU_FTR_TYPE_44x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1371,1374 **** --- 1462,1466 ---- .cpu_features = CPU_FTRS_44X, .cpu_user_features = COMMON_USER_BOOKE, + .mmu_features = MMU_FTR_TYPE_44x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1383,1386 **** --- 1475,1479 ---- .cpu_features = CPU_FTRS_44X, .cpu_user_features = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU, + .mmu_features = MMU_FTR_TYPE_44x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1395,1398 **** --- 1488,1492 ---- .cpu_features = CPU_FTRS_44X, .cpu_user_features = COMMON_USER_BOOKE, + .mmu_features = MMU_FTR_TYPE_44x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1406,1409 **** --- 1500,1504 ---- .cpu_features = CPU_FTRS_44X, .cpu_user_features = COMMON_USER_BOOKE, + .mmu_features = MMU_FTR_TYPE_44x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1417,1420 **** --- 1512,1516 ---- .cpu_features = CPU_FTRS_44X, .cpu_user_features = COMMON_USER_BOOKE, + .mmu_features = MMU_FTR_TYPE_44x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1429,1432 **** --- 1525,1529 ---- .cpu_features = CPU_FTRS_44X, .cpu_user_features = COMMON_USER_BOOKE, + .mmu_features = MMU_FTR_TYPE_44x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1441,1444 **** --- 1538,1542 ---- .cpu_features = CPU_FTRS_44X, .cpu_user_features = COMMON_USER_BOOKE, + .mmu_features = MMU_FTR_TYPE_44x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1453,1456 **** --- 1551,1555 ---- .cpu_features = CPU_FTRS_44X, .cpu_user_features = COMMON_USER_BOOKE, + .mmu_features = MMU_FTR_TYPE_44x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1465,1468 **** --- 1564,1568 ---- .cpu_features = CPU_FTRS_44X, .cpu_user_features = COMMON_USER_BOOKE, + .mmu_features = MMU_FTR_TYPE_44x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1476,1479 **** --- 1576,1580 ---- .cpu_features = CPU_FTRS_44X, .cpu_user_features = COMMON_USER_BOOKE, + .mmu_features = MMU_FTR_TYPE_44x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1488,1491 **** --- 1589,1593 ---- .cpu_features = CPU_FTRS_44X, .cpu_user_features = COMMON_USER_BOOKE, + .mmu_features = MMU_FTR_TYPE_44x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1500,1503 **** --- 1602,1606 ---- .cpu_features = CPU_FTRS_44X, .cpu_user_features = COMMON_USER_BOOKE, + .mmu_features = MMU_FTR_TYPE_44x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1510,1515 **** .pvr_value = 0x13020002, .cpu_name = "460EX", ! .cpu_features = CPU_FTRS_44X, .cpu_user_features = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU, .icache_bsize = 32, .dcache_bsize = 32, --- 1613,1619 ---- .pvr_value = 0x13020002, .cpu_name = "460EX", ! .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, *************** *** 1522,1527 **** .pvr_value = 0x13020000, .cpu_name = "460GT", ! .cpu_features = CPU_FTRS_44X, .cpu_user_features = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU, .icache_bsize = 32, .dcache_bsize = 32, --- 1626,1632 ---- .pvr_value = 0x13020000, .cpu_name = "460GT", ! .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, *************** *** 1536,1539 **** --- 1641,1645 ---- .cpu_features = CPU_FTRS_44X, .cpu_user_features = COMMON_USER_BOOKE, + .mmu_features = MMU_FTR_TYPE_44x, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1552,1555 **** --- 1658,1662 ---- PPC_FEATURE_HAS_EFP_SINGLE | PPC_FEATURE_UNIFIED_CACHE, + .mmu_features = MMU_FTR_TYPE_FSL_E, .dcache_bsize = 32, .machine_check = machine_check_e200, *************** *** 1566,1569 **** --- 1673,1677 ---- PPC_FEATURE_HAS_EFP_SINGLE_COMP | PPC_FEATURE_UNIFIED_CACHE, + .mmu_features = MMU_FTR_TYPE_FSL_E, .dcache_bsize = 32, .machine_check = machine_check_e200, *************** *** 1578,1581 **** --- 1686,1690 ---- PPC_FEATURE_HAS_EFP_SINGLE | PPC_FEATURE_UNIFIED_CACHE, + .mmu_features = MMU_FTR_TYPE_FSL_E, .dcache_bsize = 32, .machine_check = machine_check_e200, *************** *** 1592,1595 **** --- 1701,1705 ---- PPC_FEATURE_HAS_SPE_COMP | PPC_FEATURE_HAS_EFP_SINGLE_COMP, + .mmu_features = MMU_FTR_TYPE_FSL_E, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1609,1612 **** --- 1719,1723 ---- PPC_FEATURE_HAS_EFP_SINGLE_COMP | PPC_FEATURE_HAS_EFP_DOUBLE_COMP, + .mmu_features = MMU_FTR_TYPE_FSL_E | MMU_FTR_BIG_PHYS, .icache_bsize = 32, .dcache_bsize = 32, *************** *** 1623,1626 **** --- 1734,1738 ---- .cpu_features = CPU_FTRS_E500MC, .cpu_user_features = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU, + .mmu_features = MMU_FTR_TYPE_FSL_E | MMU_FTR_BIG_PHYS, .icache_bsize = 64, .dcache_bsize = 64, *************** *** 1639,1642 **** --- 1751,1755 ---- PPC_FEATURE_HAS_SPE_COMP | PPC_FEATURE_HAS_EFP_SINGLE_COMP, + .mmu_features = MMU_FTR_TYPE_FSL_E, .icache_bsize = 32, .dcache_bsize = 32, |
|
From: Albert H. <he...@us...> - 2009-03-02 19:26:43
|
Update of /cvsroot/gc-linux/linux/include/linux In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6933/include/linux Modified Files: fb.h Log Message: Merge v2.6.29-rc6. NOTE: Some of the Kconfig options and Makefile entries for the drivers marked as "broken" will disappear with this commit. Index: fb.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/linux/fb.h,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** fb.h 1 Feb 2009 18:29:35 -0000 1.31 --- fb.h 2 Mar 2009 19:26:38 -0000 1.32 *************** *** 2,6 **** #define _LINUX_FB_H ! #include <asm/types.h> #include <linux/i2c.h> --- 2,6 ---- #define _LINUX_FB_H ! #include <linux/types.h> #include <linux/i2c.h> *************** *** 894,898 **** #define fb_memset sbus_memset_io ! #elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__) || (defined(__sh__) && !defined(__SH5__)) || defined(__powerpc__) || defined(__avr32__) #define fb_readb __raw_readb --- 894,898 ---- #define fb_memset sbus_memset_io ! #elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__) || defined(__sh__) || defined(__powerpc__) || defined(__avr32__) #define fb_readb __raw_readb *************** *** 972,975 **** --- 972,990 ---- extern struct class *fb_class; + static inline int lock_fb_info(struct fb_info *info) + { + mutex_lock(&info->lock); + if (!info->fbops) { + mutex_unlock(&info->lock); + return 0; + } + return 1; + } + + static inline void unlock_fb_info(struct fb_info *info) + { + mutex_unlock(&info->lock); + } + static inline void __fb_pad_aligned_buffer(u8 *dst, u32 d_pitch, u8 *src, u32 s_pitch, u32 height) |
|
From: Albert H. <he...@us...> - 2009-03-02 18:55:03
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/platforms/embedded6xx In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3097/arch/powerpc/platforms/embedded6xx Modified Files: starlet-gpio.c Log Message: [PATCH] wii: gpio: try to honour gpio cells property From: Albert Herranz <alb...@ya...> Date: Wed, 4 Feb 2009 19:24:32 +0100 Subject: [PATCH] wii: gpio: try to honour gpio cells property Take into account the optional device tree "#gpio-cells" property, if specified, for the gpio controller. Signed-off-by: Albert Herranz <alb...@ya...> Index: starlet-gpio.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/platforms/embedded6xx/starlet-gpio.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** starlet-gpio.c 1 Feb 2009 18:50:33 -0000 1.3 --- starlet-gpio.c 2 Mar 2009 18:54:57 -0000 1.4 *************** *** 97,100 **** --- 97,101 ---- struct gpio_chip *gc; struct stgpio_chip *st_gc; + const unsigned long *prop; st_gc = kzalloc(sizeof(*st_gc), GFP_KERNEL); *************** *** 107,111 **** gc = &of_gc->gc; ! of_gc->gpio_cells = 1; gc->ngpio = 32; --- 108,116 ---- gc = &of_gc->gc; ! prop = of_get_property(np, "#gpio-cells", NULL); ! if (prop && *prop >= 2) ! of_gc->gpio_cells = *prop; ! else ! of_gc->gpio_cells = 2; /* gpio pin number, flags */ gc->ngpio = 32; |
|
From: Albert H. <he...@us...> - 2009-03-02 18:51:06
|
Update of /cvsroot/gc-linux/linux/drivers/block In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2729/drivers/block Modified Files: rvl-mem2.c Log Message: [PATCH] rvl-mem2: tell the block layer that it is not a rotational device From: Albert Herranz <alb...@ya...> Date: Mon, 2 Mar 2009 00:15:42 +0100 Subject: [PATCH] rvl-mem2: tell the block layer that it is not a rotational device Signed-off-by: Albert Herranz <alb...@ya...> Index: rvl-mem2.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/rvl-mem2.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** rvl-mem2.c 1 Feb 2009 18:29:35 -0000 1.5 --- rvl-mem2.c 2 Mar 2009 18:51:03 -0000 1.6 *************** *** 201,204 **** --- 201,205 ---- blk_queue_max_phys_segments(queue, 1); blk_queue_max_hw_segments(queue, 1); + queue_flag_set_unlocked(QUEUE_FLAG_NONROT, queue); queue->queuedata = drvdata; drvdata->queue = queue; |
|
From: Albert H. <he...@us...> - 2009-03-02 18:50:25
|
Update of /cvsroot/gc-linux/linux/drivers/block In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2636/drivers/block Modified Files: gcn-aram.c Log Message: [PATCH] gcn-aram: tell the block layer that it is not a rotational device From: Albert Herranz <alb...@ya...> Date: Mon, 2 Mar 2009 00:14:54 +0100 Subject: [PATCH] gcn-aram: tell the block layer that it is not a rotational device Signed-off-by: Albert Herranz <alb...@ya...> Index: gcn-aram.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-aram.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** gcn-aram.c 1 Feb 2009 18:29:35 -0000 1.19 --- gcn-aram.c 2 Mar 2009 18:50:14 -0000 1.20 *************** *** 346,349 **** --- 346,350 ---- blk_queue_max_phys_segments(queue, 1); blk_queue_max_hw_segments(queue, 1); + queue_flag_set_unlocked(QUEUE_FLAG_NONROT, queue); queue->queuedata = drvdata; drvdata->queue = queue; |
|
From: Albert H. <he...@us...> - 2009-03-02 18:49:51
|
Update of /cvsroot/gc-linux/linux/drivers/block In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2573/drivers/block Modified Files: rvl-stsd.c Log Message: [PATCH] rvl-stsd: tell the block layer that it is not a rotational device From: Albert Herranz <alb...@ya...> Date: Mon, 2 Mar 2009 00:05:55 +0100 Subject: [PATCH] rvl-stsd: tell the block layer that it is not a rotational device Signed-off-by: Albert Herranz <alb...@ya...> Index: rvl-stsd.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/rvl-stsd.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** rvl-stsd.c 1 Feb 2009 18:29:35 -0000 1.6 --- rvl-stsd.c 2 Mar 2009 18:49:41 -0000 1.7 *************** *** 2059,2062 **** --- 2059,2063 ---- blk_queue_max_sectors(queue, STSD_MAX_SECTORS); /* 16 * 512 = 8K */ blk_queue_dma_alignment(queue, STARLET_IPC_DMA_ALIGN); + queue_flag_set_unlocked(QUEUE_FLAG_NONROT, queue); queue->queuedata = host; host->queue = queue; |
|
From: Albert H. <he...@us...> - 2009-03-02 18:48:22
|
Update of /cvsroot/gc-linux/linux/drivers/block In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2444/drivers/block Modified Files: gcn-sd.c Log Message: [PATCH] gcn-sd: tell the block layer that it is not a rotational device From: Albert Herranz <alb...@ya...> Date: Mon, 2 Mar 2009 00:05:06 +0100 Subject: [PATCH] gcn-sd: tell the block layer that it is not a rotational device Signed-off-by: Albert Herranz <alb...@ya...> Index: gcn-sd.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-sd.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** gcn-sd.c 1 Feb 2009 18:29:35 -0000 1.16 --- gcn-sd.c 2 Mar 2009 18:48:17 -0000 1.17 *************** *** 1454,1457 **** --- 1454,1458 ---- blk_queue_max_hw_segments(queue, 1); blk_queue_max_sectors(queue, 8); + queue_flag_set_unlocked(QUEUE_FLAG_NONROT, queue); queue->queuedata = host; host->queue = queue; |
|
From: Albert H. <he...@us...> - 2009-03-02 18:47:26
|
Update of /cvsroot/gc-linux/linux/drivers/video In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2352/drivers/video Modified Files: Kconfig Log Message: [PATCH] wii: gcn-vifb: build audio/video encoder support by default From: Albert Herranz <alb...@ya...> Date: Mon, 2 Mar 2009 00:08:31 +0100 Subject: [PATCH] wii: gcn-vifb: build audio/video encoder support by default Signed-off-by: Albert Herranz <alb...@ya...> Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/Kconfig,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** Kconfig 2 Mar 2009 18:44:59 -0000 1.32 --- Kconfig 2 Mar 2009 18:47:21 -0000 1.33 *************** *** 1725,1728 **** --- 1725,1729 ---- select I2C_GPIO select I2C + default y help Say Y here to support the audio/video encoder found in the |
|
From: Albert H. <he...@us...> - 2009-03-02 18:46:35
|
Update of /cvsroot/gc-linux/linux/drivers/net In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2212/drivers/net Modified Files: gcn-bba.c Log Message: [PATCH] gcn-bba: fix two "mixed declarations and code" ISO C90 warnings From: Albert Herranz <alb...@ya...> Date: Sun, 1 Mar 2009 23:40:21 +0100 Subject: [PATCH] gcn-bba: fix two "mixed declarations and code" ISO C90 warnings Fix the following two warnings: drivers/net/gcn-bba.c: In function 'bba_calc_response': drivers/net/gcn-bba.c:964: warning: ISO C90 forbids mixed declarations and code drivers/net/gcn-bba.c:970: warning: ISO C90 forbids mixed declarations and code Signed-off-by: Albert Herranz <alb...@ya...> Index: gcn-bba.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/gcn-bba.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** gcn-bba.c 2 Mar 2009 18:45:43 -0000 1.17 --- gcn-bba.c 2 Mar 2009 18:46:20 -0000 1.18 *************** *** 958,966 **** { u8 revid_0, revid_eth_0, revid_eth_1; revid_0 = priv->revid; revid_eth_0 = priv->__0x04_init[0]; revid_eth_1 = priv->__0x04_init[1]; - u8 i0, i1, i2, i3; i0 = val >> 24; i1 = val >> 16; --- 958,968 ---- { u8 revid_0, revid_eth_0, revid_eth_1; + u8 i0, i1, i2, i3; + u8 c0, c1, c2, c3; + revid_0 = priv->revid; revid_eth_0 = priv->__0x04_init[0]; revid_eth_1 = priv->__0x04_init[1]; i0 = val >> 24; i1 = val >> 16; *************** *** 968,972 **** i3 = val; - u8 c0, c1, c2, c3; c0 = (i0 + i1 * 0xc1 + 0x18 + revid_0) ^ (i3 * i2 + 0x90); c1 = (i1 + i2 + 0x90) ^ (c0 + i0 - 0xc1); --- 970,973 ---- |
|
From: Albert H. <he...@us...> - 2009-03-02 18:45:46
|
Update of /cvsroot/gc-linux/linux/drivers/net In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2123/drivers/net Modified Files: gcn-bba.c Log Message: [PATCH] gcn-bba: safe convert to netdev_priv() From: Albert Herranz <alb...@ya...> Date: Sun, 1 Mar 2009 23:37:56 +0100 Subject: [PATCH] gcn-bba: safe convert to netdev_priv() Idem as "netdevice: safe convert to netdev_priv()". Signed-off-by: Albert Herranz <alb...@ya...> Index: gcn-bba.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/gcn-bba.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** gcn-bba.c 1 Feb 2009 18:29:35 -0000 1.16 --- gcn-bba.c 2 Mar 2009 18:45:43 -0000 1.17 *************** *** 389,393 **** static int bba_open(struct net_device *dev) { ! struct bba_private *priv = (struct bba_private *)dev->priv; int retval; --- 389,393 ---- static int bba_open(struct net_device *dev) { ! struct bba_private *priv = netdev_priv(dev); int retval; *************** *** 420,424 **** static int bba_close(struct net_device *dev) { ! struct bba_private *priv = (struct bba_private *)dev->priv; /* do not allow more packets to be queued */ --- 420,424 ---- static int bba_close(struct net_device *dev) { ! struct bba_private *priv = netdev_priv(dev); /* do not allow more packets to be queued */ *************** *** 448,452 **** static struct net_device_stats *bba_get_stats(struct net_device *dev) { ! struct bba_private *priv = (struct bba_private *)dev->priv; return &priv->stats; --- 448,452 ---- static struct net_device_stats *bba_get_stats(struct net_device *dev) { ! struct bba_private *priv = netdev_priv(dev); return &priv->stats; *************** *** 459,463 **** static int bba_start_xmit(struct sk_buff *skb, struct net_device *dev) { ! struct bba_private *priv = (struct bba_private *)dev->priv; unsigned long flags; int retval = NETDEV_TX_OK; --- 459,463 ---- static int bba_start_xmit(struct sk_buff *skb, struct net_device *dev) { ! struct bba_private *priv = netdev_priv(dev); unsigned long flags; int retval = NETDEV_TX_OK; *************** *** 500,504 **** static int bba_tx_err(u8 status, struct net_device *dev) { ! struct bba_private *priv = (struct bba_private *)dev->priv; int last_tx_errors = priv->stats.tx_errors; --- 500,504 ---- static int bba_tx_err(u8 status, struct net_device *dev) { ! struct bba_private *priv = netdev_priv(dev); int last_tx_errors = priv->stats.tx_errors; *************** *** 537,541 **** static int bba_tx(struct net_device *dev) { ! struct bba_private *priv = (struct bba_private *)dev->priv; struct sk_buff *skb; unsigned long flags; --- 537,541 ---- static int bba_tx(struct net_device *dev) { ! struct bba_private *priv = netdev_priv(dev); struct sk_buff *skb; unsigned long flags; *************** *** 597,601 **** static int bba_rx_err(u8 status, struct net_device *dev) { ! struct bba_private *priv = (struct bba_private *)dev->priv; int last_rx_errors = priv->stats.rx_errors; --- 597,601 ---- static int bba_rx_err(u8 status, struct net_device *dev) { ! struct bba_private *priv = netdev_priv(dev); int last_rx_errors = priv->stats.rx_errors; *************** *** 646,650 **** static int bba_rx(struct net_device *dev, int budget) { ! struct bba_private *priv = (struct bba_private *)dev->priv; struct sk_buff *skb; struct bba_descr descr; --- 646,650 ---- static int bba_rx(struct net_device *dev, int budget) { ! struct bba_private *priv = netdev_priv(dev); struct sk_buff *skb; struct bba_descr descr; *************** *** 780,784 **** static void bba_interrupt(struct net_device *dev) { ! struct bba_private *priv = (struct bba_private *)dev->priv; u8 ir, imr, status, lrps, ltps; int loops = 0; --- 780,784 ---- static void bba_interrupt(struct net_device *dev) { ! struct bba_private *priv = netdev_priv(dev); u8 ir, imr, status, lrps, ltps; int loops = 0; *************** *** 864,868 **** static void bba_reset_hardware(struct net_device *dev) { ! struct bba_private *priv = (struct bba_private *)dev->priv; /* unknown, mx register 0x60 */ --- 864,868 ---- static void bba_reset_hardware(struct net_device *dev) { ! struct bba_private *priv = netdev_priv(dev); /* unknown, mx register 0x60 */ *************** *** 988,992 **** { struct net_device *dev = (struct net_device *)dev0; ! struct bba_private *priv = (struct bba_private *)dev->priv; register u8 status, mask; --- 988,992 ---- { struct net_device *dev = (struct net_device *)dev0; ! struct bba_private *priv = netdev_priv(dev); register u8 status, mask; *************** *** 1065,1069 **** static inline void bba_select(void) { ! struct bba_private *priv = (struct bba_private *)bba_dev->priv; exi_dev_select(priv->exi_device); --- 1065,1069 ---- static inline void bba_select(void) { ! struct bba_private *priv = netdev_priv(bba_dev); exi_dev_select(priv->exi_device); *************** *** 1072,1076 **** static inline void bba_deselect(void) { ! struct bba_private *priv = (struct bba_private *)bba_dev->priv; exi_dev_deselect(priv->exi_device); } --- 1072,1076 ---- static inline void bba_deselect(void) { ! struct bba_private *priv = netdev_priv(bba_dev); exi_dev_deselect(priv->exi_device); } *************** *** 1078,1082 **** static inline void bba_read(void *data, size_t len) { ! struct bba_private *priv = (struct bba_private *)bba_dev->priv; return exi_dev_read(priv->exi_device, data, len); } --- 1078,1082 ---- static inline void bba_read(void *data, size_t len) { ! struct bba_private *priv = netdev_priv(bba_dev); return exi_dev_read(priv->exi_device, data, len); } *************** *** 1084,1088 **** static inline void bba_write(void *data, size_t len) { ! struct bba_private *priv = (struct bba_private *)bba_dev->priv; return exi_dev_write(priv->exi_device, data, len); } --- 1084,1088 ---- static inline void bba_write(void *data, size_t len) { ! struct bba_private *priv = netdev_priv(bba_dev); return exi_dev_write(priv->exi_device, data, len); } *************** *** 1175,1179 **** if (dev) { ! priv = (struct bba_private *)dev->priv; kthread_stop(priv->io_thread); --- 1175,1179 ---- if (dev) { ! priv = netdev_priv(dev); kthread_stop(priv->io_thread); |
|
From: Albert H. <he...@us...> - 2009-03-02 18:45:03
|
Update of /cvsroot/gc-linux/linux/drivers/video In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1966/drivers/video Modified Files: Kconfig gcnfb.c Log Message: [PATCH] wii: audio/video encoder support (RVL-AVE) From: Albert Herranz <alb...@ya...> Date: Sun, 1 Mar 2009 20:00:14 +0100 Subject: [PATCH] wii: audio/video encoder support (RVL-AVE) Add support for the audio/video encoder found on the Nintendo Wii video game console. Signed-off-by: Albert Herranz <alb...@ya...> Index: gcnfb.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/gcnfb.c,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** gcnfb.c 2 Mar 2009 18:42:27 -0000 1.23 --- gcnfb.c 2 Mar 2009 18:44:59 -0000 1.24 *************** *** 30,33 **** --- 30,36 ---- #include <linux/wait.h> #include <linux/io.h> + #ifdef CONFIG_WII_AVE_RVL + #include <linux/i2c.h> + #endif #define DRV_MODULE_NAME "gcn-vifb" *************** *** 441,444 **** --- 444,450 ---- struct fb_info *info; + #ifdef CONFIG_WII_AVE_RVL + struct i2c_client *i2c_client; + #endif }; *************** *** 530,533 **** --- 536,545 ---- */ + #ifdef CONFIG_WII_AVE_RVL + static int vi_ave_setup(struct vi_ctl *ctl); + static int vi_ave_get_video_format(struct vi_ctl *ctl, + enum vi_video_format *fmt); + #endif + /* some glue to the gx side */ static inline void gcngx_dispatch_vtrace(struct vi_ctl *ctl) *************** *** 980,983 **** --- 992,996 ---- int ntsc_idx, pal_idx; u16 dcr; + int error; dcr = in_be16(io_base + VI_DCR); *************** *** 1008,1012 **** --- 1021,1041 ---- fmt = VI_FMT_NTSC; else { + #ifdef CONFIG_WII_AVE_RVL + /* + * Look at the audio/video encoder to detect true PAL vs NTSC. + */ + error = vi_ave_get_video_format(ctl, &fmt); + if (error) { + guess = " (initial guess)"; + if (force_tv == VI_TV_PAL || + pal_idx == VI_VM_PAL_576i50) + fmt = VI_FMT_PAL; + else + fmt = VI_FMT_NTSC; + } + #else + error = 0; fmt = vi_get_video_format(ctl); + #endif } switch (fmt) { *************** *** 1113,1116 **** --- 1142,1149 ---- out_be32(io_base + VI_UNK3, 0x00ff00ff); + #ifdef CONFIG_WII_AVE_RVL + vi_ave_setup(ctl); + #endif + return 0; } *************** *** 1233,1236 **** --- 1266,1552 ---- } + #ifdef CONFIG_WII_AVE_RVL + + /* + * Audio/Video Encoder hardware support. + * + */ + + /* + * I/O accessors. + */ + + static int vi_ave_outs(struct i2c_client *client, u8 reg, + void *data, size_t len) + { + struct i2c_adapter *adap = client->adapter; + struct i2c_msg msg[1]; + u8 buf[34]; + s32 result; + int error = -EINVAL; + + if (len > sizeof(buf)-1) + goto err_out; + + buf[0] = reg; + memcpy(&buf[1], data, len); + + msg[0].addr = client->addr; + msg[0].flags = client->flags & I2C_M_TEN; + msg[0].len = len+1; + msg[0].buf = buf; + + result = i2c_transfer(adap, msg, 1); + if (result < 0) + error = result; + else if (result == 1) + error = 0; + else + error = -EIO; + + err_out: + if (error) + drv_printk(KERN_ERR, "RVL-AVE: " + "error (%d) writing to register %02Xh\n", + error, reg); + return error; + } + + static int vi_ave_out8(struct i2c_client *client, u8 reg, u8 data) + { + return vi_ave_outs(client, reg, &data, sizeof(data)); + } + + static int vi_ave_out16(struct i2c_client *client, u8 reg, u16 data) + { + cpu_to_be16s(&data); + return vi_ave_outs(client, reg, &data, sizeof(data)); + } + + static int vi_ave_out32(struct i2c_client *client, u8 reg, u32 data) + { + cpu_to_be32s(&data); + return vi_ave_outs(client, reg, &data, sizeof(data)); + } + + static int vi_ave_ins(struct i2c_client *client, u8 reg, + void *data, size_t len) + { + struct i2c_adapter *adap = client->adapter; + struct i2c_msg msg[2]; + s32 result; + int error; + + msg[0].addr = client->addr; + msg[0].flags = client->flags & I2C_M_TEN; + msg[0].len = sizeof(reg); + msg[0].buf = ® + + msg[1].addr = client->addr; + msg[1].flags = (client->flags & I2C_M_TEN) | I2C_M_RD; + msg[1].len = len; + msg[1].buf = data; + + result = i2c_transfer(adap, msg, 2); + if (result < 0) + error = result; + else if (result == 2) + error = 0; + else + error = -EIO; + + if (error) + drv_printk(KERN_ERR, "RVL-AVE: " + "error (%d) reading from register %02Xh\n", + error, reg); + + return error; + } + + static int vi_ave_in8(struct i2c_client *client, u8 reg, u8 *data) + { + return vi_ave_ins(client, reg, data, sizeof(*data)); + } + + + /* + * Try to detect current video format. + */ + static int vi_ave_get_video_format(struct vi_ctl *ctl, + enum vi_video_format *fmt) + { + u8 val = 0xff; + int error = -ENODEV; + + if (!ctl->i2c_client) + goto err_out; + + error = vi_ave_in8(ctl->i2c_client, 0x01, &val); + if (error) + goto err_out; + + if ((val & 0x1f) == 2) + *fmt = VI_FMT_PAL; + else + *fmt = VI_FMT_NTSC; + err_out: + return error; + } + + + static u8 vi_ave_gamma[] = { + 0x10, 0x00, 0x10, 0x00, 0x10, 0x00, 0x10, 0x00, + 0x10, 0x00, 0x10, 0x00, 0x10, 0x20, 0x40, 0x60, + 0x80, 0xa0, 0xeb, 0x10, 0x00, 0x20, 0x00, 0x40, + 0x00, 0x60, 0x00, 0x80, 0x00, 0xa0, 0x00, 0xeb, + 0x00 + }; + + /* + * Initialize the audio/video encoder. + */ + static int vi_ave_setup(struct vi_ctl *ctl) + { + struct i2c_client *client; + u8 macrovision[26]; + int has_component; + u8 component, format, pal60; + + if (!ctl->i2c_client) + return -ENODEV; + + client = ctl->i2c_client; + memset(macrovision, 0, sizeof(macrovision)); + + has_component = vi_has_component_cable(ctl); + + /* + * Magic initialization sequence borrowed from libogc. + */ + + vi_ave_out8(client, 0x6a, 1); + vi_ave_out8(client, 0x65, 1); + + /* + * NOTE + * We _can't_ use the fmt field in DCR to derive "format" here. + * DCR uses fmt=0 (NTSC) also for PAL 525 modes. + */ + + format = 0; /* default to NTSC */ + if ((ctl->mode->flags & VI_VMF_PAL_COLOR) != 0) + format = 2; /* PAL */ + component = (has_component) ? 1<<5 : 0; + vi_ave_out8(client, 0x01, component | format); + + vi_ave_out8(client, 0x00, 0); + vi_ave_out16(client, 0x71, 0x8e8e); + vi_ave_out8(client, 0x02, 7); + vi_ave_out16(client, 0x05, 0x0000); + vi_ave_out16(client, 0x08, 0x0000); + vi_ave_out32(client, 0x7a, 0x00000000); + vi_ave_outs(client, 0x40, macrovision, sizeof(macrovision)); + vi_ave_out8(client, 0x0a, 0); + vi_ave_out8(client, 0x03, 1); + vi_ave_outs(client, 0x10, vi_ave_gamma, sizeof(vi_ave_gamma)); + vi_ave_out8(client, 0x04, 1); + + vi_ave_out32(client, 0x7a, 0x00000000); + vi_ave_out16(client, 0x08, 0x0000); + + vi_ave_out8(client, 0x03, 1); + + /* clear bit 1 otherwise red and blue get swapped */ + if (has_component) + vi_ave_out8(client, 0x62, 0); + + /* PAL 480i/60 supposedly needs a "filter" */ + pal60 = !!(format == 2 && ctl->mode->lines == 525); + vi_ave_out8(client, 0x6e, pal60); + + return 0; + } + + static struct vi_ctl *first_vi_ctl; + static struct i2c_client *first_vi_ave; + + static int vi_attach_ave(struct vi_ctl *ctl, struct i2c_client *client) + { + if (!ctl) + return -ENODEV; + if (!client) + return -EINVAL; + + spin_lock(&ctl->lock); + if (!ctl->i2c_client) { + ctl->i2c_client = i2c_use_client(client); + spin_unlock(&ctl->lock); + drv_printk(KERN_INFO, "AVE-RVL support loaded\n"); + return 0; + } + spin_unlock(&ctl->lock); + return -EBUSY; + } + + static void vi_dettach_ave(struct vi_ctl *ctl) + { + struct i2c_client *client; + + if (!ctl) + return; + + spin_lock(&ctl->lock); + if (ctl->i2c_client) { + client = ctl->i2c_client; + ctl->i2c_client = NULL; + spin_unlock(&ctl->lock); + i2c_release_client(client); + drv_printk(KERN_INFO, "AVE-RVL support unloaded\n"); + return; + } + spin_unlock(&ctl->lock); + } + + static int vi_ave_probe(struct i2c_client *client, + const struct i2c_device_id *id) + { + int error; + + /* attach first a/v encoder to first framebuffer */ + if (!first_vi_ave) { + first_vi_ave = client; + error = vi_attach_ave(first_vi_ctl, client); + if (!error) { + /* setup again the video mode using the a/v encoder */ + vi_detect_tv_mode(first_vi_ctl); + vi_setup_tv_mode(first_vi_ctl); + } + } + return 0; + } + + static int vi_ave_remove(struct i2c_client *client) + { + if (first_vi_ave == client) + first_vi_ave = NULL; + return 0; + } + + static const struct i2c_device_id vi_ave_id[] = { + { "wii-ave-rvl", 0 }, + { } + }; + + static struct i2c_driver vi_ave_driver = { + .driver = { + .name = DRV_MODULE_NAME, + }, + .probe = vi_ave_probe, + .remove = vi_ave_remove, + .id_table = vi_ave_id, + }; + + #endif /* CONFIG_WII_AVE_RVL */ + /* *************** *** 1700,1703 **** --- 2016,2027 ---- } + #ifdef CONFIG_WII_AVE_RVL + if (!first_vi_ctl) + first_vi_ctl = ctl; + + /* try to attach the a/v encoder now */ + vi_attach_ave(ctl, first_vi_ave); + #endif + printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node, info->fix.id); *************** *** 1739,1742 **** --- 2063,2071 ---- iounmap(ctl->io_base); + #ifdef CONFIG_WII_AVE_RVL + vi_dettach_ave(ctl); + if (first_vi_ctl == ctl) + first_vi_ctl = NULL; + #endif framebuffer_release(info); return 0; *************** *** 1872,1875 **** --- 2201,2210 ---- #endif + #ifdef CONFIG_WII_AVE_RVL + error = i2c_add_driver(&vi_ave_driver); + if (error) + drv_printk(KERN_ERR, "failed to register AVE (%d)\n", error); + #endif + return of_register_platform_driver(&vifb_of_driver); } *************** *** 1878,1881 **** --- 2213,2219 ---- { of_unregister_platform_driver(&vifb_of_driver); + #ifdef CONFIG_WII_AVE_RVL + i2c_del_driver(&vi_ave_driver); + #endif } Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/Kconfig,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** Kconfig 1 Feb 2009 18:29:35 -0000 1.31 --- Kconfig 2 Mar 2009 18:44:59 -0000 1.32 *************** *** 1720,1723 **** --- 1720,1732 ---- Say Y here to support the 3D hardware found in the Nintendo GameCube. + config WII_AVE_RVL + bool "Nintendo Wii audio/video encoder support" + depends on FB_GAMECUBE && WII + select I2C_GPIO + select I2C + 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" |
|
From: Albert H. <he...@us...> - 2009-03-02 18:45:02
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/boot/dts In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1966/arch/powerpc/boot/dts Modified Files: wii.dts Log Message: [PATCH] wii: audio/video encoder support (RVL-AVE) From: Albert Herranz <alb...@ya...> Date: Sun, 1 Mar 2009 20:00:14 +0100 Subject: [PATCH] wii: audio/video encoder support (RVL-AVE) Add support for the audio/video encoder found on the Nintendo Wii video game console. Signed-off-by: Albert Herranz <alb...@ya...> Index: wii.dts =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/boot/dts/wii.dts,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wii.dts 1 Feb 2009 18:29:34 -0000 1.11 --- wii.dts 2 Mar 2009 18:44:59 -0000 1.12 *************** *** 32,36 **** /* root filesystem on 2nd partition of SD card, whiite style */ ! bootargs = "nobats root=/dev/rvlsda2 video=gcnfb:tv=NTSC force_keyboard_port=4 placeholder_for_additional_kernel_options_targetted_at_hexedit_lovers"; linux,stdout-path = "/exi@0d006800/usbgecko@0d006814"; }; --- 32,36 ---- /* root filesystem on 2nd partition of SD card, whiite style */ ! bootargs = "nobats root=/dev/rvlsda2 video=gcnfb force_keyboard_port=4 placeholder_for_additional_kernel_options_targetted_at_hexedit_lovers"; linux,stdout-path = "/exi@0d006800/usbgecko@0d006814"; }; *************** *** 159,162 **** --- 159,182 ---- compatible = "nintendo,starlet-hcd"; }; + + i2c-video { + #address-cells = <1>; + #size-cells = <0>; + compatible = "virtual,i2c-gpio"; + + gpios = <&gpio0 10 0 /* 0x10 = 31 - 15 */ + &gpio0 11 0 /* 0x11 = 31 - 14 */ + >; + sda-is-open-drain = <1>; + sda-enforce-dir = <1>; + scl-is-open-drain = <1>; + scl-is-output-only = <1>; + udelay = <2>; + + audio-video-encoder { + compatible = "nintendo,wii-ave-rvl"; + reg = <70>; + }; + }; }; }; |
|
From: Albert H. <he...@us...> - 2009-03-02 18:42:35
|
Update of /cvsroot/gc-linux/linux/drivers/video In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1453/drivers/video Modified Files: gcnfb.c Log Message: [PATCH] gcn-vifb: add video mode timings setup (1) From: Albert Herranz <alb...@ya...> Date: Sun, 1 Mar 2009 19:32:50 +0100 Subject: [PATCH] gcn-vifb: add video mode timings setup Add support for configuring the Video Interface (VI) hardware of the Nintendo GameCube and Wii video game consoles with the right timing settings for a video mode. Prior to this patch, a static video mode with pre-calculated settings was enforced at boot time and could not be changed afterwards. (1) This patch removes too the GX glue code from the gcn-vifb driver. Signed-off-by: Albert Herranz <alb...@ya...> Index: gcnfb.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/gcnfb.c,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** gcnfb.c 1 Feb 2009 18:29:35 -0000 1.22 --- gcnfb.c 2 Mar 2009 18:42:27 -0000 1.23 *************** *** 37,41 **** "Albert Herranz" ! static char vifb_driver_version[] = "1.0i"; #define drv_printk(level, format, arg...) \ --- 37,41 ---- "Albert Herranz" ! static char vifb_driver_version[] = "2.0i"; [...2104 lines suppressed...] ! ! #ifndef MODULE ! if (fb_get_options(DRV_MODULE_NAME, &option)) ! return -ENODEV; ! if (!option) { /* for backwards compatibility */ if (fb_get_options("gcnfb", &option)) return -ENODEV; } ! error = vifb_setup(option); #endif return of_register_platform_driver(&vifb_of_driver); } *************** *** 1085,1087 **** MODULE_AUTHOR(DRV_AUTHOR); MODULE_LICENSE("GPL"); - --- 1886,1887 ---- |
|
From: Albert H. <he...@us...> - 2009-03-02 18:36:26
|
Update of /cvsroot/gc-linux/linux/drivers/i2c/busses In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv845/drivers/i2c/busses Modified Files: i2c-gpio-common.c i2c-gpio-of.c Log Message: [PATCH] i2c-gpio: add sda_enforce_dir option From: Albert Herranz <alb...@ya...> Date: Sun, 1 Mar 2009 19:17:00 +0100 Subject: [PATCH] i2c-gpio: add sda_enforce_dir option Currently, i2c-gpio assumes that it can read the SDA gpio even when configured as an output pin, which is not true for all GPIO controllers. This patch adds an option to i2c-gpio to enable the use of the driver with GPIO controllers that require pins to be configured as outputs before writing to them and as inputs before reading from them. Such controllers need to set the sda_enforce_dir option. Signed-off-by: Albert Herranz <alb...@ya...> Index: i2c-gpio-common.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/i2c/busses/i2c-gpio-common.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** i2c-gpio-common.c 2 Mar 2009 18:20:40 -0000 1.1 --- i2c-gpio-common.c 2 Mar 2009 18:36:16 -0000 1.2 *************** *** 37,40 **** --- 37,54 ---- } + /* + * Toggle SDA by changing the output value of the pin, first making sure + * that the pin is configured as an output. + */ + static void i2c_gpio_setsda_val_dir(void *data, int state) + { + struct i2c_gpio_platform_data *pdata = data; + + if (!gpio_direction_is_output(pdata->sda_pin)) + gpio_direction_output(pdata->sda_pin, state); + else + gpio_set_value(pdata->sda_pin, state); + } + /* Toggle SCL by changing the direction of the pin. */ static void i2c_gpio_setscl_dir(void *data, int state) *************** *** 68,71 **** --- 82,98 ---- } + /* + * Read SDA value from the pin, first making sure that the pin is + * configured as an input. + */ + static int i2c_gpio_getsda_val_dir(void *data) + { + struct i2c_gpio_platform_data *pdata = data; + + if (gpio_direction_is_output(pdata->sda_pin)) + gpio_direction_input(pdata->sda_pin); + return gpio_get_value(pdata->sda_pin); + } + static int i2c_gpio_getscl(void *data) { *************** *** 97,101 **** if (pdata->sda_is_open_drain) { gpio_direction_output(pdata->sda_pin, 1); ! bit_data->setsda = i2c_gpio_setsda_val; } else { gpio_direction_input(pdata->sda_pin); --- 124,131 ---- if (pdata->sda_is_open_drain) { gpio_direction_output(pdata->sda_pin, 1); ! if (pdata->sda_enforce_dir) ! bit_data->setsda = i2c_gpio_setsda_val_dir; ! else ! bit_data->setsda = i2c_gpio_setsda_val; } else { gpio_direction_input(pdata->sda_pin); *************** *** 113,117 **** if (!pdata->scl_is_output_only) bit_data->getscl = i2c_gpio_getscl; ! bit_data->getsda = i2c_gpio_getsda; if (pdata->udelay) --- 143,150 ---- if (!pdata->scl_is_output_only) bit_data->getscl = i2c_gpio_getscl; ! if (pdata->sda_enforce_dir) ! bit_data->getsda = i2c_gpio_getsda_val_dir; ! else ! bit_data->getsda = i2c_gpio_getsda; if (pdata->udelay) Index: i2c-gpio-of.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/i2c/busses/i2c-gpio-of.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** i2c-gpio-of.c 2 Mar 2009 18:25:07 -0000 1.1 --- i2c-gpio-of.c 2 Mar 2009 18:36:16 -0000 1.2 *************** *** 62,65 **** --- 62,68 ---- if (prop) pdata->sda_is_open_drain = *prop; + prop = of_get_property(odev->node, "sda-enforce-dir", NULL); + if (prop) + pdata->sda_enforce_dir = *prop; prop = of_get_property(odev->node, "scl-is-open-drain", NULL); if (prop) |
|
From: Albert H. <he...@us...> - 2009-03-02 18:36:20
|
Update of /cvsroot/gc-linux/linux/Documentation/powerpc/dts-bindings/gpio In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv845/Documentation/powerpc/dts-bindings/gpio Modified Files: i2c.txt Log Message: [PATCH] i2c-gpio: add sda_enforce_dir option From: Albert Herranz <alb...@ya...> Date: Sun, 1 Mar 2009 19:17:00 +0100 Subject: [PATCH] i2c-gpio: add sda_enforce_dir option Currently, i2c-gpio assumes that it can read the SDA gpio even when configured as an output pin, which is not true for all GPIO controllers. This patch adds an option to i2c-gpio to enable the use of the driver with GPIO controllers that require pins to be configured as outputs before writing to them and as inputs before reading from them. Such controllers need to set the sda_enforce_dir option. Signed-off-by: Albert Herranz <alb...@ya...> Index: i2c.txt =================================================================== RCS file: /cvsroot/gc-linux/linux/Documentation/powerpc/dts-bindings/gpio/i2c.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** i2c.txt 2 Mar 2009 18:25:07 -0000 1.1 --- i2c.txt 2 Mar 2009 18:36:16 -0000 1.2 *************** *** 5,8 **** --- 5,10 ---- - gpios : should specify GPIOs used for SDA and SCL lines, in that order. - sda-is-open-drain : should be non-zero if SDA gpio is open-drain. + - sda-enforce-dir : should be non-zero if SDA gpio must be configured for + input before reading and for output before writing. - scl-is-open-drain : should be non-zero if SCL gpio is open-drain. - scl-is-output-only : should be non-zero if SCL is an output gpio only. *************** *** 28,31 **** --- 30,34 ---- >; sda-is-open-drain = <1>; + sda-enforce-dir = <1>; scl-is-open-drain = <1>; scl-is-output-only = <1>; |
|
From: Albert H. <he...@us...> - 2009-03-02 18:36:20
|
Update of /cvsroot/gc-linux/linux/include/linux In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv845/include/linux Modified Files: i2c-gpio.h Log Message: [PATCH] i2c-gpio: add sda_enforce_dir option From: Albert Herranz <alb...@ya...> Date: Sun, 1 Mar 2009 19:17:00 +0100 Subject: [PATCH] i2c-gpio: add sda_enforce_dir option Currently, i2c-gpio assumes that it can read the SDA gpio even when configured as an output pin, which is not true for all GPIO controllers. This patch adds an option to i2c-gpio to enable the use of the driver with GPIO controllers that require pins to be configured as outputs before writing to them and as inputs before reading from them. Such controllers need to set the sda_enforce_dir option. Signed-off-by: Albert Herranz <alb...@ya...> Index: i2c-gpio.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/linux/i2c-gpio.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** i2c-gpio.h 2 Mar 2009 18:35:13 -0000 1.1 --- i2c-gpio.h 2 Mar 2009 18:36:16 -0000 1.2 *************** *** 34,37 **** --- 34,38 ---- unsigned int scl_is_open_drain:1; unsigned int scl_is_output_only:1; + unsigned int sda_enforce_dir:1; }; |
|
From: Albert H. <he...@us...> - 2009-03-02 18:35:23
|
Update of /cvsroot/gc-linux/linux/include/linux In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv711/include/linux Added Files: i2c-gpio.h Log Message: Add vanilla include/linux/i2c-gpio.h. --- NEW FILE: i2c-gpio.h --- /* * i2c-gpio interface to platform code * * Copyright (C) 2007 Atmel Corporation * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ #ifndef _LINUX_I2C_GPIO_H #define _LINUX_I2C_GPIO_H /** * struct i2c_gpio_platform_data - Platform-dependent data for i2c-gpio * @sda_pin: GPIO pin ID to use for SDA * @scl_pin: GPIO pin ID to use for SCL * @udelay: signal toggle delay. SCL frequency is (500 / udelay) kHz * @timeout: clock stretching timeout in jiffies. If the slave keeps * SCL low for longer than this, the transfer will time out. * @sda_is_open_drain: SDA is configured as open drain, i.e. the pin * isn't actively driven high when setting the output value high. * gpio_get_value() must return the actual pin state even if the * pin is configured as an output. * @scl_is_open_drain: SCL is set up as open drain. Same requirements * as for sda_is_open_drain apply. * @scl_is_output_only: SCL output drivers cannot be turned off. */ struct i2c_gpio_platform_data { unsigned int sda_pin; unsigned int scl_pin; int udelay; int timeout; unsigned int sda_is_open_drain:1; unsigned int scl_is_open_drain:1; unsigned int scl_is_output_only:1; }; #endif /* _LINUX_I2C_GPIO_H */ |
165 messages has been excluded from this view by a project administrator.
