From: Tony Lindgren Date: Mon, 27 Oct 2008 20:15:54 +0000 (-0700) Subject: Merge current mainline tree into linux-omap tree X-Git-Tag: v2.6.28-omap1~218 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=d8376cc482b241701f7606c81ad578b90853e175;p=linux-2.6-omap-h63xx.git Merge current mainline tree into linux-omap tree Merge branches 'master' and 'linus' Conflicts: arch/arm/configs/omap3_beagle_defconfig arch/arm/configs/omap_ldp_defconfig arch/arm/configs/overo_defconfig arch/arm/include/asm/mach/map.h arch/arm/include/asm/system.h arch/arm/kernel/setup.c arch/arm/mach-omap1/board-h3.c arch/arm/mach-omap1/clock.h arch/arm/mach-omap2/Kconfig arch/arm/mach-omap2/Makefile arch/arm/mach-omap2/board-2430sdp.c arch/arm/mach-omap2/board-h4.c arch/arm/mach-omap2/board-ldp.c arch/arm/mach-omap2/board-omap3beagle.c arch/arm/mach-omap2/board-overo.c arch/arm/mach-omap2/clock.c arch/arm/mach-omap2/clock24xx.c arch/arm/mach-omap2/clock24xx.h arch/arm/mach-omap2/clock34xx.c arch/arm/mach-omap2/clock34xx.h arch/arm/mach-omap2/clockdomain.c arch/arm/mach-omap2/clockdomains.h arch/arm/mach-omap2/cm.h arch/arm/mach-omap2/devices.c arch/arm/mach-omap2/gpmc.c arch/arm/mach-omap2/id.c arch/arm/mach-omap2/io.c arch/arm/mach-omap2/irq.c arch/arm/mach-omap2/memory.c arch/arm/mach-omap2/memory.h arch/arm/mach-omap2/mux.c arch/arm/mach-omap2/pm.c arch/arm/mach-omap2/powerdomains.h arch/arm/mach-omap2/powerdomains34xx.h arch/arm/mach-omap2/prm.h arch/arm/mach-omap2/serial.c arch/arm/plat-omap/Kconfig arch/arm/plat-omap/common.c arch/arm/plat-omap/devices.c arch/arm/plat-omap/include/mach/board.h arch/arm/plat-omap/include/mach/clock.h arch/arm/plat-omap/include/mach/clockdomain.h arch/arm/plat-omap/include/mach/common.h arch/arm/plat-omap/include/mach/cpu.h arch/arm/plat-omap/include/mach/entry-macro.S arch/arm/plat-omap/include/mach/fpga.h arch/arm/plat-omap/include/mach/gpmc.h arch/arm/plat-omap/include/mach/hardware.h arch/arm/plat-omap/include/mach/io.h arch/arm/plat-omap/include/mach/irqs.h arch/arm/plat-omap/include/mach/onenand.h arch/arm/plat-omap/include/mach/pm.h arch/arm/plat-omap/include/mach/powerdomain.h arch/arm/plat-omap/include/mach/sdrc.h arch/arm/plat-omap/sram.c drivers/gpio/Kconfig drivers/gpio/gpiolib.c drivers/i2c/busses/i2c-omap.c drivers/i2c/chips/Makefile drivers/i2c/i2c-core.c drivers/media/video/Kconfig drivers/mfd/Kconfig drivers/mfd/Makefile drivers/mfd/twl4030-core.c drivers/misc/Kconfig drivers/mtd/maps/omap-toto-flash.c drivers/mtd/nand/Kconfig drivers/mtd/nand/Makefile drivers/mtd/onenand/omap2.c drivers/net/Kconfig drivers/power/bq27x00_battery.c drivers/rtc/Kconfig drivers/usb/gadget/Kconfig drivers/usb/musb/davinci.c drivers/video/omap/dispc.h include/linux/i2c/twl4030.h sound/soc/codecs/Kconfig sound/soc/codecs/Makefile sound/soc/omap/Kconfig sound/soc/omap/Makefile --- d8376cc482b241701f7606c81ad578b90853e175 diff --cc arch/arm/include/asm/mach/map.h index 5cb4f5f511b,cb1139ac194..fa0e695057d --- a/arch/arm/include/asm/mach/map.h +++ b/arch/arm/include/asm/mach/map.h @@@ -18,17 -18,13 +18,14 @@@ struct map_desc unsigned int type; }; - /* types 0-4 are defined in asm/io.h */ - #define MT_CACHECLEAN 5 - #define MT_MINICLEAN 6 - #define MT_LOW_VECTORS 7 - #define MT_HIGH_VECTORS 8 - #define MT_MEMORY 9 - #define MT_ROM 10 - #define MT_MEMORY_SO 11 - - #define MT_NONSHARED_DEVICE MT_DEVICE_NONSHARED - #define MT_IXP2000_DEVICE MT_DEVICE_IXP2000 + /* types 0-3 are defined in asm/io.h */ + #define MT_CACHECLEAN 4 + #define MT_MINICLEAN 5 + #define MT_LOW_VECTORS 6 + #define MT_HIGH_VECTORS 7 + #define MT_MEMORY 8 + #define MT_ROM 9 ++#define MT_MEMORY_SO 10 #ifdef CONFIG_MMU extern void iotable_init(struct map_desc *, int); diff --cc arch/arm/plat-omap/cpu-omap.c index dbfcca90851,b2690242a39..f412c19c3c5 --- a/arch/arm/plat-omap/cpu-omap.c +++ b/arch/arm/plat-omap/cpu-omap.c @@@ -20,11 -20,10 +20,11 @@@ #include #include #include + #include #include - #include #include +#include #define VERY_HI_RATE 900000000 diff --cc drivers/i2c/chips/Makefile index 07a29fee34b,23d2a31b0a6..cb9f2bba285 --- a/drivers/i2c/chips/Makefile +++ b/drivers/i2c/chips/Makefile @@@ -19,17 -20,9 +20,17 @@@ obj-$(CONFIG_PCF8575) += pcf8575. obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o obj-$(CONFIG_TPS65010) += tps65010.o +obj-$(CONFIG_SENSORS_TLV320AIC23) += tlv320aic23.o +obj-$(CONFIG_GPIOEXPANDER_OMAP) += gpio_expander_omap.o obj-$(CONFIG_MENELAUS) += menelaus.o obj-$(CONFIG_SENSORS_TSL2550) += tsl2550.o - obj-$(CONFIG_SENSORS_TSL2563) += tsl2563.o + obj-$(CONFIG_MCU_MPC8349EMITX) += mcu_mpc8349emitx.o +obj-$(CONFIG_TWL4030_USB) += twl4030-usb.o +obj-$(CONFIG_TWL4030_POWEROFF) += twl4030-poweroff.o +obj-$(CONFIG_TWL4030_PWRBUTTON) += twl4030-pwrbutton.o +obj-$(CONFIG_TWL4030_MADC) += twl4030-madc.o +obj-$(CONFIG_RTC_X1205_I2C) += x1205.o +obj-$(CONFIG_LP5521) += lp5521.o ifeq ($(CONFIG_I2C_DEBUG_CHIP),y) EXTRA_CFLAGS += -DDEBUG diff --cc drivers/i2c/chips/menelaus.c index 3e6e2ade92c,4b364bae6b3..923e4bc61cc --- a/drivers/i2c/chips/menelaus.c +++ b/drivers/i2c/chips/menelaus.c @@@ -879,9 -927,9 +879,9 @@@ static int menelaus_set_time(struct dev status = time_to_menelaus(t, MENELAUS_RTC_SEC); if (status < 0) return status; - status = menelaus_write_reg(MENELAUS_RTC_WKDAY, BIN2BCD(t->tm_wday)); + status = menelaus_write_reg(MENELAUS_RTC_WKDAY, bin2bcd(t->tm_wday)); if (status < 0) { - dev_err(&the_menelaus->client->dev, "rtc write reg %02x " + dev_err(&the_menelaus->client->dev, "rtc write reg %02x" "err %d\n", MENELAUS_RTC_WKDAY, status); return status; } diff --cc drivers/input/touchscreen/Kconfig index 84ba956b6f2,3d1ab8fa9ac..dbbbb78af69 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@@ -217,50 -221,10 +221,51 @@@ config TOUCHSCREEN_ATMEL_TSADC To compile this driver as a module, choose M here: the module will be called atmel_tsadcc. +config TOUCHSCREEN_TSC2005 + tristate "TSC2005 touchscreen support" + depends on SPI_MASTER + help + Say Y here for if you are using the touchscreen features of TSC2005. + +config TOUCHSCREEN_TSC2102 + tristate "TSC 2102 based touchscreens" + depends on SPI_MASTER + select SPI_TSC2102 + help + Say Y here if you have a touchscreen interface using the + TI TSC 2102 controller, and your board-specific initialization + code includes that in its table of SPI devices. Also make + sure the proper SPI controller is selected. + + If unsure, say N (but it's safe to say "Y"). + + To compile this driver as a module, choose M here: the + module will be called tsc2102_ts. + +config TOUCHSCREEN_TSC210X + tristate "TI TSC210x based touchscreens" + depends on SPI_MASTER + select SPI_TSC210X + help + Say Y here if you have a touchscreen interface using a + TI TSC210x controller, and your board-specific initialisation + code includes that in its table of SPI devices. + + If unsure, say N (but it's safe to say "Y"). + + To compile this driver as a module, choose M here: the + module will be called tsc210x_ts. + +config TOUCHSCREEN_TSC2301 + tristate "TSC2301 touchscreen support" + depends on SPI_TSC2301 + help + Say Y here for if you are using the touchscreen features of TSC2301. + config TOUCHSCREEN_UCB1400 tristate "Philips UCB1400 touchscreen" - select AC97_BUS + depends on AC97_BUS + depends on UCB1400_CORE help This enables support for the Philips UCB1400 touchscreen interface. The UCB1400 is an AC97 audio codec. The touchscreen interface diff --cc drivers/media/radio/Makefile index 645ab0b49d7,240ec63cdaf..4c4faeb89b4 --- a/drivers/media/radio/Makefile +++ b/drivers/media/radio/Makefile @@@ -16,8 -16,8 +16,9 @@@ 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 + obj-$(CONFIG_USB_MR800) += radio-mr800.o EXTRA_CFLAGS += -Isound diff --cc drivers/mfd/Makefile index baa15bd8d17,0acefe8aff8..56f659982d5 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@@ -12,8 -12,12 +12,13 @@@ obj-$(CONFIG_MFD_T7L66XB) += t7l66xb. obj-$(CONFIG_MFD_TC6387XB) += tc6387xb.o obj-$(CONFIG_MFD_TC6393XB) += tc6393xb.o + obj-$(CONFIG_MFD_WM8400) += wm8400-core.o + wm8350-objs := wm8350-core.o wm8350-regmap.o wm8350-gpio.o + obj-$(CONFIG_MFD_WM8350) += wm8350.o + obj-$(CONFIG_MFD_WM8350_I2C) += wm8350-i2c.o + obj-$(CONFIG_TWL4030_CORE) += twl4030-core.o twl4030-irq.o +obj-$(CONFIG_TWL4030_POWER) += twl4030-power.o obj-$(CONFIG_MFD_CORE) += mfd-core.o diff --cc drivers/mtd/maps/Makefile index 6cda6df973e,6d9ba35caf1..b2582506cde --- a/drivers/mtd/maps/Makefile +++ b/drivers/mtd/maps/Makefile @@@ -50,12 -50,8 +50,9 @@@ obj-$(CONFIG_MTD_REDWOOD) += redwood. obj-$(CONFIG_MTD_UCLINUX) += uclinux.o obj-$(CONFIG_MTD_NETtel) += nettel.o obj-$(CONFIG_MTD_SCB2_FLASH) += scb2_flash.o - obj-$(CONFIG_MTD_EBONY) += ebony.o - obj-$(CONFIG_MTD_OCOTEA) += ocotea.o - obj-$(CONFIG_MTD_WALNUT) += walnut.o obj-$(CONFIG_MTD_H720X) += h720x-flash.o obj-$(CONFIG_MTD_SBC8240) += sbc8240.o +obj-$(CONFIG_MTD_NOR_TOTO) += omap-toto-flash.o obj-$(CONFIG_MTD_IXP4XX) += ixp4xx.o obj-$(CONFIG_MTD_IXP2000) += ixp2000.o obj-$(CONFIG_MTD_WRSBC8260) += wr_sbc82xx_flash.o diff --cc drivers/mtd/nand/Makefile index ba42584b0ab,b661586afbf..3ec014c89d3 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile @@@ -24,9 -23,7 +24,10 @@@ obj-$(CONFIG_MTD_NAND_NANDSIM) += nand obj-$(CONFIG_MTD_NAND_CS553X) += cs553x_nand.o obj-$(CONFIG_MTD_NAND_NDFC) += ndfc.o obj-$(CONFIG_MTD_NAND_ATMEL) += atmel_nand.o + obj-$(CONFIG_MTD_NAND_GPIO) += gpio.o +obj-$(CONFIG_MTD_NAND_OMAP) += omap-nand-flash.o +obj-$(CONFIG_MTD_NAND_OMAP2) += omap2.o +obj-$(CONFIG_MTD_NAND_OMAP_HW) += omap-hw.o obj-$(CONFIG_MTD_NAND_CM_X270) += cmx270_nand.o obj-$(CONFIG_MTD_NAND_BASLER_EXCITE) += excite_nandflash.o obj-$(CONFIG_MTD_NAND_PXA3xx) += pxa3xx_nand.o diff --cc drivers/power/Kconfig index c0a3036cfaa,8e0c2b47803..14777f79439 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@@ -49,46 -49,23 +49,31 @@@ config BATTERY_OLP help Say Y to enable support for the battery on the OLPC laptop. - config BATTERY_BQ27x00 - tristate "BQ27x00 battery driver" - help - Say Y here to enable support for batteries with BQ27000 or BQ27200 chip. - - config BATTERY_BQ27000 - bool "BQ27000 battery driver" - depends on BATTERY_BQ27x00 - select W1 - select W1_SLAVE_BQ27000 - help - Say Y here to enable support for batteries with BQ27000(HDQ) chip. - - config BATTERY_BQ27200 - bool "BQ27200 battery driver" - depends on BATTERY_BQ27x00 - select I2C - select I2C_OMAP + config BATTERY_TOSA + tristate "Sharp SL-6000 (tosa) battery" + depends on MACH_TOSA && MFD_TC6393XB && TOUCHSCREEN_WM97XX help - Say Y here to enable support for batteries with BQ27200(I2C) chip. + Say Y to enable support for the battery on the Sharp Zaurus + SL-6000 (tosa) models. +config TWL4030_BCI_BATTERY + tristate "OMAP TWL4030 BCI Battery driver" + depends on (MACH_OMAP_2430SDP || MACH_OMAP_3430SDP || MACH_OMAP_LDP) && TWL4030_MADC + default y + help + Support for OMAP TWL4030 BCI Battery driver. + This driver can give support for TWL4030 Battery Charge Interface. + - config BATTERY_TOSA - tristate "Sharp SL-6000 (tosa) battery" - depends on MACH_TOSA && MFD_TC6393XB + config BATTERY_WM97XX + bool "WM97xx generic battery driver" + depends on TOUCHSCREEN_WM97XX=y help - Say Y to enable support for the battery on the Sharp Zaurus - SL-6000 (tosa) models. + Say Y to enable support for battery measured by WM97xx aux port. - config BATTERY_PALMTX - tristate "Palm T|X battery" - depends on MACH_PALMTX + config BATTERY_BQ27x00 + tristate "BQ27200 battery driver" + depends on I2C help - Say Y to enable support for the battery in Palm T|X. + Say Y here to enable support for batteries with BQ27200(I2C) chip. endif # POWER_SUPPLY diff --cc drivers/power/Makefile index 8da941a8090,e8f1ecec5d8..f219a2b99ce --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@@ -20,7 -20,6 +20,8 @@@ obj-$(CONFIG_APM_POWER) += apm_power. obj-$(CONFIG_BATTERY_DS2760) += ds2760_battery.o obj-$(CONFIG_BATTERY_PMU) += pmu_battery.o obj-$(CONFIG_BATTERY_OLPC) += olpc_battery.o +obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o +obj-$(CONFIG_TWL4030_BCI_BATTERY) += twl4030_bci_battery.o obj-$(CONFIG_BATTERY_TOSA) += tosa_battery.o - obj-$(CONFIG_BATTERY_PALMTX) += palmtx_battery.o + obj-$(CONFIG_BATTERY_WM97XX) += wm97xx_battery.o + obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o diff --cc drivers/video/omap/dispc.h index 3b279c94c8e,ef720a78f6d..0a370cf07f7 --- a/drivers/video/omap/dispc.h +++ b/drivers/video/omap/dispc.h @@@ -37,10 -37,9 +37,11 @@@ extern void omap_dispc_set_lcd_size(in extern void omap_dispc_enable_lcd_out(int enable); extern void omap_dispc_enable_digit_out(int enable); -extern int omap_dispc_request_irq(void (*callback)(void *data), void *data); -extern void omap_dispc_free_irq(void); +extern int omap_dispc_request_irq(unsigned long irq_mask, + void (*callback)(void *data), void *data); +extern void omap_dispc_free_irq(unsigned long irq_mask, + void (*callback)(void *data), void *data); extern const struct lcd_ctrl omap2_int_ctrl; + #endif diff --cc drivers/w1/w1.h index b8189e8f2a5,cdaa6fffbfc..97304bd83ec --- a/drivers/w1/w1.h +++ b/drivers/w1/w1.h @@@ -187,9 -196,16 +196,17 @@@ struct w1_slave *w1_search_slave(struc void w1_search_process(struct w1_master *dev, u8 search_type); struct w1_master *w1_search_master_id(u32 id); + /* Disconnect and reconnect devices in the given family. Used for finding + * unclaimed devices after a family has been registered or releasing devices + * after a family has been unregistered. Set attach to 1 when a new family + * has just been registered, to 0 when it has been unregistered. + */ + void w1_reconnect_slaves(struct w1_family *f, int attach); + void w1_slave_detach(struct w1_slave *sl); + u8 w1_triplet(struct w1_master *dev, int bdir); void w1_write_8(struct w1_master *, u8); +u8 w1_read_8(struct w1_master *); int w1_reset_bus(struct w1_master *); u8 w1_calc_crc8(u8 *, int); void w1_write_block(struct w1_master *, const u8 *, int); diff --cc net/ipv4/netfilter/Kconfig index 37e44705ff9,3816e1dc929..2efcd85f9b2 --- a/net/ipv4/netfilter/Kconfig +++ b/net/ipv4/netfilter/Kconfig @@@ -211,23 -197,11 +197,24 @@@ config IP_NF_TARGET_REDIREC depends on NF_NAT depends on NETFILTER_ADVANCED help - NETMAP is an implementation of static 1:1 NAT mapping of network - addresses. It maps the network address part, while keeping the host - address part intact. + REDIRECT is a special case of NAT: all incoming connections are + mapped onto the incoming interface's address, causing the packets to + come to the local machine instead of passing through. This is + useful for transparent proxies. + 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 sound/arm/Kconfig index 06a24df059f,f8e6de48d81..3e4b26349f4 --- a/sound/arm/Kconfig +++ b/sound/arm/Kconfig @@@ -41,68 -50,5 +50,68 @@@ config SND_PXA2XX_AC9 Say Y or M if you want to support any AC97 codec attached to the PXA2xx AC97 interface. -endif # SND_ARM +config SND_OMAP_AIC23 + tristate "OMAP AIC23 alsa driver (osk5912)" + depends on ARCH_OMAP && SND + select SND_PCM - select I2C - select I2C_OMAP if ARCH_OMAP ++ #select I2C ++ #select I2C_OMAP if ARCH_OMAP + select SENSORS_TLV320AIC23 + help + Say Y here if you have a OSK platform board + and want to use its AIC23 audio chip. + + To compile this driver as a module, choose M here: the module + will be called snd-omap-aic23. + +config SND_OMAP_TSC2101 + tristate "OMAP TSC2101 alsa driver" + depends on ARCH_OMAP && SND + select SND_PCM + select SPI_TSC2101 + help + Say Y here if you have a OMAP platform board + and want to use its TSC2101 audio chip. Driver has + been tested with H2 and iPAQ h6300. + + To compile this driver as a module, choose M here: the module + will be called snd-omap-tsc2101. + +config SND_SX1 + tristate "Siemens SX1 Egold alsa driver" + depends on ARCH_OMAP && SND + select SND_PCM + help + Say Y here if you have a OMAP310 based Siemens SX1. + + To compile this driver as a module, choose M here: the module + will be called snd-omap-sx1. + +config SND_OMAP_TSC2102 + tristate "OMAP TSC2102 alsa driver" + depends on ARCH_OMAP && SND + select SND_PCM + select SPI_TSC2102 + help + Say Y here if you have an OMAP platform board + and want to use its TSC2102 audio chip. + To compile this driver as a module, choose M here: the module + will be called snd-omap-tsc2102. + +config SND_OMAP24XX_EAC + tristate "Audio driver for OMAP24xx EAC" + depends on SND + help + Audio driver for Enhanced Audio Controller found in TI's OMAP24xx + processors. + + Currently contains only low-level support functions for + initializing EAC HW, creating ALSA sound card instance for it + and registering mixer controls implemented by a codec driver. + PCM stream is expected to be under DSP co-processor control. + + To compile this driver as a module, choose M here: the module + will be called snd-omap24xx-eac. + +endif # SND_ARM diff --cc sound/arm/Makefile index bd12f53404a,2054de11de8..b55e17bd221 --- a/sound/arm/Makefile +++ b/sound/arm/Makefile @@@ -11,7 -11,9 +11,11 @@@ snd-aaci-objs := aaci.o devdma. obj-$(CONFIG_SND_PXA2XX_PCM) += snd-pxa2xx-pcm.o snd-pxa2xx-pcm-objs := pxa2xx-pcm.o + obj-$(CONFIG_SND_PXA2XX_LIB) += snd-pxa2xx-lib.o + snd-pxa2xx-lib-y := pxa2xx-pcm-lib.o + snd-pxa2xx-lib-$(CONFIG_SND_PXA2XX_LIB_AC97) += pxa2xx-ac97-lib.o + obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o snd-pxa2xx-ac97-objs := pxa2xx-ac97.o + +obj-$(CONFIG_SND) += omap/