i2c/tps65010: New-style driver updates, part 2

Switch the tps65010 driver into a "new-style" I2C driver, and convert all
of its in-tree users (board support for OSK, H2, H3) accordingly.

That accounts for most of the board-specific code in this driver; the
rest of that code is now moved into board-specific initcalls.

Also remove some of the many now-superfluous #includes.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

3 files changed, 143 insertions, 5 deletions

diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 48c8c9195dc3..2f8f6ecf111f 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -20,22 +20,23 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
+#include <linux/i2c.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/input.h>
-#include <linux/workqueue.h>
 
 #include <asm/hardware.h>
+#include <asm/gpio.h>
+
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/gpio.h>
+#include <asm/arch/tps65010.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/tc.h>
 #include <asm/arch/irda.h>
@@ -277,6 +278,20 @@ static struct platform_device *h2_devices[] __initdata = {
         &h2_mcbsp1_device,
 };
 
+static struct i2c_board_info __initdata h2_i2c_board_info[] = {
+        {
+                I2C_BOARD_INFO("tps65010", 0x48),
+                .type           = "tps65010",
+                .irq            = OMAP_GPIO_IRQ(58),
+        },
+        /* TODO when driver support is ready:
+         *  - isp1301 OTG transceiver
+         *  - optional ov9640 camera sensor at 0x30
+         *  - pcf9754 for aGPS control
+         *  - ... etc
+         */
+};
+
 static void __init h2_init_smc91x(void)
 {
         if ((omap_request_gpio(0)) < 0) {
@@ -367,6 +382,14 @@ static void __init h2_init(void)
         omap_board_config = h2_config;
         omap_board_config_size = ARRAY_SIZE(h2_config);
         omap_serial_init();
+
+        /* irq for tps65010 chip */
+        omap_cfg_reg(W4_GPIO58);
+        if (gpio_request(58, "tps65010") == 0)
+                gpio_direction_input(58);
+
+        i2c_register_board_info(1, h2_i2c_board_info,
+                        ARRAY_SIZE(h2_i2c_board_info));
 }
 
 static void __init h2_map_io(void)
@@ -374,6 +397,22 @@ static void __init h2_map_io(void)
         omap1_map_common_io();
 }
 
+#ifdef CONFIG_TPS65010
+static int __init h2_tps_init(void)
+{
+        if (!machine_is_omap_h2())
+                return 0;
+
+        /* gpio3 for SD, gpio4 for VDD_DSP */
+        /* FIXME send power to DSP iff it's configured */
+
+        /* Enable LOW_PWR */
+        tps65010_set_low_pwr(ON);
+        return 0;
+}
+fs_initcall(h2_tps_init);
+#endif
+
 MACHINE_START(OMAP_H2, "TI-H2")
         /* Maintainer: Imre Deak <imre.deak@nokia.com> */
         .phys_io        = 0xfff00000,
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index 79d4ef4c54d4..add2f703204f 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -21,6 +21,7 @@
 #include <linux/platform_device.h>
 #include <linux/errno.h>
 #include <linux/workqueue.h>
+#include <linux/i2c.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
@@ -29,12 +30,14 @@
 #include <asm/setup.h>
 #include <asm/page.h>
 #include <asm/hardware.h>
+#include <asm/gpio.h>
+
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/gpio.h>
+#include <asm/arch/tps65010.h>
 #include <asm/arch/gpioexpander.h>
 #include <asm/arch/irqs.h>
 #include <asm/arch/mux.h>
@@ -413,6 +416,19 @@ static struct omap_board_config_kernel h3_config[] = {
         { OMAP_TAG_LCD,         &h3_lcd_config },
 };
 
+static struct i2c_board_info __initdata h3_i2c_board_info[] = {
+        {
+                I2C_BOARD_INFO("tps65010", 0x48),
+                .type           = "tps65013",
+                /* .irq         = OMAP_GPIO_IRQ(??), */
+        },
+        /* TODO when driver support is ready:
+         *  - isp1301 OTG transceiver
+         *  - optional ov9640 camera sensor at 0x30
+         *  - ...
+         */
+};
+
 #define H3_NAND_RB_GPIO_PIN     10
 
 static int nand_dev_ready(struct nand_platform_data *data)
@@ -446,6 +462,10 @@ static void __init h3_init(void)
         omap_board_config = h3_config;
         omap_board_config_size = ARRAY_SIZE(h3_config);
         omap_serial_init();
