diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fsl_devices.h | 1 | ||||
| -rw-r--r-- | include/linux/mfd/mxc-hdmi-core.h | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index 8c41b237fc83..2a9557307643 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h @@ -144,6 +144,7 @@ struct fsl_usb2_platform_data { unsigned irq_delay:1; enum usb_wakeup_event wakeup_event; u32 pmflags; /* PM from otg or system */ + spinlock_t lock; void __iomem *charger_base_addr; /* used for i.mx6 usb charger detect */ diff --git a/include/linux/mfd/mxc-hdmi-core.h b/include/linux/mfd/mxc-hdmi-core.h index 8ddea5a040cc..f16b11cb5cf4 100644 --- a/include/linux/mfd/mxc-hdmi-core.h +++ b/include/linux/mfd/mxc-hdmi-core.h @@ -21,6 +21,11 @@ #include <mach/mxc_edid.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> + #define IRQ_DISABLE_SUCCEED 0 #define IRQ_DISABLE_FAIL 1 @@ -50,5 +55,10 @@ extern int mxc_hdmi_disp_id; void hdmi_set_registered(int registered); int hdmi_get_registered(void); unsigned int hdmi_SDMA_check(void); +int mxc_hdmi_abort_stream(void); +int mxc_hdmi_register_audio(struct snd_pcm_substream *substream); +void mxc_hdmi_unregister_audio(struct snd_pcm_substream *substream); +unsigned int hdmi_set_cable_state(unsigned int state); +unsigned int hdmi_set_blank_state(unsigned int state); #endif |