Menu
▾
▴
gc-linux-cvs — CVS commit logs.
This list is closed, nobody may subscribe to it.
| 2004 |
Jan
(53) |
Feb
(78) |
Mar
(34) |
Apr
(26) |
May
(25) |
Jun
(34) |
Jul
(16) |
Aug
(16) |
Sep
(2) |
Oct
(58) |
Nov
(13) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(62) |
Feb
(4) |
Mar
(40) |
Apr
(9) |
May
(13) |
Jun
(26) |
Jul
(32) |
Aug
(24) |
Sep
(18) |
Oct
(18) |
Nov
(14) |
Dec
|
| 2006 |
Jan
(15) |
Feb
(2) |
Mar
(23) |
Apr
(2) |
May
(2) |
Jun
(13) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2007 |
Jan
(1) |
Feb
(45) |
Mar
|
Apr
(13) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
(31) |
Dec
(5) |
| 2008 |
Jan
(6) |
Feb
(34) |
Mar
(113) |
Apr
(40) |
May
(19) |
Jun
(5) |
Jul
(41) |
Aug
(13) |
Sep
(53) |
Oct
(4) |
Nov
(53) |
Dec
|
| 2009 |
Jan
(1) |
Feb
(29) |
Mar
(66) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(163) |
Nov
|
Dec
(91) |
|
From: Albert H. <he...@us...> - 2007-11-19 17:53:27
|
Update of /cvsroot/gc-linux/linux/sound/ppc In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4323/sound/ppc Modified Files: Kconfig Log Message: Make Nintendo GameCube AI and MIC drivers depend on ALSA PowerPC devices instead of ALSA PowerMac devices. Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/sound/ppc/Kconfig,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- Kconfig 16 Nov 2007 23:26:09 -0000 1.13 +++ Kconfig 19 Nov 2007 17:53:30 -0000 1.14 @@ -32,26 +32,6 @@ Note that you can turn on/off DRC manually even without this option. -config SND_GAMECUBE - tristate "Nintendo GameCube (Flipper)" - depends on SND && GAMECUBE - help - Say Y here to add audio support for the "Flipper" Graphics - and Sound processor as found in the GameCube from Nintendo. - - To compile this driver as a module, choose M here: the module - will be called snd-gcn. - -config SND_GAMECUBE_MIC - tristate "Nintendo GameCube Microphone (DOL-022)" - depends on SND && GAMECUBE && GAMECUBE_EXI -# default n - help - If you say yes to this option, support will be included for the - Nintendo GameCube Microphone (DOL-022). - - If in doubt, say N here. - endmenu menu "ALSA PowerPC devices" @@ -72,4 +52,24 @@ int "Startup delay time in ms" depends on SND_PS3 default "2000" + +config SND_GAMECUBE + tristate "Nintendo GameCube (Flipper)" + depends on SND && GAMECUBE + help + Say Y here to add audio support for the "Flipper" Graphics + and Sound processor as found in the GameCube from Nintendo. + + To compile this driver as a module, choose M here: the module + will be called snd-gcn. + +config SND_GAMECUBE_MIC + tristate "Nintendo GameCube Microphone (DOL-022)" + depends on SND && GAMECUBE && GAMECUBE_EXI && EXPERIMENTAL + help + If you say yes to this option, support will be included for the + Nintendo GameCube Microphone (DOL-022). + + If in doubt, say N here. + endmenu |
|
From: Albert H. <he...@us...> - 2007-11-19 17:46:52
|
Update of /cvsroot/gc-linux/linux/drivers/block In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv2004/drivers/block Modified Files: gcn-aram.c gcn-sd.c Log Message: Avoid use of deprecated typedef. Index: gcn-aram.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-aram.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- gcn-aram.c 14 Nov 2007 23:08:48 -0000 1.14 +++ gcn-aram.c 19 Nov 2007 17:46:53 -0000 1.15 @@ -224,7 +224,7 @@ /* * Performs block layer requests. */ -static void aram_do_request(request_queue_t *q) +static void aram_do_request(struct request_queue *q) { struct aram_device *adev = q->queuedata; struct request *req; Index: gcn-sd.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-sd.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- gcn-sd.c 14 Nov 2007 23:08:48 -0000 1.9 +++ gcn-sd.c 19 Nov 2007 17:46:53 -0000 1.10 @@ -1243,7 +1243,7 @@ static void sd_end_request(struct request *req, unsigned long nr_sectors) { int uptodate = (req->errors == 0) ? 1 : 0; - request_queue_t *q = req->q; + struct request_queue *q = req->q; unsigned long flags; spin_lock_irqsave(q->queue_lock, flags); @@ -1256,7 +1256,7 @@ /* * Processes a block layer request. */ -static void sd_do_request(request_queue_t * q) +static void sd_do_request(struct request_queue * q) { struct sd_host *host = q->queuedata; struct request *req; |
|
From: Albert H. <he...@us...> - 2007-11-16 23:26:36
|
Update of /cvsroot/gc-linux/linux/drivers/block/gcn-di In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29560/drivers/block/gcn-di Modified Files: gcn-di.c Log Message: Merged 2.6.23. Index: gcn-di.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-di/gcn-di.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- gcn-di.c 14 Nov 2007 23:08:48 -0000 1.20 +++ gcn-di.c 16 Nov 2007 23:26:07 -0000 1.21 @@ -1867,7 +1867,7 @@ /* * Processes a block layer request. */ -static void di_do_request(request_queue_t *q) +static void di_do_request(struct request_queue *q) { struct di_device *ddev = q->queuedata; struct di_command *cmd = &ddev->req_cmd; |
|
From: Albert H. <he...@us...> - 2007-11-16 23:26:36
|
Update of /cvsroot/gc-linux/linux/arch/ppc/platforms In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29560/arch/ppc/platforms Modified Files: gamecube.c Log Message: Merged 2.6.23. Index: gamecube.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gamecube.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- gamecube.c 14 Nov 2007 23:08:47 -0000 1.39 +++ gamecube.c 16 Nov 2007 23:26:06 -0000 1.40 @@ -56,14 +56,14 @@ #define AUDIO_DMA_LENGTH ((void __iomem *)0xCC005036) #define AI_DCL_PLAY (1<<15) -static unsigned long gamecube_find_end_of_memory(void) +static unsigned long __init gamecube_find_end_of_memory(void) { return GCN_MEM_SIZE; } -static void gamecube_map_io(void) +static void __init gamecube_map_io(void) { -#ifdef CONFIG_GAMECUBE_DEBUG_CONSOLE +#ifdef CONFIG_GAMECUBE_CONSOLE io_block_mapping(0xd0000000, 0, 0x02000000, _PAGE_IO); #endif @@ -71,6 +71,35 @@ io_block_mapping(0xcc000000, 0x0c000000, 0x00100000, _PAGE_IO); } +static void __init gamecube_calibrate_decr(void) +{ + int freq, divisor; + freq = 162000000; + divisor = 4; + tb_ticks_per_jiffy = freq / HZ / divisor; + tb_to_us = mulhwu_scale_factor(freq/divisor, 1000000); +} + +static void __init gamecube_setup_arch(void) +{ +#ifdef CONFIG_GAMECUBE_CONSOLE + gcn_con_init(); +#endif + + /* On my North American Launch cube booted + * via PSO, I get a flooding of ARAM interrupts and audio MADNESS + * when I first boot. By clearing the AI interrupts and stopping + * audio, it goes away and I can boot normally. + */ + + /* ack and clear the interrupts for the AI line */ + out_be16(CSR_REG, + DSP_CSR_PIINT|DSP_CSR_AIDINT|DSP_CSR_ARINT|DSP_CSR_DSPINT); + /* stop any audio */ + out_be16(AUDIO_DMA_LENGTH, + in_be16(AUDIO_DMA_LENGTH) & ~AI_DCL_PLAY); +} + static void gamecube_restart(char *cmd) { local_irq_disable(); @@ -88,15 +117,6 @@ gamecube_restart(NULL); } -static void gamecube_calibrate_decr(void) -{ - int freq, divisor; - freq = 162000000; - divisor = 4; - tb_ticks_per_jiffy = freq / HZ / divisor; - tb_to_us = mulhwu_scale_factor(freq/divisor, 1000000); -} - static int gamecube_get_irq(void) { int irq; @@ -142,7 +162,7 @@ .end = flipper_end_irq, }; -static void gamecube_init_IRQ(void) +static void __init gamecube_init_IRQ(void) { int i; @@ -168,26 +188,6 @@ return 0; } -static void gamecube_setup_arch(void) -{ -#ifdef CONFIG_GAMECUBE_CONSOLE - gcn_con_init(); -#endif - - /* On my North American Launch cube booted - * via PSO, I get a flooding of ARAM interrupts and audio MADNESS - * when I first boot. By clearing the AI interrupts and stopping - * audio, it goes away and I can boot normally. - */ - - /* ack and clear the interrupts for the AI line */ - out_be16(CSR_REG, - DSP_CSR_PIINT|DSP_CSR_AIDINT|DSP_CSR_ARINT|DSP_CSR_DSPINT); - /* stop any audio */ - out_be16(AUDIO_DMA_LENGTH, - in_be16(AUDIO_DMA_LENGTH) & ~AI_DCL_PLAY); -} - #ifdef CONFIG_KEXEC static void gamecube_shutdown(void) { @@ -214,21 +214,20 @@ } #endif + ppc_md.find_end_of_memory = gamecube_find_end_of_memory; + ppc_md.setup_io_mappings = gamecube_map_io; + ppc_md.calibrate_decr = gamecube_calibrate_decr; ppc_md.setup_arch = gamecube_setup_arch; + ppc_md.show_cpuinfo = gamecube_show_cpuinfo; - ppc_md.init_IRQ = gamecube_init_IRQ; ppc_md.get_irq = gamecube_get_irq; + ppc_md.init_IRQ = gamecube_init_IRQ; ppc_md.restart = gamecube_restart; ppc_md.power_off = gamecube_power_off; ppc_md.halt = gamecube_halt; - ppc_md.calibrate_decr = gamecube_calibrate_decr; - - ppc_md.find_end_of_memory = gamecube_find_end_of_memory; - ppc_md.setup_io_mappings = gamecube_map_io; - #ifdef CONFIG_KEXEC ppc_md.machine_shutdown = gamecube_shutdown; ppc_md.machine_kexec_prepare = gamecube_kexec_prepare; |
|
From: Albert H. <he...@us...> - 2007-11-16 23:26:36
|
Update of /cvsroot/gc-linux/linux/drivers/block In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29560/drivers/block Modified Files: Kconfig Makefile Log Message: Merged 2.6.23. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/Makefile,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- Makefile 19 Feb 2007 23:06:51 -0000 1.15 +++ Makefile 16 Nov 2007 23:26:07 -0000 1.16 @@ -8,9 +8,8 @@ obj-$(CONFIG_MAC_FLOPPY) += swim3.o obj-$(CONFIG_BLK_DEV_FD) += floppy.o obj-$(CONFIG_AMIGA_FLOPPY) += amiflop.o +obj-$(CONFIG_PS3_DISK) += ps3disk.o obj-$(CONFIG_ATARI_FLOPPY) += ataflop.o -obj-$(CONFIG_ATARI_ACSI) += acsi.o -obj-$(CONFIG_ATARI_SLM) += acsi_slm.o obj-$(CONFIG_AMIGA_Z2RAM) += z2ram.o obj-$(CONFIG_GAMECUBE_DI) += gcn-di/ obj-$(CONFIG_GAMECUBE_DVD) += gcn-dvd/ @@ -24,7 +23,9 @@ obj-$(CONFIG_BLK_CPQ_DA) += cpqarray.o obj-$(CONFIG_BLK_CPQ_CISS_DA) += cciss.o obj-$(CONFIG_BLK_DEV_DAC960) += DAC960.o +obj-$(CONFIG_XILINX_SYSACE) += xsysace.o obj-$(CONFIG_CDROM_PKTCDVD) += pktcdvd.o +obj-$(CONFIG_SUNVDC) += sunvdc.o obj-$(CONFIG_BLK_DEV_UMEM) += umem.o obj-$(CONFIG_BLK_DEV_NBD) += nbd.o @@ -34,3 +35,5 @@ obj-$(CONFIG_BLK_DEV_SX8) += sx8.o obj-$(CONFIG_BLK_DEV_UB) += ub.o +obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o +obj-$(CONFIG_LGUEST_BLOCK) += lguest_blk.o Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/Kconfig,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- Kconfig 14 Nov 2007 23:08:47 -0000 1.27 +++ Kconfig 16 Nov 2007 23:26:07 -0000 1.28 @@ -2,9 +2,18 @@ # Block device driver configuration # -if BLOCK +menuconfig BLK_DEV + bool "Block devices" + depends on BLOCK + default y + ---help--- + Say Y here to get to see options for various different block device + drivers. This option alone does not add any kernel code. -menu "Block devices" + If you say N, all options in this submenu will be skipped and disabled; + only do this if you know what you are doing. + +if BLK_DEV config BLK_DEV_FD tristate "Normal floppy disk support" @@ -91,7 +100,7 @@ config GAMECUBE_MEMCARD tristate "Nintendo GameCube memory card (EXPERIMENTAL)" - depends on GAMECUBE && GAMECUBE_EXI && EXPERIMENTAL && BROKEN + depends on GAMECUBE_EXI && EXPERIMENTAL && BROKEN help This enables support for using memory cards compatible with the Nintendo GameCube. @@ -102,7 +111,7 @@ config GAMECUBE_SD tristate "Nintendo GameCube SD and MMC memory card (EXPERIMENTAL)" - depends on GAMECUBE && GAMECUBE_EXI && EXPERIMENTAL + depends on GAMECUBE_EXI && EXPERIMENTAL help This enables support for using SD and MMC cards through the Nintendo SD Card Adapter (DOL-019) or compatible hardware. @@ -117,52 +126,11 @@ To compile this driver as a module, choose M here: the module will be called gcn-sd. - -config ATARI_ACSI - tristate "Atari ACSI support" - depends on ATARI && BROKEN - ---help--- - This enables support for the Atari ACSI interface. The driver - supports hard disks and CD-ROMs, which have 512-byte sectors, or can - be switched to that mode. Due to the ACSI command format, only disks - up to 1 GB are supported. Special support for certain ACSI to SCSI - adapters, which could relax that, isn't included yet. The ACSI - driver is also the basis for certain other drivers for devices - attached to the ACSI bus: Atari SLM laser printer, BioNet-100 - Ethernet, and PAMsNet Ethernet. If you want to use one of these - devices, you need ACSI support, too. - - To compile this driver as a module, choose M here: the - module will be called acsi. - -comment "Some devices (e.g. CD jukebox) support multiple LUNs" - depends on ATARI && ATARI_ACSI - -config ACSI_MULTI_LUN - bool "Probe all LUNs on each ACSI device" - depends on ATARI_ACSI - help - If you have a ACSI device that supports more than one LUN (Logical - Unit Number), e.g. a CD jukebox, you should say Y here so that all - will be found by the ACSI driver. An ACSI device with multiple LUNs - acts logically like multiple ACSI devices. The vast majority of ACSI - devices have only one LUN, and so most people can say N here and - should in fact do so, because it is safer. - -config ATARI_SLM - tristate "Atari SLM laser printer support" - depends on ATARI && ATARI_ACSI!=n - help - If you have an Atari SLM laser printer, say Y to include support for - it in the kernel. Otherwise, say N. This driver is also available as - a module ( = code which can be inserted in and removed from the - running kernel whenever you want). The module will be called - acsi_slm. Be warned: the driver needs much ST-RAM and can cause - problems due to that fact! config BLK_DEV_XD tristate "XT hard disk support" depends on ISA && ISA_DMA_API + select CHECK_SIGNATURE help Very old 8 bit hard disk controllers used in the IBM XT computer will be supported if you say Y here. @@ -203,7 +171,7 @@ config BLK_CPQ_DA tristate "Compaq SMART2 support" - depends on PCI + depends on PCI && VIRT_TO_BUS help This is the driver for Compaq Smart Array controllers. Everyone using these boards should say Y here. See the file @@ -513,8 +481,28 @@ This driver provides Support for ATA over Ethernet block devices like the Coraid EtherDrive (R) Storage Blade. +config SUNVDC + tristate "Sun Virtual Disk Client support" + depends on SUN_LDOMS + help + Support for virtual disk devices as a client under Sun + Logical Domains. + source "drivers/s390/block/Kconfig" -endmenu +config XILINX_SYSACE + tristate "Xilinx SystemACE support" + depends on 4xx + help + Include support for the Xilinx SystemACE CompactFlash interface -endif +config XEN_BLKDEV_FRONTEND + tristate "Xen virtual block device support" + depends on XEN + default y + help + This driver implements the front-end of the Xen virtual + block device driver. It communicates with a back-end driver + in another domain which drives the actual block device. + +endif # BLK_DEV |
|
From: Albert H. <he...@us...> - 2007-11-16 23:26:36
|
Update of /cvsroot/gc-linux/linux/drivers In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29560/drivers Modified Files: Makefile Log Message: Merged 2.6.23. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/Makefile,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- Makefile 14 Nov 2007 23:08:47 -0000 1.21 +++ Makefile 16 Nov 2007 23:26:07 -0000 1.22 @@ -15,6 +15,8 @@ obj-$(CONFIG_PNP) += pnp/ obj-$(CONFIG_ARM_AMBA) += amba/ +obj-$(CONFIG_XEN) += xen/ + # char/ comes before serial/ etc so that the VT console is the boot-time # default. obj-y += char/ @@ -38,6 +40,7 @@ obj-$(CONFIG_FUSION) += message/ obj-$(CONFIG_FIREWIRE) += firewire/ obj-$(CONFIG_IEEE1394) += ieee1394/ +obj-$(CONFIG_UIO) += uio/ obj-y += cdrom/ obj-y += auxdisplay/ obj-$(CONFIG_MTD) += mtd/ @@ -61,7 +64,9 @@ obj-$(CONFIG_RTC_LIB) += rtc/ obj-y += i2c/ obj-$(CONFIG_W1) += w1/ +obj-$(CONFIG_POWER_SUPPLY) += power/ obj-$(CONFIG_HWMON) += hwmon/ +obj-$(CONFIG_WATCHDOG) += char/watchdog/ obj-$(CONFIG_PHONE) += telephony/ obj-$(CONFIG_MD) += md/ obj-$(CONFIG_BT) += bluetooth/ @@ -69,6 +74,7 @@ obj-$(CONFIG_EDAC) += edac/ obj-$(CONFIG_MCA) += mca/ obj-$(CONFIG_EISA) += eisa/ +obj-$(CONFIG_LGUEST_GUEST) += lguest/ obj-$(CONFIG_CPU_FREQ) += cpufreq/ obj-$(CONFIG_MMC) += mmc/ obj-$(CONFIG_NEW_LEDS) += leds/ @@ -83,3 +89,4 @@ obj-$(CONFIG_PPC_PS3) += ps3/ obj-$(CONFIG_GAMECUBE_EXI) += exi/ obj-$(CONFIG_GAMECUBE_SI) += input/si/ +obj-$(CONFIG_OF) += of/ |
|
From: Albert H. <he...@us...> - 2007-11-16 23:26:34
|
Update of /cvsroot/gc-linux/linux/arch/ppc/configs In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29560/arch/ppc/configs Modified Files: gamecube_defconfig Log Message: Merged 2.6.23. Index: gamecube_defconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/configs/gamecube_defconfig,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- gamecube_defconfig 30 Apr 2007 17:06:11 -0000 1.43 +++ gamecube_defconfig 16 Nov 2007 23:26:06 -0000 1.44 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21 -# Mon Apr 30 18:06:31 2007 +# Linux kernel version: 2.6.23 +# Fri Nov 16 23:41:24 2007 # CONFIG_MMU=y CONFIG_GENERIC_HARDIRQS=y @@ -20,27 +20,23 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # -# Code maturity level options +# General setup # CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 - -# -# General setup -# CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y -# CONFIG_IPC_NS is not set CONFIG_SYSVIPC_SYSCTL=y # CONFIG_POSIX_MQUEUE is not set # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_TASKSTATS is not set -# CONFIG_UTS_NS is not set +# CONFIG_USER_NS is not set # CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=14 CONFIG_SYSFS_DEPRECATED=y # CONFIG_RELAY is not set CONFIG_BLK_DEV_INITRD=y @@ -57,32 +53,29 @@ CONFIG_ELF_CORE=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y +CONFIG_ANON_INODES=y CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_EVENTFD=y CONFIG_SHMEM=y -CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 -# CONFIG_SLOB is not set - -# -# Loadable module support -# CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_KMOD=y - -# -# Block layer -# CONFIG_BLOCK=y CONFIG_LBD=y # CONFIG_BLK_DEV_IO_TRACE is not set # CONFIG_LSF is not set +# CONFIG_BLK_DEV_BSG is not set # # IO Schedulers @@ -172,11 +165,15 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_RESOURCES_64BIT is not set CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y CONFIG_BINFMT_ELF=y CONFIG_BINFMT_MISC=m CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="root=/dev/ram0 video=gamecubefb ip=192.168.000.047" # CONFIG_PM is not set +CONFIG_SUSPEND_UP_POSSIBLE=y +CONFIG_HIBERNATION_UP_POSSIBLE=y CONFIG_SECCOMP=y CONFIG_ISA_DMA_API=y @@ -187,6 +184,8 @@ CONFIG_GENERIC_ISA_DMA=y # CONFIG_PPC_I8259 is not set # CONFIG_PCI_DOMAINS is not set +# CONFIG_PCI_SYSCALL is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set # # PCCARD (PCMCIA/CardBus) support @@ -223,7 +222,6 @@ # # Networking options # -# CONFIG_NETDEBUG is not set # CONFIG_PACKET is not set CONFIG_UNIX=y # CONFIG_NET_KEY is not set @@ -258,20 +256,8 @@ # CONFIG_INET6_TUNNEL is not set # CONFIG_NETWORK_SECMARK is not set # CONFIG_NETFILTER is not set - -# -# DCCP Configuration (EXPERIMENTAL) -# # CONFIG_IP_DCCP is not set - -# -# SCTP Configuration (EXPERIMENTAL) -# # CONFIG_IP_SCTP is not set - -# -# TIPC Configuration (EXPERIMENTAL) -# # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set @@ -297,7 +283,17 @@ # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set # CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set + +# +# Wireless +# +# CONFIG_CFG80211 is not set +# CONFIG_WIRELESS_EXT is not set +# CONFIG_MAC80211 is not set # CONFIG_IEEE80211 is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set # # Device Drivers @@ -310,30 +306,10 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_FW_LOADER is not set # CONFIG_SYS_HYPERVISOR is not set - -# -# Connector - unified userspace <-> kernelspace linker -# # CONFIG_CONNECTOR is not set - -# -# Memory Technology Devices (MTD) -# # CONFIG_MTD is not set - -# -# Parallel port support -# # CONFIG_PARPORT is not set - -# -# Plug and Play support -# -# CONFIG_PNPACPI is not set - -# -# Block devices -# +CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_FD is not set # CONFIG_GAMECUBE_DI is not set # CONFIG_GAMECUBE_DVD is not set @@ -349,16 +325,10 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set - -# -# Misc devices -# +CONFIG_MISC_DEVICES=y CONFIG_GAMECUBE_GQR=m # CONFIG_GAMECUBE_MI is not set - -# -# ATA/ATAPI/MFM/RLL support -# +# CONFIG_EEPROM_93CX6 is not set # CONFIG_IDE is not set # @@ -366,78 +336,30 @@ # # CONFIG_RAID_ATTRS is not set # CONFIG_SCSI is not set +# CONFIG_SCSI_DMA is not set # CONFIG_SCSI_NETLINK is not set - -# -# Serial ATA (prod) and Parallel ATA (experimental) drivers -# # CONFIG_ATA is not set - -# -# Multi-device support (RAID and LVM) -# # CONFIG_MD is not set - -# -# Fusion MPT device support -# -# CONFIG_FUSION is not set - -# -# IEEE 1394 (FireWire) support -# - -# -# I2O device support -# - -# -# Macintosh device drivers -# -# CONFIG_MAC_EMUMOUSEBTN is not set -# CONFIG_WINDFARM is not set - -# -# Network device support -# +# CONFIG_MACINTOSH_DRIVERS is not set CONFIG_NETDEVICES=y +# CONFIG_NETDEVICES_MULTIQUEUE is not set # CONFIG_DUMMY is not set # CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set - -# -# PHY device support -# # CONFIG_PHYLIB is not set - -# -# Ethernet (10 or 100Mbit) -# CONFIG_NET_ETHERNET=y # CONFIG_MII is not set CONFIG_GAMECUBE_BBA=y +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set # -# Ethernet (1000 Mbit) -# - -# -# Ethernet (10000 Mbit) -# - -# -# Token Ring devices -# - -# -# Wireless LAN (non-hamradio) -# -# CONFIG_NET_RADIO is not set - -# -# Wan interfaces +# Wireless LAN # +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set # CONFIG_WAN is not set # CONFIG_PPP is not set # CONFIG_SLIP is not set @@ -445,15 +367,7 @@ # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set - -# -# ISDN subsystem -# # CONFIG_ISDN is not set - -# -# Telephony Support -# # CONFIG_PHONE is not set # @@ -461,6 +375,7 @@ # CONFIG_INPUT=y # CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set # # Userland interfaces @@ -486,6 +401,7 @@ # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set # CONFIG_INPUT_MISC is not set @@ -517,32 +433,15 @@ CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 - -# -# IPMI -# # CONFIG_IPMI_HANDLER is not set - -# -# Watchdog Cards -# # CONFIG_WATCHDOG is not set # CONFIG_HW_RANDOM is not set CONFIG_NVRAM=y CONFIG_GEN_RTC=y # CONFIG_GEN_RTC_X is not set -# CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_RAW_DRIVER is not set - -# -# TPM devices -# # CONFIG_TCG_TPM is not set - -# -# I2C support -# # CONFIG_I2C is not set # @@ -550,21 +449,21 @@ # # CONFIG_SPI is not set # CONFIG_SPI_MASTER is not set - -# -# Dallas's 1-wire bus -# # CONFIG_W1 is not set - -# -# Hardware Monitoring support -# +# CONFIG_POWER_SUPPLY is not set CONFIG_HWMON=y # CONFIG_HWMON_VID is not set # CONFIG_SENSORS_ABITUGURU is not set +# CONFIG_SENSORS_ABITUGURU3 is not set # CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_PC87360 is not set # CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set # CONFIG_HWMON_DEBUG_CHIP is not set # @@ -576,22 +475,31 @@ # Multimedia devices # # CONFIG_VIDEO_DEV is not set +# CONFIG_DVB_CORE is not set +# CONFIG_DAB is not set # -# Digital Video Broadcasting Devices +# Graphics support # -# CONFIG_DVB is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set # -# Graphics support +# Display device support # -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set +# CONFIG_DISPLAY_SUPPORT is not set +# CONFIG_VGASTATE is not set +# CONFIG_VIDEO_OUTPUT_CONTROL is not set CONFIG_FB=y # CONFIG_FIRMWARE_EDID is not set # CONFIG_FB_DDC is not set CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_SYS_FOPS is not set +CONFIG_FB_DEFERRED_IO=y # CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set # CONFIG_FB_BACKLIGHT is not set @@ -615,14 +523,11 @@ # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set # CONFIG_FONTS is not set CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y - -# -# Logo configuration -# CONFIG_LOGO=y # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set @@ -670,66 +575,29 @@ # CONFIG_SND_GAMECUBE_MIC is not set # -# SoC audio support -# -# CONFIG_SND_SOC is not set - -# -# Open Sound System -# -# CONFIG_SOUND_PRIME is not set - -# -# HID Devices +# ALSA PowerPC devices # -CONFIG_HID=y -# CONFIG_HID_DEBUG is not set # -# USB support -# -# CONFIG_USB_ARCH_HAS_HCD is not set -# CONFIG_USB_ARCH_HAS_OHCI is not set -# CONFIG_USB_ARCH_HAS_EHCI is not set - -# -# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# System on Chip audio support # +# CONFIG_SND_SOC is not set # -# USB Gadget Support +# SoC Audio support for SuperH # -# CONFIG_USB_GADGET is not set # -# MMC/SD Card support +# Open Sound System # +# CONFIG_SOUND_PRIME is not set +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +# CONFIG_HID_DEBUG is not set +# CONFIG_USB_SUPPORT is not set # CONFIG_MMC is not set - -# -# LED devices -# # CONFIG_NEW_LEDS is not set - -# -# LED drivers -# - -# -# LED Triggers -# - -# -# InfiniBand support -# - -# -# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) -# - -# -# Real Time Clock -# +# CONFIG_EDAC is not set # CONFIG_RTC_CLASS is not set # @@ -746,12 +614,9 @@ # # -# Auxiliary Display support -# - -# -# Virtualization +# Userspace I/O # +# CONFIG_UIO is not set # # File systems @@ -834,7 +699,6 @@ # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set -# CONFIG_9P_FS is not set # # Partition Types @@ -897,11 +761,14 @@ CONFIG_BITREVERSE=y # CONFIG_CRC_CCITT is not set # CONFIG_CRC16 is not set +# CONFIG_CRC_ITU_T is not set CONFIG_CRC32=y +# CONFIG_CRC7 is not set # CONFIG_LIBCRC32C is not set CONFIG_PLIST=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y # CONFIG_PROFILING is not set # @@ -914,7 +781,6 @@ # CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_KERNEL is not set -CONFIG_LOG_BUF_SHIFT=14 CONFIG_DEBUG_BUGVERBOSE=y # @@ -922,8 +788,4 @@ # # CONFIG_KEYS is not set # CONFIG_SECURITY is not set - -# -# Cryptographic options -# # CONFIG_CRYPTO is not set |
|
From: Albert H. <he...@us...> - 2007-11-16 23:26:34
|
Update of /cvsroot/gc-linux/linux/arch/ppc In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29560/arch/ppc Modified Files: Kconfig Log Message: Merged 2.6.23. Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/Kconfig,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- Kconfig 30 Apr 2007 17:06:11 -0000 1.40 +++ Kconfig 16 Nov 2007 23:26:06 -0000 1.41 @@ -1267,8 +1267,10 @@ infrastructure code to support PCI bus devices. config PCI_DOMAINS - bool - default PCI + def_bool PCI + +config PCI_SYSCALL + def_bool PCI config MPC83xx_PCI2 bool "Support for 2nd PCI host controller" |
|
From: Albert H. <he...@us...> - 2007-11-16 23:26:13
|
Update of /cvsroot/gc-linux/linux/drivers/video In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29560/drivers/video Modified Files: Kconfig Makefile Log Message: Merged 2.6.23. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/Makefile,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- Makefile 14 Nov 2007 23:08:55 -0000 1.23 +++ Makefile 16 Nov 2007 23:26:08 -0000 1.24 @@ -103,7 +103,6 @@ obj-$(CONFIG_FB_PMAG_BA) += pmag-ba-fb.o obj-$(CONFIG_FB_PMAGB_B) += pmagb-b-fb.o obj-$(CONFIG_FB_MAXINE) += maxinefb.o -obj-$(CONFIG_FB_TX3912) += tx3912fb.o obj-$(CONFIG_FB_S1D13XXX) += s1d13xxxfb.o obj-$(CONFIG_FB_IMX) += imxfb.o obj-$(CONFIG_FB_S3C2410) += s3c2410fb.o @@ -113,10 +112,10 @@ obj-$(CONFIG_FB_PS3) += ps3fb.o obj-$(CONFIG_FB_SM501) += sm501fb.o obj-$(CONFIG_FB_XILINX) += xilinxfb.o +obj-$(CONFIG_FB_OMAP) += omap/ obj-$(CONFIG_FB_GAMECUBE) += gcnfb.o obj-$(CONFIG_FB_GAMECUBE_GX) += gcngx.o - # Platform or fallback drivers go here obj-$(CONFIG_FB_VESA) += vesafb.o obj-$(CONFIG_FB_IMAC) += imacfb.o @@ -125,3 +124,6 @@ # the test framebuffer is last obj-$(CONFIG_FB_VIRTUAL) += vfb.o + +#video output switch sysfs driver +obj-$(CONFIG_VIDEO_OUTPUT_CONTROL) += output.o Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/Kconfig,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- Kconfig 14 Nov 2007 23:08:52 -0000 1.24 +++ Kconfig 16 Nov 2007 23:26:08 -0000 1.25 @@ -12,6 +12,13 @@ tristate default n +config VIDEO_OUTPUT_CONTROL + tristate "Lowlevel video output switch controls" + default m + help + This framework adds support for low-level control of the video + output switch. + config FB tristate "Support for frame buffer devices" ---help--- @@ -812,7 +819,7 @@ config FB_EPSON1355 bool "Epson 1355 framebuffer support" - depends on (FB = y) && (SUPERH || ARCH_CEIVA) + depends on (FB = y) && ARCH_CEIVA select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT @@ -849,6 +856,16 @@ Say Y if you want to map Frame Buffer in internal SRAM. Say N if you want to let frame buffer in external SDRAM. +config FB_ATMEL_STN + bool "Use a STN display with AT91/AT32 LCD Controller" + depends on FB_ATMEL && MACH_AT91SAM9261EK + default n + help + Say Y if you want to connect a STN LCD display to the AT91/AT32 LCD + Controller. Say N if you want to connect a TFT. + + If unsure, say N. + config FB_NVIDIA tristate "nVidia Framebuffer Support" depends on FB && PCI @@ -1569,7 +1586,14 @@ config FB_AU1100 bool "Au1100 LCD Driver" - depends on (FB = y) && EXPERIMENTAL && PCI && MIPS && MIPS_PB1100=y + depends on (FB = y) && MIPS && SOC_AU1100 + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + help + This is the framebuffer driver for the AMD Au1100 SOC. It can drive + various panels and CRTs by passing in kernel cmd line option + au1100fb:panel=<name>. config FB_AU1200 bool "Au1200 LCD Driver" @@ -1636,18 +1660,6 @@ DECstation series (Personal DECstation 5000/20, /25, /33, /50, Codename "Maxine"). -config FB_TX3912 - bool "TMPTX3912/PR31700 frame buffer support" - depends on (FB = y) && NINO - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT - help - The TX3912 is a Toshiba RISC processor based on the MIPS 3900 core - see <http://www.toshiba.com/taec/components/Generic/risc/tx3912.htm>. - - Say Y here to enable kernel support for the on-board framebuffer. - config FB_G364 bool "G364 frame buffer support" depends on (FB = y) && (MIPS_MAGNUM_4000 || OLIVETTI_M700) @@ -1805,19 +1817,20 @@ adaptor, found on some IBM System P (pSeries) machines. config FB_PS3 - bool "PS3 GPU framebuffer driver" - depends on (FB = y) && PS3_PS3AV + tristate "PS3 GPU framebuffer driver" + depends on FB && PS3_PS3AV select FB_SYS_FILLRECT select FB_SYS_COPYAREA select FB_SYS_IMAGEBLIT select FB_SYS_FOPS + select VT_HW_CONSOLE_BINDING if FRAMEBUFFER_CONSOLE ---help--- Include support for the virtual frame buffer in the PS3 platform. config FB_PS3_DEFAULT_SIZE_M int "PS3 default frame buffer size (in MiB)" depends on FB_PS3 - default 18 + default 9 ---help--- This is the default size (in MiB) of the virtual frame buffer in the PS3. @@ -1835,6 +1848,10 @@ framebuffer. ML300 carries a 640*480 LCD display on the board, ML403 uses a standard DB15 VGA connector. +if ARCH_OMAP + source "drivers/video/omap/Kconfig" +endif + config FB_VIRTUAL tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)" depends on FB |
|
From: Albert H. <he...@us...> - 2007-11-16 23:26:13
|
Update of /cvsroot/gc-linux/linux/drivers/net In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29560/drivers/net Modified Files: Kconfig Makefile Log Message: Merged 2.6.23. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- Makefile 14 Nov 2007 23:08:52 -0000 1.23 +++ Makefile 16 Nov 2007 23:26:08 -0000 1.24 @@ -18,7 +18,7 @@ gianfar_sysfs.o obj-$(CONFIG_UCC_GETH) += ucc_geth_driver.o -ucc_geth_driver-objs := ucc_geth.o ucc_geth_mii.o +ucc_geth_driver-objs := ucc_geth.o ucc_geth_mii.o ucc_geth_ethtool.o # # link order important here @@ -34,6 +34,7 @@ obj-$(CONFIG_MYRI_SBUS) += myri_sbus.o obj-$(CONFIG_SUNGEM) += sungem.o sungem_phy.o obj-$(CONFIG_CASSINI) += cassini.o +obj-$(CONFIG_SUNVNET) += sunvnet.o obj-$(CONFIG_MACE) += mace.o obj-$(CONFIG_BMAC) += bmac.o @@ -60,6 +61,8 @@ obj-$(CONFIG_BNX2) += bnx2.o spidernet-y += spider_net.o spider_net_ethtool.o obj-$(CONFIG_SPIDER_NET) += spidernet.o sungem_phy.o +obj-$(CONFIG_GELIC_NET) += ps3_gelic.o +ps3_gelic-objs += ps3_gelic_net.o obj-$(CONFIG_TC35815) += tc35815.o obj-$(CONFIG_SKGE) += skge.o obj-$(CONFIG_SKY2) += sky2.o @@ -107,6 +110,7 @@ obj-$(CONFIG_B44) += b44.o obj-$(CONFIG_FORCEDETH) += forcedeth.o obj-$(CONFIG_NE_H8300) += ne-h8300.o +obj-$(CONFIG_AX88796) += ax88796.o obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o @@ -119,12 +123,16 @@ obj-$(CONFIG_PPP_BSDCOMP) += bsd_comp.o obj-$(CONFIG_PPP_MPPE) += ppp_mppe.o obj-$(CONFIG_PPPOE) += pppox.o pppoe.o +obj-$(CONFIG_PPPOL2TP) += pppox.o pppol2tp.o obj-$(CONFIG_SLIP) += slip.o obj-$(CONFIG_SLHC) += slhc.o +obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o + obj-$(CONFIG_DUMMY) += dummy.o obj-$(CONFIG_IFB) += ifb.o +obj-$(CONFIG_MACVLAN) += macvlan.o obj-$(CONFIG_DE600) += de600.o obj-$(CONFIG_DE620) += de620.o obj-$(CONFIG_LANCE) += lance.o @@ -157,6 +165,7 @@ obj-$(CONFIG_AC3200) += ac3200.o 8390.o obj-$(CONFIG_APRICOT) += 82596.o obj-$(CONFIG_LASI_82596) += lasi_82596.o +obj-$(CONFIG_SNI_82596) += sni_82596.o obj-$(CONFIG_MVME16x_NET) += 82596.o obj-$(CONFIG_BVME6000_NET) += 82596.o obj-$(CONFIG_SC92031) += sc92031.o @@ -169,14 +178,13 @@ obj-$(CONFIG_HPLANCE) += hplance.o 7990.o obj-$(CONFIG_MVME147_NET) += mvme147.o 7990.o obj-$(CONFIG_EQUALIZER) += eql.o +obj-$(CONFIG_LGUEST_NET) += lguest_net.o obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o obj-$(CONFIG_DECLANCE) += declance.o obj-$(CONFIG_ATARILANCE) += atarilance.o -obj-$(CONFIG_ATARI_BIONET) += atari_bionet.o -obj-$(CONFIG_ATARI_PAMSNET) += atari_pamsnet.o obj-$(CONFIG_A2065) += a2065.o obj-$(CONFIG_HYDRA) += hydra.o obj-$(CONFIG_ARIADNE) += ariadne.o @@ -194,6 +202,7 @@ obj-$(CONFIG_MYRI10GE) += myri10ge/ obj-$(CONFIG_SMC91X) += smc91x.o obj-$(CONFIG_SMC911X) += smc911x.o +obj-$(CONFIG_BFIN_MAC) += bfin_mac.o obj-$(CONFIG_DM9000) += dm9000.o obj-$(CONFIG_FEC_8XX) += fec_8xx/ obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- Kconfig 14 Nov 2007 23:08:50 -0000 1.26 +++ Kconfig 16 Nov 2007 23:26:08 -0000 1.27 @@ -3,11 +3,9 @@ # Network device configuration # -menu "Network device support" - depends on NET - -config NETDEVICES +menuconfig NETDEVICES default y if UML + depends on NET bool "Network device support" ---help--- You can say N here if you don't intend to connect your Linux box to @@ -28,6 +26,14 @@ # that for each of the symbols. if NETDEVICES +config NETDEVICES_MULTIQUEUE + bool "Netdevice multiple hardware queue support" + ---help--- + Say Y here if you want to allow the network stack to use multiple + hardware TX queues on an ethernet device. + + Most people will say N here. + config IFB tristate "Intermediate Functional Block support" depends on NET_CLS_ACT @@ -77,6 +83,16 @@ To compile this driver as a module, choose M here: the module will be called bonding. +config MACVLAN + tristate "MAC-VLAN support (EXPERIMENTAL)" + depends on EXPERIMENTAL + ---help--- + This allows one to create virtual interfaces that map packets to + or from specific MAC addresses to a particular interface. + + To compile this driver as a module, choose M here: the module + will be called macvlan. + config EQUALIZER tristate "EQL (serial line load balancing) support" ---help--- @@ -151,11 +167,9 @@ # Ethernet # -menu "Ethernet (10 or 100Mbit)" - depends on !UML - -config NET_ETHERNET +menuconfig NET_ETHERNET bool "Ethernet (10 or 100Mbit)" + depends on !UML ---help--- Ethernet (also called IEEE 802.3 or ISO 8802-2) is the most common type of Local Area Network (LAN) in universities and companies. @@ -180,9 +194,10 @@ kernel: saying N will just cause the configurator to skip all the questions about Ethernet network cards. If unsure, say N. +if NET_ETHERNET + config MII tristate "Generic Media Independent Interface device support" - depends on NET_ETHERNET help Most ethernet controllers have MII transceiver either as an external or internal device. It is safe to say Y or M here even if your @@ -190,8 +205,8 @@ config MACB tristate "Atmel MACB support" - depends on NET_ETHERNET && (AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263) - select MII + depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 + select PHYLIB help The Atmel MACB ethernet interface is found on many AT32 and AT91 parts. Say Y to include support for the MACB chip. @@ -201,9 +216,18 @@ source "drivers/net/arm/Kconfig" +config AX88796 + tristate "ASIX AX88796 NE2000 clone support" + depends on ARM || MIPS + select CRC32 + select MII + help + AX88796 driver, using platform bus to provide + chip detection and resources + config MACE tristate "MACE (Power Mac ethernet) support" - depends on NET_ETHERNET && PPC_PMAC && PPC32 + depends on PPC_PMAC && PPC32 select CRC32 help Power Macintoshes and clones with Ethernet built-in on the @@ -226,7 +250,7 @@ config BMAC tristate "BMAC (G3 ethernet) support" - depends on NET_ETHERNET && PPC_PMAC && PPC32 + depends on PPC_PMAC && PPC32 select CRC32 help Say Y for support of BMAC Ethernet interfaces. These are used on G3 @@ -246,7 +270,7 @@ config ARIADNE tristate "Ariadne support" - depends on NET_ETHERNET && ZORRO + depends on ZORRO help If you have a Village Tronic Ariadne Ethernet adapter, say Y. Otherwise, say N. @@ -256,7 +280,7 @@ config A2065 tristate "A2065 support" - depends on NET_ETHERNET && ZORRO + depends on ZORRO select CRC32 help If you have a Commodore A2065 Ethernet adapter, say Y. Otherwise, @@ -267,7 +291,7 @@ config HYDRA tristate "Hydra support" - depends on NET_ETHERNET && ZORRO + depends on ZORRO select CRC32 help If you have a Hydra Ethernet adapter, say Y. Otherwise, say N. @@ -277,7 +301,7 @@ config ZORRO8390 tristate "Zorro NS8390-based Ethernet support" - depends on NET_ETHERNET && ZORRO + depends on ZORRO select CRC32 help This driver is for Zorro Ethernet cards using an NS8390-compatible @@ -290,7 +314,7 @@ config APNE tristate "PCMCIA NE2000 support" - depends on NET_ETHERNET && AMIGA_PCMCIA + depends on AMIGA_PCMCIA select CRC32 help If you have a PCMCIA NE2000 compatible adapter, say Y. Otherwise, @@ -301,7 +325,7 @@ config APOLLO_ELPLUS tristate "Apollo 3c505 support" - depends on NET_ETHERNET && APOLLO + depends on APOLLO help Say Y or M here if your Apollo has a 3Com 3c505 ISA Ethernet card. If you don't have one made for Apollos, you can use one from a PC, @@ -310,7 +334,7 @@ config MAC8390 bool "Macintosh NS 8390 based ethernet cards" - depends on NET_ETHERNET && MAC + depends on MAC select CRC32 help If you want to include a driver to support Nubus or LC-PDS @@ -320,7 +344,7 @@ config MAC89x0 tristate "Macintosh CS89x0 based ethernet cards" - depends on NET_ETHERNET && MAC + depends on MAC ---help--- Support for CS89x0 chipset based Ethernet cards. If you have a Nubus or LC-PDS network (Ethernet) card of this type, say Y and @@ -333,7 +357,7 @@ config MACSONIC tristate "Macintosh SONIC based ethernet (onboard, NuBus, LC, CS)" - depends on NET_ETHERNET && MAC + depends on MAC ---help--- Support for NatSemi SONIC based Ethernet devices. This includes the onboard Ethernet in many Quadras as well as some LC-PDS, @@ -347,7 +371,7 @@ config MACMACE bool "Macintosh (AV) onboard MACE ethernet" - depends on NET_ETHERNET && MAC + depends on MAC select CRC32 help Support for the onboard AMD 79C940 MACE Ethernet controller used in @@ -357,7 +381,7 @@ config MVME147_NET tristate "MVME147 (Lance) Ethernet support" - depends on NET_ETHERNET && MVME147 + depends on MVME147 select CRC32 help Support for the on-board Ethernet interface on the Motorola MVME147 @@ -367,7 +391,7 @@ config MVME16x_NET tristate "MVME16x Ethernet support" - depends on NET_ETHERNET && MVME16x + depends on MVME16x help This is the driver for the Ethernet interface on the Motorola MVME162, 166, 167, 172 and 177 boards. Say Y here to include the @@ -376,7 +400,7 @@ config BVME6000_NET tristate "BVME6000 Ethernet support" - depends on NET_ETHERNET && BVME6000 + depends on BVME6000 help This is the driver for the Ethernet interface on BVME4000 and BVME6000 VME boards. Say Y here to include the driver for this chip @@ -385,31 +409,15 @@ config ATARILANCE tristate "Atari Lance support" - depends on NET_ETHERNET && ATARI + depends on ATARI help Say Y to include support for several Atari Ethernet adapters based on the AMD Lance chipset: RieblCard (with or without battery), or PAMCard VME (also the version by Rhotron, with different addresses). -config ATARI_BIONET - tristate "BioNet-100 support" - depends on NET_ETHERNET && ATARI && ATARI_ACSI && BROKEN - help - Say Y to include support for BioData's BioNet-100 Ethernet adapter - for the ACSI port. The driver works (has to work...) with a polled - I/O scheme, so it's rather slow :-( - -config ATARI_PAMSNET - tristate "PAMsNet support" - depends on NET_ETHERNET && ATARI && ATARI_ACSI && BROKEN - help - Say Y to include support for the PAMsNet Ethernet adapter for the - ACSI port ("ACSI node"). The driver works (has to work...) with a - polled I/O scheme, so it's rather slow :-( - config SUN3LANCE tristate "Sun3/Sun3x on-board LANCE support" - depends on NET_ETHERNET && (SUN3 || SUN3X) + depends on SUN3 || SUN3X help Most Sun3 and Sun3x motherboards (including the 3/50, 3/60 and 3/80) featured an AMD Lance 10Mbit Ethernet controller on board; say Y @@ -422,7 +430,7 @@ config SUN3_82586 bool "Sun3 on-board Intel 82586 support" - depends on NET_ETHERNET && SUN3 + depends on SUN3 help This driver enables support for the on-board Intel 82586 based Ethernet adapter found on Sun 3/1xx and 3/2xx motherboards. Note @@ -431,7 +439,7 @@ config HPLANCE bool "HP on-board LANCE support" - depends on NET_ETHERNET && DIO + depends on DIO select CRC32 help If you want to use the builtin "LANCE" Ethernet controller on an @@ -439,21 +447,28 @@ config LASI_82596 tristate "Lasi ethernet" - depends on NET_ETHERNET && GSC + depends on GSC help Say Y here to support the builtin Intel 82596 ethernet controller found in Hewlett-Packard PA-RISC machines with 10Mbit ethernet. +config SNI_82596 + tristate "SNI RM ethernet" + depends on NET_ETHERNET && SNI_RM + help + Say Y here to support the on-board Intel 82596 ethernet controller + built into SNI RM machines. + config MIPS_JAZZ_SONIC tristate "MIPS JAZZ onboard SONIC Ethernet support" - depends on NET_ETHERNET && MACH_JAZZ + depends on MACH_JAZZ help This is the driver for the onboard card of MIPS Magnum 4000, Acer PICA, Olivetti M700-10 and a few other identical OEM systems. config MIPS_AU1X00_ENET bool "MIPS AU1000 Ethernet support" - depends on NET_ETHERNET && SOC_AU1X00 + depends on SOC_AU1X00 select PHYLIB select CRC32 help @@ -462,11 +477,11 @@ config NET_SB1250_MAC tristate "SB1250 Ethernet support" - depends on NET_ETHERNET && SIBYTE_SB1xxx_SOC + depends on SIBYTE_SB1xxx_SOC config SGI_IOC3_ETH bool "SGI IOC3 Ethernet" - depends on NET_ETHERNET && PCI && SGI_IP27 + depends on PCI && SGI_IP27 select CRC32 select MII help @@ -496,7 +511,7 @@ config MIPS_SIM_NET tristate "MIPS simulator Network device" - depends on NET_ETHERNET && MIPS_SIM + depends on MIPS_SIM help The MIPSNET device is a simple Ethernet network device which is emulated by the MIPS Simulator. @@ -504,11 +519,11 @@ config SGI_O2MACE_ETH tristate "SGI O2 MACE Fast Ethernet support" - depends on NET_ETHERNET && SGI_IP32=y + depends on SGI_IP32=y config STNIC tristate "National DP83902AV support" - depends on NET_ETHERNET && SUPERH + depends on SUPERH select CRC32 help Support for cards based on the National Semiconductor DP83902AV @@ -520,7 +535,7 @@ config SUNLANCE tristate "Sun LANCE support" - depends on NET_ETHERNET && SBUS + depends on SBUS select CRC32 help This driver supports the "le" interface present on all 32-bit Sparc @@ -533,7 +548,7 @@ config HAPPYMEAL tristate "Sun Happy Meal 10/100baseT support" - depends on NET_ETHERNET && (SBUS || PCI) + depends on SBUS || PCI select CRC32 help This driver supports the "hme" interface present on most Ultra @@ -546,7 +561,7 @@ config SUNBMAC tristate "Sun BigMAC 10/100baseT support (EXPERIMENTAL)" - depends on NET_ETHERNET && SBUS && EXPERIMENTAL + depends on SBUS && EXPERIMENTAL select CRC32 help This driver supports the "be" interface available as an Sbus option. @@ -557,7 +572,7 @@ config SUNQE tristate "Sun QuadEthernet support" - depends on NET_ETHERNET && SBUS + depends on SBUS select CRC32 help This driver supports the "qe" 10baseT Ethernet device, available as @@ -569,7 +584,7 @@ config SUNGEM tristate "Sun GEM support" - depends on NET_ETHERNET && PCI + depends on PCI select CRC32 help Support for the Sun GEM chip, aka Sun GigabitEthernet/P 2.0. See also @@ -577,15 +592,21 @@ config CASSINI tristate "Sun Cassini support" - depends on NET_ETHERNET && PCI + depends on PCI select CRC32 help Support for the Sun Cassini chip, aka Sun GigaSwift Ethernet. See also <http://www.sun.com/products-n-solutions/hardware/docs/pdf/817-4341-10.pdf> +config SUNVNET + tristate "Sun Virtual Network support" + depends on SUN_LDOMS + help + Support for virtual network devices under Sun Logical Domains. + config NET_VENDOR_3COM bool "3COM cards" - depends on NET_ETHERNET && (ISA || EISA || MCA || PCI) + depends on ISA || EISA || MCA || PCI help If you have a network (Ethernet) card belonging to this class, say Y and read the Ethernet-HOWTO, available from @@ -745,7 +766,7 @@ config LANCE tristate "AMD LANCE and PCnet (AT1500 and NE2100) support" - depends on NET_ETHERNET && ISA && ISA_DMA_API + depends on ISA && ISA_DMA_API help If you have a network (Ethernet) card of this type, say Y and read the Ethernet-HOWTO, available from @@ -757,7 +778,7 @@ config NET_VENDOR_SMC bool "Western Digital/SMC cards" - depends on NET_ETHERNET && (ISA || MCA || EISA || MAC) + depends on ISA || MCA || EISA || MAC help If you have a network (Ethernet) card belonging to this class, say Y and read the Ethernet-HOWTO, available from @@ -827,23 +848,49 @@ <file:Documentation/networking/net-modules.txt>. The module will be called smc-ultra32. -config SMC91X - tristate "SMC 91C9x/91C1xxx support" +config BFIN_MAC + tristate "Blackfin 536/537 on-chip mac support" + depends on NET_ETHERNET && (BF537 || BF536) && (!BF537_PORT_H) select CRC32 - select MII - depends on NET_ETHERNET && (ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || SOC_AU1X00 || BFIN) + select BFIN_MAC_USE_L1 if DMA_UNCACHED_NONE help - This is a driver for SMC's 91x series of Ethernet chipsets, - including the SMC91C94 and the SMC91C111. Say Y if you want it - compiled into the kernel, and read the file - <file:Documentation/networking/smc9.txt> and the Ethernet-HOWTO, - available from <http://www.linuxdoc.org/docs.html#howto>. + This is the driver for blackfin on-chip mac device. Say Y if you want it + compiled into the kernel. This driver is also available as a module + ( = code which can be inserted in and removed from the running kernel + whenever you want). The module will be called bfin_mac. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called smc91x. If you want to compile it as a - module, say M here and read <file:Documentation/kbuild/modules.txt> - as well as <file:Documentation/networking/net-modules.txt>. +config BFIN_MAC_USE_L1 + bool "Use L1 memory for rx/tx packets" + depends on BFIN_MAC && BF537 + default y + help + To get maximum network performace, you should use L1 memory as rx/tx buffers. + Say N here if you want to reserve L1 memory for other uses. + +config BFIN_TX_DESC_NUM + int "Number of transmit buffer packets" + depends on BFIN_MAC + range 6 10 if BFIN_MAC_USE_L1 + range 10 100 + default "10" + help + Set the number of buffer packets used in driver. + +config BFIN_RX_DESC_NUM + int "Number of receive buffer packets" + depends on BFIN_MAC + range 20 100 if BFIN_MAC_USE_L1 + range 20 800 + default "20" + help + Set the number of buffer packets used in driver. + +config BFIN_MAC_RMII + bool "RMII PHY Interface (EXPERIMENTAL)" + depends on BFIN_MAC && EXPERIMENTAL + default n + help + Use Reduced PHY MII Interface config SMC9194 tristate "SMC 9194 support" @@ -861,10 +908,28 @@ <file:Documentation/networking/net-modules.txt>. The module will be called smc9194. +config SMC91X + tristate "SMC 91C9x/91C1xxx support" + select CRC32 + select MII + depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || SOC_AU1X00 || BFIN + help + This is a driver for SMC's 91x series of Ethernet chipsets, + including the SMC91C94 and the SMC91C111. Say Y if you want it + compiled into the kernel, and read the file + <file:Documentation/networking/smc9.txt> and the Ethernet-HOWTO, + available from <http://www.linuxdoc.org/docs.html#howto>. + + This driver is also available as a module ( = code which can be + inserted in and removed from the running kernel whenever you want). + The module will be called smc91x. If you want to compile it as a + module, say M here and read <file:Documentation/kbuild/modules.txt> + as well as <file:Documentation/networking/net-modules.txt>. + config NET_NETX tristate "NetX Ethernet support" select MII - depends on NET_ETHERNET && ARCH_NETX + depends on ARCH_NETX help This is support for the Hilscher netX builtin Ethernet ports @@ -874,7 +939,7 @@ config DM9000 tristate "DM9000 support" - depends on (ARM || MIPS) && NET_ETHERNET + depends on ARM || BLACKFIN || MIPS select CRC32 select MII ---help--- @@ -888,7 +953,7 @@ tristate "SMSC LAN911[5678] support" select CRC32 select MII - depends on NET_ETHERNET && ARCH_PXA + depends on ARCH_PXA help This is a driver for SMSC's LAN911x series of Ethernet chipsets including the new LAN9115, LAN9116, LAN9117, and LAN9118. @@ -902,7 +967,7 @@ config NET_VENDOR_RACAL bool "Racal-Interlan (Micom) NI cards" - depends on NET_ETHERNET && ISA + depends on ISA help If you have a network (Ethernet) card belonging to this class, such as the NI5010, NI5210 or NI6210, say Y and read the Ethernet-HOWTO, @@ -954,7 +1019,7 @@ config AT1700 tristate "AT1700/1720 support (EXPERIMENTAL)" - depends on NET_ETHERNET && (ISA || MCA_LEGACY) && EXPERIMENTAL + depends on (ISA || MCA_LEGACY) && EXPERIMENTAL select CRC32 ---help--- If you have a network (Ethernet) card of this type, say Y and read @@ -967,7 +1032,7 @@ config DEPCA tristate "DEPCA, DE10x, DE200, DE201, DE202, DE422 support" - depends on NET_ETHERNET && (ISA || EISA || MCA) + depends on ISA || EISA || MCA select CRC32 ---help--- If you have a network (Ethernet) card of this type, say Y and read @@ -981,7 +1046,7 @@ config HP100 tristate "HP 10/100VG PCLAN (ISA, EISA, PCI) support" - depends on NET_ETHERNET && (ISA || EISA || PCI) + depends on ISA || EISA || PCI help If you have a network (Ethernet) card of this type, say Y and read the Ethernet-HOWTO, available from @@ -993,7 +1058,7 @@ config NET_ISA bool "Other ISA cards" - depends on NET_ETHERNET && ISA + depends on ISA ---help--- If your network (Ethernet) card hasn't been mentioned yet and its bus system (that's the way the cards talks to the other components @@ -1156,7 +1221,7 @@ config NE2_MCA tristate "NE/2 (ne2000 MCA version) support" - depends on NET_ETHERNET && MCA_LEGACY + depends on MCA_LEGACY select CRC32 help If you have a network (Ethernet) card of this type, say Y and read @@ -1169,7 +1234,7 @@ config IBMLANA tristate "IBM LAN Adapter/A support" - depends on NET_ETHERNET && MCA && MCA_LEGACY + depends on MCA && MCA_LEGACY ---help--- This is a Micro Channel Ethernet adapter. You need to set CONFIG_MCA to use this driver. It is both available as an in-kernel @@ -1185,7 +1250,7 @@ config IBMVETH tristate "IBM LAN Virtual Ethernet support" - depends on NET_ETHERNET && PPC_PSERIES + depends on PPC_PSERIES ---help--- This driver supports virtual ethernet adapters on newer IBM iSeries and pSeries systems. @@ -1266,7 +1331,7 @@ config NET_PCI bool "EISA, VLB, PCI and on board controllers" - depends on NET_ETHERNET && (ISA || EISA || PCI) + depends on ISA || EISA || PCI help This is another class of network cards which attach directly to the bus. If you have one of those, say Y and read the Ethernet-HOWTO, @@ -1322,6 +1387,7 @@ To compile this driver as a module, choose M here and read <file:Documentation/networking/net-modules.txt>. The module will be called amd8111e. + config AMD8111E_NAPI bool "Enable NAPI support" depends on AMD8111_ETH @@ -1787,7 +1853,7 @@ config NET_POCKET bool "Pocket and portable adapters" - depends on NET_ETHERNET && PARPORT + depends on PARPORT ---help--- Cute little network (Ethernet) devices which attach to the parallel port ("pocket adapters"), commonly used with laptops. If you have @@ -1856,14 +1922,14 @@ config SGISEEQ tristate "SGI Seeq ethernet controller support" - depends on NET_ETHERNET && SGI_IP22 + depends on SGI_IP22 help Say Y here if you have an Seeq based Ethernet network card. This is used in many Silicon Graphics machines. config DECLANCE tristate "DEC LANCE ethernet controller support" - depends on NET_ETHERNET && MACH_DECSTATION + depends on MACH_DECSTATION select CRC32 help This driver is for the series of Ethernet controllers produced by @@ -1893,7 +1959,7 @@ config NE_H8300 tristate "NE2000 compatible support for H8/300" - depends on H8300 && NET_ETHERNET + depends on H8300 help Say Y here if you want to use the NE2000 compatible controller on the Renesas H8/300 processor. @@ -1901,7 +1967,7 @@ source "drivers/net/fec_8xx/Kconfig" source "drivers/net/fs_enet/Kconfig" -endmenu +endif # NET_ETHERNET # # Gigabit Ethernet @@ -1911,6 +1977,16 @@ bool "Ethernet (1000 Mbit)" depends on !UML default y + ---help--- + Ethernet (also called IEEE 802.3 or ISO 8802-2) is the most common + type of Local Area Network (LAN) in universities and companies. + + Say Y here to get to see options for Gigabit Ethernet drivers. + This option alone does not add any kernel code. + Note that drivers supporting both 100 and 1000 MBit may be listed + under "Ethernet (10 or 100MBit)" instead. + + If you say N, all options in this submenu will be skipped and disabled. if NETDEV_1000 @@ -2123,7 +2199,7 @@ will be called skge. This is recommended. config SKY2 - tristate "SysKonnect Yukon2 support (EXPERIMENTAL)" + tristate "SysKonnect Yukon2 support" depends on PCI select CRC32 ---help--- @@ -2138,6 +2214,16 @@ To compile this driver as a module, choose M here: the module will be called sky2. This is recommended. +config SKY2_DEBUG + bool "Debugging interface" + depends on SKY2 && DEBUG_FS + 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. + + If unsure, say N. + config SK98LIN tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support (DEPRECATED)" depends on PCI @@ -2273,6 +2359,16 @@ To compile this driver as a module, choose M here: the module will be called tsi108_eth. +config GELIC_NET + tristate "PS3 Gigabit Ethernet driver" + depends on PPC_PS3 + help + This driver supports the network device on the PS3 game + console. This driver has built-in support for Ethernet. + + To compile this driver as a module, choose M here: the + module will be called ps3_gelic. + config GIANFAR tristate "Gianfar Ethernet" depends on 85xx || 83xx || PPC_86xx @@ -2312,7 +2408,7 @@ config MV643XX_ETH tristate "MV-643XX Ethernet support" - depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MV64X60 || MOMENCO_OCELOT_3 || (PPC_MULTIPLATFORM && PPC32) + depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) select MII help This driver supports the gigabit Ethernet on the Marvell MV643XX @@ -2349,6 +2445,11 @@ bool "Ethernet (10000 Mbit)" depends on !UML default y + ---help--- + Say Y here to get to see options for 10 Gigabit Ethernet drivers. + This option alone does not add any kernel code. + + If you say N, all options in this submenu will be skipped and disabled. if NETDEV_10000 @@ -2541,6 +2642,18 @@ source "drivers/s390/net/Kconfig" +config XEN_NETDEV_FRONTEND + tristate "Xen network device frontend driver" + depends on XEN + default y + help + The network device frontend driver allows the kernel to + access network devices exported exported by a virtual + machine containing a physical network device driver. The + frontend driver is intended for unprivileged guest domains; + if you are compiling a kernel for a Xen guest, you almost + certainly want to enable this. + config ISERIES_VETH tristate "iSeries Virtual Ethernet driver support" depends on PPC_ISERIES @@ -2847,6 +2960,19 @@ which can lead to bad results if the ATM peer loses state and changes its encapsulation unilaterally. +config PPPOL2TP + tristate "PPP over L2TP (EXPERIMENTAL)" + depends on EXPERIMENTAL && PPP && INET + help + Support for PPP-over-L2TP socket family. L2TP is a protocol + used by ISPs and enterprises to tunnel PPP traffic over UDP + tunnels. L2TP is replacing PPTP for VPN uses. + + This kernel component handles only L2TP data packets: a + userland daemon handles L2TP the control protocol (tunnel + and session setup). One such daemon is OpenL2TP + (http://openl2tp.sourceforge.net/). + config SLIP tristate "SLIP (serial line) support" ---help--- @@ -2957,8 +3083,6 @@ If you want to log kernel messages over the network, enable this. See <file:Documentation/networking/netconsole.txt> for details. -endif #NETDEVICES - config NETPOLL def_bool NETCONSOLE @@ -2970,4 +3094,4 @@ config NET_POLL_CONTROLLER def_bool NETPOLL -endmenu +endif # NETDEVICES |
|
From: Albert H. <he...@us...> - 2007-11-16 23:26:08
|
Update of /cvsroot/gc-linux/linux/sound/ppc In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29560/sound/ppc Modified Files: Kconfig Makefile Log Message: Merged 2.6.23. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/sound/ppc/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Makefile 17 Feb 2007 23:43:42 -0000 1.6 +++ Makefile 16 Nov 2007 23:26:09 -0000 1.7 @@ -7,6 +7,8 @@ snd-gcn-objs := gcn-ai.o # Toplevel Module Dependency -obj-$(CONFIG_SND_POWERMAC) += snd-powermac.o -obj-$(CONFIG_SND_GAMECUBE) += snd-gcn.o -obj-$(CONFIG_SND_GAMECUBE_MIC) += gcn-mic.o +obj-$(CONFIG_SND_POWERMAC) += snd-powermac.o +obj-$(CONFIG_SND_PS3) += snd_ps3.o +obj-$(CONFIG_SND_GAMECUBE) += snd-gcn.o +obj-$(CONFIG_SND_GAMECUBE_MIC) += gcn-mic.o + Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/sound/ppc/Kconfig,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- Kconfig 17 May 2006 22:14:40 -0000 1.12 +++ Kconfig 16 Nov 2007 23:26:09 -0000 1.13 @@ -53,3 +53,23 @@ If in doubt, say N here. endmenu + +menu "ALSA PowerPC devices" + depends on SND!=n && ( PPC64 || PPC32 ) + +config SND_PS3 + tristate "PS3 Audio support" + depends on SND && PS3_PS3AV + select SND_PCM + default m + help + Say Y here to include support for audio on the PS3 + + To compile this driver as a module, choose M here: the module + will be called snd_ps3. + +config SND_PS3_DEFAULT_START_DELAY + int "Startup delay time in ms" + depends on SND_PS3 + default "2000" +endmenu |
|
From: Albert H. <he...@us...> - 2007-11-16 23:26:07
|
Update of /cvsroot/gc-linux/linux/fs In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29560/fs Modified Files: Kconfig Log Message: Merged 2.6.23. Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/fs/Kconfig,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Kconfig 14 Nov 2007 23:08:56 -0000 1.8 +++ Kconfig 16 Nov 2007 23:26:09 -0000 1.9 @@ -251,7 +251,7 @@ config JBD2_DEBUG bool "JBD2 (ext4dev/ext4) debugging support" - depends on JBD2 + depends on JBD2 && DEBUG_FS help If you are using the ext4dev/ext4 journaled file system (or potentially any other filesystem/device using JBD2), this option @@ -260,10 +260,10 @@ By default, the debugging output will be turned off. If you select Y here, then you will be able to turn on debugging - with "echo N > /proc/sys/fs/jbd2-debug", where N is a number between - 1 and 5. The higher the number, the more debugging output is - generated. To turn debugging off again, do - "echo 0 > /proc/sys/fs/jbd2-debug". + with "echo N > /sys/kernel/debug/jbd2/jbd2-debug", where N is a + number between 1 and 5. The higher the number, the more debugging + output is generated. To turn debugging off again, do + "echo 0 > /sys/kernel/debug/jbd2/jbd2-debug". config FS_MBCACHE # Meta block cache for Extended Attributes (ext2/ext3/ext4) @@ -441,9 +441,6 @@ Note: Features which OCFS2 does not support yet: - extended attributes - - shared writeable mmap - - loopback is supported, but data written will not - be cluster coherent. - quotas - cluster aware flock - Directory change notification (F_NOTIFY) @@ -1002,7 +999,7 @@ config HUGETLBFS bool "HugeTLB file system support" - depends on X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN + depends on X86 || IA64 || PPC64 || SPARC64 || (SUPERH && MMU) || BROKEN help hugetlbfs is a filesystem backing for HugeTLB pages, based on ramfs. For architectures that support it, say Y here and read @@ -1685,7 +1682,8 @@ config NFSD_V4 bool "Provide NFSv4 server support (EXPERIMENTAL)" - depends on NFSD_V3 && EXPERIMENTAL + depends on NFSD && NFSD_V3 && EXPERIMENTAL + select RPCSEC_GSS_KRB5 help If you would like to include the NFSv4 server as well as the NFSv2 and NFSv3 servers, say Y here. This feature is experimental, and @@ -2059,7 +2057,7 @@ config 9P_FS tristate "Plan 9 Resource Sharing Support (9P2000) (Experimental)" - depends on INET && EXPERIMENTAL + depends on INET && NET_9P && EXPERIMENTAL help If you say Y here, you will get experimental support for Plan 9 resource sharing via the 9P2000 protocol. |
|
From: Albert H. <he...@us...> - 2007-11-16 23:26:07
|
Update of /cvsroot/gc-linux/linux/drivers/misc In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29560/drivers/misc Modified Files: Kconfig Makefile Log Message: Merged 2.6.23. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/misc/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile 14 Nov 2007 23:08:49 -0000 1.4 +++ Makefile 16 Nov 2007 23:26:08 -0000 1.5 @@ -14,6 +14,7 @@ obj-$(CONFIG_SGI_IOC4) += ioc4.o obj-$(CONFIG_SONY_LAPTOP) += sony-laptop.o obj-$(CONFIG_THINKPAD_ACPI) += thinkpad_acpi.o +obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o obj-$(CONFIG_GAMECUBE_GQR) += gcn-gqr.o obj-$(CONFIG_GAMECUBE_MI) += gcn-mi.o Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/misc/Kconfig,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Kconfig 14 Nov 2007 23:08:49 -0000 1.7 +++ Kconfig 16 Nov 2007 23:26:07 -0000 1.8 @@ -2,7 +2,16 @@ # Misc strange devices # -menu "Misc devices" +menuconfig MISC_DEVICES + bool "Misc devices" + default y + ---help--- + Say Y here to get to see options for device drivers from various + different categories. This option alone does not add any kernel code. + + If you say N, all options in this submenu will be skipped and disabled. + +if MISC_DEVICES config GAMECUBE_GQR tristate "Device driver for Gamecube Gekko GQR" @@ -30,7 +39,7 @@ config IBM_ASM tristate "Device driver for IBM RSA service processor" - depends on X86 && PCI && EXPERIMENTAL + depends on X86 && PCI && INPUT && EXPERIMENTAL ---help--- This option enables device driver support for in-band access to the IBM RSA (Condor) service processor in eServer xSeries systems. @@ -58,6 +67,11 @@ If you choose to build module, its name will be phantom. If unsure, say N here. +config EEPROM_93CX6 + tristate "EEPROM 93CX6 support" + ---help--- + This is a driver for the EEPROM chipsets 93c46 and 93c66. + The driver supports both read as well as write commands. If unsure, say N. @@ -165,6 +179,7 @@ depends on X86 && ACPI select BACKLIGHT_CLASS_DEVICE select HWMON + select NVRAM ---help--- This is a driver for the IBM and Lenovo ThinkPad laptops. It adds support for Fn-Fx key combinations, Bluetooth control, video @@ -212,4 +227,4 @@ If you are not sure, say Y here. -endmenu +endif # MISC_DEVICES |
|
From: Albert H. <he...@us...> - 2007-11-16 23:26:07
|
Update of /cvsroot/gc-linux/linux/include/linux In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29560/include/linux Modified Files: fb.h Log Message: Merged 2.6.23. Index: fb.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/linux/fb.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- fb.h 14 Nov 2007 23:08:57 -0000 1.25 +++ fb.h 16 Nov 2007 23:26:09 -0000 1.26 @@ -124,6 +124,7 @@ #define FB_ACCEL_NV_40 46 /* nVidia Arch 40 */ #define FB_ACCEL_XGI_VOLARI_V 47 /* XGI Volari V3XT, V5, V8 */ #define FB_ACCEL_XGI_VOLARI_Z 48 /* XGI Volari Z7 */ +#define FB_ACCEL_OMAP1610 49 /* TI OMAP16xx */ #define FB_ACCEL_NEOMAGIC_NM2070 90 /* NeoMagic NM2070 */ #define FB_ACCEL_NEOMAGIC_NM2090 91 /* NeoMagic NM2090 */ #define FB_ACCEL_NEOMAGIC_NM2093 92 /* NeoMagic NM2093 */ @@ -534,6 +535,8 @@ #define FB_EVENT_CONBLANK 0x0C /* Get drawing requirements */ #define FB_EVENT_GET_REQ 0x0D +/* Unbind from the console if possible */ +#define FB_EVENT_FB_UNBIND 0x0E struct fb_event { struct fb_info *info; |
|
From: Albert H. <he...@us...> - 2007-11-16 23:26:07
|
Update of /cvsroot/gc-linux/linux/drivers/video/logo In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29560/drivers/video/logo Modified Files: Kconfig Makefile logo.c Log Message: Merged 2.6.23. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile 21 Jun 2006 18:56:06 -0000 1.5 +++ Makefile 16 Nov 2007 23:26:09 -0000 1.6 @@ -15,6 +15,8 @@ obj-$(CONFIG_LOGO_SUPERH_CLUT224) += logo_superh_clut224.o obj-$(CONFIG_LOGO_M32R_CLUT224) += logo_m32r_clut224.o +obj-$(CONFIG_SPU_BASE) += logo_spe_clut224.o + # How to generate logo's # Use logo-cfiles to retrieve list of .c files to be built Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Kconfig,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Kconfig 14 Nov 2007 23:08:56 -0000 1.6 +++ Kconfig 16 Nov 2007 23:26:09 -0000 1.7 @@ -10,6 +10,11 @@ if LOGO +config FB_LOGO_EXTRA + bool + depends on FB=y + default y if SPU_BASE + config LOGO_LINUX_MONO bool "Standard black and white Linux logo" default y @@ -29,7 +34,7 @@ config LOGO_GAMECUBE_CLUT224 bool "224-color GameCube Linux logo" - depends on LOGO && GAMECUBE + depends on GAMECUBE default y config LOGO_MAC_CLUT224 Index: logo.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/logo.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- logo.c 17 Feb 2007 23:43:41 -0000 1.4 +++ logo.c 16 Nov 2007 23:26:09 -0000 1.5 @@ -35,8 +35,11 @@ extern const struct linux_logo logo_superh_clut224; extern const struct linux_logo logo_m32r_clut224; - -const struct linux_logo *fb_find_logo(int depth) +/* logo's are marked __initdata. Use __init_refok to tell + * modpost that it is intended that this function uses data + * marked __initdata. + */ +const struct linux_logo * __init_refok fb_find_logo(int depth) { const struct linux_logo *logo = NULL; |
|
From: Albert H. <he...@us...> - 2007-11-14 23:09:26
|
Update of /cvsroot/gc-linux/linux/drivers/video In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4431/drivers/video Modified Files: Kconfig Makefile gcnfb.c gcngx.c Log Message: Merged 2.6.22. Updated drivers to use in_be* and out_be* instead of read* and write* input/output instructions. Updated DI driver: - do not use debug extensions with unknown drive models - do not load custom firmware on xenogc/duoq - evict alien firmwares and load custom formware on known drive models Index: gcnfb.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/gcnfb.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- gcnfb.c 18 Feb 2007 22:56:03 -0000 1.15 +++ gcnfb.c 14 Nov 2007 23:08:55 -0000 1.16 @@ -2,10 +2,10 @@ * drivers/video/gcnfb.c * * Nintendo GameCube "Flipper" chipset frame buffer driver - * Copyright (C) 2004-2006 The GameCube Linux Team + * Copyright (C) 2004-2007 The GameCube Linux Team * Copyright (C) 2004 Michael Steil <mi...@c6...> * Copyright (C) 2004,2005 Todd Jeffreys <to...@vo...> - * Copyright (C) 2006 Albert Herranz + * Copyright (C) 2006,2007 Albert Herranz * * Based on vesafb (c) 1998 Gerd Knorr <kr...@go...> * @@ -183,14 +183,14 @@ }; -static struct fb_fix_screeninfo gcnfb_fix __initdata = { +static struct fb_fix_screeninfo gcnfb_fix = { .id = DRV_MODULE_NAME, .type = FB_TYPE_PACKED_PIXELS, .visual = FB_VISUAL_TRUECOLOR, /* lies, lies, lies, ... */ .accel = FB_ACCEL_NONE, }; -static struct fb_var_screeninfo gcnfb_var __initdata = { +static struct fb_var_screeninfo gcnfb_var = { .bits_per_pixel = 16, .activate = FB_ACTIVATE_NOW, .height = -1, @@ -325,7 +325,7 @@ */ static inline int vi_get_mode(struct vi_ctl *ctl) { - return (readw(ctl->io_base + VI_DCR) >> 8) & 3; + return (in_be16(ctl->io_base + VI_DCR) >> 8) & 3; } /* @@ -349,7 +349,7 @@ */ static inline int vi_can_do_progressive(struct vi_ctl *ctl) { - return readw(ctl->io_base + VI_VISEL) & VI_VISEL_PROGRESSIVE; + return in_be16(ctl->io_base + VI_VISEL) & VI_VISEL_PROGRESSIVE; } /* @@ -362,7 +362,7 @@ if (vi_current_video_mode == NULL) { /* auto detection */ - if (readl(io_base + VI_HTR0) == 0x4B6A01B0) { + if (in_be32(io_base + VI_HTR0) == 0x4B6A01B0) { /* PAL50 */ vi_current_video_mode = vi_video_modes + VI_VM_PAL50; } else { @@ -403,13 +403,13 @@ void __iomem *io_base = ctl->io_base; /* set top field */ - writel(0x10000000 | (addr >> 5), io_base + VI_TFBL); + out_be32(io_base + VI_TFBL, 0x10000000 | (addr >> 5)); /* set bottom field */ if (!vi_is_mode_progressive(info->var.vmode)) { addr += info->fix.line_length; } - writel(0x10000000 | (addr >> 5), io_base + VI_BFBL); + out_be32(io_base + VI_BFBL, 0x10000000 | (addr >> 5)); } /* @@ -449,20 +449,20 @@ } /* first dot, first line */ - writel(VI_DI_INT | VI_DI_ENB | - (1 << VI_DI_VCT_SHIFT) | (1 << VI_DI_HCT_SHIFT), - io_base + VI_DI0); + out_be32(io_base + VI_DI0, + VI_DI_INT | VI_DI_ENB | + (1 << VI_DI_VCT_SHIFT) | (1 << VI_DI_HCT_SHIFT)); /* last dot, last line */ - writel(VI_DI_INT | VI_DI_ENB | - (vtrap << VI_DI_VCT_SHIFT) | (htrap << VI_DI_HCT_SHIFT), - io_base + VI_DI1); + out_be32(io_base + VI_DI1, + VI_DI_INT | VI_DI_ENB | + (vtrap << VI_DI_VCT_SHIFT) | (htrap << VI_DI_HCT_SHIFT)); } else { - writel(0, io_base + VI_DI0); - writel(0, io_base + VI_DI1); + out_be32(io_base + VI_DI0, 0); + out_be32(io_base + VI_DI1, 0); } /* these two are currently not used */ - writel(0, io_base + VI_DI2); - writel(0, io_base + VI_DI3); + out_be32(io_base + VI_DI2, 0); + out_be32(io_base + VI_DI3, 0); } /* @@ -493,33 +493,33 @@ u32 val; /* DI0 and DI1 are used to account for the vertical retrace */ - val = readl(io_base + VI_DI0); + val = in_be32(io_base + VI_DI0); if (val & VI_DI_INT) { ctl->in_vtrace = 0; gcngx_dispatch_vtrace(ctl); /* backwards compatibility */ - writel(val & ~VI_DI_INT, io_base + VI_DI0); + out_be32(io_base + VI_DI0, val & ~VI_DI_INT); return IRQ_HANDLED; } - val = readl(io_base + VI_DI1); + val = in_be32(io_base + VI_DI1); if (val & VI_DI_INT) { ctl->in_vtrace = 1; vi_dispatch_vtrace(ctl); gcngx_dispatch_vtrace(ctl); /* backwards compatibility */ - writel(val & ~VI_DI_INT, io_base + VI_DI1); + out_be32(io_base + VI_DI1, val & ~VI_DI_INT); return IRQ_HANDLED; } /* currently unused, just in case */ - val = readl(io_base + VI_DI2); + val = in_be32(io_base + VI_DI2); if (val & VI_DI_INT) { - writel(val & ~VI_DI_INT, io_base + VI_DI2); + out_be32(io_base + VI_DI2, val & ~VI_DI_INT); return IRQ_HANDLED; } - val = readl(io_base + VI_DI3); + val = in_be32(io_base + VI_DI3); if (val & VI_DI_INT) { - writel(val & ~VI_DI_INT, io_base + VI_DI3); + out_be32(io_base + VI_DI3, val & ~VI_DI_INT); return IRQ_HANDLED; } @@ -562,18 +562,18 @@ /* initialize video registers */ for (i = 0; i < 7; i++) { - writel(vi_current_video_mode->regs[i], - io_base + i * sizeof(__u32)); + out_be32(io_base + i * sizeof(__u32), + vi_current_video_mode->regs[i]); } - writel(vi_current_video_mode->regs[VI_TFBR / sizeof(__u32)], - io_base + VI_TFBR); - writel(vi_current_video_mode->regs[VI_BFBR / sizeof(__u32)], - io_base + VI_BFBR); - writel(vi_current_video_mode->regs[VI_DPV / sizeof(__u32)], - io_base + VI_DPV); + out_be32(io_base + VI_TFBR, + vi_current_video_mode->regs[VI_TFBR / sizeof(__u32)]); + out_be32(io_base + VI_BFBR, + vi_current_video_mode->regs[VI_BFBR / sizeof(__u32)]); + out_be32(io_base + VI_DPV, + vi_current_video_mode->regs[VI_DPV / sizeof(__u32)]); for (i = 16; i < 32; i++) { - writel(vi_current_video_mode->regs[i], - io_base + i * sizeof(__u32)); + out_be32(io_base + i * sizeof(__u32), + vi_current_video_mode->regs[i]); } /* enable the video retrace handling */ @@ -912,7 +912,7 @@ platform_set_drvdata(dev, info); - if (request_irq(VI_IRQ, vi_irq_handler, SA_INTERRUPT, "gcn-vi", dev)) { + if (request_irq(VI_IRQ, vi_irq_handler, IRQF_DISABLED, "gcn-vi", dev)) { printk(KERN_ERR "unable to register IRQ %u\n", VI_IRQ); goto err_request_irq; } Index: gcngx.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/gcngx.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- gcngx.c 18 Feb 2007 22:56:03 -0000 1.11 +++ gcngx.c 14 Nov 2007 23:08:56 -0000 1.12 @@ -2,8 +2,9 @@ * drivers/video/gcngx.c * * Nintendo GameCube GX driver extension - * Copyright (C) 2004-2005 The GameCube Linux Team + * Copyright (C) 2004-2007 The GameCube Linux Team * Copyright (C) 2004,2005 Todd Jeffreys <to...@vo...> + * Copyright (C) 2007 Albert Herranz * * Parts borrowed heavily from libogc. This driver would not have * been possible with this library. Thanks! @@ -75,8 +76,8 @@ #define VIDEO_PE_INTERRUPT_TOKEN_INTERRUPT (1 << 2) #define VIDEO_PE_INTERRUPT_FINISH_INTERRUPT (1 << 3) -#define gcngx_disable_pe_interrupts() writew(readw(VIDEO_PE_INTERRUPT) & ~(VIDEO_PE_INTERRUPT_TOKEN_ENABLE | VIDEO_PE_INTERRUPT_FINISH_ENABLE),VIDEO_PE_INTERRUPT) -#define gcngx_enable_pe_interrupts() { writew(readw(VIDEO_PE_INTERRUPT) | (VIDEO_PE_INTERRUPT_TOKEN_ENABLE | VIDEO_PE_INTERRUPT_FINISH_ENABLE | VIDEO_PE_INTERRUPT_TOKEN_INTERRUPT | VIDEO_PE_INTERRUPT_FINISH_INTERRUPT),VIDEO_PE_INTERRUPT); writew(0,VIDEO_PE_TOKEN); } +#define gcngx_disable_pe_interrupts() out_be16(VIDEO_PE_INTERRUPT,in_be16(VIDEO_PE_INTERRUPT) & ~(VIDEO_PE_INTERRUPT_TOKEN_ENABLE | VIDEO_PE_INTERRUPT_FINISH_ENABLE)) +#define gcngx_enable_pe_interrupts() { out_be16(VIDEO_PE_INTERRUPT,in_be16(VIDEO_PE_INTERRUPT) | (VIDEO_PE_INTERRUPT_TOKEN_ENABLE | VIDEO_PE_INTERRUPT_FINISH_ENABLE | VIDEO_PE_INTERRUPT_TOKEN_INTERRUPT | VIDEO_PE_INTERRUPT_FINISH_INTERRUPT)); out_be16(VIDEO_PE_TOKEN, 0); } #define VIDEO_CP_SR ((volatile u16 __iomem *)0xcc000000) #define VIDEO_CP_SR_OVERFLOW (1 << 0) @@ -126,7 +127,7 @@ static irqreturn_t gcfb_fifo_irq_handler(int irq,void *dev_id) { /* now handle the int */ - u16 val = readw(VIDEO_CP_SR); + u16 val = in_be16(VIDEO_CP_SR); /* ENABLE_RUMBLE(); */ @@ -185,8 +186,8 @@ u16 val; struct siginfo sig; /* ack the interrupt */ - val = readw(VIDEO_PE_INTERRUPT) | VIDEO_PE_INTERRUPT_FINISH_INTERRUPT; - writew(val,VIDEO_PE_INTERRUPT); + val = in_be16(VIDEO_PE_INTERRUPT) | VIDEO_PE_INTERRUPT_FINISH_INTERRUPT; + out_be16(VIDEO_PE_INTERRUPT, val); /* send SIG_PE_FINISH to the process */ if (mmap_task) @@ -204,8 +205,8 @@ u16 val; struct siginfo sig; /* ack the interrupt */ - val = readw(VIDEO_PE_INTERRUPT) | VIDEO_PE_INTERRUPT_TOKEN_INTERRUPT; - writew(val,VIDEO_PE_INTERRUPT); + val = in_be16(VIDEO_PE_INTERRUPT) | VIDEO_PE_INTERRUPT_TOKEN_INTERRUPT; + out_be16(VIDEO_PE_INTERRUPT, val); /* send SIG_PE_TOKEN to the process */ if (mmap_task) { @@ -640,15 +641,15 @@ goto free_mem; } - if ((err=request_irq(IRQ_PE_TOKEN,gcfb_pe_token_irq_handler,SA_INTERRUPT,"PE Token",0))) + if ((err=request_irq(IRQ_PE_TOKEN,gcfb_pe_token_irq_handler,IRQF_DISABLED,"PE Token",0))) { goto free_iounmap; } - if ((err=request_irq(IRQ_PE_FINISH,gcfb_pe_finish_irq_handler,SA_INTERRUPT,"PE Finish",0))) + if ((err=request_irq(IRQ_PE_FINISH,gcfb_pe_finish_irq_handler,IRQF_DISABLED,"PE Finish",0))) { goto free_pe_token; } - if ((err=request_irq(IRQ_CP_FIFO,gcfb_fifo_irq_handler,SA_INTERRUPT,"CP FIFO",0))) + if ((err=request_irq(IRQ_CP_FIFO,gcfb_fifo_irq_handler,IRQF_DISABLED,"CP FIFO",0))) { goto free_pe_finish; } Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/Makefile,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- Makefile 30 Apr 2007 17:06:12 -0000 1.22 +++ Makefile 14 Nov 2007 23:08:55 -0000 1.23 @@ -4,6 +4,7 @@ # Each configuration option enables a list of files. +obj-$(CONFIG_VGASTATE) += vgastate.o obj-y += fb_notify.o obj-$(CONFIG_FB) += fb.o fb-y := fbmem.o fbmon.o fbcmap.o fbsysfs.o \ @@ -12,14 +13,19 @@ obj-$(CONFIG_VT) += console/ obj-$(CONFIG_LOGO) += logo/ -obj-y += backlight/ +obj-y += backlight/ display/ obj-$(CONFIG_FB_CFB_FILLRECT) += cfbfillrect.o obj-$(CONFIG_FB_CFB_COPYAREA) += cfbcopyarea.o obj-$(CONFIG_FB_CFB_IMAGEBLIT) += cfbimgblt.o +obj-$(CONFIG_FB_SYS_FILLRECT) += sysfillrect.o +obj-$(CONFIG_FB_SYS_COPYAREA) += syscopyarea.o +obj-$(CONFIG_FB_SYS_IMAGEBLIT) += sysimgblt.o +obj-$(CONFIG_FB_SYS_FOPS) += fb_sys_fops.o obj-$(CONFIG_FB_SVGALIB) += svgalib.o obj-$(CONFIG_FB_MACMODES) += macmodes.o obj-$(CONFIG_FB_DDC) += fb_ddc.o +obj-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o # Hardware specific drivers go first obj-$(CONFIG_FB_AMIGA) += amifb.o c2p.o @@ -30,7 +36,7 @@ obj-$(CONFIG_FB_PM3) += pm3fb.o obj-$(CONFIG_FB_MATROX) += matrox/ -obj-$(CONFIG_FB_RIVA) += riva/ vgastate.o +obj-$(CONFIG_FB_RIVA) += riva/ obj-$(CONFIG_FB_NVIDIA) += nvidia/ obj-$(CONFIG_FB_ATY) += aty/ macmodes.o obj-$(CONFIG_FB_ATY128) += aty/ macmodes.o @@ -40,8 +46,7 @@ obj-$(CONFIG_FB_SAVAGE) += savage/ obj-$(CONFIG_FB_GEODE) += geode/ obj-$(CONFIG_FB_MBX) += mbx/ -obj-$(CONFIG_FB_I810) += vgastate.o -obj-$(CONFIG_FB_NEOMAGIC) += neofb.o vgastate.o +obj-$(CONFIG_FB_NEOMAGIC) += neofb.o obj-$(CONFIG_FB_3DFX) += tdfxfb.o obj-$(CONFIG_FB_CONTROL) += controlfb.o obj-$(CONFIG_FB_PLATINUM) += platinumfb.o @@ -49,9 +54,12 @@ obj-$(CONFIG_FB_CT65550) += chipsfb.o obj-$(CONFIG_FB_IMSTT) += imsttfb.o obj-$(CONFIG_FB_FM2) += fm2fb.o +obj-$(CONFIG_FB_VT8623) += vt8623fb.o obj-$(CONFIG_FB_CYBLA) += cyblafb.o obj-$(CONFIG_FB_TRIDENT) += tridentfb.o -obj-$(CONFIG_FB_S3) += s3fb.o vgastate.o +obj-$(CONFIG_FB_LE80578) += vermilion/ +obj-$(CONFIG_FB_S3) += s3fb.o +obj-$(CONFIG_FB_ARK) += arkfb.o obj-$(CONFIG_FB_STI) += stifb.o obj-$(CONFIG_FB_FFB) += ffb.o sbuslib.o obj-$(CONFIG_FB_CG6) += cg6.o sbuslib.o @@ -63,9 +71,13 @@ obj-$(CONFIG_FB_LEO) += leo.o sbuslib.o obj-$(CONFIG_FB_SGIVW) += sgivwfb.o obj-$(CONFIG_FB_ACORN) += acornfb.o -obj-$(CONFIG_FB_ATARI) += atafb.o +obj-$(CONFIG_FB_ATARI) += atafb.o c2p.o atafb_mfb.o \ + atafb_iplan2p2.o atafb_iplan2p4.o atafb_iplan2p8.o obj-$(CONFIG_FB_MAC) += macfb.o +obj-$(CONFIG_FB_HECUBA) += hecubafb.o obj-$(CONFIG_FB_HGA) += hgafb.o +obj-$(CONFIG_FB_XVR500) += sunxvr500.o +obj-$(CONFIG_FB_XVR2500) += sunxvr2500.o obj-$(CONFIG_FB_IGA) += igafb.o obj-$(CONFIG_FB_APOLLO) += dnfb.o obj-$(CONFIG_FB_Q40) += q40fb.o @@ -75,6 +87,7 @@ obj-$(CONFIG_FB_SA1100) += sa1100fb.o obj-$(CONFIG_FB_HIT) += hitfb.o obj-$(CONFIG_FB_EPSON1355) += epson1355fb.o +obj-$(CONFIG_FB_ATMEL) += atmel_lcdfb.o obj-$(CONFIG_FB_PVR2) += pvr2fb.o obj-$(CONFIG_FB_VOODOO1) += sstfb.o obj-$(CONFIG_FB_ARMCLCD) += amba-clcd.o @@ -99,6 +112,7 @@ obj-$(CONFIG_FB_IBM_GXT4500) += gxt4500.o obj-$(CONFIG_FB_PS3) += ps3fb.o obj-$(CONFIG_FB_SM501) += sm501fb.o +obj-$(CONFIG_FB_XILINX) += xilinxfb.o obj-$(CONFIG_FB_GAMECUBE) += gcnfb.o obj-$(CONFIG_FB_GAMECUBE_GX) += gcngx.o @@ -106,7 +120,7 @@ # Platform or fallback drivers go here obj-$(CONFIG_FB_VESA) += vesafb.o obj-$(CONFIG_FB_IMAC) += imacfb.o -obj-$(CONFIG_FB_VGA16) += vga16fb.o vgastate.o +obj-$(CONFIG_FB_VGA16) += vga16fb.o obj-$(CONFIG_FB_OF) += offb.o # the test framebuffer is last Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/Kconfig,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- Kconfig 30 Apr 2007 17:06:12 -0000 1.23 +++ Kconfig 14 Nov 2007 23:08:52 -0000 1.24 @@ -3,8 +3,14 @@ # menu "Graphics support" + depends on HAS_IOMEM source "drivers/video/backlight/Kconfig" +source "drivers/video/display/Kconfig" + +config VGASTATE + tristate + default n config FB tristate "Support for frame buffer devices" @@ -90,6 +96,43 @@ blitting. This is used by drivers that don't provide their own (accelerated) version. +config FB_SYS_FILLRECT + tristate + depends on FB + default n + ---help--- + Include the sys_fillrect function for generic software rectangle + filling. This is used by drivers that don't provide their own + (accelerated) version and the framebuffer is in system RAM. + +config FB_SYS_COPYAREA + tristate + depends on FB + default n + ---help--- + Include the sys_copyarea function for generic software area copying. + This is used by drivers that don't provide their own (accelerated) + version and the framebuffer is in system RAM. + +config FB_SYS_IMAGEBLIT + tristate + depends on FB + default n + ---help--- + Include the sys_imageblit function for generic software image + blitting. This is used by drivers that don't provide their own + (accelerated) version and the framebuffer is in system RAM. + +config FB_SYS_FOPS + tristate + depends on FB + default n + +config FB_DEFERRED_IO + bool + depends on FB + default y + config FB_SVGALIB tristate depends on FB @@ -191,7 +234,7 @@ If you want to compile this as a module (=code which can be inserted into and removed from the running kernel), say M - here and read <file:Documentation/modules.txt>. The module + here and read <file:Documentation/kbuild/modules.txt>. The module will be called amba-clcd. choice @@ -375,9 +418,10 @@ config FB_ARC tristate "Arc Monochrome LCD board support" depends on FB && X86 - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT + select FB_SYS_FILLRECT + select FB_SYS_COPYAREA + select FB_SYS_IMAGEBLIT + select FB_SYS_FOPS help This enables support for the Arc Monochrome LCD board. The board is based on the KS-108 lcd controller and is typically a matrix @@ -389,14 +433,17 @@ config FB_ATARI bool "Atari native chipset support" - depends on (FB = y) && ATARI && BROKEN + depends on (FB = y) && ATARI + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT help This is the frame buffer device driver for the builtin graphics chipset found in Ataris. config FB_OF bool "Open Firmware frame buffer device support" - depends on (FB = y) && (PPC64 || PPC_OF) + depends on (FB = y) && (PPC64 || PPC_OF) && (!PPC_PSERIES || PCI) select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT @@ -472,6 +519,8 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select VGASTATE + select FONT_8x16 if FRAMEBUFFER_CONSOLE help This is the frame buffer device driver for VGA 16 color graphic cards. Say Y if you have such a card. @@ -516,15 +565,25 @@ default y config FB_TGA - tristate "TGA framebuffer support" - depends on FB && ALPHA + tristate "TGA/SFB+ framebuffer support" + depends on FB && (ALPHA || TC) select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select BITREVERSE - help - This is the frame buffer device driver for generic TGA graphic - cards. Say Y if you have one of those. + ---help--- + This is the frame buffer device driver for generic TGA and SFB+ + graphic cards. These include DEC ZLXp-E1, -E2 and -E3 PCI cards, + also known as PBXGA-A, -B and -C, and DEC ZLX-E1, -E2 and -E3 + TURBOchannel cards, also known as PMAGD-A, -B and -C. + + Due to hardware limitations ZLX-E2 and E3 cards are not supported + for DECstation 5000/200 systems. Additionally due to firmware + limitations these cards may cause troubles with booting DECstation + 5000/240 and /260 systems, but are fully supported under Linux if + you manage to get it going. ;-) + + Say Y if you have one of those. config FB_VESA bool "VESA VGA graphics support" @@ -548,6 +607,21 @@ help This is the frame buffer device driver for the Intel-based Macintosh +config FB_HECUBA + tristate "Hecuba board support" + depends on FB && X86 && MMU + select FB_SYS_FILLRECT + select FB_SYS_COPYAREA + select FB_SYS_IMAGEBLIT + select FB_SYS_FOPS + select FB_DEFERRED_IO + help + This enables support for the Hecuba board. This driver was tested + with an E-Ink 800x600 display and x86 SBCs through a 16 bit GPIO + interface (8 bit data, 4 bit control). If you anticpate using + this driver, say Y or M; otherwise say N. You must specify the + GPIO IO address to be used for setting control and data. + config FB_HGA tristate "Hercules mono graphics support" depends on FB && X86 @@ -630,6 +704,91 @@ This is the frame buffer device driver for the CGsix (GX, TurboGX) frame buffer. +config FB_FFB + bool "Creator/Creator3D/Elite3D support" + depends on FB_SBUS && SPARC64 + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + help + This is the frame buffer device driver for the Creator, Creator3D, + and Elite3D graphics boards. + +config FB_TCX + bool "TCX (SS4/SS5 only) support" + depends on FB_SBUS + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + help + This is the frame buffer device driver for the TCX 24/8bit frame + buffer. + +config FB_CG14 + bool "CGfourteen (SX) support" + depends on FB_SBUS + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + help + This is the frame buffer device driver for the CGfourteen frame + buffer on Desktop SPARCsystems with the SX graphics option. + +config FB_P9100 + bool "P9100 (Sparcbook 3 only) support" + depends on FB_SBUS + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + help + This is the frame buffer device driver for the P9100 card + supported on Sparcbook 3 machines. + +config FB_LEO + bool "Leo (ZX) support" + depends on FB_SBUS + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + help + This is the frame buffer device driver for the SBUS-based Sun ZX + (leo) frame buffer cards. + +config FB_IGA + bool "IGA 168x display support" + depends on (FB = y) && SPARC32 + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + help + This is the framebuffer device for the INTERGRAPHICS 1680 and + successor frame buffer cards. + +config FB_XVR500 + bool "Sun XVR-500 3DLABS Wildcat support" + depends on (FB = y) && PCI && SPARC64 + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + help + This is the framebuffer device for the Sun XVR-500 and similar + graphics cards based upon the 3DLABS Wildcat chipset. The driver + only works on sparc64 systems where the system firwmare has + mostly initialized the card already. It is treated as a + completely dumb framebuffer device. + +config FB_XVR2500 + bool "Sun XVR-2500 3DLABS Wildcat support" + depends on (FB = y) && PCI && SPARC64 + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + help + This is the framebuffer device for the Sun XVR-2500 and similar + graphics cards based upon the 3DLABS Wildcat chipset. The driver + only works on sparc64 systems where the system firwmare has + mostly initialized the card already. It is treated as a + completely dumb framebuffer device. + config FB_PVR2 tristate "NEC PowerVR 2 display support" depends on FB && SH_DREAMCAST @@ -674,6 +833,22 @@ working with S1D13806). Product specs at <http://www.erd.epson.com/vdc/html/legacy_13xxx.htm> +config FB_ATMEL + tristate "AT91/AT32 LCD Controller support" + depends on FB && (ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || AVR32) + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + help + This enables support for the AT91/AT32 LCD Controller. + +config FB_INTSRAM + bool "Frame Buffer in internal SRAM" + depends on FB_ATMEL && ARCH_AT91SAM9261 + help + Say Y if you want to map Frame Buffer in internal SRAM. Say N if you want + to let frame buffer in external SDRAM. + config FB_NVIDIA tristate "nVidia Framebuffer Support" depends on FB && PCI @@ -683,6 +858,7 @@ select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select BITREVERSE + select VGASTATE help This driver supports graphics boards with the nVidia chips, TNT and newer. For very old chipsets, such as the RIVA128, then use @@ -705,6 +881,15 @@ independently validate video mode parameters, you should say Y here. +config FB_NVIDIA_DEBUG + bool "Lots of debug output" + depends on FB_NVIDIA + default n + help + Say Y here if you want the nVidia driver to output all sorts + of debugging information to provide to the maintainer when + something goes wrong. + config FB_NVIDIA_BACKLIGHT bool "Support for backlight control" depends on FB_NVIDIA @@ -721,6 +906,7 @@ select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select BITREVERSE + select VGASTATE help This driver supports graphics boards with the nVidia Riva/Geforce chips. @@ -743,7 +929,7 @@ here. config FB_RIVA_DEBUG - bool "Lots of debug output from Riva(nVidia) driver" + bool "Lots of debug output" depends on FB_RIVA default n help @@ -767,6 +953,7 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select VGASTATE help This driver supports the on-board graphics built in to the Intel 810 and 815 chipsets. Say Y if you have and plan to use such a board. @@ -806,6 +993,22 @@ select FB_DDC help +config FB_LE80578 + tristate "Intel LE80578 (Vermilion) support" + depends on FB && PCI && X86 + select FB_MODE_HELPERS + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + help + This driver supports the LE80578 (Vermilion Range) chipset + +config FB_CARILLO_RANCH + tristate "Intel Carillo Ranch support" + depends on FB_LE80578 && FB && PCI && X86 + help + This driver supports the LE80578 (Carillo Ranch) board + config FB_INTEL tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G support (EXPERIMENTAL)" depends on FB && EXPERIMENTAL && PCI && X86 @@ -1077,7 +1280,7 @@ config FB_ATY_CT bool "Mach64 CT/VT/GT/LT (incl. 3D RAGE) support" depends on PCI && FB_ATY - default y if SPARC64 && FB_PCI + default y if SPARC64 && PCI help Say Y here to support use of ATI's 64-bit Rage boards (or other boards based on the Mach64 CT, VT, GT, and LT chipsets) as a @@ -1117,6 +1320,8 @@ select FB_CFB_IMAGEBLIT select FB_TILEBLITTING select FB_SVGALIB + select VGASTATE + select FONT_8x16 if FRAMEBUFFER_CONSOLE ---help--- Driver for graphics boards with S3 Trio / S3 Virge chip. @@ -1127,6 +1332,7 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select VGASTATE help This driver supports notebooks and computers with S3 Savage PCI/AGP chips. @@ -1193,6 +1399,7 @@ select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select VGASTATE help This driver supports notebooks with NeoMagic PCI chips. Say Y if you have such a graphics card. @@ -1252,6 +1459,20 @@ Please read the <file:Documentation/fb/README-sstfb.txt> for supported options and other important info support. +config FB_VT8623 + tristate "VIA VT8623 support" + depends on FB && PCI + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + select FB_TILEBLITTING + select FB_SVGALIB + select VGASTATE + select FONT_8x16 if FRAMEBUFFER_CONSOLE + ---help--- + Driver for CastleRock integrated graphics core in the + VIA VT8623 [Apollo CLE266] chipset. + config FB_CYBLA tristate "Cyberblade/i1 support" depends on FB && PCI && X86_32 && !64BIT @@ -1305,9 +1526,26 @@ This will compile the Trident frame buffer device with acceleration functions. +config FB_ARK + tristate "ARK 2000PV support" + depends on FB && PCI + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + select FB_TILEBLITTING + select FB_SVGALIB + select VGASTATE + select FONT_8x16 if FRAMEBUFFER_CONSOLE + ---help--- + Driver for PCI graphics boards with ARK 2000PV chip + and ICS 5342 RAMDAC. + config FB_PM3 - tristate "Permedia3 support" - depends on FB && PCI && BROKEN + tristate "Permedia3 support (EXPERIMENTAL)" + depends on FB && PCI && EXPERIMENTAL + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT help This is the frame buffer device driver for the 3DLabs Permedia3 chipset, used in Formac ProFormance III, 3DLabs Oxygen VX1 & @@ -1346,69 +1584,6 @@ source "drivers/video/geode/Kconfig" -config FB_FFB - bool "Creator/Creator3D/Elite3D support" - depends on FB_SBUS && SPARC64 - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT - help - This is the frame buffer device driver for the Creator, Creator3D, - and Elite3D graphics boards. - -config FB_TCX - bool "TCX (SS4/SS5 only) support" - depends on FB_SBUS - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT - help - This is the frame buffer device driver for the TCX 24/8bit frame - buffer. - -config FB_CG14 - bool "CGfourteen (SX) support" - depends on FB_SBUS - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT - help - This is the frame buffer device driver for the CGfourteen frame - buffer on Desktop SPARCsystems with the SX graphics option. - -config FB_P9100 - bool "P9100 (Sparcbook 3 only) support" - depends on FB_SBUS - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT - help - This is the frame buffer device driver for the P9100 card - supported on Sparcbook 3 machines. - -config FB_LEO - bool "Leo (ZX) support" - depends on FB_SBUS - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT - help - This is the frame buffer device driver for the SBUS-based Sun ZX - (leo) frame buffer cards. - -config FB_PCI - bool "PCI framebuffers" - depends on (FB = y) && PCI && SPARC - -config FB_IGA - bool "IGA 168x display support" - depends on SPARC32 && FB_PCI - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT - help - This is the framebuffer device for the INTERGRAPHICS 1680 and - successor frame buffer cards. - config FB_HIT tristate "HD64461 Frame Buffer support" depends on FB && HD64461 @@ -1506,7 +1681,7 @@ This driver is also available as a module ( = code which can be inserted and removed from the running kernel whenever you want). The module will be called pxafb. If you want to compile it as a module, - say M here and read <file:Documentation/modules.txt>. + say M here and read <file:Documentation/kbuild/modules.txt>. If unsure, say N. @@ -1559,7 +1734,7 @@ This driver is also available as a module ( = code which can be inserted and removed from the running kernel whenever you want). The module will be called w100fb. If you want to compile it as a module, - say M here and read <file:Documentation/modules.txt>. + say M here and read <file:Documentation/kbuild/modules.txt>. If unsure, say N. @@ -1576,7 +1751,7 @@ This driver is also available as a module ( = code which can be inserted and removed from the running kernel whenever you want). The module will be called s3c2410fb. If you want to compile it as a module, - say M here and read <file:Documentation/modules.txt>. + say M here and read <file:Documentation/kbuild/modules.txt>. If unsure, say N. config FB_S3C2410_DEBUG @@ -1632,9 +1807,10 @@ config FB_PS3 bool "PS3 GPU framebuffer driver" depends on (FB = y) && PS3_PS3AV - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT + select FB_SYS_FILLRECT + select FB_SYS_COPYAREA + select FB_SYS_IMAGEBLIT + select FB_SYS_FOPS ---help--- Include support for the virtual frame buffer in the PS3 platform. @@ -1648,13 +1824,25 @@ The default value can be overridden on the kernel command line using the "ps3fb" option (e.g. "ps3fb=9M"); -config FB_VIRTUAL - tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)" - depends on FB +config FB_XILINX + tristate "Xilinx frame buffer support" + depends on FB && XILINX_VIRTEX select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT ---help--- + Include support for the Xilinx ML300/ML403 reference design + framebuffer. ML300 carries a 640*480 LCD display on the board, + ML403 uses a standard DB15 VGA connector. + +config FB_VIRTUAL + tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)" + depends on FB + select FB_SYS_FILLRECT + select FB_SYS_COPYAREA + select FB_SYS_IMAGEBLIT + select FB_SYS_FOPS + ---help--- This is a `virtual' frame buffer device. It operates on a chunk of unswappable kernel memory instead of on the memory of a graphics board. This means you cannot see any output sent to this frame |
|
From: Albert H. <he...@us...> - 2007-11-14 23:09:24
|
Update of /cvsroot/gc-linux/linux/drivers/video/logo In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4431/drivers/video/logo Modified Files: Kconfig Log Message: Merged 2.6.22. Updated drivers to use in_be* and out_be* instead of read* and write* input/output instructions. Updated DI driver: - do not use debug extensions with unknown drive models - do not load custom firmware on xenogc/duoq - evict alien firmwares and load custom formware on known drive models Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Kconfig,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Kconfig 18 Jan 2006 23:41:53 -0000 1.5 +++ Kconfig 14 Nov 2007 23:08:56 -0000 1.6 @@ -2,32 +2,29 @@ # Logo configuration # -menu "Logo configuration" - -config LOGO +menuconfig LOGO bool "Bootup logo" depends on FB || SGI_NEWPORT_CONSOLE help Enable and select frame buffer bootup logos. +if LOGO + config LOGO_LINUX_MONO bool "Standard black and white Linux logo" - depends on LOGO default y config LOGO_LINUX_VGA16 bool "Standard 16-color Linux logo" - depends on LOGO default y config LOGO_LINUX_CLUT224 bool "Standard 224-color Linux logo" - depends on LOGO default y config LOGO_DEC_CLUT224 bool "224-color Digital Equipment Corporation Linux logo" - depends on LOGO && (MACH_DECSTATION || ALPHA) + depends on MACH_DECSTATION || ALPHA default y config LOGO_GAMECUBE_CLUT224 @@ -37,43 +34,42 @@ config LOGO_MAC_CLUT224 bool "224-color Macintosh Linux logo" - depends on LOGO && MAC + depends on MAC default y config LOGO_PARISC_CLUT224 bool "224-color PA-RISC Linux logo" - depends on LOGO && PARISC + depends on PARISC default y config LOGO_SGI_CLUT224 bool "224-color SGI Linux logo" - depends on LOGO && (SGI_IP22 || SGI_IP27 || SGI_IP32 || X86_VISWS) + depends on SGI_IP22 || SGI_IP27 || SGI_IP32 || X86_VISWS default y config LOGO_SUN_CLUT224 bool "224-color Sun Linux logo" - depends on LOGO && SPARC + depends on SPARC default y config LOGO_SUPERH_MONO bool "Black and white SuperH Linux logo" - depends on LOGO && SUPERH + depends on SUPERH default y config LOGO_SUPERH_VGA16 bool "16-color SuperH Linux logo" - depends on LOGO && SUPERH + depends on SUPERH default y config LOGO_SUPERH_CLUT224 bool "224-color SuperH Linux logo" - depends on LOGO && SUPERH + depends on SUPERH default y config LOGO_M32R_CLUT224 bool "224-color M32R Linux logo" - depends on LOGO && M32R + depends on M32R default y -endmenu - +endif # LOGO |
|
From: Albert H. <he...@us...> - 2007-11-14 23:09:21
|
Update of /cvsroot/gc-linux/linux/drivers/net In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4431/drivers/net Modified Files: Kconfig Makefile Log Message: Merged 2.6.22. Updated drivers to use in_be* and out_be* instead of read* and write* input/output instructions. Updated DI driver: - do not use debug extensions with unknown drive models - do not load custom firmware on xenogc/duoq - evict alien firmwares and load custom formware on known drive models Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- Makefile 30 Apr 2007 17:06:12 -0000 1.22 +++ Makefile 14 Nov 2007 23:08:52 -0000 1.23 @@ -18,7 +18,7 @@ gianfar_sysfs.o obj-$(CONFIG_UCC_GETH) += ucc_geth_driver.o -ucc_geth_driver-objs := ucc_geth.o ucc_geth_phy.o +ucc_geth_driver-objs := ucc_geth.o ucc_geth_mii.o # # link order important here @@ -197,6 +197,7 @@ obj-$(CONFIG_DM9000) += dm9000.o obj-$(CONFIG_FEC_8XX) += fec_8xx/ obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o +obj-$(CONFIG_MLX4_CORE) += mlx4/ obj-$(CONFIG_GAMECUBE_BBA) += gcn-bba.o obj-$(CONFIG_MACB) += macb.o @@ -207,7 +208,15 @@ obj-$(CONFIG_WAN) += wan/ obj-$(CONFIG_ARCNET) += arcnet/ obj-$(CONFIG_NET_PCMCIA) += pcmcia/ -obj-$(CONFIG_NET_RADIO) += wireless/ + +obj-$(CONFIG_USB_CATC) += usb/ +obj-$(CONFIG_USB_KAWETH) += usb/ +obj-$(CONFIG_USB_PEGASUS) += usb/ +obj-$(CONFIG_USB_RTL8150) += usb/ +obj-$(CONFIG_USB_USBNET) += usb/ +obj-$(CONFIG_USB_ZD1201) += usb/ + +obj-y += wireless/ obj-$(CONFIG_NET_TULIP) += tulip/ obj-$(CONFIG_HAMRADIO) += hamradio/ obj-$(CONFIG_IRDA) += irda/ Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- Kconfig 30 Apr 2007 17:06:12 -0000 1.25 +++ Kconfig 14 Nov 2007 23:08:50 -0000 1.26 @@ -320,7 +320,7 @@ config MAC89x0 tristate "Macintosh CS89x0 based ethernet cards" - depends on NET_ETHERNET && MAC && BROKEN + depends on NET_ETHERNET && MAC ---help--- Support for CS89x0 chipset based Ethernet cards. If you have a Nubus or LC-PDS network (Ethernet) card of this type, say Y and @@ -346,8 +346,8 @@ be called macsonic. config MACMACE - bool "Macintosh (AV) onboard MACE ethernet (EXPERIMENTAL)" - depends on NET_ETHERNET && MAC && EXPERIMENTAL + bool "Macintosh (AV) onboard MACE ethernet" + depends on NET_ETHERNET && MAC select CRC32 help Support for the onboard AMD 79C940 MACE Ethernet controller used in @@ -495,8 +495,8 @@ enables offloading for checksums on transmit. If unsure, say Y. config MIPS_SIM_NET - tristate "MIPS simulator Network device (EXPERIMENTAL)" - depends on MIPS_SIM && EXPERIMENTAL + tristate "MIPS simulator Network device" + depends on NET_ETHERNET && MIPS_SIM help The MIPSNET device is a simple Ethernet network device which is emulated by the MIPS Simulator. @@ -831,7 +831,7 @@ tristate "SMC 91C9x/91C1xxx support" select CRC32 select MII - depends on NET_ETHERNET && (ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || SOC_AU1X00) + depends on NET_ETHERNET && (ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || SOC_AU1X00 || BFIN) help This is a driver for SMC's 91x series of Ethernet chipsets, including the SMC91C94 and the SMC91C111. Say Y if you want it @@ -842,8 +842,8 @@ This driver is also available as a module ( = code which can be inserted in and removed from the running kernel whenever you want). The module will be called smc91x. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + module, say M here and read <file:Documentation/kbuild/modules.txt> + as well as <file:Documentation/networking/net-modules.txt>. config SMC9194 tristate "SMC 9194 support" @@ -898,7 +898,7 @@ This driver is also available as a module. The module will be called smc911x. If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt> + here and read <file:Documentation/kbuild/modules.txt> config NET_VENDOR_RACAL bool "Racal-Interlan (Micom) NI cards" @@ -1113,7 +1113,7 @@ config NE2000 tristate "NE2000/NE1000 support" - depends on NET_ISA || (Q40 && m) || M32R + depends on NET_ISA || (Q40 && m) || M32R || TOSHIBA_RBTX4927 || TOSHIBA_RBTX4938 select CRC32 ---help--- If you have a network (Ethernet) card of this type, say Y and read @@ -1196,7 +1196,7 @@ config IBM_EMAC tristate "PowerPC 4xx on-chip Ethernet support" - depends on 4xx + depends on 4xx && !PPC_MERGE help This driver supports the PowerPC 4xx EMAC family of on-chip Ethernet controllers. @@ -1453,7 +1453,8 @@ config TC35815 tristate "TOSHIBA TC35815 Ethernet support" - depends on NET_PCI && PCI && TOSHIBA_JMR3927 + depends on NET_PCI && PCI && MIPS + select MII config DGRS tristate "Digi Intl. RightSwitch SE-X support" @@ -1906,8 +1907,12 @@ # Gigabit Ethernet # -menu "Ethernet (1000 Mbit)" +menuconfig NETDEV_1000 + bool "Ethernet (1000 Mbit)" depends on !UML + default y + +if NETDEV_1000 config ACENIC tristate "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support" @@ -2222,7 +2227,7 @@ config VIA_VELOCITY tristate "VIA Velocity support" - depends on NET_PCI && PCI + depends on PCI select CRC32 select CRC_CCITT select MII @@ -2282,11 +2287,12 @@ depends on GIANFAR config UCC_GETH - tristate "Freescale QE UCC GETH" - depends on QUICC_ENGINE && UCC_FAST + tristate "Freescale QE Gigabit Ethernet" + depends on QUICC_ENGINE + select PHYLIB help - This driver supports the Gigabit Ethernet mode of QE UCC. - QE can be found on MPC836x CPUs. + This driver supports the Gigabit Ethernet mode of the QUICC Engine, + which is available on some Freescale SOCs. config UGETH_NAPI bool "NAPI Support" @@ -2300,17 +2306,13 @@ bool "Mac address filtering support" depends on UCC_GETH -config UGETH_TX_ON_DEMOND - bool "Transmit on Demond support" +config UGETH_TX_ON_DEMAND + bool "Transmit on Demand support" depends on UCC_GETH -config UGETH_HAS_GIGA - bool - depends on UCC_GETH && PPC_MPC836x - config MV643XX_ETH tristate "MV-643XX Ethernet support" - depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 || (PPC_MULTIPLATFORM && PPC32) + depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MV64X60 || MOMENCO_OCELOT_3 || (PPC_MULTIPLATFORM && PPC32) select MII help This driver supports the gigabit Ethernet on the Marvell MV643XX @@ -2337,14 +2339,18 @@ To compile this driver as a module, choose M here. The module will be called atl1. -endmenu +endif # NETDEV_1000 # # 10 Gigabit Ethernet # -menu "Ethernet (10000 Mbit)" +menuconfig NETDEV_10000 + bool "Ethernet (10000 Mbit)" depends on !UML + default y + +if NETDEV_10000 config CHELSIO_T1 tristate "Chelsio 10Gb Ethernet support" @@ -2499,16 +2505,34 @@ config PASEMI_MAC tristate "PA Semi 1/10Gbit MAC" depends on PPC64 && PCI + select PHYLIB help This driver supports the on-chip 1/10Gbit Ethernet controller on PA Semi's PWRficient line of chips. -endmenu +config MLX4_CORE + tristate + depends on PCI + default n + +config MLX4_DEBUG + bool "Verbose debugging output" if (MLX4_CORE && EMBEDDED) + depends on MLX4_CORE + default y + ---help--- + This option causes debugging code to be compiled into the + mlx4_core driver. The output can be turned on via the + debug_level module parameter (which can also be set after + the driver is loaded through sysfs). + +endif # NETDEV_10000 source "drivers/net/tokenring/Kconfig" source "drivers/net/wireless/Kconfig" +source "drivers/net/usb/Kconfig" + source "drivers/net/pcmcia/Kconfig" source "drivers/net/wan/Kconfig" @@ -2938,11 +2962,6 @@ config NETPOLL def_bool NETCONSOLE -config NETPOLL_RX - bool "Netpoll support for trapping incoming packets" - default n - depends on NETPOLL - config NETPOLL_TRAP bool "Netpoll traffic trapping" default n |
|
From: Albert H. <he...@us...> - 2007-11-14 23:09:18
|
Update of /cvsroot/gc-linux/linux/drivers/misc In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4431/drivers/misc Modified Files: Kconfig Makefile gcn-gqr.c gcn-mi.c Log Message: Merged 2.6.22. Updated drivers to use in_be* and out_be* instead of read* and write* input/output instructions. Updated DI driver: - do not use debug extensions with unknown drive models - do not load custom firmware on xenogc/duoq - evict alien firmwares and load custom formware on known drive models Index: gcn-gqr.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/misc/gcn-gqr.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gcn-gqr.c 2 Dec 2004 15:52:41 -0000 1.1 +++ gcn-gqr.c 14 Nov 2007 23:08:49 -0000 1.2 @@ -2,8 +2,9 @@ * drivers/misc/gcn-gqr.c * * Nintendo GameCube GQR driver + * Copyright (C) 2004-2007 The GameCube Linux Team * Copyright (C) 2004 Todd Jeffreys <to...@vo...> - * Copyright (C) 2004 The GameCube Linux Team + * Copyright (C) 2007 Albert Herranz * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -121,7 +122,7 @@ int __init gcngqr_init(void) { - if (!(gqr_table_header = register_sysctl_table(gqr_table,1))) { + if (!(gqr_table_header = register_sysctl_table(gqr_table))) { printk(KERN_ERR "Unable to register GQR sysctl table\n"); return -ENOMEM; } Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/misc/Kconfig,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Kconfig 30 Apr 2007 17:06:12 -0000 1.6 +++ Kconfig 14 Nov 2007 23:08:49 -0000 1.7 @@ -49,6 +49,15 @@ information on the specific driver level and support statement for your IBM server. +config PHANTOM + tristate "Sensable PHANToM" + depends on PCI + help + Say Y here if you want to build a driver for Sensable PHANToM device. + + If you choose to build module, its name will be phantom. If unsure, + say N here. + If unsure, say N. @@ -136,14 +145,71 @@ depends on X86 && ACPI select BACKLIGHT_CLASS_DEVICE ---help--- - This mini-driver drives the SNC device present in the ACPI BIOS of - the Sony Vaio laptops. + This mini-driver drives the SNC and SPIC devices present in the ACPI + BIOS of the Sony Vaio laptops. - It gives access to some extra laptop functionalities. In its current - form, this driver let the user set or query the screen brightness - through the backlight subsystem and remove/apply power to some + It gives access to some extra laptop functionalities like Bluetooth, + screen brightness control, Fn keys and allows powering on/off some devices. Read <file:Documentation/sony-laptop.txt> for more information. +config SONYPI_COMPAT + bool "Sonypi compatibility" + depends on SONY_LAPTOP + ---help--- + Build the sonypi driver compatibility code into the sony-laptop driver. + +config THINKPAD_ACPI + tristate "ThinkPad ACPI Laptop Extras" + depends on X86 && ACPI + select BACKLIGHT_CLASS_DEVICE + select HWMON + ---help--- + This is a driver for the IBM and Lenovo ThinkPad laptops. It adds + support for Fn-Fx key combinations, Bluetooth control, video + output switching, ThinkLight control, UltraBay eject and more. + For more information about this driver see + <file:Documentation/thinkpad-acpi.txt> and <http://ibm-acpi.sf.net/> . + + This driver was formely known as ibm-acpi. + + If you have an IBM or Lenovo ThinkPad laptop, say Y or M here. + +config THINKPAD_ACPI_DEBUG + bool "Verbose debug mode" + depends on THINKPAD_ACPI + default n + ---help--- + Enables extra debugging information, at the expense of a slightly + increase in driver size. + + If you are not sure, say N here. + +config THINKPAD_ACPI_DOCK + bool "Legacy Docking Station Support" + depends on THINKPAD_ACPI + depends on ACPI_DOCK=n + default n + ---help--- + Allows the thinkpad_acpi driver to handle docking station events. + This support was made obsolete by the generic ACPI docking station + support (CONFIG_ACPI_DOCK). It will allow locking and removing the + laptop from the docking station, but will not properly connect PCI + devices. + + If you are not sure, say N here. + +config THINKPAD_ACPI_BAY + bool "Legacy Removable Bay Support" + depends on THINKPAD_ACPI + default y + ---help--- + Allows the thinkpad_acpi driver to handle removable bays. It will + eletrically disable the device in the bay, and also generate + notifications when the bay lever is ejected or inserted. + + If you are not sure, say Y here. + + endmenu Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/misc/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 23 Jun 2005 20:02:18 -0000 1.3 +++ Makefile 14 Nov 2007 23:08:49 -0000 1.4 @@ -3,7 +3,17 @@ # obj- := misc.o # Dummy rule to force built-in.o to be made -obj-$(CONFIG_IBM_ASM) += ibmasm/ +obj-$(CONFIG_IBM_ASM) += ibmasm/ obj-$(CONFIG_HDPU_FEATURES) += hdpuftrs/ +obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o +obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o +obj-$(CONFIG_LKDTM) += lkdtm.o +obj-$(CONFIG_TIFM_CORE) += tifm_core.o +obj-$(CONFIG_TIFM_7XX1) += tifm_7xx1.o +obj-$(CONFIG_PHANTOM) += phantom.o +obj-$(CONFIG_SGI_IOC4) += ioc4.o +obj-$(CONFIG_SONY_LAPTOP) += sony-laptop.o +obj-$(CONFIG_THINKPAD_ACPI) += thinkpad_acpi.o obj-$(CONFIG_GAMECUBE_GQR) += gcn-gqr.o obj-$(CONFIG_GAMECUBE_MI) += gcn-mi.o + Index: gcn-mi.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/misc/gcn-mi.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- gcn-mi.c 18 Feb 2007 22:56:02 -0000 1.5 +++ gcn-mi.c 14 Nov 2007 23:08:49 -0000 1.6 @@ -1,9 +1,9 @@ /* - * arch/ppc/platforms/gcn-mi.c + * drivers/misc/gcn-mi.c * * Nintendo GameCube Memory Interface driver - * Copyright (C) 2004-2005 The GameCube Linux Team - * Copyright (C) 2004,2005 Albert Herranz + * Copyright (C) 2004-2007 The GameCube Linux Team + * Copyright (C) 2004,2005,2007 Albert Herranz * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -110,10 +110,10 @@ spin_lock_irqsave(&priv->lock, flags); - address = readw(MI_ADDRLO) | (readw(MI_ADDRHI)<<16); + address = in_be16(MI_ADDRLO) | (in_be16(MI_ADDRHI)<<16); ack = 0; - cause = readw(MI_ICR); + cause = in_be16(MI_ICR); /* a fault was detected in some of the registered regions */ if ( (cause & 0xf) != 0) { @@ -145,8 +145,8 @@ } } ack |= cause; - writew(ack, MI_ICR); /* ack int */ - writew(0, MI_0x4020); /* kind of ack */ + out_be16(MI_ICR, ack); /* ack int */ + out_be16(MI_0x4020, 0); /* kind of ack */ spin_unlock_irqrestore(&priv->lock, flags); @@ -191,7 +191,7 @@ if (retval) { mi_printk(KERN_ERR, "request of irq%d failed\n", priv->irq); } else { - writew((1<<4), MI_IMR); /* do not mask all MI interrupts */ + out_be16(MI_IMR, (1<<4)); /* do not mask all MI interrupts */ } return retval; @@ -412,13 +412,12 @@ priv->regions_bitmap |= (1 << region); priv->nr_regions++; - writew((readw(MI_PROT_TYPE) & ~(3 << 2*region))|(type << 2*region), - MI_PROT_TYPE); + out_be16(MI_PROT_TYPE, + (in_be16(MI_PROT_TYPE) & ~(3 << 2*region))|(type << 2*region)); pagelo = physlo >> MI_PAGE_SHIFT; pagehi = (physhi >> MI_PAGE_SHIFT) - 1; - writel((pagelo << 16) | pagehi, - MI_PROT_REGION0 + 4*region); - writew(readw(MI_IMR) | (1 << region), MI_IMR); + out_be32(MI_PROT_REGION0 + 4*region, (pagelo << 16) | pagehi); + out_be16(MI_IMR, in_be16(MI_IMR) | (1 << region)); mi_printk(KERN_INFO, "protected region #%d" " from 0x%0lx to 0x%0lx with 0x%0x\n", region, @@ -442,9 +441,9 @@ if (region < 0 || region > MI_MAX_REGIONS) return -EINVAL; - writew(readw(MI_IMR) & ~(1 << region), MI_IMR); - writel(0, MI_PROT_REGION0 + 4*region); - writew(readw(MI_PROT_TYPE) | (MI_PROT_RW << 2*region), MI_PROT_TYPE); + out_be16(MI_IMR, in_be16(MI_IMR) & ~(1 << region)); + out_be32(MI_PROT_REGION0 + 4*region, 0); + out_be16(MI_PROT_TYPE, in_be16(MI_PROT_TYPE) | (MI_PROT_RW << 2*region)); if ( (priv->regions_bitmap & (1<<region)) != 0 ) mi_printk(KERN_INFO, "region #%d unprotected\n", region); @@ -462,7 +461,7 @@ { int region; - writew(0, MI_IMR); + out_be16(MI_IMR, 0); for (region = 0; region < MI_MAX_REGIONS; region++) { gcn_mi_region_unprotect(region); } |
|
From: Albert H. <he...@us...> - 2007-11-14 23:09:17
|
Update of /cvsroot/gc-linux/linux/drivers/input/si In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4431/drivers/input/si Modified Files: gcn-si.c Log Message: Merged 2.6.22. Updated drivers to use in_be* and out_be* instead of read* and write* input/output instructions. Updated DI driver: - do not use debug extensions with unknown drive models - do not load custom firmware on xenogc/duoq - evict alien firmwares and load custom formware on known drive models Index: gcn-si.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/input/si/gcn-si.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- gcn-si.c 18 Feb 2007 22:56:02 -0000 1.6 +++ gcn-si.c 14 Nov 2007 23:08:49 -0000 1.7 @@ -152,34 +152,34 @@ /* SICOUTBUF */ for (i = 0; i < SI_MAX_PORTS; ++i) - writel(0, SICOUTBUF(i)); + out_be32(SICOUTBUF(i), 0); /* SICINBUFH */ for (i = 0; i < SI_MAX_PORTS; ++i) - writel(0, SICINBUFH(i)); + out_be32(SICINBUFH(i), 0); /* SICINBUFL */ for (i = 0; i < SI_MAX_PORTS; ++i) - writel(0, SICINBUFL(i)); + out_be32(SICINBUFL(i), 0); - writel(0, SIPOLL); - writel(0, SICOMCSR); - writel(0, SISR); + out_be32(SIPOLL, 0); + out_be32(SICOMCSR, 0); + out_be32(SISR, 0); - writel(0, (void __iomem *)0xcc006480); - writel(0, (void __iomem *)0xcc006484); - writel(0, (void __iomem *)0xcc006488); - writel(0, (void __iomem *)0xcc00648c); + out_be32((void __iomem *)0xcc006480, 0); + out_be32((void __iomem *)0xcc006484, 0); + out_be32((void __iomem *)0xcc006488, 0); + out_be32((void __iomem *)0xcc00648c, 0); - writel(0, (void __iomem *)0xcc006490); - writel(0, (void __iomem *)0xcc006494); - writel(0, (void __iomem *)0xcc006498); - writel(0, (void __iomem *)0xcc00649c); + out_be32((void __iomem *)0xcc006490, 0); + out_be32((void __iomem *)0xcc006494, 0); + out_be32((void __iomem *)0xcc006498, 0); + out_be32((void __iomem *)0xcc00649c, 0); - writel(0, (void __iomem *)0xcc0064a0); - writel(0, (void __iomem *)0xcc0064a4); - writel(0, (void __iomem *)0xcc0064a8); - writel(0, (void __iomem *)0xcc0064ac); + out_be32((void __iomem *)0xcc0064a0, 0); + out_be32((void __iomem *)0xcc0064a4, 0); + out_be32((void __iomem *)0xcc0064a8, 0); + out_be32((void __iomem *)0xcc0064ac, 0); } /** @@ -190,10 +190,10 @@ unsigned long transfer_done; do { - transfer_done = readl(SICOMCSR) & (1 << 31); + transfer_done = in_be32(SICOMCSR) & (1 << 31); } while (!transfer_done); - writel(readl(SICOMCSR) | (1 << 31), SICOMCSR); /* ack IRQ */ + out_be32(SICOMCSR, in_be32(SICOMCSR) | (1 << 31)); /* ack IRQ */ } /** @@ -203,14 +203,14 @@ { gcn_si_reset(); - writel(0, SIPOLL); - writel(0, SICOUTBUF(port)); - writel(0x80000000, SISR); - writel(0xd0010001 | port << 1, SICOMCSR); + out_be32(SIPOLL, 0); + out_be32(SICOUTBUF(port), 0); + out_be32(SISR, 0x80000000); + out_be32(SICOMCSR, 0xd0010001 | port << 1); gcn_si_wait_transfer_done(); - return readl((void __iomem *)0xcc006480); + return in_be32((void __iomem *)0xcc006480); } /** @@ -224,10 +224,10 @@ for (i = 0; i < SI_MAX_PORTS; ++i) { switch (port[i].id) { case CTL_PAD: - writel(0x00400300, SICOUTBUF(i)); + out_be32(SICOUTBUF(i), 0x00400300); break; case CTL_KEYBOARD: - writel(0x00540000, SICOUTBUF(i)); + out_be32(SICOUTBUF(i), 0x00540000); break; default: continue; @@ -235,9 +235,9 @@ pad_bits |= 1 << (7 - i); } - writel(0x00F70200 | pad_bits, SIPOLL); - writel(0x80000000, SISR); - writel(0xC0010801, SICOMCSR); + out_be32(SIPOLL, 0x00F70200 | pad_bits); + out_be32(SISR, 0x80000000); + out_be32(SICOMCSR, 0xC0010801); gcn_si_wait_transfer_done(); } @@ -247,13 +247,8 @@ */ static void gcn_si_set_rumbling(int portno, int rumble) { - if (rumble) { - writel(0x00400001, SICOUTBUF(portno)); - writel(0x80000000, SISR); - } else { - writel(0x00400000, SICOUTBUF(portno)); - writel(0x80000000, SISR); - } + out_be32(SICOUTBUF(portno), 0x00400000 | (rumble)?1:0); + out_be32(SISR, 0x80000000); } /** @@ -267,8 +262,8 @@ unsigned char oldkey; int i; - raw[0] = readl(SICINBUFH(portno)); - raw[1] = readl(SICINBUFL(portno)); + raw[0] = in_be32(SICINBUFH(portno)); + raw[1] = in_be32(SICINBUFL(portno)); switch (sdev->id) { case CTL_PAD: |
|
From: Albert H. <he...@us...> - 2007-11-14 23:09:17
|
Update of /cvsroot/gc-linux/linux/drivers/block/gcn-di In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4431/drivers/block/gcn-di Modified Files: gcn-di.c Log Message: Merged 2.6.22. Updated drivers to use in_be* and out_be* instead of read* and write* input/output instructions. Updated DI driver: - do not use debug extensions with unknown drive models - do not load custom firmware on xenogc/duoq - evict alien firmwares and load custom formware on known drive models Index: gcn-di.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-di/gcn-di.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- gcn-di.c 18 Feb 2007 22:56:01 -0000 1.19 +++ gcn-di.c 14 Nov 2007 23:08:48 -0000 1.20 @@ -2,8 +2,8 @@ * drivers/block/gcn-di/gcn-di.c * * Nintendo GameCube DVD Interface driver - * Copyright (C) 2005-2006 The GameCube Linux Team - * Copyright (C) 2005,2006 Albert Herranz + * Copyright (C) 2005-2007 The GameCube Linux Team + * Copyright (C) 2005,2006,2007 Albert Herranz * * Portions based on previous work by Scream|CT. * @@ -37,7 +37,7 @@ #define DRV_DESCRIPTION "Nintendo GameCube DVD Interface driver" #define DRV_AUTHOR "Albert Herranz" -static char di_driver_version[] = "0.7-isobel"; +static char di_driver_version[] = "0.8-isobel"; #define di_printk(level, format, arg...) \ printk(level DRV_MODULE_NAME ": " format , ## arg) @@ -138,7 +138,7 @@ /* Driver Settings */ -#define DI_NAME "di" +#define DI_NAME "gcndi" #define DI_MAJOR 60 #define DI_COMMAND_TIMEOUT 20 /* seconds */ @@ -233,8 +233,7 @@ __DI_MEDIA_CHANGED, __DI_START_QUEUE, __DI_RESETTING, - __DI_DRIVECHIP_PRESENT, - __DI_ALREADY_RESET, + __DI_AVOID_DEBUG, }; /* @@ -269,8 +268,7 @@ #define DI_MEDIA_CHANGED (1<<__DI_MEDIA_CHANGED) #define DI_START_QUEUE (1<<__DI_START_QUEUE) #define DI_RESETTING (1<<__DI_RESETTING) -#define DI_DRIVECHIP_PRESENT (1<<__DI_DRIVECHIP_PRESENT) -#define DI_ALREADY_RESET (1<<__DI_ALREADY_RESET) +#define DI_AVOID_DEBUG (1<<__DI_AVOID_DEBUG) unsigned long nr_sectors; @@ -415,6 +413,10 @@ .cmdbuf0 = 0, }, +/* + * The following commands are available in debug mode only. + */ + #define DI_OP_READMEM (DI_OP_ENABLE2+1) [DI_OP_READMEM] = { .op = DI_OP(DI_OP_READMEM, DI_DIR_READ | DI_MODE_IMMED), @@ -602,6 +604,7 @@ /* * Builds a "Read Memory" command. + * Requires debug mode enabled. */ static inline void di_op_readmem(struct di_command *cmd, struct di_device *ddev) @@ -612,6 +615,7 @@ /* * Builds a "Invoke func" command. + * Requires debug mode enabled. */ static inline void di_op_func(struct di_command *cmd, struct di_device *ddev, u32 address) @@ -623,6 +627,7 @@ /* * Builds a "Write Memory" command. + * Requires debug mode enabled. */ static inline void di_op_writemem(struct di_command *cmd, struct di_device *ddev) @@ -641,6 +646,7 @@ /* * Builds a "spin motor" command. + * Requires debug mode enabled. */ static void di_op_spinmotor(struct di_command *cmd, struct di_device *ddev, u32 flags) @@ -651,6 +657,7 @@ /* * Builds a "set drive status" command. + * Requires debug mode enabled. */ static void di_op_setstatus(struct di_command *cmd, struct di_device *ddev, u8 status) @@ -663,6 +670,7 @@ * Builds a "enable extensions" command. * The extended firmware will transparently disable the extensions when * original media is found. + * Requires debug mode enabled. */ static void di_op_enableextensions(struct di_command *cmd, struct di_device *ddev, u8 enable) @@ -820,16 +828,16 @@ (len & DI_DMA_ALIGN) != 0); /* setup address and length of transfer */ - writel(len, io_base + DI_LENGTH); - writel(data, io_base + DI_MAR); + out_be32(io_base + DI_LENGTH, len); + out_be32(io_base + DI_MAR, data); /* enable the Transfer Complete interrupt */ spin_lock_irqsave(&ddev->io_lock, flags); - writel(readl(sr_reg) | DI_SR_TCINTMASK, sr_reg); + out_be32(sr_reg, in_be32(sr_reg) | DI_SR_TCINTMASK); spin_unlock_irqrestore(&ddev->io_lock, flags); /* start the transfer */ - writel(DI_CR_TSTART | DI_CR_DMA | (mode&0x4), io_base + DI_CR); + out_be32(io_base + DI_CR, DI_CR_TSTART | DI_CR_DMA | (mode&0x4)); } /* @@ -841,11 +849,11 @@ unsigned long timeout = jiffies + secs*HZ; /* busy-wait for transfer complete */ - while((readl(cr_reg) & DI_CR_TSTART) && time_before(jiffies, timeout)) { + while((in_be32(cr_reg) & DI_CR_TSTART) && time_before(jiffies, timeout)) { cpu_relax(); } - return (readl(cr_reg) & DI_CR_TSTART)?-EBUSY:0; + return (in_be32(cr_reg) & DI_CR_TSTART)?-EBUSY:0; } /* @@ -859,7 +867,7 @@ /* we don't want TCINTs to disturb us while waiting */ spin_lock_irqsave(&ddev->io_lock, flags); - writel(readl(sr_reg) & ~DI_SR_TCINTMASK, sr_reg); + out_be32(sr_reg, in_be32(sr_reg) & ~DI_SR_TCINTMASK); spin_unlock_irqrestore(&ddev->io_lock, flags); /* if the drive got stuck, reset it */ @@ -870,7 +878,7 @@ /* ack and enable the Transfer Complete interrupt */ spin_lock_irqsave(&ddev->io_lock, flags); - writel(readl(sr_reg) | (DI_SR_TCINT|DI_SR_TCINTMASK), sr_reg); + out_be32(sr_reg, in_be32(sr_reg) | (DI_SR_TCINT|DI_SR_TCINTMASK)); spin_unlock_irqrestore(&ddev->io_lock, flags); return; @@ -891,14 +899,14 @@ spin_lock_irqsave(&ddev->io_lock, flags); /* ack and mask dvd io interrupts */ - sr = readl(sr_reg); + sr = in_be32(sr_reg); sr |= DI_SR_BRKINT | DI_SR_TCINT | DI_SR_DEINT; sr &= ~(DI_SR_BRKINTMASK | DI_SR_TCINTMASK | DI_SR_DEINTMASK); - writel(sr, sr_reg); + out_be32(sr_reg, sr); /* ack and mask dvd cover interrupts */ - cvr = readl(cvr_reg); - writel((cvr | DI_CVR_CVRINT) & ~DI_CVR_CVRINTMASK, cvr_reg); + cvr = in_be32(cvr_reg); + out_be32(cvr_reg, (cvr | DI_CVR_CVRINT) & ~DI_CVR_CVRINTMASK); spin_unlock_irqrestore(&ddev->io_lock, flags); @@ -922,14 +930,14 @@ /*DBG("buf0 = 0x%08x, buf1 = 0x%08x, buf2 = 0x%08x\n", cmd->cmdbuf0, cmd->cmdbuf1, cmd->cmdbuf2);*/ - writel(cmd->cmdbuf0, io_base + DI_CMDBUF0); - writel(cmd->cmdbuf1, io_base + DI_CMDBUF1); - writel(cmd->cmdbuf2, io_base + DI_CMDBUF2); + out_be32(io_base + DI_CMDBUF0, cmd->cmdbuf0); + out_be32(io_base + DI_CMDBUF1, cmd->cmdbuf1); + out_be32(io_base + DI_CMDBUF2, cmd->cmdbuf2); cmd->ddev->drive_status = 0; if (tstart) { - writel(DI_CR_TSTART | (opcode->op & 0x6), io_base + DI_CR); + out_be32(io_base + DI_CR, DI_CR_TSTART | (opcode->op & 0x6)); } } @@ -994,7 +1002,7 @@ void __iomem *io_base = ddev->io_base; u32 __iomem *data_reg = io_base + DI_DATA; - ddev->drive_status = readl(data_reg); + ddev->drive_status = in_be32(data_reg); } /* @@ -1190,11 +1198,11 @@ spin_lock_irqsave(&ddev->io_lock, flags); - sr = readl(sr_reg); + sr = in_be32(sr_reg); mask = sr & (DI_SR_BRKINTMASK | DI_SR_TCINTMASK | DI_SR_DEINTMASK); reason = sr; /* & (mask << 1); */ if (reason) { - writel(sr | reason, sr_reg); + out_be32(sr_reg, sr | reason); spin_unlock_irqrestore(&ddev->io_lock, flags); if (reason & DI_SR_TCINT) { @@ -1211,19 +1219,18 @@ spin_lock_irqsave(&ddev->io_lock, flags); } - cvr = readl(cvr_reg); + cvr = in_be32(cvr_reg); mask = cvr & DI_CVR_CVRINTMASK; reason = cvr; /* & (mask << 1); */ if ((reason & DI_CVR_CVRINT)) { - writel(cvr | DI_CVR_CVRINT, cvr_reg); + out_be32(cvr_reg, cvr | DI_CVR_CVRINT); set_bit(__DI_MEDIA_CHANGED, &ddev->flags); if (test_and_clear_bit(__DI_RESETTING, &ddev->flags)) { - if (ddev->flags & DI_INTEROPERABLE) { - DBG("extensions loaded" - " and hopefully working\n"); - } else { - DBG("drive reset, no extensions" - " loaded yet\n"); + if (!test_bit(__DI_AVOID_DEBUG, &ddev->flags)) { + if (ddev->flags & DI_INTEROPERABLE) { + DBG("extensions loaded" + " and hopefully working\n"); + } } } else { DBG("dvd cover interrupt\n"); @@ -1245,15 +1252,17 @@ #define FLIPPER_RESET_DVD 0x00000004 - /* set flags, but preserve the drivechip flag */ - ddev->flags = (ddev->flags & DI_DRIVECHIP_PRESENT) | - DI_RESETTING | DI_MEDIA_CHANGED | DI_ALREADY_RESET; + /* set flags, but preserve the alien firmware flag */ + ddev->flags = (ddev->flags & DI_AVOID_DEBUG) | + DI_RESETTING | DI_MEDIA_CHANGED; - reset = readl(reset_reg); - writel((reset & ~FLIPPER_RESET_DVD) | 1, reset_reg); + reset = in_be32(reset_reg); + out_be32(reset_reg, (reset & ~FLIPPER_RESET_DVD) | 1); mdelay(500); - writel((reset | FLIPPER_RESET_DVD) | 1, reset_reg); + out_be32(reset_reg, (reset | FLIPPER_RESET_DVD) | 1); mdelay(500); + + DBG("drive reset\n"); } @@ -1292,7 +1301,7 @@ di_op_getstatus(&cmd, ddev); di_run_command_and_wait(&cmd); - drive_status = readl(data_reg); + drive_status = in_be32(data_reg); return drive_status; } @@ -1334,7 +1343,7 @@ cmd.cmdbuf1 = address; di_run_command_and_wait(&cmd); if (di_command_ok(&cmd)) { - *data = readl(io_base + DI_DATA); + *data = in_be32(io_base + DI_DATA); result = 0; } return result; @@ -1346,7 +1355,7 @@ */ static unsigned long di_fw_get_irq_handler(struct di_device *ddev) { - unsigned long data = ~0; + unsigned long data = 0; di_fw_read_meml(ddev, &data, DI_DRIVE_IRQ_VECTOR); return data; @@ -1452,7 +1461,6 @@ static u8 parking_code[] = { 0xa0, /* sub d0, d0 */ 0xc4, 0xda, 0xfc, /* movb d0, (ADBCTL) */ - 0xf4, 0x40, 0x60, 0xec, 0x40, /* movb d0,(0x40ec60) */ 0xf4, 0x74, 0x74, 0x0a, 0x08, /* mov 0x080a74, a0 */ /* fixup */ 0xf7, 0x20, 0x4c, 0x80, /* mov a0, (0x804c) */ 0xfe, /* rts */ @@ -1478,7 +1486,7 @@ /* fix the parking code to match our drive model */ cpu_to_le32s(&irq_handler); - memcpy(parking_code + 11, &irq_handler, 3); + memcpy(parking_code + 6, &irq_handler, 3); /* load and call it */ di_fw_patch_mem(ddev, load_address, parking_code, sizeof(parking_code)); @@ -1529,46 +1537,93 @@ } /* + * Tries to determine if firmware extensions are currently installed. + * Requires debug mode enabled. + */ +static int di_has_alien_drive_code(struct di_device *ddev) +{ + unsigned long address; + int result = 1; + + /* + * We assume that alien drive code is in place if the interrupt handler + * is not pointing to ROM address space. + */ + address = di_fw_get_irq_handler(ddev); + address = le32_to_cpu(address); + if (address) { + if ((address & 0xffff0000) == 0x00080000) + result = 0; + } + return result; +} + +/* + * Enables some workarounds and/or special behaviours depending on + * the drive firmware found. + * Requires debug mode enabled. + */ +static void di_init_alien_drive_code_quirks(struct di_device *ddev) +{ + unsigned long fingerprint; + + /* + * Test if a xenogc/duoq is installed. + */ + if (!di_fw_read_meml(ddev, &fingerprint, 0x40c60a)) { + if (fingerprint == 0xf710fff7) { + di_printk(KERN_INFO, "drivechip: xenogc/duoq\n"); + set_bit(__DI_AVOID_DEBUG, &ddev->flags); + } + } +} + +/* * Configures the drive to accept DVD-R and DVD+R media. */ static void di_make_interoperable(struct di_device *ddev) { struct di_command cmd; - if (ddev->drive_code) { - /* calm things down */ - di_spin_down_drive(ddev); + if (!ddev->drive_code || test_bit(__DI_AVOID_DEBUG, &ddev->flags)) + return; - /* disable any alien drive code */ - di_enable_debug_commands(ddev); - di_park_firmware(ddev); + /* calm things down */ + di_spin_down_drive(ddev); - /* re-enable debug commands */ - di_enable_debug_commands(ddev); + /* disable any alien drive code */ + di_enable_debug_commands(ddev); + di_park_firmware(ddev); - /* load our own drive code extensions */ - di_fw_patch(ddev, ddev->drive_code, 1); + /* re-enable debug commands */ + di_enable_debug_commands(ddev); - /* - * The drive will become interoperable now. - * Here we go...! - */ - set_bit(__DI_INTEROPERABLE, &ddev->flags); - di_op_func(&cmd, ddev, DI_DRIVE_CODE_BASE); - di_run_command_and_wait(&cmd); + /* load our own drive code extensions */ + di_fw_patch(ddev, ddev->drive_code, 1); - /* this checks if drive is still working... */ - di_get_drive_status(ddev); - } + /* + * The drive will become interoperable now. + * Here we go...! + */ + set_bit(__DI_INTEROPERABLE, &ddev->flags); + di_op_func(&cmd, ddev, DI_DRIVE_CODE_BASE); + di_run_command_and_wait(&cmd); + + /* this checks if drive is still working... */ + di_get_drive_status(ddev); } /* * Ensures that the debug features of the drive firmware are working. */ -static int di_test_debug_features(struct di_device *ddev) +static int di_probe_debug_features(struct di_device *ddev) { int result; + /* do nothing on unknown drive models */ + if (!ddev->drive_code) + return -EINVAL; + result = di_enable_debug_commands(ddev); if (!di_result_ok(result)) { DBG("uhmm, debug commands seem banned...\n"); @@ -1582,66 +1637,25 @@ } /* - * Tries to determine if firmware extensions are currently installed. - * Requires debug mode enabled. - */ -static int di_has_alien_drive_code(struct di_device *ddev) -{ - unsigned long address; - int result = 1; - - /* - * We assume that alien drive code is in place if the interrupt handler - * is not pointing to ROM address space. - */ - address = di_fw_get_irq_handler(ddev); - if ((le32_to_cpu(address) & 0xffff0000) == 0x00080000) - result = 0; - - return result; -} - -/* - * Checks if a drivechip, modchip or custom firmware is present. - * - * We consider a drivechip a piece of hardware that automatically patches - * the laser unit firmware on reset. + * Probes the existing firmware features and determines the best operation + * mode. */ -static void di_check_for_addons(struct di_device *ddev) +static void di_probe_firmware(struct di_device *ddev) { - unsigned long fingerprint; - - /* this also enables the debug mode */ - di_test_debug_features(ddev); - - if (di_has_alien_drive_code(ddev)) { - di_printk(KERN_INFO, "alien drive code detected\n"); - - /* - * Test if a xenogc/duoq is installed. - */ - if (!di_fw_read_meml(ddev, &fingerprint, 0x40c60a)) { - if (fingerprint == 0xf710fff7) { - di_printk(KERN_INFO, "drivechip: " - "xenogc/duoq\n"); - set_bit(__DI_DRIVECHIP_PRESENT, &ddev->flags); - } - } + if (di_probe_debug_features(ddev)) { + /* we can't use debug features, thus try to avoid them */ + di_printk(KERN_INFO, "firmware: debug features do not work," + " using standard command set\n"); + set_bit(__DI_AVOID_DEBUG, &ddev->flags); } else { - /* - * We avoid the first drive reset if no custom - * firmware was found. - */ - set_bit(__DI_ALREADY_RESET, &ddev->flags); + if (di_has_alien_drive_code(ddev)) { + di_printk(KERN_INFO, "firmware: patched drive\n"); + /* enable some workarounds if required */ + di_init_alien_drive_code_quirks(ddev); + } else { + di_printk(KERN_INFO, "firmware: unpatched drive\n"); + } } - - /* - * Some optimizations for a fast startup... - * Try to make the drive interoperable only if the drive - * has not accepted the disc yet. - */ - if (!di_is_drive_ready(ddev)) - di_make_interoperable(ddev); } /* @@ -1692,36 +1706,51 @@ { struct di_command cmd; u32 drive_status; + unsigned int attempts = 2; - if (test_bit(__DI_INTEROPERABLE, &ddev->flags)) { - /* do nothing if the drive is already spinning */ - if (di_is_drive_ready(ddev)) - goto out; - } else { - di_make_interoperable(ddev); - } + /* do nothing if the drive is already spinning */ + if (di_is_drive_ready(ddev)) + goto out; - /* - * We only re-enable the extensions if the drive is not - * in a pending read disk id state. Otherwise, we assume - * that the drive has already accepted the disk. - */ - drive_status = di_get_drive_status(ddev); - if (DI_STATUS(drive_status) != DI_STATUS_DISK_ID_NOT_READ) { - di_op_enableextensions(&cmd, ddev, enable_extensions); - di_run_command_and_wait(&cmd); - } + if (test_bit(__DI_AVOID_DEBUG, &ddev->flags)) { + /* don't use debug commands, let's hope a drivechip is there */ + di_reset(ddev); + } else { + while(attempts-- > 0) { + if (!test_bit(__DI_INTEROPERABLE, &ddev->flags)) + di_make_interoperable(ddev); - /* the spin motor command requires the debug mode */ - di_enable_debug_commands(ddev); + /* + * We only re-enable the extensions if the drive is not + * in a pending read disk id state. Otherwise, we assume + * that the drive has already accepted the disk. + */ + drive_status = di_get_drive_status(ddev); + if (DI_STATUS(drive_status) != + DI_STATUS_DISK_ID_NOT_READ) { + di_op_enableextensions(&cmd, ddev, + enable_extensions); + di_run_command_and_wait(&cmd); + } - di_op_spinmotor(&cmd, ddev, DI_SPINMOTOR_UP); - di_run_command_and_wait(&cmd); + /* the spin motor command requires the debug mode */ + di_enable_debug_commands(ddev); + di_op_spinmotor(&cmd, ddev, DI_SPINMOTOR_UP); + di_run_command_and_wait(&cmd); - if (!ddev->drive_status) { - di_op_setstatus(&cmd, ddev, DI_STATUS_DISK_ID_NOT_READ+1); - cmd.cmdbuf0 |= 0x00000300; /* XXX cheqmate */ - di_run_command_and_wait(&cmd); + if (!ddev->drive_status) { + di_op_setstatus(&cmd, ddev, + DI_STATUS_DISK_ID_NOT_READ+1); + cmd.cmdbuf0 |= 0x00000300; /* XXX cheqmate */ + di_run_command_and_wait(&cmd); + } else { + if (DI_ERROR(ddev->drive_status) != + DI_ERROR_MEDIUM_NOT_PRESENT) + di_reset(ddev); + continue; + } + break; + } } out: return; @@ -2117,24 +2146,21 @@ spin_lock_irqsave(&ddev->io_lock, flags); - sr = readl(sr_reg); + sr = in_be32(sr_reg); sr |= DI_SR_BRKINT | DI_SR_TCINT | DI_SR_DEINT; sr |= DI_SR_BRKINTMASK | DI_SR_TCINTMASK | DI_SR_DEINTMASK; - writel(sr, sr_reg); + out_be32(sr_reg, sr); - cvr = readl(cvr_reg); - writel(cvr | DI_CVR_CVRINT | DI_CVR_CVRINTMASK, cvr_reg); + cvr = in_be32(cvr_reg); + out_be32(cvr_reg, cvr | DI_CVR_CVRINT | DI_CVR_CVRINTMASK); spin_unlock_irqrestore(&ddev->io_lock, flags); di_retrieve_drive_model(ddev); - if (di_select_drive_code(ddev)) { - free_irq(ddev->irq, ddev); - retval = -ENODEV; - goto out; - } + di_select_drive_code(ddev); + + di_probe_firmware(ddev); - di_check_for_addons(ddev); di_schedule_motor_off(ddev, DI_MOTOR_OFF_TIMEOUT); out: @@ -2330,7 +2356,7 @@ /* - * Drive model probe function for our device. + * Driver model probe function for our device. */ static int di_probe(struct device *device) { @@ -2350,7 +2376,7 @@ } /* - * Drive model remove function for our device. + * Driver model remove function for our device. */ static int di_remove(struct device *device) { @@ -2363,7 +2389,7 @@ } /* - * Drive model shutdown function for our device. + * Driver model shutdown function for our device. */ static void di_shutdown(struct device *device) { |
|
From: Albert H. <he...@us...> - 2007-11-14 23:09:17
|
Update of /cvsroot/gc-linux/linux/drivers/block In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4431/drivers/block Modified Files: Kconfig gcn-aram.c gcn-sd.c Log Message: Merged 2.6.22. Updated drivers to use in_be* and out_be* instead of read* and write* input/output instructions. Updated DI driver: - do not use debug extensions with unknown drive models - do not load custom firmware on xenogc/duoq - evict alien firmwares and load custom formware on known drive models Index: gcn-aram.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-aram.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- gcn-aram.c 18 Feb 2007 22:56:01 -0000 1.13 +++ gcn-aram.c 14 Nov 2007 23:08:48 -0000 1.14 @@ -2,9 +2,9 @@ * drivers/block/gcn-aram.c * * Nintendo GameCube Auxiliary RAM block driver - * Copyright (C) 2004-2005 The GameCube Linux Team + * Copyright (C) 2004-2007 The GameCube Linux Team * Copyright (C) 2005 Todd Jeffreys <to...@vo...> - * Copyright (C) 2005 Albert Herranz + * Copyright (C) 2005,2007 Albert Herranz * * Based on previous work by Franz Lehner. * @@ -31,7 +31,7 @@ #define DRV_AUTHOR "Todd Jeffreys <to...@vo...>, " \ "Albert Herranz" -static char aram_driver_version[] = "2.0"; +static char aram_driver_version[] = "3.0"; #define aram_printk(level, format, arg...) \ printk(level DRV_MODULE_NAME ": " format , ## arg) @@ -90,7 +90,7 @@ /* * Driver settings */ -#define ARAM_NAME "aram" +#define ARAM_NAME "gcnaram" #define ARAM_MAJOR Z2RAM_MAJOR #define ARAM_SECTOR_SIZE PAGE_SIZE @@ -163,11 +163,11 @@ BUG_ON((dma_addr & ARAM_DMA_ALIGN) != 0 || (dma_len & ARAM_DMA_ALIGN) != 0); - writel(dma_addr, io_base + AR_DMA_MMADDR); - writel(aram_addr, io_base + AR_DMA_ARADDR); + out_be32(io_base + AR_DMA_MMADDR, dma_addr); + out_be32(io_base + AR_DMA_ARADDR, aram_addr); /* writing the low-word kicks off the DMA */ - writel(rq_dir_to_aram_dir(adev->req) | dma_len, io_base + AR_DMA_CNT); + out_be32(io_base + AR_DMA_CNT, rq_dir_to_aram_dir(adev->req) | dma_len); } /* @@ -183,7 +183,7 @@ spin_lock_irqsave(&adev->io_lock, flags); - csr = readw(csr_reg); + csr = in_be16(csr_reg); /* * Do nothing if the interrupt is not targetted for us. @@ -196,7 +196,7 @@ /* strictly ack the ARAM interrupt, and nothing more */ csr &= ~(DSP_CSR_AIDINT | DSP_CSR_DSPINT); - writew(csr, csr_reg); + out_be16(csr_reg, csr); /* pick up current request being serviced */ req = adev->req; @@ -462,13 +462,13 @@ * Disable ARAM interrupts, but do not accidentally ack non-ARAM ones. */ spin_lock_irqsave(&adev->io_lock, flags); - csr = readw(csr_reg); + csr = in_be16(csr_reg); csr &= ~(DSP_CSR_AIDINT | DSP_CSR_DSPINT | DSP_CSR_ARINTMASK); - writew(csr, csr_reg); + out_be16(csr_reg, csr); spin_unlock_irqrestore(&adev->io_lock, flags); /* wait until pending transfers are finished */ - while(readw(csr_reg) & DSP_CSR_DSPDMA) + while(in_be16(csr_reg) & DSP_CSR_DSPDMA) cpu_relax(); } @@ -484,7 +484,7 @@ /* request interrupt */ retval = request_irq(adev->irq, aram_irq_handler, - SA_INTERRUPT | SA_SHIRQ, + IRQF_DISABLED | IRQF_SHARED, DRV_MODULE_NAME, adev); if (retval) { aram_printk(KERN_ERR, "request of irq%d failed\n", adev->irq); @@ -496,10 +496,10 @@ * As in the other cases, preserve the AI and DSP interrupts. */ spin_lock_irqsave(&adev->io_lock, flags); - csr = readw(csr_reg); + csr = in_be16(csr_reg); csr |= (DSP_CSR_ARINT | DSP_CSR_ARINTMASK | DSP_CSR_PIINT); csr &= ~(DSP_CSR_AIDINT | DSP_CSR_DSPINT); - writew(csr, csr_reg); + out_be16(csr_reg, csr); spin_unlock_irqrestore(&adev->io_lock, flags); out: Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/Kconfig,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- Kconfig 30 Apr 2007 17:06:12 -0000 1.26 +++ Kconfig 14 Nov 2007 23:08:47 -0000 1.27 @@ -506,8 +506,6 @@ this option is dangerous unless the CD-RW media is known good, as we don't do deferred write error handling yet. -source "drivers/s390/block/Kconfig" - config ATA_OVER_ETH tristate "ATA over Ethernet support" depends on NET @@ -515,6 +513,8 @@ This driver provides Support for ATA over Ethernet block devices like the Coraid EtherDrive (R) Storage Blade. +source "drivers/s390/block/Kconfig" + endmenu endif Index: gcn-sd.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-sd.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- gcn-sd.c 17 Feb 2007 23:43:40 -0000 1.8 +++ gcn-sd.c 14 Nov 2007 23:08:48 -0000 1.9 @@ -2,10 +2,10 @@ * drivers/block/gcn-sd.c * * MMC/SD card block driver for the Nintendo GameCube - * Copyright (C) 2004-2006 The GameCube Linux Team + * Copyright (C) 2004-2007 The GameCube Linux Team * Copyright (C) 2004,2005 Rob Reylink * Copyright (C) 2005 Todd Jeffreys - * Copyright (C) 2005,2006 Albert Herranz + * Copyright (C) 2005,2006,2007 Albert Herranz * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -44,7 +44,7 @@ * | B | partition 7 | 61 | 15 | * +------+-------------+-------+-------+ * - * For example, run "mknod /dev/sdcardb1 b 61 9" to create a device file + * For example, run "mknod /dev/gcnsdb1 b 61 9" to create a device file * to access the 1st partition on the card inserted in memcard slot B. * */ @@ -67,7 +67,8 @@ */ #include <linux/mmc/host.h> #include <linux/mmc/card.h> -#include <linux/mmc/protocol.h> +#include <linux/mmc/mmc.h> +#include <linux/mmc/sd.h> #include <linux/exi.h> @@ -81,7 +82,7 @@ MODULE_DESCRIPTION(DRV_DESCRIPTION); MODULE_LICENSE("GPL"); -static char sd_driver_version[] = "3.1-isobel"; +static char sd_driver_version[] = "4.0-isobel"; #define sd_printk(level, format, arg...) \ printk(level DRV_MODULE_NAME ": " format , ## arg) @@ -195,7 +196,7 @@ #define MMC_SHIFT 3 /* 8 partitions */ #define SD_MAJOR 61 -#define SD_NAME "sdcard" +#define SD_NAME "gcnsd" #define KERNEL_SECTOR_SHIFT 9 #define KERNEL_SECTOR_SIZE (1 << KERNEL_SECTOR_SHIFT) /*512 */ @@ -204,7 +205,7 @@ enum { __SD_MEDIA_CHANGED = 0, - __SD_DEL, + __SD_BAD_CARD, }; @@ -228,6 +229,7 @@ int refcnt; unsigned long flags; #define SD_MEDIA_CHANGED (1<<__SD_MEDIA_CHANGED) +#define SD_BAD_CARD (1<<__SD_BAD_CARD) /* card related info */ struct mmc_card card; @@ -264,6 +266,17 @@ static void sd_kill(struct sd_host *host); + +static void sd_card_set_bad(struct sd_host *host) +{ + set_bit(__SD_BAD_CARD, &host->flags); +} + +static int sd_card_bad(struct sd_host *host) +{ + return test_bit(__SD_BAD_CARD, &host->flags); +} + /* * * MMC/SD data structures manipulation. @@ -367,7 +380,6 @@ default: sd_printk(KERN_ERR, "card has unknown MMCA" " version %d\n", card->csd.mmca_vsn); - mmc_card_set_bad(card); break; } } @@ -390,7 +402,6 @@ if (csd_struct != 0 && csd_struct != 1 && csd_struct != 2) { sd_printk(KERN_ERR, "unrecognised CSD structure" " version %d\n", csd_struct); - mmc_card_set_bad(card); return; } @@ -543,10 +554,7 @@ * This will help reducing CPU monopolization on large reads. * */ - exi_transfer(exi_get_exi_channel(host->exi_device), data, len, - EXI_OP_READ, EXI_CMD_IDI); - //exi_transfer(exi_get_exi_channel(host->exi_device), data, len, - // EXI_OP_READ, EXI_CMD_NODMA); + exi_dev_transfer(host->exi_device, data, len, EXI_OP_READ, EXI_CMD_IDI); } /* cycles are expressed in 8 clock cycles */ @@ -987,7 +995,7 @@ if (retval == 0x00) { /* we found a SD card */ mmc_card_set_present(&host->card); - mmc_card_set_sd(&host->card); + host->card.type = MMC_TYPE_SD; break; } if ((retval & R1_SPI_ILLEGAL_COMMAND)) { @@ -1016,7 +1024,7 @@ } if (retval != 0x00) { DBG("MMC card, bad, retval=%02x\n", retval); - mmc_card_set_bad(&host->card); + sd_card_set_bad(host); } } @@ -1033,7 +1041,7 @@ /* soft reset the card */ retval = sd_reset_sequence(host); - if (retval < 0 || mmc_card_bad(&host->card)) + if (retval < 0 || sd_card_bad(host)) goto out; /* read Operating Conditions Register */ @@ -1076,7 +1084,7 @@ goto out; err_bad_card: - mmc_card_set_bad(&host->card); + sd_card_set_bad(host); out: return retval; } @@ -1441,7 +1449,7 @@ /* get the card into a known status */ retval = sd_welcome_card(host); - if (retval < 0 || mmc_card_bad(&host->card)) { + if (retval < 0 || sd_card_bad(host)) { retval = -ENOMEDIUM; goto out; } |
|
From: Albert H. <he...@us...> - 2007-11-14 23:09:17
|
Update of /cvsroot/gc-linux/linux/drivers/exi In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4431/drivers/exi Modified Files: exi-hw.c exi-hw.h Log Message: Merged 2.6.22. Updated drivers to use in_be* and out_be* instead of read* and write* input/output instructions. Updated DI driver: - do not use debug extensions with unknown drive models - do not load custom firmware on xenogc/duoq - evict alien firmwares and load custom formware on known drive models Index: exi-hw.h =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/exi/exi-hw.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- exi-hw.h 7 Nov 2005 21:34:17 -0000 1.7 +++ exi-hw.h 14 Nov 2007 23:08:49 -0000 1.8 @@ -2,9 +2,9 @@ * drivers/exi/exi-hw.h * * Nintendo GameCube EXpansion Interface support. Hardware routines. - * Copyright (C) 2004-2005 The GameCube Linux Team + * Copyright (C) 2004-2007 The GameCube Linux Team * Copyright (C) 2004,2005 Todd Jeffreys <to...@vo...> - * Copyright (C) 2005 Albert Herranz + * Copyright (C) 2005,2006,2007 Albert Herranz * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -163,24 +163,24 @@ */ \ if ((mode & EXI_OP_WRITE)) \ _on_write; \ - writel(_val, data_reg); \ + out_be32(data_reg, _val); \ \ /* start transfer */ \ _val = EXI_CR_TSTART | EXI_CR_TLEN(sizeof(_type)) | (mode&0xf); \ - writel(_val, cr_reg); \ + out_be32(cr_reg, _val); \ \ /* wait for transfer completion */ \ - while(readl(cr_reg) & EXI_CR_TSTART) \ + while(in_be32(cr_reg) & EXI_CR_TSTART) \ cpu_relax(); \ \ /* XXX check if we need that on immediate mode */ \ /* assert transfer complete interrupt */ \ spin_lock_irqsave(&exi_channel->io_lock, flags); \ - writel(readl(csr_reg) | EXI_CSR_TCINT, csr_reg); \ + out_be32(csr_reg, in_be32(csr_reg) | EXI_CSR_TCINT); \ spin_unlock_irqrestore(&exi_channel->io_lock, flags); \ \ if ((mode&0xf) != EXI_OP_WRITE) { /* read or read-write */ \ - _val = readl(data_reg); \ + _val = in_be32(data_reg); \ _on_read; \ } \ } Index: exi-hw.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/exi/exi-hw.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- exi-hw.c 18 Feb 2007 22:56:01 -0000 1.14 +++ exi-hw.c 14 Nov 2007 23:08:49 -0000 1.15 @@ -2,9 +2,9 @@ * drivers/exi/exi-hw.c * * Nintendo GameCube EXpansion Interface support. Hardware routines. - * Copyright (C) 2004-2005 The GameCube Linux Team + * Copyright (C) 2004-2007 The GameCube Linux Team * Copyright (C) 2004,2005 Todd Jeffreys <to...@vo...> - * Copyright (C) 2005 Albert Herranz + * Copyright (C) 2005,2006,2007 Albert Herranz * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -190,10 +190,10 @@ * Preserve interrupt masks while setting the CS line bits. */ spin_lock_irqsave(&exi_channel->io_lock, flags); - csr = readl(csr_reg); + csr = in_be32(csr_reg); csr &= (EXI_CSR_EXTINMASK | EXI_CSR_TCINTMASK | EXI_CSR_EXIINTMASK); csr |= ((1<<device) << 7) | (freq << 4); - writel(csr, csr_reg); + out_be32(csr_reg, csr); spin_unlock_irqrestore(&exi_channel->io_lock, flags); } @@ -215,9 +215,9 @@ * Preserve interrupt masks while clearing the CS line bits. */ spin_lock_irqsave(&exi_channel->io_lock, flags); - csr = readl(csr_reg); + csr = in_be32(csr_reg); csr &= (EXI_CSR_EXTINMASK | EXI_CSR_TCINTMASK | EXI_CSR_EXIINTMASK); - writel(csr, csr_reg); + out_be32(csr_reg, csr); spin_unlock_irqrestore(&exi_channel->io_lock, flags); } @@ -290,15 +290,15 @@ } } - writel(val, io_base + EXI_DATA); + out_be32(io_base + EXI_DATA, val); /* enable the Transfer Complete interrupt */ spin_lock_irqsave(&exi_channel->io_lock, flags); - writel(readl(csr_reg) | EXI_CSR_TCINTMASK, csr_reg); + out_be32(csr_reg, in_be32(csr_reg) | EXI_CSR_TCINTMASK); spin_unlock_irqrestore(&exi_channel->io_lock, flags); /* start the transfer */ - writel(EXI_CR_TSTART | EXI_CR_TLEN(len) | (mode&0xf), io_base + EXI_CR); + out_be32(io_base + EXI_CR, EXI_CR_TSTART | EXI_CR_TLEN(len) | (mode&0xf)); } /* @@ -313,7 +313,7 @@ BUG_ON(len < 1 || len > 4); if ((mode&0xf) != EXI_OP_WRITE) { - val = readl(io_base + EXI_DATA); + val = in_be32(io_base + EXI_DATA); switch(len) { case 1: *((u8*)data) = (u8)(val >> 24); @@ -352,19 +352,19 @@ * special hardware, like SD cards. * Indeed, we need all 1s here. */ - writel(~0, io_base + EXI_DATA); + out_be32(io_base + EXI_DATA, ~0); /* setup address and length of transfer */ - writel(data, io_base + EXI_MAR); - writel(len, io_base + EXI_LENGTH); + out_be32(io_base + EXI_MAR, data); + out_be32(io_base + EXI_LENGTH, len); /* enable the Transfer Complete interrupt */ spin_lock_irqsave(&exi_channel->io_lock, flags); - writel(readl(csr_reg) | EXI_CSR_TCINTMASK, csr_reg); + out_be32(csr_reg, in_be32(csr_reg) | EXI_CSR_TCINTMASK); spin_unlock_irqrestore(&exi_channel->io_lock, flags); /* start the transfer */ - writel(EXI_CR_TSTART | EXI_CR_DMA | (mode&0xf), io_base + EXI_CR); + out_be32(io_base + EXI_CR, EXI_CR_TSTART | EXI_CR_DMA | (mode&0xf)); } @@ -379,16 +379,16 @@ /* we don't want TCINTs to disturb us while waiting */ spin_lock_irqsave(&exi_channel->io_lock, flags); - writel(readl(csr_reg) & ~EXI_CSR_TCINTMASK, csr_reg); + out_be32(csr_reg, in_be32(csr_reg) & ~EXI_CSR_TCINTMASK); spin_unlock_irqrestore(&exi_channel->io_lock, flags); /* busy-wait for transfer complete */ - while(readl(cr_reg) & EXI_CR_TSTART) + while(in_be32(cr_reg) & EXI_CR_TSTART) cpu_relax(); /* ack the Transfer Complete interrupt */ spin_lock_irqsave(&exi_channel->io_lock, flags); - writel(readl(csr_reg) | EXI_CSR_TCINT, csr_reg); + out_be32(csr_reg, in_be32(csr_reg) | EXI_CSR_TCINT); spin_unlock_irqrestore(&exi_channel->io_lock, flags); } @@ -1083,7 +1083,7 @@ */ spin_lock_irqsave(&exi_channel->io_lock, flags); - csr = readl(csr_reg); + csr = in_be32(csr_reg); mask = csr & (EXI_CSR_EXTINMASK | EXI_CSR_TCINTMASK | EXI_CSR_EXIINTMASK); status = csr & (mask << 1); @@ -1099,7 +1099,7 @@ exi_channel->csr); /* ack all for this channel */ - writel(csr | status, csr_reg); + out_be32(csr_reg, csr | status); spin_unlock_irqrestore(&exi_channel->io_lock, flags); @@ -1128,18 +1128,18 @@ unsigned long flags; spin_lock_irqsave(&exi_channel->io_lock, flags); - csr = readl(csr_reg); + csr = in_be32(csr_reg); /* ack and enable the associated interrupt */ switch (event_id) { case EXI_EVENT_INSERT: - writel(csr | (EXI_CSR_EXTIN | EXI_CSR_EXTINMASK), csr_reg); + out_be32(csr_reg, csr | (EXI_CSR_EXTIN | EXI_CSR_EXTINMASK)); break; case EXI_EVENT_TC: - //writel(csr | (EXI_CSR_TCINT | EXI_CSR_TCINTMASK), csr_reg); + //out_be32(csr_reg, csr | (EXI_CSR_TCINT | EXI_CSR_TCINTMASK)); break; case EXI_EVENT_IRQ: - writel(csr | (EXI_CSR_EXIINT | EXI_CSR_EXIINTMASK), csr_reg); + out_be32(csr_reg, csr | (EXI_CSR_EXIINT | EXI_CSR_EXIINTMASK)); break; } spin_unlock_irqrestore(&exi_channel->io_lock, flags); @@ -1157,18 +1157,18 @@ unsigned long flags; spin_lock_irqsave(&exi_channel->io_lock, flags); - csr = readl(csr_reg); + csr = in_be32(csr_reg); /* ack and disable the associated interrupt */ switch (event_id) { case EXI_EVENT_INSERT: - writel((csr | EXI_CSR_EXTIN) & ~EXI_CSR_EXTINMASK, csr_reg); + out_be32(csr_reg, (csr | EXI_CSR_EXTIN) & ~EXI_CSR_EXTINMASK); break; case EXI_EVENT_TC: - //writel((csr | EXI_CSR_TCINT) & ~EXI_CSR_TCINTMASK, csr_reg); + //out_be32(csr_reg, (csr | EXI_CSR_TCINT) & ~EXI_CSR_TCINTMASK); break; case EXI_EVENT_IRQ: - writel((csr | EXI_CSR_EXIINT) & ~EXI_CSR_EXIINTMASK, csr_reg); + out_be32(csr_reg, (csr | EXI_CSR_EXIINT) & ~EXI_CSR_EXIINTMASK); break; } spin_unlock_irqrestore(&exi_channel->io_lock, flags); @@ -1251,8 +1251,8 @@ exi_wait_for_transfer_raw(exi_channel); /* ack and mask all interrupts */ - writel(EXI_CSR_TCINT | EXI_CSR_EXIINT | EXI_CSR_EXTIN | csr_mask, - exi_channel->io_base + EXI_CSR); + out_be32(exi_channel->io_base + EXI_CSR, + EXI_CSR_TCINT | EXI_CSR_EXIINT | EXI_CSR_EXTIN | csr_mask); } /* @@ -1303,7 +1303,7 @@ if ((__to_channel(exi_channel) == 0 || __to_channel(exi_channel) == 1) && exi_device->eid.device == 0) { - if (readl(csr_reg) & EXI_CSR_EXT) { + if (in_be32(csr_reg) & EXI_CSR_EXT) { id = EXI_ID_NONE; } } @@ -1318,7 +1318,7 @@ int exi_get_ext_line(struct exi_channel *exi_channel) { u32 __iomem *csr_reg = exi_channel->io_base + EXI_CSR; - return (readl(csr_reg) & EXI_CSR_EXT)?1:0; + return (in_be32(csr_reg) & EXI_CSR_EXT)?1:0; } /* |
|
From: Albert H. <he...@us...> - 2007-11-14 23:09:17
|
Update of /cvsroot/gc-linux/linux/drivers/input In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4431/drivers/input Modified Files: Kconfig Log Message: Merged 2.6.22. Updated drivers to use in_be* and out_be* instead of read* and write* input/output instructions. Updated DI driver: - do not use debug extensions with unknown drive models - do not load custom firmware on xenogc/duoq - evict alien firmwares and load custom formware on known drive models Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/input/Kconfig,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Kconfig 18 Feb 2007 22:56:02 -0000 1.7 +++ Kconfig 14 Nov 2007 23:08:49 -0000 1.8 @@ -3,6 +3,7 @@ # menu "Input device support" + depends on !S390 config INPUT tristate "Generic input layer (needed for keyboard, mouse, ...)" if EMBEDDED @@ -38,6 +39,19 @@ To compile this driver as a module, choose M here: the module will be called ff-memless. +config INPUT_POLLDEV + tristate "Polled input device skeleton" + help + Say Y here if you are using a driver for an input + device that periodically polls hardware state. This + option is only useful for out-of-tree drivers since + in-tree drivers select it automatically. + + If unsure, say N. + + To compile this driver as a module, choose M here: the + module will be called input-polldev. + comment "Userland interfaces" config INPUT_MOUSEDEV @@ -153,6 +167,8 @@ source "drivers/input/joystick/Kconfig" +source "drivers/input/tablet/Kconfig" + source "drivers/input/touchscreen/Kconfig" source "drivers/input/misc/Kconfig" |
|
From: Albert H. <he...@us...> - 2007-11-14 23:09:15
|
Update of /cvsroot/gc-linux/linux/arch/ppc/boot/simple In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4431/arch/ppc/boot/simple Modified Files: Makefile misc-embedded.c Log Message: Merged 2.6.22. Updated drivers to use in_be* and out_be* instead of read* and write* input/output instructions. Updated DI driver: - do not use debug extensions with unknown drive models - do not load custom firmware on xenogc/duoq - evict alien firmwares and load custom formware on known drive models Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/simple/Makefile,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- Makefile 30 Apr 2007 17:06:11 -0000 1.18 +++ Makefile 14 Nov 2007 23:08:46 -0000 1.19 @@ -205,6 +205,7 @@ endif boot-$(CONFIG_SERIAL_MPC52xx_CONSOLE) += mpc52xx_tty.o boot-$(CONFIG_SERIAL_MPSC_CONSOLE) += mv64x60_tty.o +boot-$(CONFIG_SERIAL_UARTLITE_CONSOLE) += uartlite_tty.o LIBS := $(common)/lib.a $(bootlib)/lib.a ifeq ($(CONFIG_PPC_PREP),y) Index: misc-embedded.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/simple/misc-embedded.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- misc-embedded.c 17 Feb 2007 23:43:40 -0000 1.8 +++ misc-embedded.c 14 Nov 2007 23:08:46 -0000 1.9 @@ -138,7 +138,7 @@ /* * We link ourself to an arbitrary low address. When we run, we - * relocate outself to that address. __image_being points to + * relocate ourself to that address. __image_being points to * the part of the image where the zImage is. -- Tom */ zimage_start = (char *)(unsigned long)(&__image_begin); |
165 messages has been excluded from this view by a project administrator.
