From 5c825ee202d0891269e29197d5b21f8e2be3498a Mon Sep 17 00:00:00 2001 From: Andy Green Date: Mon, 30 May 2011 07:43:05 -0700 Subject: I2C: OMAP: add rev to omap i2c platform data We need to pass the I2C IP revision from the hwmod class up into the OMAP I2C driver, which does not have direct access to it. This adds a member to the platform data the OMAP I2C driver does use already to hold the I2C IP revision. Cc: patches@linaro.org Reported-by: Peter Maydell Signed-off-by: Andy Green Signed-off-by: Tony Lindgren Acked-by: Ben Dooks Signed-off-by: Kevin Hilman --- include/linux/i2c-omap.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/linux') diff --git a/include/linux/i2c-omap.h b/include/linux/i2c-omap.h index 0aa0cbd676f7..55eac259a451 100644 --- a/include/linux/i2c-omap.h +++ b/include/linux/i2c-omap.h @@ -32,6 +32,7 @@ struct omap_i2c_bus_platform_data { u32 clkrate; + u32 rev; void (*set_mpu_wkup_lat)(struct device *dev, long set); int (*device_enable) (struct platform_device *pdev); int (*device_shutdown) (struct platform_device *pdev); -- cgit v1.2.3 From c23600a688dc71f4312f83cb0f23a736e1578a5e Mon Sep 17 00:00:00 2001 From: Andy Green Date: Mon, 30 May 2011 07:43:08 -0700 Subject: I2C: OMAP1/OMAP2+: add flags field to omap i2c platform data OMAP I2C driver can access the configuration flags through its platform data. Cc: patches@linaro.org Reported-by: Peter Maydell Signed-off-by: Andy Green Signed-off-by: Tony Lindgren Acked-by: Ben Dooks Signed-off-by: Kevin Hilman --- include/linux/i2c-omap.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/linux') diff --git a/include/linux/i2c-omap.h b/include/linux/i2c-omap.h index 55eac259a451..56a9924c31ca 100644 --- a/include/linux/i2c-omap.h +++ b/include/linux/i2c-omap.h @@ -33,6 +33,7 @@ struct omap_i2c_bus_platform_data { u32 clkrate; u32 rev; + u32 flags; void (*set_mpu_wkup_lat)(struct device *dev, long set); int (*device_enable) (struct platform_device *pdev); int (*device_shutdown) (struct platform_device *pdev); -- cgit v1.2.3 From c9c7ae40660f5983854f73b6ae65f208e9a15082 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Thu, 4 Aug 2011 08:01:56 -0700 Subject: I2C: OMAP: remove unused function pointers from pdata Now that this driver is using runtime PM, there is no longer a need for the idle/enable/shutdown function pointers in pdata. Signed-off-by: Kevin Hilman --- include/linux/i2c-omap.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'include/linux') diff --git a/include/linux/i2c-omap.h b/include/linux/i2c-omap.h index 56a9924c31ca..92a0dc75bc74 100644 --- a/include/linux/i2c-omap.h +++ b/include/linux/i2c-omap.h @@ -35,9 +35,6 @@ struct omap_i2c_bus_platform_data { u32 rev; u32 flags; void (*set_mpu_wkup_lat)(struct device *dev, long set); - int (*device_enable) (struct platform_device *pdev); - int (*device_shutdown) (struct platform_device *pdev); - int (*device_idle) (struct platform_device *pdev); }; #endif -- cgit v1.2.3