diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-26 01:10:38 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-26 01:10:38 +0300 |
| commit | 9f33be2c3a80bdc2cc08342dd77fac87652e0548 (patch) | |
| tree | 7ad6e825427a15c5ec0fc15540abc0429d7f4bce /include/linux/i2c-pnx.h | |
| parent | 2741ecb4ce5c2d430b5c44b0a169038338c21df5 (diff) | |
| parent | eed18b5fa4d297c681b00144e8c6942dd35d39a7 (diff) | |
| download | linux-9f33be2c3a80bdc2cc08342dd77fac87652e0548.tar.xz | |
Merge branches 'clks' and 'pnx' into devel
Diffstat (limited to 'include/linux/i2c-pnx.h')
| -rw-r--r-- | include/linux/i2c-pnx.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/include/linux/i2c-pnx.h b/include/linux/i2c-pnx.h index 9eb07bbc6522..a87124d4d533 100644 --- a/include/linux/i2c-pnx.h +++ b/include/linux/i2c-pnx.h @@ -12,9 +12,8 @@ #ifndef __I2C_PNX_H__ #define __I2C_PNX_H__ -#include <linux/pm.h> - struct platform_device; +struct clk; struct i2c_pnx_mif { int ret; /* Return value */ @@ -26,20 +25,18 @@ struct i2c_pnx_mif { }; struct i2c_pnx_algo_data { - u32 base; - u32 ioaddr; - int irq; + void __iomem *ioaddr; struct i2c_pnx_mif mif; int last; + struct clk *clk; + struct i2c_pnx_data *i2c_pnx; + struct i2c_adapter adapter; }; struct i2c_pnx_data { - int (*suspend) (struct platform_device *pdev, pm_message_t state); - int (*resume) (struct platform_device *pdev); - u32 (*calculate_input_freq) (struct platform_device *pdev); - int (*set_clock_run) (struct platform_device *pdev); - int (*set_clock_stop) (struct platform_device *pdev); - struct i2c_adapter *adapter; + const char *name; + u32 base; + int irq; }; #endif /* __I2C_PNX_H__ */ |