From: Tony Lindgren Date: Tue, 12 Feb 2008 21:19:22 +0000 (-0800) Subject: Merge current mainline tree into linux-omap tree X-Git-Tag: v2.6.25-omap1~200 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ccc4e1d8ddc4005fefbfb79d0482ce49b21ba884;p=linux-2.6-omap-h63xx.git Merge current mainline tree into linux-omap tree Merge branches 'master' and 'linus' Conflicts: arch/arm/Kconfig arch/arm/boot/compressed/Makefile arch/arm/configs/omap_h2_1610_defconfig arch/arm/configs/omap_osk_5912_defconfig arch/arm/mach-omap1/board-h2.c arch/arm/mach-omap1/board-h3-mmc.c arch/arm/mach-omap1/board-h3.c arch/arm/mach-omap1/board-palmte.c arch/arm/mach-omap1/board-sx1.c arch/arm/mach-omap1/pm.c arch/arm/mach-omap2/board-apollon.c arch/arm/mach-omap2/timer-gp.c arch/arm/plat-omap/Makefile arch/arm/plat-omap/gpio.c arch/arm/tools/mach-types arch/arm/vfp/vfphw.S arch/arm/vfp/vfpmodule.c drivers/crypto/Kconfig drivers/crypto/Makefile drivers/hwmon/Makefile drivers/i2c/chips/Kconfig drivers/input/keyboard/Makefile drivers/mmc/host/omap.c drivers/net/irda/Makefile drivers/net/smc91x.h drivers/usb/Kconfig drivers/video/backlight/Makefile drivers/w1/masters/Kconfig drivers/w1/masters/Makefile include/asm-arm/arch-omap/board-h3.h include/asm-arm/arch-omap/common.h include/asm-arm/arch-omap/dma.h include/asm-arm/arch-omap/gpio.h include/asm-arm/arch-omap/irqs.h include/asm-arm/fpstate.h include/asm-arm/vfp.h include/asm-arm/vfpmacros.h kernel/printk.c net/ipv4/netfilter/Kconfig net/ipv4/netfilter/Makefile security/Kconfig --- ccc4e1d8ddc4005fefbfb79d0482ce49b21ba884 diff --cc Makefile index d235309e577,c162370c736..56f77be2a37 --- a/Makefile +++ b/Makefile @@@ -172,10 -169,8 +172,10 @@@ SUBARCH := $(shell uname -m | sed -e s/ -e s/arm.*/arm/ -e s/sa110/arm/ \ -e s/s390x/s390/ -e s/parisc64/parisc/ \ -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ - -e s/sh[234].*/sh/ ) + -e s/sh.*/sh/ ) +SUBARCH := arm + # Cross compiling and selecting different set of gcc/bin-utils # --------------------------------------------------------------------------- # diff --cc arch/arm/Kconfig index a2f60234071,9619c43783f..c3258b32fb1 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@@ -406,9 -468,19 +468,20 @@@ config ARCH_OMA bool "TI OMAP" select GENERIC_GPIO select GENERIC_TIME + select GENERIC_CLOCKEVENTS help - Support for TI's OMAP platform (OMAP1, OMAP2 and OMAP3). + Support for TI's OMAP platform (OMAP1 and OMAP2). + + config ARCH_MSM7X00A + bool "Qualcomm MSM7X00A" + select GENERIC_TIME + select GENERIC_CLOCKEVENTS + help + Support for Qualcomm MSM7X00A based systems. This runs on the ARM11 + apps processor of the MSM7X00A and depends on a shared memory + interface to the ARM9 modem processor which runs the baseband stack + and controls some vital subsystems (clock and power control, etc). + endchoice diff --cc arch/arm/boot/compressed/Makefile index bc9714780f7,de9d9ee5095..2980faf5331 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@@ -44,14 -44,6 +44,10 @@@ ifeq ($(CONFIG_PXA_SHARPSL),y OBJS += head-sharpsl.o endif - ifeq ($(CONFIG_ARCH_AT91RM9200),y) - OBJS += head-at91rm9200.o - endif - +ifeq ($(CONFIG_MACH_OMAP_PERSEUS2),y) +OBJS += head-omap.o +endif + ifeq ($(CONFIG_CPU_BIG_ENDIAN),y) ifeq ($(CONFIG_CPU_CP15),y) OBJS += big-endian.o diff --cc arch/arm/mach-omap1/board-h2.c index 9b3a1d180b2,070345ee39a..c4f720d4685 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c @@@ -20,19 -20,18 +20,23 @@@ */ #include +#include #include #include + #include #include #include #include #include + #include +#include +#include +#include +#include #include + #include + #include #include #include diff --cc arch/arm/mach-omap1/board-h3.c index 481775de953,6fc516855a8..e49e070f1ed --- a/arch/arm/mach-omap1/board-h3.c +++ b/arch/arm/mach-omap1/board-h3.c @@@ -25,10 -26,7 +26,11 @@@ #include #include #include + #include +#include +#include +#include +#include #include #include diff --cc arch/arm/mach-omap2/board-apollon.c index d8156356489,7846551f057..2ee24a8cf33 --- a/arch/arm/mach-omap2/board-apollon.c +++ b/arch/arm/mach-omap2/board-apollon.c @@@ -22,12 -22,10 +22,14 @@@ #include #include #include + #include + #include #include #include +#include +#include +#include +#include #include #include diff --cc arch/arm/mm/Kconfig index 6a3a7c8cb2e,76348f060f2..1626f5c170b --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@@ -177,11 -171,10 +177,11 @@@ config CPU_ARM925 # ARM926T config CPU_ARM926T bool "Support ARM926T processor" - depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || MACH_REALVIEW_EB || ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_NS9XXX || ARCH_DAVINCI - default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_NS9XXX || ARCH_DAVINCI + depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || MACH_REALVIEW_EB || ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9 || ARCH_NS9XXX || ARCH_DAVINCI + default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9 || ARCH_NS9XXX || ARCH_DAVINCI select CPU_32v5 select CPU_ABRT_EV5TJ + select CPU_PABRT_NOIFAR select CPU_CACHE_VIVT select CPU_CP15_MMU select CPU_COPY_V4WB if MMU @@@ -359,11 -366,11 +380,12 @@@ config CPU_FEROCEON_OLD_I # ARMv6 config CPU_V6 bool "Support ARM V6 processor" - depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP2 || ARCH_MX3 + depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP2 || ARCH_MX3 || ARCH_MSM7X00A default y if ARCH_MX3 + default y if ARCH_MSM7X00A select CPU_32v6 select CPU_ABRT_EV6 + select CPU_PABRT_NOIFAR select CPU_CACHE_V6 select CPU_CACHE_VIPT select CPU_CP15_MMU diff --cc drivers/crypto/Kconfig index 0d4f80f3b39,6b658d84d52..cb34a72b890 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@@ -83,13 -81,82 +81,89 @@@ config ZCRYPT_MONOLITHI that contains all parts of the crypto device driver (ap bus, request router and all the card drivers). +config OMAP_SHA1_MD5 + tristate "Support for OMAP SHA1/MD5 hw engine" + depends on ARCH_OMAP24XX && CRYPTO_SHA1 && CRYPTO_MD5 + help + OMAP processors have SHA1/MD5 module accelerator. Select this if you + want to use the OMAP module for SHA1/MD5 algorithms. + - If unsure say M. The compiled module will be called omap-sha1-md5.ko + config CRYPTO_SHA1_S390 + tristate "SHA1 digest algorithm" + depends on S390 + select CRYPTO_ALGAPI + help + This is the s390 hardware accelerated implementation of the + SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2). + + config CRYPTO_SHA256_S390 + tristate "SHA256 digest algorithm" + depends on S390 + select CRYPTO_ALGAPI + help + This is the s390 hardware accelerated implementation of the + SHA256 secure hash standard (DFIPS 180-2). + + This version of SHA implements a 256 bit hash with 128 bits of + security against collision attacks. + + config CRYPTO_DES_S390 + tristate "DES and Triple DES cipher algorithms" + depends on S390 + select CRYPTO_ALGAPI + select CRYPTO_BLKCIPHER + help + This us the s390 hardware accelerated implementation of the + DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3). + + config CRYPTO_AES_S390 + tristate "AES cipher algorithms" + depends on S390 + select CRYPTO_ALGAPI + select CRYPTO_BLKCIPHER + help + This is the s390 hardware accelerated implementation of the + AES cipher algorithms (FIPS-197). AES uses the Rijndael + algorithm. + + Rijndael appears to be consistently a very good performer in + both hardware and software across a wide range of computing + environments regardless of its use in feedback or non-feedback + modes. Its key setup time is excellent, and its key agility is + good. Rijndael's very low memory requirements make it very well + suited for restricted-space environments, in which it also + demonstrates excellent performance. Rijndael's operations are + among the easiest to defend against power and timing attacks. + + On s390 the System z9-109 currently only supports the key size + of 128 bit. + + config S390_PRNG + tristate "Pseudo random number generator device driver" + depends on S390 + default "m" + help + Select this option if you want to use the s390 pseudo random number + generator. The PRNG is part of the cryptographic processor functions + and uses triple-DES to generate secure random numbers like the + ANSI X9.17 standard. The PRNG is usable via the char device + /dev/prandom. + + config CRYPTO_DEV_HIFN_795X + tristate "Driver HIFN 795x crypto accelerator chips" + select CRYPTO_DES + select CRYPTO_ALGAPI + select CRYPTO_BLKCIPHER + select HW_RANDOM if CRYPTO_DEV_HIFN_795X_RNG + depends on PCI + help + This option allows you to have support for HIFN 795x crypto adapters. + + config CRYPTO_DEV_HIFN_795X_RNG + bool "HIFN 795x random number generator" + depends on CRYPTO_DEV_HIFN_795X + help + Select this option if you want to enable the random number generator + on the HIFN 795x crypto adapters. endif # CRYPTO_HW diff --cc drivers/crypto/Makefile index daa0e1560c9,c0327f0dadc..6549d4503a4 --- a/drivers/crypto/Makefile +++ b/drivers/crypto/Makefile @@@ -1,4 -1,4 +1,5 @@@ obj-$(CONFIG_CRYPTO_DEV_PADLOCK_AES) += padlock-aes.o obj-$(CONFIG_CRYPTO_DEV_PADLOCK_SHA) += padlock-sha.o obj-$(CONFIG_CRYPTO_DEV_GEODE) += geode-aes.o +obj-$(CONFIG_OMAP_SHA1_MD5) += omap-sha1-md5.o + obj-$(CONFIG_CRYPTO_DEV_HIFN_795X) += hifn_795x.o diff --cc drivers/hwmon/Makefile index 50012d5225f,824161337f1..2e6c58218f7 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile @@@ -68,7 -69,7 +69,8 @@@ obj-$(CONFIG_SENSORS_VT1211) += vt1211. obj-$(CONFIG_SENSORS_VT8231) += vt8231.o obj-$(CONFIG_SENSORS_W83627EHF) += w83627ehf.o obj-$(CONFIG_SENSORS_W83L785TS) += w83l785ts.o +obj-$(CONFIG_SENSORS_TSC210X) += tsc210x_sensors.o + obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o ifeq ($(CONFIG_HWMON_DEBUG_CHIP),y) EXTRA_CFLAGS += -DDEBUG diff --cc drivers/i2c/chips/Kconfig index f8b4e54bbff,b21593f9358..bb78a0743f2 --- a/drivers/i2c/chips/Kconfig +++ b/drivers/i2c/chips/Kconfig @@@ -116,66 -103,6 +103,54 @@@ config TPS6501 This driver can also be built as a module. If so, the module will be called tps65010. +config SENSORS_TLV320AIC23 + tristate "Texas Instruments TLV320AIC23 Codec" + depends on I2C && I2C_OMAP + help + If you say yes here you get support for the I2C control + interface for Texas Instruments TLV320AIC23 audio codec. + +config GPIOEXPANDER_OMAP + bool "GPIO Expander PCF8574PWR for OMAP" + depends on I2C && (ARCH_OMAP16XX || ARCH_OMAP24XX) + help + If you say yes here you get support for I/O expander calls + to configure IrDA, Camera and audio devices. + +config TWL4030_CORE + bool "TI's TWL4030 companion chip Core Driver Support" + depends on I2C=y && (ARCH_OMAP24XX || ARCH_OMAP34XX) + help + Say yes here if you have TWL4030 chip on your board + +config TWL4030_GPIO + bool "TWL4030 GPIO Driver" + depends on TWL4030_CORE + +config TWL4030_USB + bool "TWL4030 USB Transceiver Driver" + depends on TWL4030_CORE + +choice + prompt "Transceiver mode" + depends on TWL4030_USB + help + TWL4030 USB transceiver can operate in various + mutually-exclusive modes. Select one of them. + +config TWL4030_USB_HS_ULPI + depends on TWL4030_USB + bool "High-speed ULPI" + help + Say Y here if the TWL4030 is connected to high-speed USB + controller through a ULPI interface. + +endchoice + +config TWL4030_POWEROFF + bool "TWL4030 device poweroff" + depends on TWL4030_CORE + - config SENSORS_M41T00 - tristate "ST M41T00 RTC chip (DEPRECATED)" - depends on PPC32 - help - If you say yes here you get support for the ST M41T00 RTC chip. - - This driver can also be built as a module. If so, the module - will be called m41t00. - - This driver is deprecated and will be dropped soon. Use - rtc-ds1307 or rtc-m41t80 instead. - config SENSORS_MAX6875 tristate "Maxim MAX6875 Power supply supervisor" depends on EXPERIMENTAL diff --cc drivers/input/keyboard/Kconfig index 1d7cb099968,8ea709be330..1c22930465b --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@@ -238,40 -259,14 +259,40 @@@ config KEYBOARD_OMA To compile this driver as a module, choose M here: the module will be called omap-keypad. +config KEYBOARD_TWL4030 + tristate "TI TWL4030 keypad support" + depends on TWL4030_CORE && (MACH_OMAP_2430SDP || MACH_OMAP_3430SDP) + help + Say Y here if you want to use the OMAP TWL4030 keypad. + + To compile this driver as a module, choose M here: the + module will be called omap-twl4030keypad. This driver depends on + TWL4030 Core and TWL4030 GPIO I2C client driver + +config OMAP_PS2 + tristate "TI OMAP Innovator 1510 PS/2 keyboard & mouse support" + depends on ARCH_OMAP15XX && MACH_OMAP_INNOVATOR + help + Say Y here if you want to use the OMAP Innovator 1510 PS/2 + keyboard and mouse. + + To compile this driver as a module, choose M here: the + module will be called innovator_ps2. + +config KEYBOARD_TSC2301 + tristate "TSC2301 keypad support" + depends on SPI_TSC2301 + help + Say Y here for if you are using the keypad features of TSC2301. + config KEYBOARD_PXA27x - tristate "PXA27x keyboard support" - depends on PXA27x + tristate "PXA27x/PXA3xx keypad support" + depends on PXA27x || PXA3xx help - Enable support for PXA27x matrix keyboard controller + Enable support for PXA27x/PXA3xx keypad controller To compile this driver as a module, choose M here: the - module will be called pxa27x_keyboard. + module will be called pxa27x_keypad. config KEYBOARD_AAED2000 tristate "AAED-2000 keyboard" diff --cc drivers/input/keyboard/Makefile index 06956ba66d5,e741f403101..bc0bbc1de49 --- a/drivers/input/keyboard/Makefile +++ b/drivers/input/keyboard/Makefile @@@ -18,10 -19,7 +19,10 @@@ obj-$(CONFIG_KEYBOARD_TOSA) += tosakbd obj-$(CONFIG_KEYBOARD_HIL) += hil_kbd.o obj-$(CONFIG_KEYBOARD_HIL_OLD) += hilkbd.o obj-$(CONFIG_KEYBOARD_OMAP) += omap-keypad.o +obj-$(CONFIG_OMAP_PS2) += innovator_ps2.o +obj-$(CONFIG_KEYBOARD_TSC2301) += tsc2301_kp.o +obj-$(CONFIG_KEYBOARD_TWL4030) += omap-twl4030keypad.o - obj-$(CONFIG_KEYBOARD_PXA27x) += pxa27x_keyboard.o + obj-$(CONFIG_KEYBOARD_PXA27x) += pxa27x_keypad.o obj-$(CONFIG_KEYBOARD_AAED2000) += aaed2000_kbd.o obj-$(CONFIG_KEYBOARD_GPIO) += gpio_keys.o obj-$(CONFIG_KEYBOARD_HP6XX) += jornada680_kbd.o diff --cc drivers/media/radio/Makefile index f3555fad979,a30159f6fa4..f5bffcce0b5 --- a/drivers/media/radio/Makefile +++ b/drivers/media/radio/Makefile @@@ -20,7 -20,7 +20,8 @@@ obj-$(CONFIG_RADIO_GEMTEK) += radio-gem obj-$(CONFIG_RADIO_GEMTEK_PCI) += radio-gemtek-pci.o obj-$(CONFIG_RADIO_TRUST) += radio-trust.o obj-$(CONFIG_RADIO_MAESTRO) += radio-maestro.o +obj-$(CONFIG_RADIO_TEA5761) += radio-tea5761.o obj-$(CONFIG_USB_DSBR) += dsbr100.o + obj-$(CONFIG_USB_SI470X) += radio-si470x.o EXTRA_CFLAGS += -Isound diff --cc drivers/mmc/host/omap.c index 60e3fd70395,c9dfeb15b48..6e4896397fe --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c @@@ -2,7 -2,7 +2,7 @@@ * linux/drivers/mmc/host/omap.c * * Copyright (C) 2004 Nokia Corporation -- * Written by Tuukka Tikkanen and Juha Yrjölä ++ * Written by Tuukka Tikkanen and Juha Yrj�l� * Misc hacks here and there by Tony Lindgren * Other hacks (DMA, SD, etc) by David Brownell * @@@ -37,8 -36,6 +38,7 @@@ #include #include #include - #include +#include #define OMAP_MMC_REG_CMD 0x00 #define OMAP_MMC_REG_ARGL 0x04 @@@ -1661,4 -1274,4 +1661,4 @@@ module_exit(mmc_omap_exit) MODULE_DESCRIPTION("OMAP Multimedia Card driver"); MODULE_LICENSE("GPL"); MODULE_ALIAS(DRIVER_NAME); --MODULE_AUTHOR("Juha Yrjölä"); ++MODULE_AUTHOR("Juha Yrj�l�"); diff --cc drivers/net/irda/Makefile index d1320ff344f,5d20fde32a2..49e6f062e05 --- a/drivers/net/irda/Makefile +++ b/drivers/net/irda/Makefile @@@ -20,22 -18,10 +18,11 @@@ obj-$(CONFIG_VLSI_FIR) += vlsi_ir. obj-$(CONFIG_VIA_FIR) += via-ircc.o obj-$(CONFIG_PXA_FICP) += pxaficp_ir.o obj-$(CONFIG_MCS_FIR) += mcs7780.o +obj-$(CONFIG_OMAP_IR) += omap-ir.o - # Old dongle drivers for old SIR drivers - obj-$(CONFIG_ESI_DONGLE_OLD) += esi.o - obj-$(CONFIG_TEKRAM_DONGLE_OLD) += tekram.o - obj-$(CONFIG_ACTISYS_DONGLE_OLD) += actisys.o - obj-$(CONFIG_GIRBIL_DONGLE_OLD) += girbil.o - obj-$(CONFIG_LITELINK_DONGLE_OLD) += litelink.o - obj-$(CONFIG_OLD_BELKIN_DONGLE_OLD) += old_belkin.o - obj-$(CONFIG_MCP2120_DONGLE_OLD) += mcp2120.o - obj-$(CONFIG_ACT200L_DONGLE_OLD) += act200l.o - obj-$(CONFIG_MA600_DONGLE_OLD) += ma600.o - obj-$(CONFIG_EP7211_IR) += ep7211_ir.o obj-$(CONFIG_AU1000_FIR) += au1k_ir.o - # New SIR drivers + # SIR drivers obj-$(CONFIG_IRTTY_SIR) += irtty-sir.o sir-dev.o - # New dongles drivers for new SIR drivers + # dongle drivers for SIR drivers obj-$(CONFIG_ESI_DONGLE) += esi-sir.o obj-$(CONFIG_TEKRAM_DONGLE) += tekram-sir.o obj-$(CONFIG_ACTISYS_DONGLE) += actisys-sir.o diff --cc drivers/usb/Kconfig index be5f640e52e,755823cdf62..142a3717902 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@@ -49,7 -54,7 +54,8 @@@ config USB_ARCH_HAS_EHC boolean default y if PPC_83xx default y if SOC_AU1200 + default y if ARCH_IXP4XX + default y if ARCH_OMAP34XX default PCI # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface. diff --cc drivers/usb/host/Kconfig index 8b545dc4987,d97b16b52ef..a134350b642 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@@ -28,35 -28,7 +28,26 @@@ config USB_EHCI_HC To compile this driver as a module, choose M here: the module will be called ehci-hcd. +choice + prompt "PHY/TLL mode" + depends on USB_EHCI_HCD && EXPERIMENTAL && ARCH_OMAP34XX + ---help--- + Choose PHY or TLL mode of operation + +config OMAP_EHCI_PHY_MODE + bool "PHY mode: ISP1504 on Port1/2 (NEW 3430ES2.0)" + depends on USB_EHCI_HCD && EXPERIMENTAL && ARCH_OMAP34XX + ---help--- + EHCI PHY mode. Port1 and Port2 are connected to ISP1504 transcievers + +config OMAP_EHCI_TLL_MODE + bool "TLL mode: (EXPERIMENTAL)" + depends on USB_EHCI_HCD && EXPERIMENTAL && ARCH_OMAP34XX + ---help--- + OMAP EHCI controller has TLL mode of operation for all 3 ports. + Use this mode when no transciever is present +endchoice - config USB_EHCI_SPLIT_ISO - bool "Full speed ISO transactions (EXPERIMENTAL)" - depends on USB_EHCI_HCD && EXPERIMENTAL - default n - ---help--- - This code is new and hasn't been used with many different - EHCI or USB 2.0 transaction translator implementations. - It should work for ISO-OUT transfers, like audio. - config USB_EHCI_ROOT_HUB_TT bool "Root Hub Transaction Translators (EXPERIMENTAL)" depends on USB_EHCI_HCD && EXPERIMENTAL diff --cc drivers/w1/masters/Kconfig index f89a1d16768,c4493091c65..636d4f767ea --- a/drivers/w1/masters/Kconfig +++ b/drivers/w1/masters/Kconfig @@@ -42,13 -42,15 +42,22 @@@ config W1_MASTER_DS1W in HP iPAQ devices like h5xxx, h2200, and ASIC3-based like hx4700. +config HDQ_MASTER_OMAP + tristate "OMAP HDQ driver" + depends on ARCH_OMAP2430 || ARCH_OMAP34XX + help + Say Y here if you want support for the 1-wire or HDQ Interface + on an OMAP processor. + + config W1_MASTER_GPIO + tristate "GPIO 1-wire busmaster" + depends on GENERIC_GPIO + help + Say Y here if you want to communicate with your 1-wire devices using + GPIO pins. This driver uses the GPIO API to control the wire. + + This support is also available as a module. If so, the module + will be called w1-gpio.ko. endmenu diff --cc drivers/w1/masters/Makefile index 040d2ae4f2a,1420b5bbdda..1daeb6e4b95 --- a/drivers/w1/masters/Makefile +++ b/drivers/w1/masters/Makefile @@@ -6,4 -6,4 +6,5 @@@ obj-$(CONFIG_W1_MASTER_MATROX) += matr obj-$(CONFIG_W1_MASTER_DS2490) += ds2490.o obj-$(CONFIG_W1_MASTER_DS2482) += ds2482.o obj-$(CONFIG_W1_MASTER_DS1WM) += ds1wm.o +obj-$(CONFIG_HDQ_MASTER_OMAP) += omap_hdq.o + obj-$(CONFIG_W1_MASTER_GPIO) += w1-gpio.o diff --cc include/asm-arm/arch-omap/dma.h index b4c3465565b,24acf090030..be0431efc3e --- a/include/asm-arm/arch-omap/dma.h +++ b/include/asm-arm/arch-omap/dma.h @@@ -491,12 -450,9 +491,12 @@@ extern int omap_get_dma_src_addr_counte extern void omap_clear_dma(int lch); extern int omap_dma_running(void); extern void omap_dma_set_global_params(int arb_rate, int max_fifo_depth, - int tparams); + int tparams); extern int omap_dma_set_prio_lch(int lch, unsigned char read_prio, - unsigned char write_prio); + unsigned char write_prio); +extern void omap_set_dma_dst_endian_type(int lch, enum end_type etype); +extern void omap_set_dma_src_endian_type(int lch, enum end_type etype); +extern int omap_get_dma_index(int lch, int *ei, int *fi); /* Chaining APIs */ #ifndef CONFIG_ARCH_OMAP1 diff --cc include/linux/i2c-id.h index c473204a636,b979112f74e..96527f810d3 --- a/include/linux/i2c-id.h +++ b/include/linux/i2c-id.h @@@ -125,49 -91,11 +91,13 @@@ #define I2C_DRIVERID_LM4857 92 /* LM4857 Audio Amplifier */ #define I2C_DRIVERID_VP27SMPX 93 /* Panasonic VP27s tuner internal MPX */ #define I2C_DRIVERID_CS4270 94 /* Cirrus Logic 4270 audio codec */ + #define I2C_DRIVERID_M52790 95 /* Mitsubishi M52790SP/FP AV switch */ + #define I2C_DRIVERID_CS5345 96 /* cs5345 audio processor */ +#define I2C_DRIVERID_MISC 99 /* Whatever until sorted out */ + #define I2C_DRIVERID_I2CDEV 900 - #define I2C_DRIVERID_ARP 902 /* SMBus ARP Client */ - #define I2C_DRIVERID_ALERT 903 /* SMBus Alert Responder Client */ - /* IDs -- Use DRIVERIDs 1000-1999 for sensors. - These were originally in sensors.h in the lm_sensors package */ - #define I2C_DRIVERID_LM78 1002 - #define I2C_DRIVERID_LM75 1003 - #define I2C_DRIVERID_GL518 1004 - #define I2C_DRIVERID_EEPROM 1005 - #define I2C_DRIVERID_W83781D 1006 - #define I2C_DRIVERID_LM80 1007 - #define I2C_DRIVERID_ADM1021 1008 - #define I2C_DRIVERID_ADM9240 1009 - #define I2C_DRIVERID_LTC1710 1010 - #define I2C_DRIVERID_BT869 1013 - #define I2C_DRIVERID_MAXILIFE 1014 - #define I2C_DRIVERID_MATORB 1015 - #define I2C_DRIVERID_GL520 1016 - #define I2C_DRIVERID_THMC50 1017 - #define I2C_DRIVERID_ADM1025 1020 - #define I2C_DRIVERID_LM87 1021 - #define I2C_DRIVERID_PCF8574 1022 - #define I2C_DRIVERID_MTP008 1023 - #define I2C_DRIVERID_DS1621 1024 - #define I2C_DRIVERID_ADM1024 1025 - #define I2C_DRIVERID_CH700X 1027 /* single driver for CH7003-7009 digital pc to tv encoders */ - #define I2C_DRIVERID_FSCPOS 1028 - #define I2C_DRIVERID_FSCSCY 1029 - #define I2C_DRIVERID_PCF8591 1030 - #define I2C_DRIVERID_LM92 1033 - #define I2C_DRIVERID_SMARTBATT 1035 - #define I2C_DRIVERID_BMCSENSORS 1036 - #define I2C_DRIVERID_FS451 1037 - #define I2C_DRIVERID_LM85 1039 - #define I2C_DRIVERID_LM83 1040 - #define I2C_DRIVERID_LM90 1042 - #define I2C_DRIVERID_ASB100 1043 - #define I2C_DRIVERID_FSCHER 1046 - #define I2C_DRIVERID_W83L785TS 1047 #define I2C_DRIVERID_OV7670 1048 /* Omnivision 7670 camera */ /* diff --cc net/ipv4/netfilter/Kconfig index c3509ab74eb,9a077cb2479..a54a082fc96 --- a/net/ipv4/netfilter/Kconfig +++ b/net/ipv4/netfilter/Kconfig @@@ -227,28 -216,6 +216,19 @@@ config IP_NF_TARGET_NETMA address part intact. It is similar to Fast NAT, except that Netfilter's connection tracking doesn't work well with Fast NAT. + To compile it as a module, choose M here. If unsure, say N. + - config IP_NF_TARGET_SAME - tristate "SAME target support (OBSOLETE)" - depends on NF_NAT - help - This option adds a `SAME' target, which works like the standard SNAT - target, but attempts to give clients the same IP for all connections. - - To compile it as a module, choose M here. If unsure, say N. - +config IP_NF_TARGET_IDLETIMER + tristate "IDLETIMER target support" + depends on IP_NF_IPTABLES + help + This option adds a `IDLETIMER' target. Each matching packet resets + the timer associated with input and/or output interfaces. Timer + expiry causes kobject uevent. Idle timer can be read via sysfs. + + To compile it as a module, choose M here. If unsure, say N. + + To compile it as a module, choose M here. If unsure, say N. config NF_NAT_SNMP_BASIC diff --cc net/ipv4/netfilter/Makefile index 9b22b3db6e2,0c7dc78a62e..584ed767095 --- a/net/ipv4/netfilter/Makefile +++ b/net/ipv4/netfilter/Makefile @@@ -58,9 -55,6 +55,7 @@@ obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) + obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o - obj-$(CONFIG_IP_NF_TARGET_SAME) += ipt_SAME.o +obj-$(CONFIG_IP_NF_TARGET_IDLETIMER) += ipt_IDLETIMER.o - obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o diff --cc security/Kconfig index 49fc5fcdfc7,5dfc206748c..3113d8f8973 --- a/security/Kconfig +++ b/security/Kconfig @@@ -103,15 -104,26 +104,34 @@@ config SECURITY_ROOTPLU If you are unsure how to answer this question, answer N. +config SECURITY_LOWMEM + tristate "Low memory watermark support" + depends on SECURITY + help - Implements low memory watermark support. ++ Implements low memory watermark support + + If you are unsure how to answer this question, answer N. + + config SECURITY_DEFAULT_MMAP_MIN_ADDR + int "Low address space to protect from user allocation" + depends on SECURITY + default 0 + help + This is the portion of low virtual memory which should be protected + from userspace allocation. Keeping a user from writing to low pages + can help reduce the impact of kernel NULL pointer bugs. + + For most users with lots of address space a value of 65536 is + reasonable and should cause no problems. Programs which use vm86 + functionality would either need additional permissions from either + the LSM or the capabilities module or have this protection disabled. + + This value can be changed after boot using the + /proc/sys/vm/mmap_min_addr tunable. + + source security/selinux/Kconfig + source security/smack/Kconfig endmenu diff --cc security/Makefile index 9d5b0aade3d,9e8b0252501..2feea8d97c0 --- a/security/Makefile +++ b/security/Makefile @@@ -14,6 -15,6 +15,7 @@@ endi obj-$(CONFIG_SECURITY) += security.o dummy.o inode.o # Must precede capability.o in order to stack properly. obj-$(CONFIG_SECURITY_SELINUX) += selinux/built-in.o + obj-$(CONFIG_SECURITY_SMACK) += commoncap.o smack/built-in.o obj-$(CONFIG_SECURITY_CAPABILITIES) += commoncap.o capability.o obj-$(CONFIG_SECURITY_ROOTPLUG) += commoncap.o root_plug.o +obj-$(CONFIG_SECURITY_LOWMEM) += commoncap.o lowmem.o diff --cc sound/oss/Makefile index d6f98a15eaf,1f86299fae4..0dbb89e83c7 --- a/sound/oss/Makefile +++ b/sound/oss/Makefile @@@ -6,12 -6,7 +6,11 @@@ # Each configuration option enables a list of files. obj-$(CONFIG_SOUND_OSS) += sound.o - obj-$(CONFIG_SOUND_CS4232) += cs4232.o ad1848.o +obj-$(CONFIG_SOUND_OMAP) += omap-audio-dma-intfc.o omap-audio.o +obj-$(CONFIG_SOUND_OMAP_TSC2101)+= omap-audio-tsc2101.o +obj-$(CONFIG_SOUND_OMAP_AIC23) += omap-audio-aic23.o + # Please leave it as is, cause the link order is significant ! obj-$(CONFIG_SOUND_SH_DAC_AUDIO) += sh_dac_audio.o