summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/i2c.c
diff options
context:
space:
mode:
authorMohsan Habibi <mohsan@motorola.com>2014-06-13 16:49:06 -0400
committerMohsan Habibi <mohsan@motorola.com>2014-06-17 18:32:32 -0400
commitb7a769d59041a3b52a95cd9e96a38dd285aa70f7 (patch)
tree10f3157de3f7a9acff618554dd34108097133ae6 /arch/arm/mach-omap2/i2c.c
parentdf4b6dc1b018da53d9d4507094bbbc9a429d7b3a (diff)
downloadolio-linux-3.10-b7a769d59041a3b52a95cd9e96a38dd285aa70f7.tar.xz
olio-linux-3.10-b7a769d59041a3b52a95cd9e96a38dd285aa70f7.zip
IKXCLOCK-2142 i2c: omap: convert I2C driver to PM QoS for latency constraints
Convert the driver from the outdated omap_pm_set_max_mpu_wakeup_lat API to the new PM QoS API. Since the constraint is on the MPU subsystem, use the PM_QOS_CPU_DMA_LATENCY class of PM QoS. The resulting MPU constraints are used by cpuidle to decide the next power state of the MPU subsystem. The I2C device latency timing is derived from the FIFO size and the clock speed and so is applicable to all OMAP SoCs. Based on: 671d9f5 OMAP: convert I2C driver to PM QoS for latency constraints Change-Id: Iea5ac78d89019ed6e8888a0d6489057186748bfa Signed-off-by: Mohsan Habibi <mohsan@motorola.com>
Diffstat (limited to 'arch/arm/mach-omap2/i2c.c')
-rw-r--r--arch/arm/mach-omap2/i2c.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/arm/mach-omap2/i2c.c b/arch/arm/mach-omap2/i2c.c
index d940e53dd9f..728ca6729a3 100644
--- a/arch/arm/mach-omap2/i2c.c
+++ b/arch/arm/mach-omap2/i2c.c
@@ -121,16 +121,6 @@ static int __init omap_i2c_nr_ports(void)
return ports;
}
-/*
- * XXX This function is a temporary compatibility wrapper - only
- * needed until the I2C driver can be converted to call
- * omap_pm_set_max_dev_wakeup_lat() and handle a return code.
- */
-static void omap_pm_set_max_mpu_wakeup_lat_compat(struct device *dev, long t)
-{
- omap_pm_set_max_mpu_wakeup_lat(dev, t);
-}
-
static const char name[] = "omap_i2c";
int __init omap_i2c_add_bus(struct omap_i2c_bus_platform_data *i2c_pdata,
@@ -168,15 +158,6 @@ int __init omap_i2c_add_bus(struct omap_i2c_bus_platform_data *i2c_pdata,
dev_attr = (struct omap_i2c_dev_attr *)oh->dev_attr;
pdata->flags = dev_attr->flags;
- /*
- * When waiting for completion of a i2c transfer, we need to
- * set a wake up latency constraint for the MPU. This is to
- * ensure quick enough wakeup from idle, when transfer
- * completes.
- * Only omap3 has support for constraints
- */
- if (cpu_is_omap34xx())
- pdata->set_mpu_wkup_lat = omap_pm_set_max_mpu_wakeup_lat_compat;
pdev = omap_device_build(name, bus_id, oh, pdata,
sizeof(struct omap_i2c_bus_platform_data));
WARN(IS_ERR(pdev), "Could not build omap_device for %s\n", name);