diff options
| author | Xinyu Chen <b03824@freescale.com> | 2012-02-23 15:06:20 +0800 |
|---|---|---|
| committer | Xinyu Chen <b03824@freescale.com> | 2012-02-23 15:06:20 +0800 |
| commit | 822999502d2ce629d6f5a91c2aa8731c0c88c3d8 (patch) | |
| tree | 0fe83cdaa5de477b890e1df1572733c6de50cfa7 /include | |
| parent | a388e861bc01090367c30f327846f44452cb2395 (diff) | |
| parent | 1e54cdcdb6940a58d5e09174410fe0fe28041fa3 (diff) | |
Merge remote branch 'fsl-linux-sdk/imx_3.0.15_12.02.01' into imx_3.0.15_android
Conflicts:
arch/arm/mach-mx6/clock.c
arch/arm/plat-mxc/devices/platform-imx-perfmon.c
drivers/usb/gadget/arcotg_udc.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fsl_devices.h | 7 | ||||
| -rw-r--r-- | include/linux/mfd/mxc-hdmi-core.h | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index e96cca48cbf8..63c4407fc51f 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h @@ -124,7 +124,12 @@ struct fsl_usb2_platform_data { void (*wakeup_handler)(struct fsl_usb2_platform_data *); void (*hsic_post_ops)(void); void (*hsic_device_connected)(void); - void (*gadget_discharge_dp) (bool); + /* + * Some platforms, like i.mx6x needs to discharge dp/dm at device mode + * or there is wakeup interrupt caused by dp/dm change when the cable + * is disconnected with Host. + */ + void (*dr_discharge_line) (bool); struct fsl_usb2_wakeup_platform_data *wakeup_pdata; struct platform_device *pdev; diff --git a/include/linux/mfd/mxc-hdmi-core.h b/include/linux/mfd/mxc-hdmi-core.h index b607feec147a..0b241838f1b9 100644 --- a/include/linux/mfd/mxc-hdmi-core.h +++ b/include/linux/mfd/mxc-hdmi-core.h @@ -46,4 +46,7 @@ void hdmi_get_edid_cfg(struct mxc_edid_cfg *cfg); extern int mxc_hdmi_ipu_id; extern int mxc_hdmi_disp_id; +void hdmi_set_registered(int registered); +int hdmi_get_registered(void); + #endif |