diff options
| -rw-r--r-- | arch/arm/mach-msm/include/mach/msm_hdmi_audio_codec.h | 39 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_hdmi_edid.h | 4 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_hdmi_tx.c | 1 | ||||
| -rw-r--r-- | include/linux/msm_hdmi.h | 33 |
4 files changed, 33 insertions, 44 deletions
diff --git a/arch/arm/mach-msm/include/mach/msm_hdmi_audio_codec.h b/arch/arm/mach-msm/include/mach/msm_hdmi_audio_codec.h deleted file mode 100644 index 397304408723..000000000000 --- a/arch/arm/mach-msm/include/mach/msm_hdmi_audio_codec.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 and - * only version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#ifndef __MSM_HDMI_AUDIO_CODEC_H__ -#define __MSM_HDMI_AUDIO_CODEC_H__ - -#include <linux/device.h> -#include <linux/platform_device.h> - -struct msm_hdmi_audio_edid_blk { - u8 *audio_data_blk; - unsigned int audio_data_blk_size; /* in bytes */ - u8 *spk_alloc_data_blk; - unsigned int spk_alloc_data_blk_size; /* in bytes */ -}; - -struct msm_hdmi_audio_codec_ops { - int (*audio_info_setup)(struct platform_device *pdev, - u32 sample_rate, u32 num_of_channels, - u32 channel_allocation, u32 level_shift, - bool down_mix); - int (*get_audio_edid_blk) (struct platform_device *pdev, - struct msm_hdmi_audio_edid_blk *blk); - int (*hdmi_cable_status) (struct platform_device *pdev, u32 vote); -}; - -int msm_hdmi_register_audio_codec(struct platform_device *pdev, - struct msm_hdmi_audio_codec_ops *ops); - -#endif /* __MSM_HDMI_AUDIO_CODEC_H__ */ diff --git a/drivers/video/fbdev/msm/mdss_hdmi_edid.h b/drivers/video/fbdev/msm/mdss_hdmi_edid.h index e8d1b7cd1d18..d14ae3242444 100644 --- a/drivers/video/fbdev/msm/mdss_hdmi_edid.h +++ b/drivers/video/fbdev/msm/mdss_hdmi_edid.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2012, The Linux Foundation. All rights reserved. +/* Copyright (c) 2010-2014, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -13,7 +13,7 @@ #ifndef __HDMI_EDID_H__ #define __HDMI_EDID_H__ -#include <mach/msm_hdmi_audio_codec.h> +#include <linux/msm_hdmi.h> #include "mdss_hdmi_util.h" struct hdmi_edid_init_data { diff --git a/drivers/video/fbdev/msm/mdss_hdmi_tx.c b/drivers/video/fbdev/msm/mdss_hdmi_tx.c index fe4718a09319..76c757368722 100644 --- a/drivers/video/fbdev/msm/mdss_hdmi_tx.c +++ b/drivers/video/fbdev/msm/mdss_hdmi_tx.c @@ -21,7 +21,6 @@ #include <linux/of_platform.h> #include <linux/types.h> #include <linux/msm_hdmi.h> -#include <mach/msm_hdmi_audio_codec.h> #define REG_DUMP 0 diff --git a/include/linux/msm_hdmi.h b/include/linux/msm_hdmi.h index 70fae94f8881..369d07e7b133 100644 --- a/include/linux/msm_hdmi.h +++ b/include/linux/msm_hdmi.h @@ -14,6 +14,9 @@ #ifndef _MSM_HDMI_H_ #define _MSM_HDMI_H_ +#include <linux/device.h> +#include <linux/platform_device.h> + /* * HDMI cable notify handler sturcture. * link A link for the linked list @@ -26,6 +29,23 @@ struct hdmi_cable_notify { void (*hpd_notify) (struct hdmi_cable_notify *h); }; +struct msm_hdmi_audio_edid_blk { + u8 *audio_data_blk; + unsigned int audio_data_blk_size; /* in bytes */ + u8 *spk_alloc_data_blk; + unsigned int spk_alloc_data_blk_size; /* in bytes */ +}; + +struct msm_hdmi_audio_codec_ops { + int (*audio_info_setup)(struct platform_device *pdev, + u32 sample_rate, u32 num_of_channels, + u32 channel_allocation, u32 level_shift, + bool down_mix); + int (*get_audio_edid_blk) (struct platform_device *pdev, + struct msm_hdmi_audio_edid_blk *blk); + int (*hdmi_cable_status) (struct platform_device *pdev, u32 vote); +}; + #ifdef CONFIG_FB_MSM_MDSS_HDMI_PANEL /* * Register for HDMI cable connect or disconnect notification. @@ -42,16 +62,25 @@ int register_hdmi_cable_notification( */ int unregister_hdmi_cable_notification( struct hdmi_cable_notify *handler); + +int msm_hdmi_register_audio_codec(struct platform_device *pdev, + struct msm_hdmi_audio_codec_ops *ops); + #else -int register_hdmi_cable_notification( +static inline int register_hdmi_cable_notification( struct hdmi_cable_notify *handler) { return 0; } -int unregister_hdmi_cable_notification( +static inline int unregister_hdmi_cable_notification( struct hdmi_cable_notify *handler) { return 0; } + +static inline int msm_hdmi_register_audio_codec(struct platform_device *pdev, + struct msm_hdmi_audio_codec_ops *ops) { + return 0; +} #endif /* CONFIG_FB_MSM_MDSS_HDMI_PANEL */ #endif /*_MSM_HDMI_H_*/ |