diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-11 23:53:01 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-11 23:53:01 +0200 |
| commit | c2fda22207e2977d0b80eac58a9004b6f8beed6d (patch) | |
| tree | 0c82957b9d6fb53aafe0f9a9d54de6015484e3e6 /arch/arm/mach-omap2/common-board-devices.c | |
| parent | fdcc205fb9ba006bcd37f72e1b1b904704257351 (diff) | |
| parent | e4609747a33b903c03346eea20d811fafd462269 (diff) | |
Merge branch 'fixes-part-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into omap/fixes
Diffstat (limited to 'arch/arm/mach-omap2/common-board-devices.c')
| -rw-r--r-- | arch/arm/mach-omap2/common-board-devices.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/arch/arm/mach-omap2/common-board-devices.c b/arch/arm/mach-omap2/common-board-devices.c index 0043fa8e370..bcb0c581716 100644 --- a/arch/arm/mach-omap2/common-board-devices.c +++ b/arch/arm/mach-omap2/common-board-devices.c @@ -20,36 +20,15 @@ * */ -#include <linux/i2c.h> -#include <linux/i2c/twl.h> - #include <linux/gpio.h> #include <linux/spi/spi.h> #include <linux/spi/ads7846.h> -#include <plat/i2c.h> #include <plat/mcspi.h> #include <plat/nand.h> #include "common-board-devices.h" -static struct i2c_board_info __initdata pmic_i2c_board_info = { - .addr = 0x48, - .flags = I2C_CLIENT_WAKE, -}; - -void __init omap_pmic_init(int bus, u32 clkrate, - const char *pmic_type, int pmic_irq, - struct twl4030_platform_data *pmic_data) -{ - strncpy(pmic_i2c_board_info.type, pmic_type, - sizeof(pmic_i2c_board_info.type)); - pmic_i2c_board_info.irq = pmic_irq; - pmic_i2c_board_info.platform_data = pmic_data; - - omap_register_i2c_bus(bus, clkrate, &pmic_i2c_board_info, 1); -} - #if defined(CONFIG_TOUCHSCREEN_ADS7846) || \ defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE) static struct omap2_mcspi_device_config ads7846_mcspi_config = { |