diff options
Diffstat (limited to 'include/linux/i2c/twl.h')
-rw-r--r-- | include/linux/i2c/twl.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h index 61b9609e55f2..0c0d1ae79981 100644 --- a/include/linux/i2c/twl.h +++ b/include/linux/i2c/twl.h | |||
@@ -600,6 +600,8 @@ struct twl4030_usb_data { | |||
600 | int (*phy_power)(struct device *dev, int iD, int on); | 600 | int (*phy_power)(struct device *dev, int iD, int on); |
601 | /* enable/disable phy clocks */ | 601 | /* enable/disable phy clocks */ |
602 | int (*phy_set_clock)(struct device *dev, int on); | 602 | int (*phy_set_clock)(struct device *dev, int on); |
603 | /* suspend/resume of phy */ | ||
604 | int (*phy_suspend)(struct device *dev, int suspend); | ||
603 | }; | 605 | }; |
604 | 606 | ||
605 | struct twl4030_ins { | 607 | struct twl4030_ins { |
@@ -637,7 +639,6 @@ extern void twl4030_power_init(struct twl4030_power_data *triton2_scripts); | |||
637 | extern int twl4030_remove_script(u8 flags); | 639 | extern int twl4030_remove_script(u8 flags); |
638 | 640 | ||
639 | struct twl4030_codec_audio_data { | 641 | struct twl4030_codec_audio_data { |
640 | unsigned int audio_mclk; /* not used, will be removed */ | ||
641 | unsigned int digimic_delay; /* in ms */ | 642 | unsigned int digimic_delay; /* in ms */ |
642 | unsigned int ramp_delay_value; | 643 | unsigned int ramp_delay_value; |
643 | unsigned int offset_cncl_path; | 644 | unsigned int offset_cncl_path; |
@@ -648,7 +649,6 @@ struct twl4030_codec_audio_data { | |||
648 | }; | 649 | }; |
649 | 650 | ||
650 | struct twl4030_codec_vibra_data { | 651 | struct twl4030_codec_vibra_data { |
651 | unsigned int audio_mclk; | ||
652 | unsigned int coexist; | 652 | unsigned int coexist; |
653 | }; | 653 | }; |
654 | 654 | ||
@@ -698,6 +698,7 @@ struct twl4030_platform_data { | |||
698 | struct regulator_init_data *vana; | 698 | struct regulator_init_data *vana; |
699 | struct regulator_init_data *vcxio; | 699 | struct regulator_init_data *vcxio; |
700 | struct regulator_init_data *vusb; | 700 | struct regulator_init_data *vusb; |
701 | struct regulator_init_data *clk32kg; | ||
701 | }; | 702 | }; |
702 | 703 | ||
703 | /*----------------------------------------------------------------------*/ | 704 | /*----------------------------------------------------------------------*/ |
@@ -777,5 +778,6 @@ static inline int twl4030charger_usb_en(int enable) { return 0; } | |||
777 | 778 | ||
778 | /* INTERNAL LDOs */ | 779 | /* INTERNAL LDOs */ |
779 | #define TWL6030_REG_VRTC 47 | 780 | #define TWL6030_REG_VRTC 47 |
781 | #define TWL6030_REG_CLK32KG 48 | ||
780 | 782 | ||
781 | #endif /* End of __TWL4030_H */ | 783 | #endif /* End of __TWL4030_H */ |