From: Tony Lindgren <tony@atomide.com>
Date: Tue, 27 Jan 2009 21:07:22 +0000 (-0800)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=96584c6afee1ab7ea408e6f9331ab64399f821d3

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	arch/arm/configs/omap3_pandora_defconfig
	arch/arm/configs/omap_2430sdp_defconfig
	arch/arm/configs/omap_ldp_defconfig
	arch/arm/configs/overo_defconfig
	arch/arm/mach-omap2/board-apollon.c
	arch/arm/mach-omap2/board-omap3beagle.c
	arch/arm/plat-omap/dma.c
	drivers/misc/Makefile
	drivers/mmc/host/omap_hsmmc.c
	drivers/spi/Kconfig
	include/linux/i2c-id.h
---

96584c6afee1ab7ea408e6f9331ab64399f821d3
diff --cc arch/arm/mach-omap2/board-omap3beagle.c
index fe97bab53e9,38c88fbe658..48cfae91509
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@@ -28,7 -28,7 +28,8 @@@
  #include <linux/mtd/partitions.h>
  #include <linux/mtd/nand.h>
  
 +#include <linux/regulator/machine.h>
+ #include <linux/i2c/twl4030.h>
  
  #include <mach/hardware.h>
  #include <asm/mach-types.h>
diff --cc arch/arm/plat-omap/dma.c
index 3a50a6633f6,e77373c39f8..5eaa46841fe
mode 100755,100644..100755
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
diff --cc drivers/misc/Makefile
index 04399dddef3,bc119983055..b162e23af35
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@@ -13,8 -13,6 +13,7 @@@ obj-$(CONFIG_TIFM_CORE)       	+= tifm_
  obj-$(CONFIG_TIFM_7XX1)       	+= tifm_7xx1.o
  obj-$(CONFIG_PHANTOM)		+= phantom.o
  obj-$(CONFIG_SGI_IOC4)		+= ioc4.o
- obj-$(CONFIG_EEPROM_93CX6)	+= eeprom_93cx6.o
 +obj-$(CONFIG_OMAP_STI)		+= sti/
  obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o
  obj-$(CONFIG_KGDB_TESTS)	+= kgdbts.o
  obj-$(CONFIG_SGI_XP)		+= sgi-xp/
diff --cc drivers/spi/Kconfig
index c203657178a,83a185d5296..8bc6d114721
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@@ -230,58 -230,6 +230,47 @@@ config SPI_XILIN
  #
  comment "SPI Protocol Masters"
  
- config SPI_AT25
- 	tristate "SPI EEPROMs from most vendors"
- 	depends on SYSFS
- 	help
- 	  Enable this driver to get read/write support to most SPI EEPROMs,
- 	  after you configure the board init code to know about each eeprom
- 	  on your target board.
- 
- 	  This driver can also be built as a module.  If so, the module
- 	  will be called at25.
- 
 +config SPI_TSC210X
 +	depends on SPI_MASTER && EXPERIMENTAL
 +	tristate "TI TSC210x (TSC2101/TSC2102) support"
 +	help
 +	  Say Y here if you want support for the TSC210x chips.  Some
 +	  boards use these for touchscreen and audio support.
 +
 +	  These are members of a family of highly integrated PDA analog
 +	  interface circuit.  They include a 12-bit ADC used for battery,
 +	  temperature, touchscreen, and other sensors.  They also have
 +	  an audio DAC and amplifier, and in some models an audio ADC.
 +	  The audio support is highly chip-specific, but most of the
 +	  sensor support works the same.
 +
 +	  Note that the device has to be present in the board's SPI
 +	  devices table for this driver to load.  This driver doesn't
 +	  automatically enable touchscreen, sensors or audio
 +	  functionality - enable these in their respective menus.
 +
 +config SPI_TSC2301
 +	tristate "TSC2301 driver"
 +	depends on SPI_MASTER
 +	help
 +	  Say Y here if you have a TSC2301 chip connected to an SPI
 +	  bus on your board.
 +
 +	  The TSC2301 is a highly integrated PDA analog interface circuit.
 +	  It contains a complete 12-bit A/D resistive touch screen
 +	  converter (ADC) including drivers, touch pressure measurement
 +	  capability, keypad controller, and 8-bit D/A converter (DAC) output
 +	  for LCD contrast control.
 +
 +	  To compile this driver as a module, choose M here: the
 +	  module will be called tsc2301.
 +
 +config SPI_TSC2301_AUDIO
 +	boolean "TSC2301 audio support"
 +	depends on SPI_TSC2301 && SND
 +	help
 +	  Say Y here for if you are using the audio features of TSC2301.
 +
  config SPI_SPIDEV
  	tristate "User mode SPI device driver support"
  	depends on EXPERIMENTAL
diff --cc drivers/spi/Makefile
index 525abc3dcb9,5d0451936d8..2b8af987873
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@@ -33,12 -33,8 +33,11 @@@ obj-$(CONFIG_SPI_SH_SCI)		+= spi_sh_sci
  # 	... add above this line ...
  
  # SPI protocol drivers (device/link on bus)
- obj-$(CONFIG_SPI_AT25)		+= at25.o
  obj-$(CONFIG_SPI_SPIDEV)	+= spidev.o
  obj-$(CONFIG_SPI_TLE62X0)	+= tle62x0.o
 +obj-$(CONFIG_SPI_TSC210X)	+= tsc210x.o
 +obj-$(CONFIG_SPI_TSC2301)	+= tsc2301.o
 +tsc2301-objs			:= tsc2301-core.o
  # 	... add above this line ...
  
  # SPI slave controller drivers (upstream link)