Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12d3ea9a authored by Jyri Sarha's avatar Jyri Sarha Committed by Tomi Valkeinen
Browse files

OMAPDSS: hdmi: Remove most of OMAP[45]_DSS_HDMI_AUDIO ifdefs 



It does not waste too many bytes to compile all audio related core
functions always in with HDMI support. It should help readability and
in keeping the audio code in working shape. Leave the options just for
disabling and enabling the functionality in hdmi[45].c.

Signed-off-by: default avatarJyri Sarha <jsarha@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 652ce043

drivers/video/fbdev/omap2/dss/hdmi.h

+1 −2
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ int hdmi_phy_parse_lanes(struct hdmi_phy_data *phy, const u32 *lanes); 
int hdmi_parse_lanes_of(struct platform_device *pdev, struct device_node *ep,

	struct hdmi_phy_data *phy);



#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO) || defined(CONFIG_OMAP5_DSS_HDMI_AUDIO)

/* Audio funcs */

int hdmi_compute_acr(u32 pclk, u32 sample_freq, u32 *n, u32 *cts);

int hdmi_wp_audio_enable(struct hdmi_wp_data *wp, bool enable);

int hdmi_wp_audio_core_req_enable(struct hdmi_wp_data *wp, bool enable);
@@ -334,4 +334,3 @@ static inline bool hdmi_mode_has_audio(int mode) 
	return mode == HDMI_HDMI ? true : false;

}

#endif
 
#endif

drivers/video/fbdev/omap2/dss/hdmi4_core.c

+0 −5
Original line number Diff line number Diff line
@@ -31,10 +31,8 @@ 
#include <linux/platform_device.h>

#include <linux/string.h>

#include <linux/seq_file.h>

#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO)

#include <sound/asound.h>

#include <sound/asoundef.h>

#endif



#include "hdmi4_core.h"

#include "dss_features.h"
@@ -530,7 +528,6 @@ void hdmi4_core_dump(struct hdmi_core_data *core, struct seq_file *s) 
	DUMPCOREAV(HDMI_CORE_AV_CEC_ADDR_ID);

}



#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO)

static void hdmi_core_audio_config(struct hdmi_core_data *core,

					struct hdmi_core_audio_config *cfg)

{
@@ -886,8 +883,6 @@ int hdmi4_audio_get_dma_port(u32 *offset, u32 *size) 
	return 0;

}



#endif



int hdmi4_core_init(struct platform_device *pdev, struct hdmi_core_data *core)

{

	struct resource *res;

drivers/video/fbdev/omap2/dss/hdmi4_core.h

+0 −2
Original line number Diff line number Diff line
@@ -266,12 +266,10 @@ void hdmi4_configure(struct hdmi_core_data *core, struct hdmi_wp_data *wp, 
void hdmi4_core_dump(struct hdmi_core_data *core, struct seq_file *s);

int hdmi4_core_init(struct platform_device *pdev, struct hdmi_core_data *core);



#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO)

int hdmi4_audio_start(struct hdmi_core_data *core, struct hdmi_wp_data *wp);

void hdmi4_audio_stop(struct hdmi_core_data *core, struct hdmi_wp_data *wp);

int hdmi4_audio_config(struct hdmi_core_data *core, struct hdmi_wp_data *wp,

		struct omap_dss_audio *audio, u32 pclk);

int hdmi4_audio_get_dma_port(u32 *offset, u32 *size);

#endif



#endif

drivers/video/fbdev/omap2/dss/hdmi5_core.c

+0 −6
Original line number Diff line number Diff line
@@ -30,10 +30,8 @@ 
#include <linux/string.h>

#include <linux/seq_file.h>

#include <drm/drm_edid.h>

#if defined(CONFIG_OMAP5_DSS_HDMI_AUDIO)

#include <sound/asound.h>

#include <sound/asoundef.h>

#endif



#include "hdmi5_core.h"
@@ -644,9 +642,6 @@ void hdmi5_configure(struct hdmi_core_data *core, struct hdmi_wp_data *wp, 
	hdmi_core_enable_interrupts(core);

}





#if defined(CONFIG_OMAP5_DSS_HDMI_AUDIO)



static void hdmi5_core_audio_config(struct hdmi_core_data *core,

			struct hdmi_core_audio_config *cfg)

{
@@ -897,7 +892,6 @@ int hdmi5_audio_config(struct hdmi_core_data *core, struct hdmi_wp_data *wp, 


	return 0;

}

#endif



int hdmi5_core_init(struct platform_device *pdev, struct hdmi_core_data *core)

{

drivers/video/fbdev/omap2/dss/hdmi5_core.h

+0 −2
Original line number Diff line number Diff line
@@ -299,8 +299,6 @@ void hdmi5_configure(struct hdmi_core_data *core, struct hdmi_wp_data *wp, 
			struct hdmi_config *cfg);

int hdmi5_core_init(struct platform_device *pdev, struct hdmi_core_data *core);



#if defined(CONFIG_OMAP5_DSS_HDMI_AUDIO)

int hdmi5_audio_config(struct hdmi_core_data *core, struct hdmi_wp_data *wp,

			struct omap_dss_audio *audio, u32 pclk);

#endif
 
#endif