From: Tony Lindgren <tony@atomide.com>
Date: Sun, 18 Jan 2009 12:08:53 +0000 (+0200)
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=45e5c5ffd32ade5a21a5e87b4040072590ec3ae1

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	drivers/i2c/chips/Kconfig
	drivers/i2c/chips/Makefile
	drivers/leds/Makefile
---

45e5c5ffd32ade5a21a5e87b4040072590ec3ae1
diff --cc drivers/i2c/chips/Kconfig
index 744ecbcc450,b9bef04b7be..4c27f8ae7d8
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@@ -168,42 -139,4 +168,31 @@@ config SENSORS_TSL255
  	  This driver can also be built as a module.  If so, the module
  	  will be called tsl2550.
  
 +config SENSORS_TSL2563
 +       tristate "Taos TSL2563 ambient light sensor"
 +       depends on I2C && HWMON
 +       help
 +         If you say yes here you get support for the Taos TSL2563
 +         ambient light sensor.
 +
 +         This driver can also be built as a module.  If so, the module
 +         will be called tsl2563.
 +
 +config LP5521
 +	tristate "LP5521 LED driver chip"
 +	depends on I2C
 +	help
 +	  If you say yes here you get support for the National Semiconductor
 +	  LP5521 LED driver.
 +
 +config MENELAUS
 +	bool "TWL92330/Menelaus PM chip"
 +	depends on I2C=y && ARCH_OMAP24XX
 +	help
 +	  If you say yes here you get support for the Texas Instruments
 +	  TWL92330/Menelaus Power Management chip. This include voltage
 +	  regulators, Dual slot memory card tranceivers, real-time clock
 +	  and other features that are often used in portable devices like
 +	  cell phones and PDAs.
 +
- config MCU_MPC8349EMITX
- 	tristate "MPC8349E-mITX MCU driver"
- 	depends on I2C && PPC_83xx
- 	select GENERIC_GPIO
- 	select ARCH_REQUIRE_GPIOLIB
- 	help
- 	  Say Y here to enable soft power-off functionality on the Freescale
- 	  boards with the MPC8349E-mITX-compatible MCU chips. This driver will
- 	  also register MCU GPIOs with the generic GPIO API, so you'll able
- 	  to use MCU pins as GPIOs.
- 
  endmenu
diff --cc drivers/i2c/chips/Makefile
index ffd8d0d1909,00fcb5193ac..b451369092c
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@@ -18,14 -18,7 +18,13 @@@ obj-$(CONFIG_SENSORS_PCA9539)	+= pca953
  obj-$(CONFIG_SENSORS_PCF8574)	+= pcf8574.o
  obj-$(CONFIG_PCF8575)		+= pcf8575.o
  obj-$(CONFIG_SENSORS_PCF8591)	+= pcf8591.o
 +obj-$(CONFIG_MENELAUS)		+= menelaus.o
  obj-$(CONFIG_SENSORS_TSL2550)	+= tsl2550.o
- obj-$(CONFIG_MCU_MPC8349EMITX)	+= mcu_mpc8349emitx.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/mfd/twl4030-core.c
index 7e7f0db2005,e7ab0035d30..19ee29b7751
--- a/drivers/mfd/twl4030-core.c
+++ b/drivers/mfd/twl4030-core.c
@@@ -784,12 -776,8 +784,12 @@@ twl4030_probe(struct i2c_client *client
  	inuse = true;
  
  	/* setup clock framework */
- 	clocks_init();
+ 	clocks_init(&client->dev);
  
 +	/* load power event scripts */
 +	if (twl_has_power() && pdata->power)
 +		twl4030_power_init(pdata->power);
 +
  	/* Maybe init the T2 Interrupt subsystem */
  	if (client->irq
  			&& pdata->irq_base