diff options
| author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
| commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
| tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /include/linux/sii9234.h | |
| parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
| download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 | |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'include/linux/sii9234.h')
| -rw-r--r--[-rwxr-xr-x] | include/linux/sii9234.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/include/linux/sii9234.h b/include/linux/sii9234.h index f15bfa3..cb61906 100755..100644 --- a/include/linux/sii9234.h +++ b/include/linux/sii9234.h @@ -26,6 +26,7 @@ struct sii9234_platform_data { u8 power_state; u8 swing_level; + u8 factory_test; int ddc_i2c_num; void (*init)(void); void (*mhl_sel)(bool enable); @@ -37,6 +38,10 @@ struct sii9234_platform_data { #else void (*vbus_present)(bool on); #endif +#ifdef CONFIG_SAMSUNG_MHL_UNPOWERED + int (*get_vbus_status)(void); + void (*sii9234_otg_control)(bool onoff); +#endif struct i2c_client *mhl_tx_client; struct i2c_client *tpi_client; struct i2c_client *hdmi_rx_client; @@ -50,8 +55,15 @@ struct sii9234_platform_data { extern u8 mhl_onoff_ex(bool onoff); #endif +#if defined(__MHL_NEW_CBUS_MSC_CMD__) +#if defined(CONFIG_MFD_MAX77693) +extern void max77693_muic_usb_cb(u8 usb_mode); +#endif +#endif + #ifdef CONFIG_SAMSUNG_WORKAROUND_HPD_GLANCE extern void mhl_hpd_handler(bool onoff); +extern bool (*is_mhl_power_state_on)(void); #endif #ifdef CONFIG_SAMSUNG_USE_11PIN_CONNECTOR @@ -66,4 +78,9 @@ extern int max77693_muic_get_status1_adc_value(void); extern void sii9234_wake_lock(void); extern void sii9234_wake_unlock(void); #endif + +#ifdef CONFIG_JACK_MON +extern void jack_event_handler(const char *name, int value); +#endif + #endif /* _SII9234_H_ */ |