+
+        /* FIXME setup irq for tps65013 chip */
+        i2c_register_board_info(1, h3_i2c_board_info,
+                        ARRAY_SIZE(h3_i2c_board_info));
 }
 
 static void __init h3_init_smc91x(void)
@@ -470,6 +490,23 @@ static void __init h3_map_io(void)
         omap1_map_common_io();
 }
 
+#ifdef CONFIG_TPS65010
+static int __init h3_tps_init(void)
+{
+        if (!machine_is_omap_h3())
+                return 0;
+
+        /* gpio4 for SD, gpio3 for VDD_DSP */
+        /* FIXME send power to DSP iff it's configured */
+
+        /* Enable LOW_PWR */
+        tps65013_set_low_pwr(ON);
+
+        return 0;
+}
+fs_initcall(h3_tps_init);
+#endif
+
 MACHINE_START(OMAP_H3, "TI OMAP1710 H3 board")
         /* Maintainer: Texas Instruments, Inc. */
         .phys_io        = 0xfff00000,
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index e7130293a03f..a61bf455ee02 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -31,18 +31,21 @@
 #include <linux/platform_device.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
+#include <linux/i2c.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 
 #include <asm/hardware.h>
+#include <asm/gpio.h>
+
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/flash.h>
 
-#include <asm/arch/gpio.h>
 #include <asm/arch/usb.h>
+#include <asm/arch/tps65010.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/tc.h>
 #include <asm/arch/common.h>
@@ -179,6 +182,19 @@ static struct platform_device *osk5912_devices[] __initdata = {
         &osk5912_mcbsp1_device,
 };
 
+static struct i2c_board_info __initdata osk_i2c_board_info[] = {
+        {
+                I2C_BOARD_INFO("tps65010", 0x48),
+                .type           = "tps65010",
+                .irq            = OMAP_GPIO_IRQ(OMAP_MPUIO(1)),
+        },
+        /* TODO when driver support is ready:
+         *  - aic23 audio chip at 0x1a
+         *  - on Mistral, 24c04 eeprom at 0x50
+         *  - optionally on Mistral, ov9640 camera sensor at 0x30
+         */
+};
+
 static void __init osk_init_smc91x(void)
 {
         if ((omap_request_gpio(0)) < 0) {
@@ -397,6 +413,14 @@ static void __init osk_init(void)
         omap_board_config_size = ARRAY_SIZE(osk_config);
         USB_TRANSCEIVER_CTRL_REG |= (3 << 1);
 
+        /* irq for tps65010 chip */
+        /* bootloader effectively does:  omap_cfg_reg(U19_1610_MPUIO1); */
+        if (gpio_request(OMAP_MPUIO(1), "tps65010") == 0)
+                gpio_direction_input(OMAP_MPUIO(1));
+
+        i2c_register_board_info(1, osk_i2c_board_info,
+                        ARRAY_SIZE(osk_i2c_board_info));
+
         omap_serial_init();
         osk_mistral_init();
 }
@@ -406,6 +430,44 @@ static void __init osk_map_io(void)
         omap1_map_common_io();
 }
 
+#ifdef CONFIG_TPS65010
+static int __init osk_tps_init(void)
+{
+        if (!machine_is_omap_osk())
+                return 0;
+
+        /* Let LED1 (D9) blink */
+        tps65010_set_led(LED1, BLINK);
+
+        /* Disable LED 2 (D2) */
+        tps65010_set_led(LED2, OFF);
+
+        /* Set GPIO 1 HIGH to disable VBUS power supply;
+         * OHCI driver powers it up/down as needed.
+         */
+        tps65010_set_gpio_out_value(GPIO1, HIGH);
+
+        /* Set GPIO 2 low to turn on LED D3 */
+        tps65010_set_gpio_out_value(GPIO2, HIGH);
+
+        /* Set GPIO 3 low to take ethernet out of reset */
+        tps65010_set_gpio_out_value(GPIO3, LOW);
+
+        /* gpio4 for VDD_DSP */
+        /* FIXME send power to DSP iff it's configured */
+
+        /* Enable LOW_PWR */
+        tps65010_set_low_pwr(ON);
+
+        /* Switch VLDO2 to 3.0V for AIC23 */
+        tps65010_config_vregs1(TPS_LDO2_ENABLE | TPS_VLDO2_3_0V
+                        | TPS_LDO1_ENABLE);
+
+        return 0;
+}
+fs_initcall(osk_tps_init);
+#endif
+
 MACHINE_START(OMAP_OSK, "TI-OSK")
         /* Maintainer: Dirk Behme <dirk.behme@de.bosch.com> */
         .phys_io        = 0xfff00000,