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-10-25 18:57:08
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/platforms In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/arch/powerpc/platforms Modified Files: Kconfig.cputype Log Message: Forward to v2.6.31. Index: Kconfig.cputype =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/platforms/Kconfig.cputype,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Kconfig.cputype 25 Oct 2009 18:53:45 -0000 1.11 --- Kconfig.cputype 25 Oct 2009 18:56:56 -0000 1.12 *************** *** 2,5 **** --- 2,6 ---- bool "64-bit kernel" default n + select PPC_HAVE_PMU_SUPPORT help This option selects whether a 32-bit or a 64-bit kernel *************** *** 10,14 **** prompt "Processor Type" depends on PPC32 - default 6xx help There are five families of 32 bit PowerPC chips supported. --- 11,14 ---- *************** *** 22,26 **** If unsure, select 52xx/6xx/7xx/74xx/82xx/83xx/86xx. ! config 6xx bool "512x/52xx/6xx/7xx/74xx/82xx/83xx/86xx" select PPC_FPU --- 22,26 ---- If unsure, select 52xx/6xx/7xx/74xx/82xx/83xx/86xx. ! config PPC_BOOK3S_32 bool "512x/52xx/6xx/7xx/74xx/82xx/83xx/86xx" select PPC_FPU *************** *** 58,68 **** endchoice ! # Until we have a choice of exclusive CPU types on 64-bit, we always ! # use PPC_BOOK3S. On 32-bit, this is equivalent to 6xx which is ! # "classic" MMU config PPC_BOOK3S ! def_bool y ! depends on PPC64 || 6xx config POWER4_ONLY --- 58,69 ---- endchoice ! config PPC_BOOK3S_64 ! def_bool y ! depends on PPC64 ! select PPC_FPU config PPC_BOOK3S ! def_bool y ! depends on PPC_BOOK3S_32 || PPC_BOOK3S_64 config POWER4_ONLY *************** *** 75,78 **** --- 76,84 ---- when compiled with binutils 2.15 or later. + config 6xx + def_bool y + depends on PPC32 && PPC_BOOK3S + select PPC_HAVE_PMU_SUPPORT + config POWER3 bool *************** *** 203,209 **** config PPC_STD_MMU ! bool ! depends on 6xx || PPC64 ! default y config PPC_STD_MMU_32 --- 209,214 ---- config PPC_STD_MMU ! def_bool y ! depends on PPC_BOOK3S config PPC_STD_MMU_32 *************** *** 243,246 **** --- 248,260 ---- If in doubt, say Y here. + config PPC_HAVE_PMU_SUPPORT + bool + + config PPC_PERF_CTRS + def_bool y + depends on PERF_COUNTERS && PPC_HAVE_PMU_SUPPORT + help + This enables the powerpc-specific perf_counter back-end. + config SMP depends on PPC_STD_MMU || FSL_BOOKE *************** *** 263,268 **** config NR_CPUS ! int "Maximum number of CPUs (2-1024)" ! range 2 1024 depends on SMP default "32" if PPC64 --- 277,282 ---- config NR_CPUS ! int "Maximum number of CPUs (2-8192)" ! range 2 8192 depends on SMP default "32" if PPC64 |
From: Albert H. <he...@us...> - 2009-10-25 18:57:08
|
Update of /cvsroot/gc-linux/linux/drivers/usb In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/drivers/usb Modified Files: Kconfig Makefile Log Message: Forward to v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/usb/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile 25 Oct 2009 18:53:45 -0000 1.8 --- Makefile 25 Oct 2009 18:56:56 -0000 1.9 *************** *** 15,18 **** --- 15,19 ---- obj-$(CONFIG_USB_UHCI_HCD) += host/ obj-$(CONFIG_USB_FHCI_HCD) += host/ + obj-$(CONFIG_USB_XHCI_HCD) += host/ obj-$(CONFIG_USB_SL811_HCD) += host/ obj-$(CONFIG_USB_U132_HCD) += host/ Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/usb/Kconfig,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Kconfig 25 Oct 2009 18:53:45 -0000 1.9 --- Kconfig 25 Oct 2009 18:56:56 -0000 1.10 *************** *** 23,26 **** --- 23,27 ---- default y if ARM # SL-811 default y if SUPERH # r8a66597-hcd + default y if MICROBLAZE default PCI *************** *** 64,67 **** --- 65,69 ---- tristate "Support for Host-side USB" depends on USB_ARCH_HAS_HCD + select NLS # for UTF-8 strings ---help--- Universal Serial Bus (USB) is a specification for a serial bus |
From: Albert H. <he...@us...> - 2009-10-25 18:57:08
|
Update of /cvsroot/gc-linux/linux/fs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/fs Modified Files: Kconfig Log Message: Forward to v2.6.31. Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/fs/Kconfig,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Kconfig 25 Oct 2009 18:45:36 -0000 1.16 --- Kconfig 25 Oct 2009 18:56:56 -0000 1.17 *************** *** 40,43 **** --- 40,50 ---- default n + source "fs/xfs/Kconfig" + source "fs/gfs2/Kconfig" + source "fs/ocfs2/Kconfig" + source "fs/btrfs/Kconfig" + + endif # BLOCK + config FILE_LOCKING bool "Enable POSIX file locking API" if EMBEDDED *************** *** 48,58 **** call. Disabling this option saves about 11k. - source "fs/xfs/Kconfig" - source "fs/gfs2/Kconfig" - source "fs/ocfs2/Kconfig" - source "fs/btrfs/Kconfig" - - endif # BLOCK - source "fs/notify/Kconfig" --- 55,58 ---- *************** *** 63,66 **** --- 63,76 ---- source "fs/fuse/Kconfig" + config CUSE + tristate "Character device in Userpace support" + depends on FUSE_FS + help + This FUSE extension allows character devices to be + implemented in userspace. + + If you want to develop or use userspace character device + based on CUSE, answer Y or M. + config GENERIC_ACL bool *************** *** 125,129 **** bool "HugeTLB file system support" depends on X86 || IA64 || PPC64 || SPARC64 || (SUPERH && MMU) || \ ! (S390 && 64BIT) || BROKEN help hugetlbfs is a filesystem backing for HugeTLB pages, based on --- 135,139 ---- bool "HugeTLB file system support" depends on X86 || IA64 || PPC64 || SPARC64 || (SUPERH && MMU) || \ ! (S390 && 64BIT) || SYS_SUPPORTS_HUGETLBFS || BROKEN help hugetlbfs is a filesystem backing for HugeTLB pages, based on *************** *** 177,206 **** source "fs/ufs/Kconfig" source "fs/exofs/Kconfig" ! ! config NILFS2_FS ! tristate "NILFS2 file system support (EXPERIMENTAL)" ! depends on BLOCK && EXPERIMENTAL ! select CRC32 ! help ! NILFS2 is a log-structured file system (LFS) supporting continuous ! snapshotting. In addition to versioning capability of the entire ! file system, users can even restore files mistakenly overwritten or ! destroyed just a few seconds ago. Since this file system can keep ! consistency like conventional LFS, it achieves quick recovery after ! system crashes. ! ! NILFS2 creates a number of checkpoints every few seconds or per ! synchronous write basis (unless there is no change). Users can ! select significant versions among continuously created checkpoints, ! and can change them into snapshots which will be preserved for long ! periods until they are changed back to checkpoints. Each ! snapshot is mountable as a read-only file system concurrently with ! its writable mount, and this feature is convenient for online backup. ! ! Some features including atime, extended attributes, and POSIX ACLs, ! are not supported yet. ! ! To compile this file system support as a module, choose M here: the ! module will be called nilfs2. If unsure, say N. endif # MISC_FILESYSTEMS --- 187,191 ---- source "fs/ufs/Kconfig" source "fs/exofs/Kconfig" ! source "fs/nilfs2/Kconfig" endif # MISC_FILESYSTEMS *************** *** 227,234 **** --- 212,221 ---- config LOCKD tristate + depends on FILE_LOCKING config LOCKD_V4 bool depends on NFSD_V3 || NFS_V3 + depends on FILE_LOCKING default y |
From: Albert H. <he...@us...> - 2009-10-25 18:57:06
|
Update of /cvsroot/gc-linux/linux/drivers/net In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/drivers/net Modified Files: Kconfig Makefile Log Message: Forward to v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** Makefile 25 Oct 2009 18:53:45 -0000 1.36 --- Makefile 25 Oct 2009 18:56:56 -0000 1.37 *************** *** 3,6 **** --- 3,8 ---- # + obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o + obj-$(CONFIG_E1000) += e1000/ obj-$(CONFIG_E1000E) += e1000e/ *************** *** 74,77 **** --- 76,80 ---- obj-$(CONFIG_TIGON3) += tg3.o obj-$(CONFIG_BNX2) += bnx2.o + obj-$(CONFIG_CNIC) += cnic.o obj-$(CONFIG_BNX2X) += bnx2x.o bnx2x-objs := bnx2x_main.o bnx2x_link.o *************** *** 85,88 **** --- 88,93 ---- obj-$(CONFIG_SKY2) += sky2.o obj-$(CONFIG_SKFP) += skfp/ + obj-$(CONFIG_KS8842) += ks8842.o + obj-$(CONFIG_KS8851) += ks8851.o obj-$(CONFIG_VIA_RHINE) += via-rhine.o obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o *************** *** 96,99 **** --- 101,105 ---- obj-$(CONFIG_MII) += mii.o + obj-$(CONFIG_MDIO) += mdio.o obj-$(CONFIG_PHYLIB) += phy/ *************** *** 135,138 **** --- 141,146 ---- obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o + ll_temac-objs := ll_temac_main.o ll_temac_mdio.o + obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o obj-$(CONFIG_QLA3XXX) += qla3xxx.o obj-$(CONFIG_QLGE) += qlge/ *************** *** 239,242 **** --- 247,251 ---- obj-$(CONFIG_DNET) += dnet.o obj-$(CONFIG_MACB) += macb.o + obj-$(CONFIG_S6GMAC) += s6gmac.o obj-$(CONFIG_ARM) += arm/ Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** Kconfig 25 Oct 2009 18:53:45 -0000 1.42 --- Kconfig 25 Oct 2009 18:56:56 -0000 1.43 *************** *** 1,3 **** - # # Network device configuration --- 1,2 ---- *************** *** 27,39 **** if NETDEVICES - config COMPAT_NET_DEV_OPS - default y - bool "Enable older network device API compatibility" - ---help--- - This option enables kernel compatibility with older network devices - that do not use net_device_ops interface. - - If unsure, say Y. - config IFB tristate "Intermediate Functional Block support" --- 26,29 ---- *************** *** 527,532 **** tristate "Renesas SuperH Ethernet support" depends on SUPERH && \ ! (CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712 || CPU_SUBTYPE_SH7763 || \ ! CPU_SUBTYPE_SH7619) select CRC32 select MII --- 517,523 ---- tristate "Renesas SuperH Ethernet support" depends on SUPERH && \ ! (CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712 || \ ! CPU_SUBTYPE_SH7763 || CPU_SUBTYPE_SH7619 || \ ! CPU_SUBTYPE_SH7724) select CRC32 select MII *************** *** 535,539 **** help Renesas SuperH Ethernet device driver. ! This driver support SH7710, SH7712, SH7763 and SH7619. config SUNLANCE --- 526,530 ---- help Renesas SuperH Ethernet device driver. ! This driver support SH7710, SH7712, SH7763, SH7619, and SH7724. config SUNLANCE *************** *** 928,931 **** --- 919,932 ---- will be called netx-eth. + config TI_DAVINCI_EMAC + tristate "TI DaVinci EMAC Support" + depends on ARM && ARCH_DAVINCI + select PHYLIB + help + This driver supports TI's DaVinci Ethernet . + + To compile this driver as a module, choose M here: the module + will be called davinci_emac_driver. This is recommended. + config DM9000 tristate "DM9000 support" *************** *** 1001,1005 **** config SMSC911X tristate "SMSC LAN911x/LAN921x families embedded ethernet support" ! depends on ARM || SUPERH select CRC32 select MII --- 1002,1006 ---- config SMSC911X tristate "SMSC LAN911x/LAN921x families embedded ethernet support" ! depends on ARM || SUPERH || BLACKFIN select CRC32 select MII *************** *** 1723,1726 **** --- 1724,1742 ---- Please email feedback to <tor...@co...>. + config KS8842 + tristate "Micrel KSZ8842" + depends on HAS_IOMEM + help + This platform driver is for Micrel KSZ8842 / KS8842 + 2-port ethernet switch chip (managed, VLAN, QoS). + + config KS8851 + tristate "Micrel KS8851 SPI" + depends on SPI + select MII + select CRC32 + help + SPI driver for Micrel KS8851 SPI attached network chip. + config VIA_RHINE tristate "VIA Rhine support" *************** *** 1859,1864 **** config FEC ! bool "FEC ethernet controller (of ColdFire CPUs)" ! depends on M523x || M527x || M5272 || M528x || M520x || M532x || MACH_MX27 help Say Y here if you want to use the built-in 10/100 Fast ethernet --- 1875,1880 ---- config FEC ! bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)" ! depends on M523x || M527x || M5272 || M528x || M520x || M532x || MACH_MX27 || ARCH_MX35 help Say Y here if you want to use the built-in 10/100 Fast ethernet *************** *** 1881,1885 **** This option enables support for the MPC5200's on-chip Fast Ethernet Controller ! If compiled as module, it will be called 'fec_mpc52xx.ko'. config FEC_MPC52xx_MDIO --- 1897,1901 ---- This option enables support for the MPC5200's on-chip Fast Ethernet Controller ! If compiled as module, it will be called fec_mpc52xx. config FEC_MPC52xx_MDIO *************** *** 1893,1897 **** If your board uses an external PHY connected to FEC, enable this. If not sure, enable. ! If compiled as module, it will be called 'fec_mpc52xx_phy.ko'. config NE_H8300 --- 1909,1913 ---- If your board uses an external PHY connected to FEC, enable this. If not sure, enable. ! If compiled as module, it will be called fec_mpc52xx_phy. config NE_H8300 *************** *** 2201,2205 **** help This option adds the ability to dump driver state for debugging. ! The file debugfs/skge/ethX displays the state of the internal transmit and receive rings. --- 2217,2221 ---- help This option adds the ability to dump driver state for debugging. ! The file /sys/kernel/debug/skge/ethX displays the state of the internal transmit and receive rings. *************** *** 2227,2231 **** help This option adds the ability to dump driver state for debugging. ! The file debugfs/sky2/ethX displays the state of the internal transmit and receive rings. --- 2243,2247 ---- help This option adds the ability to dump driver state for debugging. ! The file /sys/kernel/debug/sky2/ethX displays the state of the internal transmit and receive rings. *************** *** 2265,2268 **** --- 2281,2296 ---- will be called bnx2. This is recommended. + config CNIC + tristate "Broadcom CNIC support" + depends on PCI + select BNX2 + select UIO + help + This driver supports offload features of Broadcom NetXtremeII + gigabit Ethernet cards. + + To compile this driver as a module, choose M here: the module + will be called cnic. This is recommended. + config SPIDER_NET tristate "Spider Gigabit Ethernet driver" *************** *** 2352,2356 **** config MV643XX_ETH tristate "Marvell Discovery (643XX) and Orion ethernet support" ! depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) || PLAT_ORION select INET_LRO select PHYLIB --- 2380,2384 ---- config MV643XX_ETH tristate "Marvell Discovery (643XX) and Orion ethernet support" ! depends on MV64X60 || PPC32 || PLAT_ORION select INET_LRO select PHYLIB *************** *** 2363,2366 **** --- 2391,2402 ---- Ocelot C and Jaguar ATX and Pegasos II. + config XILINX_LL_TEMAC + tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver" + select PHYLIB + depends on PPC_DCR_NATIVE + help + This driver supports the Xilinx 10/100/1000 LocalLink TEMAC + core used in Xilinx Spartan and Virtex FPGAs + config QLA3XXX tristate "QLogic QLA3XXX Network Driver Support" *************** *** 2418,2421 **** --- 2454,2468 ---- will be called jme. + config S6GMAC + tristate "S6105 GMAC ethernet support" + depends on XTENSA_VARIANT_S6000 + select PHYLIB + help + This driver supports the on chip ethernet device on the + S6105 xtensa processor. + + To compile this driver as a module, choose M here. The module + will be called s6gmac. + endif # NETDEV_1000 *************** *** 2436,2443 **** --- 2483,2494 ---- if NETDEV_10000 + config MDIO + tristate + config CHELSIO_T1 tristate "Chelsio 10Gb Ethernet support" depends on PCI select CRC32 + select MDIO help This driver supports Chelsio gigabit and 10-gigabit *************** *** 2472,2475 **** --- 2523,2527 ---- depends on CHELSIO_T3_DEPENDS select FW_LOADER + select MDIO help This driver supports Chelsio T3-based gigabit and 10Gb Ethernet *************** *** 2507,2510 **** --- 2559,2563 ---- tristate "Intel(R) 10GbE PCI Express adapters support" depends on PCI && INET + select MDIO ---help--- This driver supports Intel(R) 10GbE PCI Express family of *************** *** 2669,2672 **** --- 2722,2726 ---- tristate "Broadcom NetXtremeII 10Gb support" depends on PCI + select FW_LOADER select ZLIB_INFLATE select LIBCRC32C *************** *** 2705,2708 **** --- 2759,2764 ---- source "drivers/atm/Kconfig" + source "drivers/ieee802154/Kconfig" + source "drivers/s390/net/Kconfig" |
From: Albert H. <he...@us...> - 2009-10-25 18:57:06
|
Update of /cvsroot/gc-linux/linux/drivers/usb/host In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/drivers/usb/host Modified Files: Kconfig Makefile ehci-hcd.c ehci.h ohci-hcd.c Log Message: Forward to v2.6.31. Index: ehci.h =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/usb/host/ehci.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ehci.h 25 Oct 2009 18:53:45 -0000 1.3 --- ehci.h 25 Oct 2009 18:56:56 -0000 1.4 *************** *** 117,120 **** --- 117,121 ---- unsigned long actions; unsigned stamp; + unsigned random_frame; unsigned long next_statechange; u32 command; *************** *** 354,358 **** --- 355,361 ---- unsigned short start; /* where polling starts */ #define NO_FRAME ((unsigned short)~0) /* pick new start */ + struct usb_device *dev; /* access to TT */ + unsigned clearing_tt:1; /* Clear-TT-Buf in progress */ } __attribute__ ((aligned (32))); Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/usb/host/Kconfig,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Kconfig 25 Oct 2009 18:53:45 -0000 1.10 --- Kconfig 25 Oct 2009 18:56:56 -0000 1.11 *************** *** 18,21 **** --- 18,41 ---- module will be called c67x00. + config USB_XHCI_HCD + tristate "xHCI HCD (USB 3.0) support (EXPERIMENTAL)" + depends on USB && PCI && EXPERIMENTAL + ---help--- + The eXtensible Host Controller Interface (xHCI) is standard for USB 3.0 + "SuperSpeed" host controller hardware. + + To compile this driver as a module, choose M here: the + module will be called xhci-hcd. + + config USB_XHCI_HCD_DEBUGGING + bool "Debugging for the xHCI host controller" + depends on USB_XHCI_HCD + ---help--- + Say 'Y' to turn on debugging for the xHCI host controller driver. + This will spew debugging output, even in interrupt context. + This should only be used for debugging xHCI driver bugs. + + If unsure, say N. + config USB_EHCI_HCD tristate "EHCI HCD (USB 2.0) support" *************** *** 162,185 **** STB03xxx processor chip. If unsure, say Y. - config USB_OHCI_HCD_PPC_OF - bool "OHCI support for PPC USB controller on OF platform bus" - depends on USB_OHCI_HCD && PPC_OF - default y - ---help--- - Enables support for the USB controller PowerPC present on the - OpenFirmware platform bus. - config USB_OHCI_HCD_PPC_OF_BE ! bool "Support big endian HC" ! depends on USB_OHCI_HCD_PPC_OF ! default y select USB_OHCI_BIG_ENDIAN_DESC select USB_OHCI_BIG_ENDIAN_MMIO config USB_OHCI_HCD_PPC_OF_LE ! bool "Support little endian HC" ! depends on USB_OHCI_HCD_PPC_OF ! default n select USB_OHCI_LITTLE_ENDIAN config USB_OHCI_HCD_PCI --- 182,206 ---- STB03xxx processor chip. If unsure, say Y. config USB_OHCI_HCD_PPC_OF_BE ! bool "OHCI support for OF platform bus (big endian)" ! depends on USB_OHCI_HCD && PPC_OF select USB_OHCI_BIG_ENDIAN_DESC select USB_OHCI_BIG_ENDIAN_MMIO + ---help--- + Enables support for big-endian USB controllers present on the + OpenFirmware platform bus. config USB_OHCI_HCD_PPC_OF_LE ! bool "OHCI support for OF platform bus (little endian)" ! depends on USB_OHCI_HCD && PPC_OF select USB_OHCI_LITTLE_ENDIAN + ---help--- + Enables support for little-endian USB controllers present on the + OpenFirmware platform bus. + + config USB_OHCI_HCD_PPC_OF + bool + depends on USB_OHCI_HCD && PPC_OF + default USB_OHCI_HCD_PPC_OF_BE || USB_OHCI_HCD_PPC_OF_LE config USB_OHCI_HCD_PCI *************** *** 318,325 **** config SUPERH_ON_CHIP_R8A66597 boolean "Enable SuperH on-chip R8A66597 USB" ! depends on USB_R8A66597_HCD && (CPU_SUBTYPE_SH7366 || CPU_SUBTYPE_SH7723) help This driver enables support for the on-chip R8A66597 in the ! SH7366 and SH7723 processors. config USB_WHCI_HCD --- 339,346 ---- config SUPERH_ON_CHIP_R8A66597 boolean "Enable SuperH on-chip R8A66597 USB" ! depends on USB_R8A66597_HCD && (CPU_SUBTYPE_SH7366 || CPU_SUBTYPE_SH7723 || CPU_SUBTYPE_SH7724) help This driver enables support for the on-chip R8A66597 in the ! SH7366, SH7723 and SH7724 processors. config USB_WHCI_HCD Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/usb/host/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile 25 Oct 2009 18:53:45 -0000 1.7 --- Makefile 25 Oct 2009 18:56:56 -0000 1.8 *************** *** 13,16 **** --- 13,17 ---- fhci-objs += fhci-dbg.o endif + xhci-objs := xhci-hcd.o xhci-mem.o xhci-pci.o xhci-ring.o xhci-hub.o xhci-dbg.o obj-$(CONFIG_USB_WHCI_HCD) += whci/ *************** *** 24,27 **** --- 25,29 ---- obj-$(CONFIG_USB_UHCI_HCD) += uhci-hcd.o obj-$(CONFIG_USB_FHCI_HCD) += fhci.o + obj-$(CONFIG_USB_XHCI_HCD) += xhci.o obj-$(CONFIG_USB_SL811_HCD) += sl811-hcd.o obj-$(CONFIG_USB_SL811_CS) += sl811_cs.o Index: ohci-hcd.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/usb/host/ohci-hcd.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ohci-hcd.c 25 Oct 2009 18:53:45 -0000 1.3 --- ohci-hcd.c 25 Oct 2009 18:56:56 -0000 1.4 *************** *** 572,576 **** static int ohci_run (struct ohci_hcd *ohci) { ! u32 mask, temp; int first = ohci->fminterval == 0; struct usb_hcd *hcd = ohci_to_hcd(ohci); --- 572,576 ---- static int ohci_run (struct ohci_hcd *ohci) { ! u32 mask, val; int first = ohci->fminterval == 0; struct usb_hcd *hcd = ohci_to_hcd(ohci); *************** *** 581,586 **** if (first) { ! temp = ohci_readl (ohci, &ohci->regs->fminterval); ! ohci->fminterval = temp & 0x3fff; if (ohci->fminterval != FI) ohci_dbg (ohci, "fminterval delta %d\n", --- 581,586 ---- if (first) { ! val = ohci_readl (ohci, &ohci->regs->fminterval); ! ohci->fminterval = val & 0x3fff; if (ohci->fminterval != FI) ohci_dbg (ohci, "fminterval delta %d\n", *************** *** 601,605 **** switch (ohci->hc_control & OHCI_CTRL_HCFS) { case OHCI_USB_OPER: ! temp = 0; break; case OHCI_USB_SUSPEND: --- 601,605 ---- switch (ohci->hc_control & OHCI_CTRL_HCFS) { case OHCI_USB_OPER: ! val = 0; break; case OHCI_USB_SUSPEND: *************** *** 607,611 **** ohci->hc_control &= OHCI_CTRL_RWC; ohci->hc_control |= OHCI_USB_RESUME; ! temp = 10 /* msec wait */; break; // case OHCI_USB_RESET: --- 607,611 ---- ohci->hc_control &= OHCI_CTRL_RWC; ohci->hc_control |= OHCI_USB_RESUME; ! val = 10 /* msec wait */; break; // case OHCI_USB_RESET: *************** *** 613,617 **** ohci->hc_control &= OHCI_CTRL_RWC; ohci->hc_control |= OHCI_USB_RESET; ! temp = 50 /* msec wait */; break; } --- 613,617 ---- ohci->hc_control &= OHCI_CTRL_RWC; ohci->hc_control |= OHCI_USB_RESET; ! val = 50 /* msec wait */; break; } *************** *** 619,623 **** // flush the writes (void) ohci_readl (ohci, &ohci->regs->control); ! msleep(temp); memset (ohci->hcca, 0, sizeof (struct ohci_hcca)); --- 619,623 ---- // flush the writes (void) ohci_readl (ohci, &ohci->regs->control); ! msleep(val); memset (ohci->hcca, 0, sizeof (struct ohci_hcca)); *************** *** 629,635 **** /* HC Reset requires max 10 us delay */ ohci_writel (ohci, OHCI_HCR, &ohci->regs->cmdstatus); ! temp = 30; /* ... allow extra time */ while ((ohci_readl (ohci, &ohci->regs->cmdstatus) & OHCI_HCR) != 0) { ! if (--temp == 0) { spin_unlock_irq (&ohci->lock); ohci_err (ohci, "USB HC reset timed out!\n"); --- 629,635 ---- /* HC Reset requires max 10 us delay */ ohci_writel (ohci, OHCI_HCR, &ohci->regs->cmdstatus); ! val = 30; /* ... allow extra time */ while ((ohci_readl (ohci, &ohci->regs->cmdstatus) & OHCI_HCR) != 0) { ! if (--val == 0) { spin_unlock_irq (&ohci->lock); ohci_err (ohci, "USB HC reset timed out!\n"); *************** *** 700,710 **** /* handle root hub init quirks ... */ ! temp = roothub_a (ohci); ! temp &= ~(RH_A_PSM | RH_A_OCPM); if (ohci->flags & OHCI_QUIRK_SUPERIO) { /* NSC 87560 and maybe others */ ! temp |= RH_A_NOCP; ! temp &= ~(RH_A_POTPGT | RH_A_NPS); ! ohci_writel (ohci, temp, &ohci->regs->roothub.a); } else if ((ohci->flags & OHCI_QUIRK_AMD756) || (ohci->flags & OHCI_QUIRK_HUB_POWER)) { --- 700,710 ---- /* handle root hub init quirks ... */ ! val = roothub_a (ohci); ! val &= ~(RH_A_PSM | RH_A_OCPM); if (ohci->flags & OHCI_QUIRK_SUPERIO) { /* NSC 87560 and maybe others */ ! val |= RH_A_NOCP; ! val &= ~(RH_A_POTPGT | RH_A_NPS); ! ohci_writel (ohci, val, &ohci->regs->roothub.a); } else if ((ohci->flags & OHCI_QUIRK_AMD756) || (ohci->flags & OHCI_QUIRK_HUB_POWER)) { *************** *** 712,720 **** * Mac platforms. ganged overcurrent reporting, if any. */ ! temp |= RH_A_NPS; ! ohci_writel (ohci, temp, &ohci->regs->roothub.a); } ohci_writel (ohci, RH_HS_LPSC, &ohci->regs->roothub.status); ! ohci_writel (ohci, (temp & RH_A_NPS) ? 0 : RH_B_PPCM, &ohci->regs->roothub.b); // flush those writes --- 712,720 ---- * Mac platforms. ganged overcurrent reporting, if any. */ ! val |= RH_A_NPS; ! ohci_writel (ohci, val, &ohci->regs->roothub.a); } ohci_writel (ohci, RH_HS_LPSC, &ohci->regs->roothub.status); ! ohci_writel (ohci, (val & RH_A_NPS) ? 0 : RH_B_PPCM, &ohci->regs->roothub.b); // flush those writes *************** *** 725,729 **** // POTPGT delay is bits 24-31, in 2 ms units. ! mdelay ((temp >> 23) & 0x1fe); hcd->state = HC_STATE_RUNNING; --- 725,729 ---- // POTPGT delay is bits 24-31, in 2 ms units. ! mdelay ((val >> 23) & 0x1fe); hcd->state = HC_STATE_RUNNING; *************** *** 1106,1110 **** #ifdef DEBUG ! ohci_debug_root = debugfs_create_dir("ohci", NULL); if (!ohci_debug_root) { retval = -ENOENT; --- 1106,1110 ---- #ifdef DEBUG ! ohci_debug_root = debugfs_create_dir("ohci", usb_debug_root); if (!ohci_debug_root) { retval = -ENOENT; Index: ehci-hcd.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/usb/host/ehci-hcd.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ehci-hcd.c 25 Oct 2009 18:53:45 -0000 1.3 --- ehci-hcd.c 25 Oct 2009 18:56:56 -0000 1.4 *************** *** 904,908 **** break; case QH_STATE_IDLE: ! WARN_ON(1); break; } --- 904,909 ---- break; case QH_STATE_IDLE: ! /* QH might be waiting for a Clear-TT-Buffer */ ! qh_completions(ehci, qh); break; } *************** *** 1004,1007 **** --- 1005,1010 ---- goto rescan; case QH_STATE_IDLE: /* fully unlinked */ + if (qh->clearing_tt) + goto idle_timeout; if (list_empty (&qh->qtd_list)) { qh_put (qh); *************** *** 1025,1028 **** --- 1028,1073 ---- } + static void + ehci_endpoint_reset(struct usb_hcd *hcd, struct usb_host_endpoint *ep) + { + struct ehci_hcd *ehci = hcd_to_ehci(hcd); + struct ehci_qh *qh; + int eptype = usb_endpoint_type(&ep->desc); + int epnum = usb_endpoint_num(&ep->desc); + int is_out = usb_endpoint_dir_out(&ep->desc); + unsigned long flags; + + if (eptype != USB_ENDPOINT_XFER_BULK && eptype != USB_ENDPOINT_XFER_INT) + return; + + spin_lock_irqsave(&ehci->lock, flags); + qh = ep->hcpriv; + + /* For Bulk and Interrupt endpoints we maintain the toggle state + * in the hardware; the toggle bits in udev aren't used at all. + * When an endpoint is reset by usb_clear_halt() we must reset + * the toggle bit in the QH. + */ + if (qh) { + usb_settoggle(qh->dev, epnum, is_out, 0); + if (!list_empty(&qh->qtd_list)) { + WARN_ONCE(1, "clear_halt for a busy endpoint\n"); + } else if (qh->qh_state == QH_STATE_LINKED) { + + /* The toggle value in the QH can't be updated + * while the QH is active. Unlink it now; + * re-linking will call qh_refresh(). + */ + if (eptype == USB_ENDPOINT_XFER_BULK) { + unlink_async(ehci, qh); + } else { + intr_deschedule(ehci, qh); + (void) qh_schedule(ehci, qh); + } + } + } + spin_unlock_irqrestore(&ehci->lock, flags); + } + static int ehci_get_frame (struct usb_hcd *hcd) { *************** *** 1098,1102 **** #ifdef DEBUG ! ehci_debug_root = debugfs_create_dir("ehci", NULL); if (!ehci_debug_root) { retval = -ENOENT; --- 1143,1147 ---- #ifdef DEBUG ! ehci_debug_root = debugfs_create_dir("ehci", usb_debug_root); if (!ehci_debug_root) { retval = -ENOENT; |
From: Albert H. <he...@us...> - 2009-10-25 18:57:06
|
Update of /cvsroot/gc-linux/linux/arch/powerpc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/arch/powerpc Modified Files: Kconfig Kconfig.debug Log Message: Forward to v2.6.31. Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/Kconfig,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Kconfig 25 Oct 2009 18:53:45 -0000 1.11 --- Kconfig 25 Oct 2009 18:56:55 -0000 1.12 *************** *** 43,46 **** --- 43,50 ---- default y + config GENERIC_HARDIRQS_NO__DO_IRQ + bool + default y + config HAVE_SETUP_PER_CPU_AREA def_bool PPC64 *************** *** 59,63 **** config TRACE_IRQFLAGS_SUPPORT bool - depends on PPC64 default y --- 63,66 ---- *************** *** 90,97 **** default y - config GENERIC_CALIBRATE_DELAY - bool - default y - config GENERIC_FIND_NEXT_BIT bool --- 93,96 ---- *************** *** 126,129 **** --- 125,130 ---- select HAVE_OPROFILE select HAVE_SYSCALL_WRAPPERS if PPC64 + select GENERIC_ATOMIC64 if PPC32 + select HAVE_PERF_COUNTERS config EARLY_PRINTK *************** *** 297,303 **** def_bool PPC64 config PPC_NEED_DMA_SYNC_OPS def_bool y ! depends on NOT_COHERENT_CACHE config HOTPLUG_CPU --- 298,314 ---- def_bool PPC64 + config SWIOTLB + bool "SWIOTLB support" + default n + select IOMMU_HELPER + ---help--- + Support for IO bounce buffering for systems without an IOMMU. + This allows us to DMA to the full physical address space on + platforms where the size of a physical address is larger + than the bus address. Not all platforms support this. + config PPC_NEED_DMA_SYNC_OPS def_bool y ! depends on (NOT_COHERENT_CACHE || SWIOTLB) config HOTPLUG_CPU Index: Kconfig.debug =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/Kconfig.debug,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Kconfig.debug 25 Oct 2009 18:53:45 -0000 1.10 --- Kconfig.debug 25 Oct 2009 18:56:55 -0000 1.11 *************** *** 3,6 **** --- 3,23 ---- source "lib/Kconfig.debug" + config PPC_DISABLE_WERROR + bool "Don't build arch/powerpc code with -Werror" + default n + help + This option tells the compiler NOT to build the code under + arch/powerpc with the -Werror flag (which means warnings + are treated as errors). + + Only enable this if you are hitting a build failure in the + arch/powerpc code caused by a warning, and you don't feel + inclined to fix it. + + config PPC_WERROR + bool + depends on !PPC_DISABLE_WERROR + default y + config PRINT_STACK_DEPTH int "Stack depth to print" if DEBUG_KERNEL *************** *** 42,45 **** --- 59,75 ---- calls. + config PPC_EMULATED_STATS + bool "Emulated instructions tracking" + depends on DEBUG_FS + help + Adds code to keep track of the number of instructions that are + emulated by the in-kernel emulator. Counters for the various classes + of emulated instructions are available under + powerpc/emulated_instructions/ in the root of the debugfs file + system. Optionally (controlled by + powerpc/emulated_instructions/do_warn in debugfs), rate-limited + warnings can be printed to the console when instructions are + emulated. + config CODE_PATCHING_SELFTEST bool "Run self-tests of the code-patching code." |
From: Albert H. <he...@us...> - 2009-10-25 18:57:06
|
Update of /cvsroot/gc-linux/linux/drivers/video In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/drivers/video Modified Files: Kconfig Makefile Log Message: Forward to v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/Makefile,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** Makefile 25 Oct 2009 18:53:45 -0000 1.34 --- Makefile 25 Oct 2009 18:56:56 -0000 1.35 *************** *** 98,101 **** --- 98,102 ---- obj-$(CONFIG_FB_ASILIANT) += asiliantfb.o obj-$(CONFIG_FB_PXA) += pxafb.o + obj-$(CONFIG_FB_PXA168) += pxa168fb.o obj-$(CONFIG_FB_W100) += w100fb.o obj-$(CONFIG_FB_TMIO) += tmiofb.o Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/Kconfig,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** Kconfig 25 Oct 2009 18:53:45 -0000 1.38 --- Kconfig 25 Oct 2009 18:56:56 -0000 1.39 *************** *** 398,402 **** config FB_IMX tristate "Motorola i.MX LCD support" ! depends on FB && (ARCH_IMX || ARCH_MX2) select FB_CFB_FILLRECT select FB_CFB_COPYAREA --- 398,402 ---- config FB_IMX tristate "Motorola i.MX LCD support" ! depends on FB && (ARCH_MX1 || ARCH_MX2) select FB_CFB_FILLRECT select FB_CFB_COPYAREA *************** *** 617,620 **** --- 617,622 ---- select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select STI_CONSOLE + select VT default y ---help--- *************** *** 1118,1127 **** 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 select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT ! select FB_BOOT_VESA_SUPPORT help This driver supports the on-board graphics built in to the Intel --- 1120,1130 ---- 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 && EMBEDDED select FB_MODE_HELPERS select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT ! select FB_BOOT_VESA_SUPPORT if FB_INTEL = y ! depends on !DRM_I915 help This driver supports the on-board graphics built in to the Intel *************** *** 1129,1132 **** --- 1132,1137 ---- Say Y if you have and plan to use such a board. + To make FB_INTELFB=Y work you need to say AGP_INTEL=y too. + To compile this driver as a module, choose M here: the module will be called intelfb. *************** *** 1461,1465 **** select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT ! select FB_BOOT_VESA_SUPPORT help This is the frame buffer device driver for the SiS 300, 315, 330 --- 1466,1470 ---- select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT ! select FB_BOOT_VESA_SUPPORT if FB_SIS = y help This is the frame buffer device driver for the SiS 300, 315, 330 *************** *** 1760,1763 **** --- 1765,1778 ---- the Motorola 68328 CPU family. + config FB_PXA168 + tristate "PXA168/910 LCD framebuffer support" + depends on FB && (CPU_PXA168 || CPU_PXA910) + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + ---help--- + Frame buffer driver for the built-in LCD controller in the Marvell + MMP processor. + config FB_PXA tristate "PXA LCD framebuffer support" *************** *** 1997,2001 **** config FB_XILINX tristate "Xilinx frame buffer support" ! depends on FB && XILINX_VIRTEX select FB_CFB_FILLRECT select FB_CFB_COPYAREA --- 2012,2016 ---- config FB_XILINX tristate "Xilinx frame buffer support" ! depends on FB && (XILINX_VIRTEX || MICROBLAZE) select FB_CFB_FILLRECT select FB_CFB_COPYAREA *************** *** 2095,2098 **** --- 2110,2114 ---- depends on FB_MB862XX depends on OF && !FB_MB862XX_PCI_GDC + depends on PPC select FB_FOREIGN_ENDIAN select FB_LITTLE_ENDIAN |
From: Albert H. <he...@us...> - 2009-10-25 18:57:06
|
Update of /cvsroot/gc-linux/linux/drivers/i2c/busses In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/drivers/i2c/busses Modified Files: Kconfig Makefile Log Message: Forward to v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/i2c/busses/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile 25 Oct 2009 18:53:45 -0000 1.7 --- Makefile 25 Oct 2009 18:56:56 -0000 1.8 *************** *** 31,34 **** --- 31,35 ---- obj-$(CONFIG_I2C_CPM) += i2c-cpm.o obj-$(CONFIG_I2C_DAVINCI) += i2c-davinci.o + obj-$(CONFIG_I2C_DESIGNWARE) += i2c-designware.o obj-$(CONFIG_I2C_GPIO) += i2c-gpio.o obj-$(CONFIG_I2C_HIGHLANDER) += i2c-highlander.o *************** *** 49,52 **** --- 50,54 ---- obj-$(CONFIG_I2C_SH_MOBILE) += i2c-sh_mobile.o obj-$(CONFIG_I2C_SIMTEC) += i2c-simtec.o + obj-$(CONFIG_I2C_STU300) += i2c-stu300.o obj-$(CONFIG_I2C_VERSATILE) += i2c-versatile.o Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/i2c/busses/Kconfig,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Kconfig 25 Oct 2009 18:53:45 -0000 1.7 --- Kconfig 25 Oct 2009 18:56:56 -0000 1.8 *************** *** 212,216 **** config I2C_VIAPRO ! tristate "VIA VT82C596/82C686/82xx and CX700/VX800/VX820" depends on PCI help --- 212,216 ---- config I2C_VIAPRO ! tristate "VIA VT82C596/82C686/82xx and CX700/VX8xx" depends on PCI help *************** *** 226,231 **** VT8251 CX700 ! VX800 ! VX820 This driver can also be built as a module. If so, the module --- 226,231 ---- VT8251 CX700 ! VX800/VX820 ! VX855/VX875 This driver can also be built as a module. If so, the module *************** *** 299,303 **** int "Blackfin TWI I2C clock (kHz)" depends on I2C_BLACKFIN_TWI ! range 10 400 default 50 help --- 299,303 ---- int "Blackfin TWI I2C clock (kHz)" depends on I2C_BLACKFIN_TWI ! range 21 400 default 50 help *************** *** 327,330 **** --- 327,340 ---- For details please see http://www.ti.com/davinci + config I2C_DESIGNWARE + tristate "Synopsys DesignWare" + depends on HAVE_CLK + help + If you say yes to this option, support will be included for the + Synopsys DesignWare I2C adapter. Only master mode is supported. + + This driver can also be built as a module. If so, the module + will be called i2c-designware. + config I2C_GPIO tristate "GPIO-based bitbanging I2C" *************** *** 514,517 **** --- 524,540 ---- will be called i2c-simtec. + config I2C_STU300 + tristate "ST Microelectronics DDC I2C interface" + depends on MACH_U300 + default y if MACH_U300 + help + If you say yes to this option, support will be included for the + I2C interface from ST Microelectronics simply called "DDC I2C" + supporting both I2C and DDC, used in e.g. the U300 series + mobile platforms. + + This driver can also be built as a module. If so, the module + will be called i2c-stu300. + config I2C_VERSATILE tristate "ARM Versatile/Realview I2C bus support" |
From: Albert H. <he...@us...> - 2009-10-25 18:57:05
|
Update of /cvsroot/gc-linux/linux/drivers/rtc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/drivers/rtc Modified Files: Kconfig Makefile Log Message: Forward to v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/rtc/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile 25 Oct 2009 18:53:45 -0000 1.10 --- Makefile 25 Oct 2009 18:56:56 -0000 1.11 *************** *** 63,66 **** --- 63,67 ---- obj-$(CONFIG_RTC_DRV_RS5C348) += rtc-rs5c348.o obj-$(CONFIG_RTC_DRV_RS5C372) += rtc-rs5c372.o + obj-$(CONFIG_RTC_DRV_RX8025) += rtc-rx8025.o obj-$(CONFIG_RTC_DRV_RX8581) += rtc-rx8581.o obj-$(CONFIG_RTC_DRV_S35390A) += rtc-s35390a.o Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/rtc/Kconfig,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Kconfig 25 Oct 2009 18:53:45 -0000 1.10 --- Kconfig 25 Oct 2009 18:56:56 -0000 1.11 *************** *** 297,300 **** --- 297,309 ---- will be called rtc-rx8581. + config RTC_DRV_RX8025 + tristate "Epson RX-8025SA/NB" + help + If you say yes here you get support for the Epson + RX-8025SA/NB RTC chips. + + This driver can also be built as a module. If so, the module + will be called rtc-rx8025. + endif # I2C *************** *** 693,697 **** # Please consider writing a new RTC driver instead of using the generic # RTC abstraction ! depends on PARISC || M68K || PPC help Say Y or M here to enable RTC support on systems using the generic --- 702,706 ---- # Please consider writing a new RTC driver instead of using the generic # RTC abstraction ! depends on PARISC || M68K || PPC || SUPERH32 help Say Y or M here to enable RTC support on systems using the generic |
From: Albert H. <he...@us...> - 2009-10-25 18:57:05
|
Update of /cvsroot/gc-linux/linux/drivers/input/keyboard In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/drivers/input/keyboard Modified Files: Kconfig Makefile Log Message: Forward to v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/input/keyboard/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile 25 Oct 2009 18:53:45 -0000 1.10 --- Makefile 25 Oct 2009 18:56:56 -0000 1.11 *************** *** 5,30 **** # Each configuration option enables a list of files. ! obj-$(CONFIG_KEYBOARD_ATKBD) += atkbd.o ! obj-$(CONFIG_KEYBOARD_SUNKBD) += sunkbd.o ! obj-$(CONFIG_KEYBOARD_LKKBD) += lkkbd.o ! obj-$(CONFIG_KEYBOARD_XTKBD) += xtkbd.o obj-$(CONFIG_KEYBOARD_AMIGA) += amikbd.o obj-$(CONFIG_KEYBOARD_ATARI) += atakbd.o ! obj-$(CONFIG_KEYBOARD_LOCOMO) += locomokbd.o ! obj-$(CONFIG_KEYBOARD_NEWTON) += newtonkbd.o ! obj-$(CONFIG_KEYBOARD_STOWAWAY) += stowaway.o obj-$(CONFIG_KEYBOARD_CORGI) += corgikbd.o ! obj-$(CONFIG_KEYBOARD_SPITZ) += spitzkbd.o ! obj-$(CONFIG_KEYBOARD_TOSA) += tosakbd.o obj-$(CONFIG_KEYBOARD_HIL) += hil_kbd.o obj-$(CONFIG_KEYBOARD_HIL_OLD) += hilkbd.o - obj-$(CONFIG_KEYBOARD_OMAP) += omap-keypad.o - obj-$(CONFIG_KEYBOARD_PXA27x) += pxa27x_keypad.o - obj-$(CONFIG_KEYBOARD_PXA930_ROTARY) += pxa930_rotary.o - obj-$(CONFIG_KEYBOARD_AAED2000) += aaed2000_kbd.o - obj-$(CONFIG_KEYBOARD_GPIO) += gpio_keys.o obj-$(CONFIG_KEYBOARD_HP6XX) += jornada680_kbd.o obj-$(CONFIG_KEYBOARD_HP7XX) += jornada720_kbd.o obj-$(CONFIG_KEYBOARD_MAPLE) += maple_keyb.o ! obj-$(CONFIG_KEYBOARD_BFIN) += bf54x-keys.o obj-$(CONFIG_KEYBOARD_SH_KEYSC) += sh_keysc.o --- 5,33 ---- # Each configuration option enables a list of files. ! obj-$(CONFIG_KEYBOARD_AAED2000) += aaed2000_kbd.o obj-$(CONFIG_KEYBOARD_AMIGA) += amikbd.o obj-$(CONFIG_KEYBOARD_ATARI) += atakbd.o ! obj-$(CONFIG_KEYBOARD_ATKBD) += atkbd.o ! obj-$(CONFIG_KEYBOARD_BFIN) += bf54x-keys.o obj-$(CONFIG_KEYBOARD_CORGI) += corgikbd.o ! obj-$(CONFIG_KEYBOARD_EP93XX) += ep93xx_keypad.o ! obj-$(CONFIG_KEYBOARD_GPIO) += gpio_keys.o obj-$(CONFIG_KEYBOARD_HIL) += hil_kbd.o obj-$(CONFIG_KEYBOARD_HIL_OLD) += hilkbd.o obj-$(CONFIG_KEYBOARD_HP6XX) += jornada680_kbd.o obj-$(CONFIG_KEYBOARD_HP7XX) += jornada720_kbd.o + obj-$(CONFIG_KEYBOARD_LKKBD) += lkkbd.o + obj-$(CONFIG_KEYBOARD_LM8323) += lm8323.o + obj-$(CONFIG_KEYBOARD_LOCOMO) += locomokbd.o obj-$(CONFIG_KEYBOARD_MAPLE) += maple_keyb.o ! obj-$(CONFIG_KEYBOARD_MATRIX) += matrix_keypad.o ! obj-$(CONFIG_KEYBOARD_NEWTON) += newtonkbd.o ! obj-$(CONFIG_KEYBOARD_OMAP) += omap-keypad.o ! obj-$(CONFIG_KEYBOARD_PXA27x) += pxa27x_keypad.o ! obj-$(CONFIG_KEYBOARD_PXA930_ROTARY) += pxa930_rotary.o obj-$(CONFIG_KEYBOARD_SH_KEYSC) += sh_keysc.o + obj-$(CONFIG_KEYBOARD_SPITZ) += spitzkbd.o + obj-$(CONFIG_KEYBOARD_STOWAWAY) += stowaway.o + obj-$(CONFIG_KEYBOARD_SUNKBD) += sunkbd.o + obj-$(CONFIG_KEYBOARD_TOSA) += tosakbd.o + obj-$(CONFIG_KEYBOARD_XTKBD) += xtkbd.o Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/input/keyboard/Kconfig,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Kconfig 25 Oct 2009 18:53:45 -0000 1.14 --- Kconfig 25 Oct 2009 18:56:56 -0000 1.15 *************** *** 13,16 **** --- 13,52 ---- if INPUT_KEYBOARD + config KEYBOARD_AAED2000 + tristate "AAED-2000 keyboard" + depends on MACH_AAED2000 + select INPUT_POLLDEV + default y + help + Say Y here to enable the keyboard on the Agilent AAED-2000 + development board. + + To compile this driver as a module, choose M here: the + module will be called aaed2000_kbd. + + config KEYBOARD_AMIGA + tristate "Amiga keyboard" + depends on AMIGA + help + Say Y here if you are running Linux on any AMIGA and have a keyboard + attached. + + To compile this driver as a module, choose M here: the + module will be called amikbd. + + config ATARI_KBD_CORE + bool + + config KEYBOARD_ATARI + tristate "Atari keyboard" + depends on ATARI + select ATARI_KBD_CORE + help + Say Y here if you are running Linux on any Atari and have a keyboard + attached. + + To compile this driver as a module, choose M here: the + module will be called atakbd. + config KEYBOARD_ATKBD tristate "AT keyboard" if EMBEDDED || !X86 *************** *** 69,135 **** left-hand column. ! config KEYBOARD_SUNKBD ! tristate "Sun Type 4 and Type 5 keyboard" ! select SERIO ! help ! Say Y here if you want to use a Sun Type 4 or Type 5 keyboard, ! connected either to the Sun keyboard connector or to an serial ! (RS-232) port via a simple adapter. ! ! To compile this driver as a module, choose M here: the ! module will be called sunkbd. ! ! config KEYBOARD_LKKBD ! tristate "DECstation/VAXstation LK201/LK401 keyboard" ! select SERIO ! help ! Say Y here if you want to use a LK201 or LK401 style serial ! keyboard. This keyboard is also useable on PCs if you attach ! it with the inputattach program. The connector pinout is ! described within lkkbd.c. ! ! To compile this driver as a module, choose M here: the ! module will be called lkkbd. ! ! config KEYBOARD_LOCOMO ! tristate "LoCoMo Keyboard Support" ! depends on SHARP_LOCOMO && INPUT_KEYBOARD ! help ! Say Y here if you are running Linux on a Sharp Zaurus Collie or Poodle based PDA ! ! To compile this driver as a module, choose M here: the ! module will be called locomokbd. ! ! config KEYBOARD_XTKBD ! tristate "XT keyboard" ! select SERIO ! help ! Say Y here if you want to use the old IBM PC/XT keyboard (or ! compatible) on your system. This is only possible with a ! parallel port keyboard adapter, you cannot connect it to the ! keyboard port on a PC that runs Linux. ! ! To compile this driver as a module, choose M here: the ! module will be called xtkbd. ! ! config KEYBOARD_NEWTON ! tristate "Newton keyboard" ! select SERIO ! help ! Say Y here if you have a Newton keyboard on a serial port. ! ! To compile this driver as a module, choose M here: the ! module will be called newtonkbd. ! ! config KEYBOARD_STOWAWAY ! tristate "Stowaway keyboard" ! select SERIO help ! Say Y here if you have a Stowaway keyboard on a serial port. ! Stowaway compatible keyboards like Dicota Input-PDA keyboard ! are also supported by this driver. To compile this driver as a module, choose M here: the ! module will be called stowaway. config KEYBOARD_CORGI --- 105,116 ---- left-hand column. ! config KEYBOARD_BFIN ! tristate "Blackfin BF54x keypad support" ! depends on (BF54x && !BF544) help ! Say Y here if you want to use the BF54x keypad. To compile this driver as a module, choose M here: the ! module will be called bf54x-keys. config KEYBOARD_CORGI *************** *** 144,202 **** module will be called corgikbd. ! config KEYBOARD_SPITZ ! tristate "Spitz keyboard" ! depends on PXA_SHARPSL ! default y help ! Say Y here to enable the keyboard on the Sharp Zaurus SL-C1000, ! SL-C3000 and Sl-C3100 series of PDAs. To compile this driver as a module, choose M here: the ! module will be called spitzkbd. ! config KEYBOARD_TOSA ! tristate "Tosa keyboard" ! depends on MACH_TOSA ! default y help ! Say Y here to enable the keyboard on the Sharp Zaurus SL-6000x (Tosa) To compile this driver as a module, choose M here: the ! module will be called tosakbd. ! config KEYBOARD_TOSA_USE_EXT_KEYCODES ! bool "Tosa keyboard: use extended keycodes" ! depends on KEYBOARD_TOSA ! default n help ! Say Y here to enable the tosa keyboard driver to generate extended ! (>= 127) keycodes. Be aware, that they can't be correctly interpreted ! by either console keyboard driver or by Kdrive keybd driver. ! ! Say Y only if you know, what you are doing! ! config KEYBOARD_AMIGA ! tristate "Amiga keyboard" ! depends on AMIGA ! help ! Say Y here if you are running Linux on any AMIGA and have a keyboard ! attached. To compile this driver as a module, choose M here: the ! module will be called amikbd. ! ! config ATARI_KBD_CORE ! bool ! config KEYBOARD_ATARI ! tristate "Atari keyboard" ! depends on ATARI ! select ATARI_KBD_CORE help ! Say Y here if you are running Linux on any Atari and have a keyboard ! attached. To compile this driver as a module, choose M here: the ! module will be called atakbd. config KEYBOARD_HIL_OLD --- 125,172 ---- module will be called corgikbd. ! config KEYBOARD_LKKBD ! tristate "DECstation/VAXstation LK201/LK401 keyboard" ! select SERIO help ! Say Y here if you want to use a LK201 or LK401 style serial ! keyboard. This keyboard is also useable on PCs if you attach ! it with the inputattach program. The connector pinout is ! described within lkkbd.c. To compile this driver as a module, choose M here: the ! module will be called lkkbd. ! config KEYBOARD_EP93XX ! tristate "EP93xx Matrix Keypad support" ! depends on ARCH_EP93XX help ! Say Y here to enable the matrix keypad on the Cirrus EP93XX. To compile this driver as a module, choose M here: the ! module will be called ep93xx_keypad. ! config KEYBOARD_GPIO ! tristate "GPIO Buttons" ! depends on GENERIC_GPIO help ! This driver implements support for buttons connected ! to GPIO pins of various CPUs (and some other chips). ! Say Y here if your device has buttons connected ! directly to such GPIO pins. Your board-specific ! setup logic must also provide a platform device, ! with configuration data saying which GPIOs are used. To compile this driver as a module, choose M here: the ! module will be called gpio_keys. ! config KEYBOARD_MATRIX ! tristate "GPIO driven matrix keypad support" ! depends on GENERIC_GPIO help ! Enable support for GPIO driven matrix keypad. To compile this driver as a module, choose M here: the ! module will be called matrix_keypad. config KEYBOARD_HIL_OLD *************** *** 251,262 **** module will be called jornada720_kbd. ! config KEYBOARD_OMAP ! tristate "TI OMAP keypad support" ! depends on (ARCH_OMAP1 || ARCH_OMAP2) help ! Say Y here if you want to use the OMAP keypad. To compile this driver as a module, choose M here: the ! module will be called omap-keypad. config KEYBOARD_PXA27x --- 221,262 ---- module will be called jornada720_kbd. ! config KEYBOARD_LM8323 ! tristate "LM8323 keypad chip" ! depends on I2C ! depends on LEDS_CLASS help ! If you say yes here you get support for the National Semiconductor ! LM8323 keypad controller. To compile this driver as a module, choose M here: the ! module will be called lm8323. ! ! config KEYBOARD_LOCOMO ! tristate "LoCoMo Keyboard Support" ! depends on SHARP_LOCOMO ! help ! Say Y here if you are running Linux on a Sharp Zaurus Collie or Poodle based PDA ! ! To compile this driver as a module, choose M here: the ! module will be called locomokbd. ! ! config KEYBOARD_MAPLE ! tristate "Maple bus keyboard" ! depends on SH_DREAMCAST && MAPLE ! help ! Say Y here if you have a Dreamcast console running Linux and have ! a keyboard attached to its Maple bus. ! ! To compile this driver as a module, choose M here: the ! module will be called maple_keyb. ! ! config KEYBOARD_NEWTON ! tristate "Newton keyboard" ! select SERIO ! help ! Say Y here if you have a Newton keyboard on a serial port. ! ! To compile this driver as a module, choose M here: the ! module will be called newtonkbd. config KEYBOARD_PXA27x *************** *** 264,268 **** depends on PXA27x || PXA3xx help ! Enable support for PXA27x/PXA3xx keypad controller To compile this driver as a module, choose M here: the --- 264,268 ---- depends on PXA27x || PXA3xx help ! Enable support for PXA27x/PXA3xx keypad controller. To compile this driver as a module, choose M here: the *************** *** 278,326 **** module will be called pxa930_rotary. ! config KEYBOARD_AAED2000 ! tristate "AAED-2000 keyboard" ! depends on MACH_AAED2000 ! select INPUT_POLLDEV default y help ! Say Y here to enable the keyboard on the Agilent AAED-2000 ! development board. ! ! To compile this driver as a module, choose M here: the ! module will be called aaed2000_kbd. ! ! config KEYBOARD_GPIO ! tristate "GPIO Buttons" ! depends on GENERIC_GPIO ! help ! This driver implements support for buttons connected ! to GPIO pins of various CPUs (and some other chips). ! ! Say Y here if your device has buttons connected ! directly to such GPIO pins. Your board-specific ! setup logic must also provide a platform device, ! with configuration data saying which GPIOs are used. To compile this driver as a module, choose M here: the ! module will be called gpio-keys. ! config KEYBOARD_MAPLE ! tristate "Maple bus keyboard" ! depends on SH_DREAMCAST && MAPLE help ! Say Y here if you have a Dreamcast console running Linux and have ! a keyboard attached to its Maple bus. To compile this driver as a module, choose M here: the ! module will be called maple_keyb. ! config KEYBOARD_BFIN ! tristate "Blackfin BF54x keypad support" ! depends on (BF54x && !BF544) help ! Say Y here if you want to use the BF54x keypad. To compile this driver as a module, choose M here: the ! module will be called bf54x-keys. config KEYBOARD_SH_KEYSC --- 278,313 ---- module will be called pxa930_rotary. ! config KEYBOARD_SPITZ ! tristate "Spitz keyboard" ! depends on PXA_SHARPSL default y help ! Say Y here to enable the keyboard on the Sharp Zaurus SL-C1000, ! SL-C3000 and Sl-C3100 series of PDAs. To compile this driver as a module, choose M here: the ! module will be called spitzkbd. ! config KEYBOARD_STOWAWAY ! tristate "Stowaway keyboard" ! select SERIO help ! Say Y here if you have a Stowaway keyboard on a serial port. ! Stowaway compatible keyboards like Dicota Input-PDA keyboard ! are also supported by this driver. To compile this driver as a module, choose M here: the ! module will be called stowaway. ! config KEYBOARD_SUNKBD ! tristate "Sun Type 4 and Type 5 keyboard" ! select SERIO help ! Say Y here if you want to use a Sun Type 4 or Type 5 keyboard, ! connected either to the Sun keyboard connector or to an serial ! (RS-232) port via a simple adapter. To compile this driver as a module, choose M here: the ! module will be called sunkbd. config KEYBOARD_SH_KEYSC *************** *** 333,335 **** --- 320,364 ---- To compile this driver as a module, choose M here: the module will be called sh_keysc. + + config KEYBOARD_OMAP + tristate "TI OMAP keypad support" + depends on (ARCH_OMAP1 || ARCH_OMAP2) + help + Say Y here if you want to use the OMAP keypad. + + To compile this driver as a module, choose M here: the + module will be called omap-keypad. + + config KEYBOARD_TOSA + tristate "Tosa keyboard" + depends on MACH_TOSA + default y + help + Say Y here to enable the keyboard on the Sharp Zaurus SL-6000x (Tosa) + + To compile this driver as a module, choose M here: the + module will be called tosakbd. + + config KEYBOARD_TOSA_USE_EXT_KEYCODES + bool "Tosa keyboard: use extended keycodes" + depends on KEYBOARD_TOSA + help + Say Y here to enable the tosa keyboard driver to generate extended + (>= 127) keycodes. Be aware, that they can't be correctly interpreted + by either console keyboard driver or by Kdrive keybd driver. + + Say Y only if you know, what you are doing! + + config KEYBOARD_XTKBD + tristate "XT keyboard" + select SERIO + help + Say Y here if you want to use the old IBM PC/XT keyboard (or + compatible) on your system. This is only possible with a + parallel port keyboard adapter, you cannot connect it to the + keyboard port on a PC that runs Linux. + + To compile this driver as a module, choose M here: the + module will be called xtkbd. + endif |
From: Albert H. <he...@us...> - 2009-10-25 18:57:05
|
Update of /cvsroot/gc-linux/linux/drivers/block In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/drivers/block Modified Files: Kconfig Makefile Log Message: Forward to v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/Makefile,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** Makefile 25 Oct 2009 18:53:45 -0000 1.28 --- Makefile 25 Oct 2009 18:56:56 -0000 1.29 *************** *** 24,27 **** --- 24,28 ---- obj-$(CONFIG_MG_DISK) += mg_disk.o obj-$(CONFIG_SUNVDC) += sunvdc.o + obj-$(CONFIG_BLK_DEV_OSD) += osdblk.o obj-$(CONFIG_BLK_DEV_UMEM) += umem.o Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/Kconfig,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** Kconfig 25 Oct 2009 18:53:45 -0000 1.40 --- Kconfig 25 Oct 2009 18:56:56 -0000 1.41 *************** *** 113,117 **** disks. Select this option to access any disks in your GD ROM drive. Most users will want to say "Y" here. ! You can also build this as a module which will be called gdrom.ko source "drivers/block/paride/Kconfig" --- 113,117 ---- disks. Select this option to access any disks in your GD ROM drive. Most users will want to say "Y" here. ! You can also build this as a module which will be called gdrom. source "drivers/block/paride/Kconfig" *************** *** 299,302 **** --- 299,318 ---- If unsure, say N. + config BLK_DEV_OSD + tristate "OSD object-as-blkdev support" + depends on SCSI_OSD_ULD + ---help--- + Saying Y or M here will allow the exporting of a single SCSI + OSD (object-based storage) object as a Linux block device. + + For example, if you create a 2G object on an OSD device, + you can then use this module to present that 2G object as + a Linux block device. + + To compile this driver as a module, choose M here: the + module will be called osdblk. + + If unsure, say N. + config BLK_DEV_SX8 tristate "Promise SATA SX8 support" *************** *** 413,417 **** config MG_DISK tristate "mGine mflash, gflash support" ! depends on ARM && ATA && GPIOLIB help mGine mFlash(gFlash) block device driver --- 429,433 ---- config MG_DISK tristate "mGine mflash, gflash support" ! depends on ARM && GPIOLIB help mGine mFlash(gFlash) block device driver *************** *** 439,443 **** config XILINX_SYSACE tristate "Xilinx SystemACE support" ! depends on 4xx help Include support for the Xilinx SystemACE CompactFlash interface --- 455,459 ---- config XILINX_SYSACE tristate "Xilinx SystemACE support" ! depends on 4xx || MICROBLAZE help Include support for the Xilinx SystemACE CompactFlash interface |
From: Albert H. <he...@us...> - 2009-10-25 18:57:05
|
Update of /cvsroot/gc-linux/linux/kernel In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/kernel Modified Files: kexec.c Log Message: Forward to v2.6.31. Index: kexec.c =================================================================== RCS file: /cvsroot/gc-linux/linux/kernel/kexec.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** kexec.c 25 Oct 2009 18:53:46 -0000 1.3 --- kexec.c 25 Oct 2009 18:56:56 -0000 1.4 *************** *** 1229,1233 **** if (*crash_size > 0) { ! while (*cur != ' ' && *cur != '@') cur++; if (*cur == '@') { --- 1229,1233 ---- if (*crash_size > 0) { ! while (*cur && *cur != ' ' && *cur != '@') cur++; if (*cur == '@') { *************** *** 1449,1463 **** } suspend_console(); ! error = device_suspend(PMSG_FREEZE); if (error) goto Resume_console; ! /* At this point, device_suspend() has been called, ! * but *not* device_power_down(). We *must* ! * device_power_down() now. Otherwise, drivers for * some devices (e.g. interrupt controllers) become * desynchronized with the actual state of the * hardware at resume time, and evil weirdness ensues. */ ! error = device_power_down(PMSG_FREEZE); if (error) goto Resume_devices; --- 1449,1463 ---- } suspend_console(); ! error = dpm_suspend_start(PMSG_FREEZE); if (error) goto Resume_console; ! /* At this point, dpm_suspend_start() has been called, ! * but *not* dpm_suspend_noirq(). We *must* call ! * dpm_suspend_noirq() now. Otherwise, drivers for * some devices (e.g. interrupt controllers) become * desynchronized with the actual state of the * hardware at resume time, and evil weirdness ensues. */ ! error = dpm_suspend_noirq(PMSG_FREEZE); if (error) goto Resume_devices; *************** *** 1487,1493 **** Enable_cpus: enable_nonboot_cpus(); ! device_power_up(PMSG_RESTORE); Resume_devices: ! device_resume(PMSG_RESTORE); Resume_console: resume_console(); --- 1487,1493 ---- Enable_cpus: enable_nonboot_cpus(); ! dpm_resume_noirq(PMSG_RESTORE); Resume_devices: ! dpm_resume_end(PMSG_RESTORE); Resume_console: resume_console(); |
From: Albert H. <he...@us...> - 2009-10-25 18:57:05
|
Update of /cvsroot/gc-linux/linux/drivers/serial In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/drivers/serial Modified Files: Kconfig Makefile Log Message: Forward to v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/serial/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile 25 Oct 2009 18:53:45 -0000 1.10 --- Makefile 25 Oct 2009 18:56:56 -0000 1.11 *************** *** 72,75 **** --- 72,76 ---- obj-$(CONFIG_SERIAL_ATMEL) += atmel_serial.o obj-$(CONFIG_SERIAL_UARTLITE) += uartlite.o + obj-$(CONFIG_SERIAL_MSM) += msm_serial.o obj-$(CONFIG_SERIAL_NETX) += netx-serial.o obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o *************** *** 78,79 **** --- 79,81 ---- obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o obj-$(CONFIG_SERIAL_QE) += ucc_uart.o + obj-$(CONFIG_SERIAL_TIMBERDALE) += timbuart.o Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/serial/Kconfig,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Kconfig 25 Oct 2009 18:53:45 -0000 1.11 --- Kconfig 25 Oct 2009 18:56:56 -0000 1.12 *************** *** 528,532 **** config SERIAL_S3C6400 tristate "Samsung S3C6400/S3C6410 Serial port support" ! depends on SERIAL_SAMSUNG && (CPU_S3C600 || CPU_S3C6410) default y help --- 528,532 ---- config SERIAL_S3C6400 tristate "Samsung S3C6400/S3C6410 Serial port support" ! depends on SERIAL_SAMSUNG && (CPU_S3C6400 || CPU_S3C6410) default y help *************** *** 834,837 **** --- 834,838 ---- depends on ARM && (ARCH_IMX || ARCH_MXC) select SERIAL_CORE + select RATIONAL help If you have a machine based on a Motorola IMX CPU you *************** *** 861,865 **** To compile this driver as a module, choose M here: the ! module will be called uartlite.ko. config SERIAL_UARTLITE_CONSOLE --- 862,866 ---- To compile this driver as a module, choose M here: the ! module will be called uartlite. config SERIAL_UARTLITE_CONSOLE *************** *** 1320,1323 **** --- 1321,1334 ---- say Y or M. Otherwise, say N. + config SERIAL_MSM + bool "MSM on-chip serial port support" + depends on ARM && ARCH_MSM + select SERIAL_CORE + + config SERIAL_MSM_CONSOLE + bool "MSM serial console support" + depends on SERIAL_MSM=y + select SERIAL_CORE_CONSOLE + config SERIAL_NETX tristate "NetX serial port support" *************** *** 1434,1436 **** --- 1445,1454 ---- default 9600 if (SERIAL_SPORT_BAUD_RATE_9600) + config SERIAL_TIMBERDALE + tristate "Support for timberdale UART" + depends on MFD_TIMBERDALE + select SERIAL_CORE + ---help--- + Add support for UART controller on timberdale. + endmenu |
From: Albert H. <he...@us...> - 2009-10-25 18:57:05
|
Update of /cvsroot/gc-linux/linux/drivers/video/logo In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/drivers/video/logo Modified Files: Makefile logo.c Log Message: Forward to v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile 25 Oct 2009 18:53:46 -0000 1.10 --- Makefile 25 Oct 2009 18:56:56 -0000 1.11 *************** *** 38,57 **** extra-y += $(call logo-cfiles,_gray256,pgm) # Create commands like "pnmtologo -t mono -n logo_mac_mono -o ..." quiet_cmd_logo = LOGO $@ ! cmd_logo = scripts/pnmtologo \ -t $(patsubst $*_%,%,$(notdir $(basename $<))) \ -n $(notdir $(basename $<)) -o $@ $< ! $(obj)/%_mono.c: $(src)/%_mono.pbm FORCE $(call if_changed,logo) ! $(obj)/%_vga16.c: $(src)/%_vga16.ppm FORCE $(call if_changed,logo) ! $(obj)/%_clut224.c: $(src)/%_clut224.ppm FORCE $(call if_changed,logo) ! $(obj)/%_gray256.c: $(src)/%_gray256.pgm FORCE $(call if_changed,logo) --- 38,59 ---- extra-y += $(call logo-cfiles,_gray256,pgm) + pnmtologo := scripts/pnmtologo + # Create commands like "pnmtologo -t mono -n logo_mac_mono -o ..." quiet_cmd_logo = LOGO $@ ! cmd_logo = $(pnmtologo) \ -t $(patsubst $*_%,%,$(notdir $(basename $<))) \ -n $(notdir $(basename $<)) -o $@ $< ! $(obj)/%_mono.c: $(src)/%_mono.pbm $(pnmtologo) FORCE $(call if_changed,logo) ! $(obj)/%_vga16.c: $(src)/%_vga16.ppm $(pnmtologo) FORCE $(call if_changed,logo) ! $(obj)/%_clut224.c: $(src)/%_clut224.ppm $(pnmtologo) FORCE $(call if_changed,logo) ! $(obj)/%_gray256.c: $(src)/%_gray256.pgm $(pnmtologo) FORCE $(call if_changed,logo) Index: logo.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/logo.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** logo.c 25 Oct 2009 18:53:46 -0000 1.10 --- logo.c 25 Oct 2009 18:56:56 -0000 1.11 *************** *** 22,40 **** #endif - extern const struct linux_logo logo_linux_mono; - extern const struct linux_logo logo_linux_vga16; - extern const struct linux_logo logo_linux_clut224; - extern const struct linux_logo logo_blackfin_vga16; - extern const struct linux_logo logo_blackfin_clut224; - extern const struct linux_logo logo_dec_clut224; - extern const struct linux_logo logo_mac_clut224; - extern const struct linux_logo logo_parisc_clut224; - extern const struct linux_logo logo_sgi_clut224; - extern const struct linux_logo logo_sun_clut224; - extern const struct linux_logo logo_superh_mono; - extern const struct linux_logo logo_superh_vga16; - extern const struct linux_logo logo_superh_clut224; - extern const struct linux_logo logo_m32r_clut224; - static int nologo; module_param(nologo, bool, 0); --- 22,25 ---- |
From: Albert H. <he...@us...> - 2009-10-25 18:57:05
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/include/asm In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/arch/powerpc/include/asm Modified Files: dma-mapping.h Log Message: Forward to v2.6.31. Index: dma-mapping.h =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/include/asm/dma-mapping.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** dma-mapping.h 25 Oct 2009 18:53:45 -0000 1.3 --- dma-mapping.h 25 Oct 2009 18:56:55 -0000 1.4 *************** *** 16,22 **** --- 16,31 ---- #include <linux/dma-attrs.h> #include <asm/io.h> + #include <asm/swiotlb.h> #define DMA_ERROR_CODE (~(dma_addr_t)0x0) + /* Some dma direct funcs must be visible for use in other dma_ops */ + extern void *dma_direct_alloc_coherent(struct device *dev, size_t size, + dma_addr_t *dma_handle, gfp_t flag); + extern void dma_direct_free_coherent(struct device *dev, size_t size, + void *vaddr, dma_addr_t dma_handle); + + extern unsigned long get_dma_direct_offset(struct device *dev); + #ifdef CONFIG_NOT_COHERENT_CACHE /* *************** *** 79,82 **** --- 88,93 ---- enum dma_data_direction direction, struct dma_attrs *attrs); + int (*addr_needs_map)(struct device *dev, dma_addr_t addr, + size_t size); #ifdef CONFIG_PPC_NEED_DMA_SYNC_OPS void (*sync_single_range_for_cpu)(struct device *hwdev, *************** *** 299,303 **** BUG_ON(!dma_ops); ! dma_ops->sync_single_range_for_cpu(dev, dma_handle, 0, size, direction); } --- 310,316 ---- BUG_ON(!dma_ops); ! ! if (dma_ops->sync_single_range_for_cpu) ! dma_ops->sync_single_range_for_cpu(dev, dma_handle, 0, size, direction); } *************** *** 310,314 **** BUG_ON(!dma_ops); ! dma_ops->sync_single_range_for_device(dev, dma_handle, 0, size, direction); } --- 323,329 ---- BUG_ON(!dma_ops); ! ! if (dma_ops->sync_single_range_for_device) ! dma_ops->sync_single_range_for_device(dev, dma_handle, 0, size, direction); } *************** *** 321,325 **** BUG_ON(!dma_ops); ! dma_ops->sync_sg_for_cpu(dev, sgl, nents, direction); } --- 336,342 ---- BUG_ON(!dma_ops); ! ! if (dma_ops->sync_sg_for_cpu) ! dma_ops->sync_sg_for_cpu(dev, sgl, nents, direction); } *************** *** 331,335 **** BUG_ON(!dma_ops); ! dma_ops->sync_sg_for_device(dev, sgl, nents, direction); } --- 348,354 ---- BUG_ON(!dma_ops); ! ! if (dma_ops->sync_sg_for_device) ! dma_ops->sync_sg_for_device(dev, sgl, nents, direction); } *************** *** 341,345 **** BUG_ON(!dma_ops); ! dma_ops->sync_single_range_for_cpu(dev, dma_handle, offset, size, direction); } --- 360,366 ---- BUG_ON(!dma_ops); ! ! if (dma_ops->sync_single_range_for_cpu) ! dma_ops->sync_single_range_for_cpu(dev, dma_handle, offset, size, direction); } *************** *** 352,356 **** BUG_ON(!dma_ops); ! dma_ops->sync_single_range_for_device(dev, dma_handle, offset, size, direction); } --- 373,379 ---- BUG_ON(!dma_ops); ! ! if (dma_ops->sync_single_range_for_device) ! dma_ops->sync_single_range_for_device(dev, dma_handle, offset, size, direction); } |
From: Albert H. <he...@us...> - 2009-10-25 18:57:05
|
Update of /cvsroot/gc-linux/linux/drivers/mmc/host In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/drivers/mmc/host Modified Files: Kconfig Makefile Log Message: Forward to v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/mmc/host/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 25 Oct 2009 18:53:45 -0000 1.2 --- Makefile 25 Oct 2009 18:56:56 -0000 1.3 *************** *** 15,18 **** --- 15,20 ---- obj-$(CONFIG_MMC_RICOH_MMC) += ricoh_mmc.o obj-$(CONFIG_MMC_SDHCI_OF) += sdhci-of.o + obj-$(CONFIG_MMC_SDHCI_PLTFM) += sdhci-pltfm.o + obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o obj-$(CONFIG_MMC_WBSD) += wbsd.o obj-$(CONFIG_MMC_AU1X) += au1xmmc.o *************** *** 30,32 **** --- 32,39 ---- obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_cs.o obj-$(CONFIG_MMC_TMIO) += tmio_mmc.o + obj-$(CONFIG_MMC_CB710) += cb710-mmc.o + obj-$(CONFIG_MMC_VIA_SDMMC) += via-sdmmc.o + ifeq ($(CONFIG_CB710_DEBUG),y) + CFLAGS-cb710-mmc += -DDEBUG + endif Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/mmc/host/Kconfig,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Kconfig 25 Oct 2009 18:53:45 -0000 1.2 --- Kconfig 25 Oct 2009 18:56:56 -0000 1.3 *************** *** 84,87 **** --- 84,123 ---- If unsure, say N. + config MMC_SDHCI_PLTFM + tristate "SDHCI support on the platform specific bus" + depends on MMC_SDHCI + help + This selects the platform specific bus support for Secure Digital Host + Controller Interface. + + If you have a controller with this interface, say Y or M here. + + If unsure, say N. + + config MMC_SDHCI_S3C + tristate "SDHCI support on Samsung S3C SoC" + depends on MMC_SDHCI && (PLAT_S3C24XX || PLAT_S3C64XX) + help + This selects the Secure Digital Host Controller Interface (SDHCI) + often referrered to as the HSMMC block in some of the Samsung S3C + range of SoC. + + Note, due to the problems with DMA, the DMA support is only + available with CONFIG_EXPERIMENTAL is selected. + + If you have a controller with this interface, say Y or M here. + + If unsure, say N. + + config MMC_SDHCI_S3C_DMA + bool "DMA support on S3C SDHCI" + depends on MMC_SDHCI_S3C && EXPERIMENTAL + help + Enable DMA support on the Samsung S3C SDHCI glue. The DMA + has proved to be problematic if the controller encounters + certain errors, and thus should be treated with care. + + YMMV. + config MMC_OMAP tristate "TI OMAP Multimedia Card Interface support" *************** *** 156,160 **** config MMC_IMX tristate "Motorola i.MX Multimedia Card Interface support" ! depends on ARCH_IMX help This selects the Motorola i.MX Multimedia card Interface. --- 192,196 ---- config MMC_IMX tristate "Motorola i.MX Multimedia Card Interface support" ! depends on ARCH_MX1 help This selects the Motorola i.MX Multimedia card Interface. *************** *** 238,243 **** config MMC_TMIO tristate "Toshiba Mobile IO Controller (TMIO) MMC/SD function support" ! depends on MFD_TMIO help This provides support for the SD/MMC cell found in TC6393XB, ! T7L66XB and also ipaq ASIC3 --- 274,303 ---- config MMC_TMIO tristate "Toshiba Mobile IO Controller (TMIO) MMC/SD function support" ! depends on MFD_TMIO || MFD_ASIC3 help This provides support for the SD/MMC cell found in TC6393XB, ! T7L66XB and also HTC ASIC3 ! ! config MMC_CB710 ! tristate "ENE CB710 MMC/SD Interface support" ! depends on PCI ! select CB710_CORE ! help ! This option enables support for MMC/SD part of ENE CB710/720 Flash ! memory card reader found in some laptops (ie. some versions of ! HP Compaq nx9500). ! ! This driver can also be built as a module. If so, the module ! will be called cb710-mmc. ! ! config MMC_VIA_SDMMC ! tristate "VIA SD/MMC Card Reader Driver" ! depends on PCI ! help ! This selects the VIA SD/MMC Card Reader driver, say Y or M here. ! VIA provides one multi-functional card reader which integrated into ! some motherboards manufactured by VIA. This card reader supports ! SD/MMC/SDHC. ! If you have a controller with this interface, say Y or M here. ! ! If unsure, say N. |
From: Albert H. <he...@us...> - 2009-10-25 18:57:05
|
Update of /cvsroot/gc-linux/linux/drivers/misc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/drivers/misc Modified Files: Kconfig Makefile Log Message: Forward to v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/misc/Makefile,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Makefile 25 Oct 2009 18:53:45 -0000 1.15 --- Makefile 25 Oct 2009 18:56:56 -0000 1.16 *************** *** 22,23 **** --- 22,24 ---- obj-$(CONFIG_C2PORT) += c2port/ obj-y += eeprom/ + obj-y += cb710/ Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/misc/Kconfig,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Kconfig 25 Oct 2009 18:53:45 -0000 1.19 --- Kconfig 25 Oct 2009 18:56:56 -0000 1.20 *************** *** 236,239 **** --- 236,240 ---- source "drivers/misc/c2port/Kconfig" source "drivers/misc/eeprom/Kconfig" + source "drivers/misc/cb710/Kconfig" endif # MISC_DEVICES |
From: Albert H. <he...@us...> - 2009-10-25 18:57:03
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/kernel In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/arch/powerpc/kernel Modified Files: cputable.c dma.c head_32.S Log Message: Forward to v2.6.31. Index: dma.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/kernel/dma.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** dma.c 25 Oct 2009 18:53:45 -0000 1.3 --- dma.c 25 Oct 2009 18:56:55 -0000 1.4 *************** *** 8,11 **** --- 8,12 ---- #include <linux/device.h> #include <linux/dma-mapping.h> + #include <linux/lmb.h> #include <asm/bug.h> #include <asm/abs_addr.h> *************** *** 20,24 **** */ ! static unsigned long get_dma_direct_offset(struct device *dev) { if (dev) --- 21,25 ---- */ ! unsigned long get_dma_direct_offset(struct device *dev) { if (dev) *************** *** 91,99 **** { #ifdef CONFIG_PPC64 ! /* Could be improved to check for memory though it better be ! * done via some global so platforms can set the limit in case * they have limited DMA windows */ ! return mask >= DMA_BIT_MASK(32); #else return 1; --- 92,99 ---- { #ifdef CONFIG_PPC64 ! /* Could be improved so platforms can set the limit in case * they have limited DMA windows */ ! return mask >= (lmb_end_of_DRAM() - 1); #else return 1; Index: head_32.S =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/kernel/head_32.S,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** head_32.S 25 Oct 2009 18:53:45 -0000 1.12 --- head_32.S 25 Oct 2009 18:56:55 -0000 1.13 *************** *** 734,740 **** EXCEPTION_PROLOG #ifdef CONFIG_ALTIVEC ! bne load_up_altivec /* if from user, just load it up */ #endif /* CONFIG_ALTIVEC */ ! addi r3,r1,STACK_FRAME_OVERHEAD EXC_XFER_EE_LITE(0xf20, altivec_unavailable_exception) --- 734,742 ---- EXCEPTION_PROLOG #ifdef CONFIG_ALTIVEC ! beq 1f ! bl load_up_altivec /* if from user, just load it up */ ! b fast_exception_return #endif /* CONFIG_ALTIVEC */ ! 1: addi r3,r1,STACK_FRAME_OVERHEAD EXC_XFER_EE_LITE(0xf20, altivec_unavailable_exception) *************** *** 744,842 **** EXC_XFER_STD(0xf00, performance_monitor_exception) - #ifdef CONFIG_ALTIVEC - /* Note that the AltiVec support is closely modeled after the FP - * support. Changes to one are likely to be applicable to the - * other! */ - load_up_altivec: - /* - * Disable AltiVec for the task which had AltiVec previously, - * and save its AltiVec registers in its thread_struct. - * Enables AltiVec for use in the kernel on return. - * On SMP we know the AltiVec units are free, since we give it up every - * switch. -- Kumar - */ - mfmsr r5 - oris r5,r5,MSR_VEC@h - MTMSRD(r5) /* enable use of AltiVec now */ - isync - /* - * For SMP, we don't do lazy AltiVec switching because it just gets too - * horrendously complex, especially when a task switches from one CPU - * to another. Instead we call giveup_altivec in switch_to. - */ - #ifndef CONFIG_SMP - tophys(r6,0) - addis r3,r6,last_task_used_altivec@ha - lwz r4,last_task_used_altivec@l(r3) - cmpwi 0,r4,0 - beq 1f - add r4,r4,r6 - addi r4,r4,THREAD /* want THREAD of last_task_used_altivec */ - SAVE_32VRS(0,r10,r4) - mfvscr vr0 - li r10,THREAD_VSCR - stvx vr0,r10,r4 - lwz r5,PT_REGS(r4) - add r5,r5,r6 - lwz r4,_MSR-STACK_FRAME_OVERHEAD(r5) - lis r10,MSR_VEC@h - andc r4,r4,r10 /* disable altivec for previous task */ - stw r4,_MSR-STACK_FRAME_OVERHEAD(r5) - 1: - #endif /* CONFIG_SMP */ - /* enable use of AltiVec after return */ - oris r9,r9,MSR_VEC@h - mfspr r5,SPRN_SPRG3 /* current task's THREAD (phys) */ - li r4,1 - li r10,THREAD_VSCR - stw r4,THREAD_USED_VR(r5) - lvx vr0,r10,r5 - mtvscr vr0 - REST_32VRS(0,r10,r5) - #ifndef CONFIG_SMP - subi r4,r5,THREAD - sub r4,r4,r6 - stw r4,last_task_used_altivec@l(r3) - #endif /* CONFIG_SMP */ - /* restore registers and return */ - /* we haven't used ctr or xer or lr */ - b fast_exception_return - - /* - * giveup_altivec(tsk) - * Disable AltiVec for the task given as the argument, - * and save the AltiVec registers in its thread_struct. - * Enables AltiVec for use in the kernel on return. - */ - - .globl giveup_altivec - giveup_altivec: - mfmsr r5 - oris r5,r5,MSR_VEC@h - SYNC - MTMSRD(r5) /* enable use of AltiVec now */ - isync - cmpwi 0,r3,0 - beqlr- /* if no previous owner, done */ - addi r3,r3,THREAD /* want THREAD of task */ - lwz r5,PT_REGS(r3) - cmpwi 0,r5,0 - SAVE_32VRS(0, r4, r3) - mfvscr vr0 - li r4,THREAD_VSCR - stvx vr0,r4,r3 - beq 1f - lwz r4,_MSR-STACK_FRAME_OVERHEAD(r5) - lis r3,MSR_VEC@h - andc r4,r4,r3 /* disable AltiVec for previous task */ - stw r4,_MSR-STACK_FRAME_OVERHEAD(r5) - 1: - #ifndef CONFIG_SMP - li r5,0 - lis r4,last_task_used_altivec@ha - stw r5,last_task_used_altivec@l(r4) - #endif /* CONFIG_SMP */ - blr - #endif /* CONFIG_ALTIVEC */ /* --- 746,749 ---- *************** *** 1218,1224 **** /* ! * 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: --- 1125,1130 ---- /* ! * On 601, we use 3 BATs to map up to 24M of RAM at _PAGE_OFFSET ! * (we keep one for debugging) and on others, we use one 256M BAT. */ initial_bats: *************** *** 1230,1239 **** ori r11,r11,4 /* set up BAT registers for 601 */ li r8,0x7f /* valid, block length = 8MB */ - oris r9,r11,0x800000@h /* set up BAT reg for 2nd 8M */ - oris r10,r8,0x800000@h /* set up BAT reg for 2nd 8M */ mtspr SPRN_IBAT0U,r11 /* N.B. 601 has valid bit in */ mtspr SPRN_IBAT0L,r8 /* lower BAT register */ ! mtspr SPRN_IBAT1U,r9 ! mtspr SPRN_IBAT1L,r10 isync blr --- 1136,1149 ---- ori r11,r11,4 /* set up BAT registers for 601 */ li r8,0x7f /* valid, block length = 8MB */ mtspr SPRN_IBAT0U,r11 /* N.B. 601 has valid bit in */ mtspr SPRN_IBAT0L,r8 /* lower BAT register */ ! addis r11,r11,0x800000@h ! addis r8,r8,0x800000@h ! mtspr SPRN_IBAT1U,r11 ! mtspr SPRN_IBAT1L,r8 ! addis r11,r11,0x800000@h ! addis r8,r8,0x800000@h ! mtspr SPRN_IBAT2U,r11 ! mtspr SPRN_IBAT2L,r8 isync blr Index: cputable.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/kernel/cputable.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** cputable.c 25 Oct 2009 18:53:45 -0000 1.11 --- cputable.c 25 Oct 2009 18:56:55 -0000 1.12 *************** *** 428,432 **** .cpu_features = CPU_FTRS_POWER7, .cpu_user_features = COMMON_USER_POWER7, ! .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 128, .dcache_bsize = 128, --- 428,433 ---- .cpu_features = CPU_FTRS_POWER7, .cpu_user_features = COMMON_USER_POWER7, ! .mmu_features = MMU_FTR_HPTE_TABLE | ! MMU_FTR_TLBIE_206, .icache_bsize = 128, .dcache_bsize = 128, *************** *** 442,446 **** .cpu_features = CPU_FTRS_POWER7, .cpu_user_features = COMMON_USER_POWER7, ! .mmu_features = MMU_FTR_HPTE_TABLE, .icache_bsize = 128, .dcache_bsize = 128, --- 443,448 ---- .cpu_features = CPU_FTRS_POWER7, .cpu_user_features = COMMON_USER_POWER7, ! .mmu_features = MMU_FTR_HPTE_TABLE | ! MMU_FTR_TLBIE_206, .icache_bsize = 128, .dcache_bsize = 128, |
From: Albert H. <he...@us...> - 2009-10-25 18:54:02
|
Update of /cvsroot/gc-linux/linux/drivers/video In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31851/drivers/video Modified Files: Kconfig Makefile Log Message: Rewind to v2.6.30. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/Makefile,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** Makefile 25 Oct 2009 18:50:27 -0000 1.33 --- Makefile 25 Oct 2009 18:53:45 -0000 1.34 *************** *** 126,130 **** obj-$(CONFIG_FB_CARMINE) += carminefb.o obj-$(CONFIG_FB_MB862XX) += mb862xx/ - obj-$(CONFIG_FB_GAMECUBE) += gcnfb.o # Platform or fallback drivers go here --- 126,129 ---- Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/Kconfig,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** Kconfig 25 Oct 2009 18:50:27 -0000 1.37 --- Kconfig 25 Oct 2009 18:53:45 -0000 1.38 *************** *** 1664,1686 **** endchoice - config FB_GAMECUBE - bool "Nintendo GameCube/Wii frame buffer" - depends on FB && GAMECUBE_COMMON - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT - help - This is the frame buffer device driver for the Nintendo GameCube. - - config WII_AVE_RVL - bool "Nintendo Wii audio/video encoder support" - depends on FB_GAMECUBE && WII - select I2C_GPIO - select I2C - default y - help - Say Y here to support the audio/video encoder found in the - Nintendo Wii video game console. - config FB_AU1100 bool "Au1100 LCD Driver" --- 1664,1667 ---- |
From: Albert H. <he...@us...> - 2009-10-25 18:54:00
|
Update of /cvsroot/gc-linux/linux/drivers/serial In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31851/drivers/serial Modified Files: Kconfig Makefile Log Message: Rewind to v2.6.30. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/serial/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile 25 Oct 2009 18:50:27 -0000 1.9 --- Makefile 25 Oct 2009 18:53:45 -0000 1.10 *************** *** 78,80 **** obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o obj-$(CONFIG_SERIAL_QE) += ucc_uart.o - obj-$(CONFIG_SERIAL_USBGECKO) += usbgecko.o --- 78,79 ---- Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/serial/Kconfig,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Kconfig 25 Oct 2009 18:50:27 -0000 1.10 --- Kconfig 25 Oct 2009 18:53:45 -0000 1.11 *************** *** 1434,1449 **** default 9600 if (SERIAL_SPORT_BAUD_RATE_9600) - config SERIAL_USBGECKO - bool "USBGecko adapter on the Nintendo GameCube/Wii" - depends on GAMECUBE_EXI - select SERIAL_CORE - help - This is a driver for the USB Gecko adapter for the Nintendo GameCube - and Wii gaming consoles. It provides a console and a tty interface. - - If you have an adapter like this, say Y here, otherwise say N. - - To compile this driver as a module, choose M here: the - module will be called usbgecko. - endmenu --- 1434,1436 ---- |
From: Albert H. <he...@us...> - 2009-10-25 18:54:00
|
Update of /cvsroot/gc-linux/linux/drivers/block In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31851/drivers/block Modified Files: Kconfig Makefile Log Message: Rewind to v2.6.30. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/Makefile,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** Makefile 25 Oct 2009 18:50:27 -0000 1.27 --- Makefile 25 Oct 2009 18:53:45 -0000 1.28 *************** *** 14,22 **** obj-$(CONFIG_ATARI_FLOPPY) += ataflop.o obj-$(CONFIG_AMIGA_Z2RAM) += z2ram.o - obj-$(CONFIG_GAMECUBE_SD) += gcn-sd.o - obj-$(CONFIG_GAMECUBE_ARAM) += gcn-aram.o - obj-$(CONFIG_GAMECUBE_DI) += gcn-di/ - obj-$(CONFIG_WII_MEM2) += rvl-mem2.o - obj-$(CONFIG_WII_SD) += rvl-stsd.o obj-$(CONFIG_BLK_DEV_RAM) += brd.o obj-$(CONFIG_BLK_DEV_LOOP) += loop.o --- 14,17 ---- Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/Kconfig,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** Kconfig 25 Oct 2009 18:50:27 -0000 1.39 --- Kconfig 25 Oct 2009 18:53:45 -0000 1.40 *************** *** 64,132 **** module will be called z2ram. - config GAMECUBE_SD - tristate "Nintendo GameCube/Wii MMC/SD card" - depends on GAMECUBE_EXI - help - This enables support for using SD and MMC cards through - the Nintendo SD Card Adapter (DOL-019) or compatible hardware. - - You probably want to compile FAT support, and the required - codepages, or mount will complain. See Filesystems -> DOS/FAT/NT - filesystems and Filesystems -> Native Language Support - - Say Y if you want to include this driver in the kernel. - - To compile this driver as a module, choose M here: the - module will be called gcn-sd. - - config GAMECUBE_ARAM - tristate "Nintendo GameCube Auxiliary RAM (ARAM)" - depends on GAMECUBE - help - This enables support for using the 16MB of ARAM found in the - Nintendo GameCube as a block device. - Say Y if you want to include this driver in the kernel. - - To compile this driver as a module, choose M here: the - module will be called gcn-aram. - - config GAMECUBE_DI - tristate "Nintendo GameCube Disk Interface (DI)" - depends on GAMECUBE - help - This enables support for using the DVD drive unit found - in the Nintendo GameCube. - Say Y if you want to include this driver in the kernel. - - To compile this driver as a module, choose M here: the - module will be called gcn-di. - - config WII_MEM2 - tristate "Nintendo Wii MEM2" - depends on WII - help - This enables support for using the MEM2 found in the - Nintendo Wii as a block device. - Say Y if you want to include this driver in the kernel. - - To compile this driver as a module, choose M here: the - module will be called rvl-mem2. - - config WII_SD - tristate "Nintendo Wii front slot MMC/SD" - depends on STARLET_IOS - help - This enables support for MMC/SD cards using the front SD card - slot of the Nintendo Wii. - - You probably want to compile FAT support, and the required - codepages, or mount will complain. See Filesystems -> DOS/FAT/NT - filesystems and Filesystems -> Native Language Support - - Say Y if you want to include this driver in the kernel. - - To compile this driver as a module, choose M here: the - module will be called rvl-stsd. - config BLK_DEV_XD tristate "XT hard disk support" --- 64,67 ---- |
From: Albert H. <he...@us...> - 2009-10-25 18:53:59
|
Update of /cvsroot/gc-linux/linux/drivers In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31851/drivers Modified Files: Kconfig Makefile Log Message: Rewind to v2.6.30. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/Makefile,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** Makefile 25 Oct 2009 18:50:27 -0000 1.31 --- Makefile 25 Oct 2009 18:53:45 -0000 1.32 *************** *** 103,108 **** obj-$(CONFIG_HID) += hid/ obj-$(CONFIG_PPC_PS3) += ps3/ - obj-$(CONFIG_GAMECUBE_EXI) += exi/ - obj-$(CONFIG_GAMECUBE_SI) += input/si/ obj-$(CONFIG_OF) += of/ obj-$(CONFIG_SSB) += ssb/ --- 103,106 ---- Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/Kconfig,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Kconfig 25 Oct 2009 18:50:27 -0000 1.7 --- Kconfig 25 Oct 2009 18:53:45 -0000 1.8 *************** *** 51,56 **** source "drivers/i2c/Kconfig" - source "drivers/exi/Kconfig" - source "drivers/spi/Kconfig" --- 51,54 ---- |
From: Albert H. <he...@us...> - 2009-10-25 18:53:59
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/platforms/embedded6xx In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31851/arch/powerpc/platforms/embedded6xx Modified Files: Kconfig Makefile Log Message: Rewind to v2.6.30. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/platforms/embedded6xx/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile 25 Oct 2009 18:50:27 -0000 1.10 --- Makefile 25 Oct 2009 18:53:45 -0000 1.11 *************** *** 8,20 **** obj-$(CONFIG_PPC_PRPMC2800) += prpmc2800.o obj-$(CONFIG_PPC_C2K) += c2k.o - obj-$(CONFIG_GAMECUBE) += gamecube.o gamecube_dev.o - obj-$(CONFIG_WII) += wii.o wii_dev.o - obj-$(CONFIG_WII_GPIO) += starlet-gpio.o - obj-$(CONFIG_STARLET_MINI) += starlet-mipc.o - obj-$(CONFIG_STARLET_IOS) += starlet-ipc.o starlet-malloc.o \ - starlet-stm.o starlet-es.o - obj-$(CONFIG_FLIPPER_PIC) += flipper-pic.o - obj-$(CONFIG_HOLLYWOOD_PIC) += hollywood-pic.o - obj-$(CONFIG_USBGECKO_UDBG) += usbgecko_udbg.o - obj-$(CONFIG_GAMECUBE_VIDEO_UDBG) += gcnvi_udbg.o - obj-$(CONFIG_GAMECUBE_RSW) += gcn-rsw.o --- 8,9 ---- Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/platforms/embedded6xx/Kconfig,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Kconfig 25 Oct 2009 18:50:27 -0000 1.10 --- Kconfig 25 Oct 2009 18:53:45 -0000 1.11 *************** *** 91,198 **** bool "Enable MPC10x store gathering" depends on MPC10X_BRIDGE - - config GAMECUBE - bool "Nintendo-GameCube" - depends on EMBEDDED6xx - select GAMECUBE_COMMON - help - Select GAMECUBE if configuring for the Nintendo GameCube. - More information at: <http://gc-linux.sourceforge.net/> - - config WII - bool "Nintendo-Wii" - depends on EMBEDDED6xx - select GAMECUBE_COMMON - select PPC_LIB_RHEAP if STARLET_IOS - select USB_ARCH_HAS_EHCI if STARLET_MINI - select USB_ARCH_HAS_OHCI if STARLET_MINI - select HAVE_GENERIC_DMA_COHERENT - help - Select WII if configuring for the Nintendo Wii. - More information at: <http://gc-linux.sourceforge.net/> - - config STARLET_IOS - bool "Nintendo Wii Starlet IOS support" - depends on WII - default y - - config STARLET_MINI - bool "Team Twiizers 'mini' firmware support" - depends on WII && EXPERIMENTAL - default y - - config FLIPPER_PIC - bool - depends on GAMECUBE_COMMON - default y - - config HOLLYWOOD_PIC - bool - depends on STARLET_MINI - default y - - config GAMECUBE_COMMON - bool - select NOT_COHERENT_CACHE - select FLIPPER_PIC - default n - - config GAMECUBE_UDBG - bool "Nintendo GameCube/Wii udbg support" - depends on GAMECUBE_COMMON - default n - help - If you say yes to this option, you will be able to choose between - several udbg drivers available for the Nintendo GameCube/Wii. - - If in doubt, say N here. - - choice - prompt "Nintendo GameCube/Wii udbg drivers" - depends on GAMECUBE_UDBG - - config USBGECKO_UDBG - bool "USB Gecko udbg console for the Nintendo GameCube/Wii" - help - If you say yes to this option, support will be included for the - USB Gecko adapter as an udbg console. - The USB Gecko is a EXI to USB Serial converter that can be plugged - into a memcard slot in the Nintendo GameCube/Wii. - - This driver bypasses the EXI layer completely. - - If in doubt, say N here. - - config GAMECUBE_VIDEO_UDBG - bool "Nintendo GameCube/Wii framebuffer udbg console" - select FONTS - select FONT_8x16 - help - If you say yes to this option, support will be included for a - framebuffer based udbg console for the Nintendo GameCube/Wii. - - If in doubt, say N here. - - endchoice - - config GAMECUBE_RSW - bool "Nintendo GameCube/Wii reset switch/button" - depends on GAMECUBE_COMMON - default y - help - If you say yes to this option, support will be included for the - reset switch/button of the Nintendo GameCube/Wii. - - If in doubt, say Y here. - - config WII_GPIO - bool "Nintendo Wii GPIO support" - depends on GPIOLIB - default y - help - If you say yes to this option, support will be included for the - Nintendo Wii GPIO lines that control, for example, the sensor - bar IR leds, the front led, or the eject switch of the disk unit. - - If in doubt, say Y here. - --- 91,92 ---- |
From: Albert H. <he...@us...> - 2009-10-25 18:53:59
|
Update of /cvsroot/gc-linux/linux/include/linux In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31851/include/linux Modified Files: fb.h gpio.h i2c-gpio.h kexec.h Log Message: Rewind to v2.6.30. Index: i2c-gpio.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/linux/i2c-gpio.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** i2c-gpio.h 25 Oct 2009 18:50:28 -0000 1.4 --- i2c-gpio.h 25 Oct 2009 18:53:46 -0000 1.5 *************** *** 34,38 **** unsigned int scl_is_open_drain:1; unsigned int scl_is_output_only:1; - unsigned int sda_enforce_dir:1; }; --- 34,37 ---- Index: kexec.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/linux/kexec.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** kexec.h 25 Oct 2009 18:50:28 -0000 1.2 --- kexec.h 25 Oct 2009 18:53:46 -0000 1.3 *************** *** 53,61 **** typedef unsigned long kimage_entry_t; ! #define IND_DESTINATION 0x01 ! #define IND_INDIRECTION 0x02 ! #define IND_DONE 0x04 ! #define IND_SOURCE 0x08 ! #define IND_NOALLOC 0x10 /* special case for memory preserving code */ #define KEXEC_SEGMENT_MAX 16 --- 53,60 ---- typedef unsigned long kimage_entry_t; ! #define IND_DESTINATION 0x1 ! #define IND_INDIRECTION 0x2 ! #define IND_DONE 0x4 ! #define IND_SOURCE 0x8 #define KEXEC_SEGMENT_MAX 16 *************** *** 127,132 **** extern struct page *kimage_alloc_control_pages(struct kimage *image, unsigned int order); - extern int kimage_add_preserved_region(struct kimage *image, unsigned long to, - unsigned long from, int length); extern void crash_kexec(struct pt_regs *); int kexec_should_crash(struct task_struct *); --- 126,129 ---- Index: fb.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/linux/fb.h,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** fb.h 25 Oct 2009 18:50:28 -0000 1.35 --- fb.h 25 Oct 2009 18:53:46 -0000 1.36 *************** *** 39,47 **** #define FBIOGET_DISPINFO 0x4618 - #define FBIOWAITRETRACE 0x4619 - #define FBIOWAITPEFINISH 0x4620 - #define FBIOVIRTTOPHYS 0x4621 - #define FBIOFLIP 0x4622 - #define FBIOFLIPHACK 0x4623 /* libsdl */ #define FB_TYPE_PACKED_PIXELS 0 /* Packed Pixels */ --- 39,42 ---- *************** *** 907,917 **** #define fb_writeb __raw_writeb #define fb_writew __raw_writew ! #ifndef CONFIG_FB_GAMECUBE /* XXX Why? O' why? */ ! # define fb_writel __raw_writel ! #else ! extern unsigned int vifb_writel(unsigned int, void *); ! # define fb_writel(b, addr) vifb_writel(b, addr) ! # define fb_writel_real(b, addr) (*(/*volatile*/ u32 __iomem *)(addr) = (b)) ! #endif #define fb_writeq __raw_writeq #define fb_memset memset_io --- 902,906 ---- #define fb_writeb __raw_writeb #define fb_writew __raw_writew ! #define fb_writel __raw_writel #define fb_writeq __raw_writeq #define fb_memset memset_io Index: gpio.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/linux/gpio.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** gpio.h 25 Oct 2009 18:50:28 -0000 1.4 --- gpio.h 25 Oct 2009 18:53:46 -0000 1.5 *************** *** 50,58 **** } - static inline int gpio_direction_is_output(unsigned gpio) - { - return -EINVAL; - } - static inline int gpio_get_value(unsigned gpio) { --- 50,53 ---- |
From: Albert H. <he...@us...> - 2009-10-25 18:53:59
|
Update of /cvsroot/gc-linux/linux/drivers/rtc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31851/drivers/rtc Modified Files: Kconfig Makefile Log Message: Rewind to v2.6.30. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/rtc/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile 25 Oct 2009 18:50:27 -0000 1.9 --- Makefile 25 Oct 2009 18:53:45 -0000 1.10 *************** *** 40,44 **** obj-$(CONFIG_RTC_DRV_EP93XX) += rtc-ep93xx.o obj-$(CONFIG_RTC_DRV_FM3130) += rtc-fm3130.o - obj-$(CONFIG_RTC_DRV_GCN) += rtc-gcn.o obj-$(CONFIG_RTC_DRV_ISL1208) += rtc-isl1208.o obj-$(CONFIG_RTC_DRV_M41T80) += rtc-m41t80.o --- 40,43 ---- Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/rtc/Kconfig,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Kconfig 25 Oct 2009 18:50:27 -0000 1.9 --- Kconfig 25 Oct 2009 18:53:45 -0000 1.10 *************** *** 527,540 **** NXP PCF50633 used in embedded systems. - config RTC_DRV_GCN - bool "Nintendo GameCube/Wii Real Time Clock and SRAM" - depends on GAMECUBE_EXI - default y - help - If you say yes to this option, support will be included for the - Real Time Clock and SRAM of the Nintendo GameCube/Wii. - - If in doubt, say Y here. - comment "on-CPU RTC drivers" --- 527,530 ---- |