Merge branch 'nfs-for-2.6.39' into nfs-for-next

[firefly-linux-kernel-4.4.55.git] / include / linux / i2c / twl.h

diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index 61b9609e55f25829b80c71583fbccbb0a5922ad6..58afd9d2c438ea323cc6255c1c87057f85d8bd15 100644 (file)
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -600,6 +600,8 @@ struct twl4030_usb_data {
        int             (*phy_power)(struct device *dev, int iD, int on);
        /* enable/disable  phy clocks */
        int             (*phy_set_clock)(struct device *dev, int on);
+       /* suspend/resume of phy */
+       int             (*phy_suspend)(struct device *dev, int suspend);
 };
 
 struct twl4030_ins {
@@ -637,7 +639,6 @@ extern void twl4030_power_init(struct twl4030_power_data *triton2_scripts);
 extern int twl4030_remove_script(u8 flags);
 
 struct twl4030_codec_audio_data {
-       unsigned int audio_mclk; /* not used, will be removed */
        unsigned int digimic_delay; /* in ms */
        unsigned int ramp_delay_value;
        unsigned int offset_cncl_path;
@@ -648,7 +649,6 @@ struct twl4030_codec_audio_data {
 };
 
 struct twl4030_codec_vibra_data {
-       unsigned int    audio_mclk;
        unsigned int    coexist;
 };