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

Commit 4d594dff authored by Jyri Sarha's avatar Jyri Sarha Committed by Tomi Valkeinen
Browse files

OMAPDSS: hdmi4: Register ASoC platform device for omap hdmi audio 



Implements callbacks for OMAP HDMI audio platform driver and registers
it in probe function. Unregistering is done in remove function.

Signed-off-by: default avatarJyri Sarha <jsarha@ti.com>
Reviewed-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent c49ad78e

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

+125 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/gpio.h>

#include <linux/gpio.h>

#include <linux/regulator/consumer.h>

#include <linux/regulator/consumer.h>

#include <video/omapdss.h>

#include <video/omapdss.h>

#include <sound/omap-hdmi-audio.h>





#include "hdmi4_core.h"

#include "hdmi4_core.h"

#include "dss.h"

#include "dss.h"
@@ -340,6 +341,8 @@ static int hdmi_display_enable(struct omap_dss_device *dssdev) 
		goto err0;

		goto err0;

	}

	}





	hdmi.display_enabled = true;



	mutex_unlock(&hdmi.lock);

	mutex_unlock(&hdmi.lock);

	return 0;

	return 0;
@@ -354,8 +357,13 @@ static void hdmi_display_disable(struct omap_dss_device *dssdev) 




	mutex_lock(&hdmi.lock);

	mutex_lock(&hdmi.lock);





	if (hdmi.audio_pdev && hdmi.audio_abort_cb)

		hdmi.audio_abort_cb(&hdmi.audio_pdev->dev);



	hdmi_power_off_full(dssdev);

	hdmi_power_off_full(dssdev);





	hdmi.display_enabled = false;



	mutex_unlock(&hdmi.lock);

	mutex_unlock(&hdmi.lock);

}

}
@@ -531,6 +539,112 @@ static int hdmi_probe_of(struct platform_device *pdev) 
	return r;

	return r;

}

}





/* Audio callbacks */

static int hdmi_audio_startup(struct device *dev,

			      void (*abort_cb)(struct device *dev))

{

	struct omap_hdmi *hd = dev_get_drvdata(dev);

	int ret = 0;



	mutex_lock(&hd->lock);



	if (!hdmi_mode_has_audio(&hd->cfg) || !hd->display_enabled) {

		ret = -EPERM;

		goto out;

	}



	hd->audio_abort_cb = abort_cb;



out:

	mutex_unlock(&hd->lock);



	return ret;

}



static int hdmi_audio_shutdown(struct device *dev)

{

	struct omap_hdmi *hd = dev_get_drvdata(dev);



	mutex_lock(&hd->lock);

	hd->audio_abort_cb = NULL;

	mutex_unlock(&hd->lock);



	return 0;

}



static int hdmi_audio_start(struct device *dev)

{

	struct omap_hdmi *hd = dev_get_drvdata(dev);



	WARN_ON(!hdmi_mode_has_audio(&hd->cfg));

	WARN_ON(!hd->display_enabled);



	hdmi_wp_audio_enable(&hd->wp, true);

	hdmi4_audio_start(&hd->core, &hd->wp);



	return 0;

}



static void hdmi_audio_stop(struct device *dev)

{

	struct omap_hdmi *hd = dev_get_drvdata(dev);



	WARN_ON(!hdmi_mode_has_audio(&hd->cfg));

	WARN_ON(!hd->display_enabled);



	hdmi4_audio_stop(&hd->core, &hd->wp);

	hdmi_wp_audio_enable(&hd->wp, false);

}



static int hdmi_audio_config(struct device *dev,

			     struct omap_dss_audio *dss_audio)

{

	struct omap_hdmi *hd = dev_get_drvdata(dev);

	int ret;



	mutex_lock(&hd->lock);



	if (!hdmi_mode_has_audio(&hd->cfg) || !hd->display_enabled) {

		ret = -EPERM;

		goto out;

	}



	ret = hdmi4_audio_config(&hd->core, &hd->wp, dss_audio,

				 hd->cfg.timings.pixelclock);



out:

	mutex_unlock(&hd->lock);



	return ret;

}



static const struct omap_hdmi_audio_ops hdmi_audio_ops = {

	.audio_startup = hdmi_audio_startup,

	.audio_shutdown = hdmi_audio_shutdown,

	.audio_start = hdmi_audio_start,

	.audio_stop = hdmi_audio_stop,

	.audio_config = hdmi_audio_config,

};



static int hdmi_audio_register(struct device *dev)

{

	struct omap_hdmi_audio_pdata pdata = {

		.dev = dev,

		.dss_version = omapdss_get_version(),

		.audio_dma_addr = hdmi_wp_get_audio_dma_addr(&hdmi.wp),

		.ops = &hdmi_audio_ops,

	};



	hdmi.audio_pdev = platform_device_register_data(

		dev, "omap-hdmi-audio", PLATFORM_DEVID_AUTO,

		&pdata, sizeof(pdata));



	if (IS_ERR(hdmi.audio_pdev))

		return PTR_ERR(hdmi.audio_pdev);



	return 0;

}



/* HDMI HW IP initialisation */

/* HDMI HW IP initialisation */

static int omapdss_hdmihw_probe(struct platform_device *pdev)

static int omapdss_hdmihw_probe(struct platform_device *pdev)

{

{
@@ -583,6 +697,14 @@ static int omapdss_hdmihw_probe(struct platform_device *pdev) 




	hdmi_init_output(pdev);

	hdmi_init_output(pdev);





	r = hdmi_audio_register(&pdev->dev);

	if (r) {

		DSSERR("Registering HDMI audio failed\n");

		hdmi_uninit_output(pdev);

		pm_runtime_disable(&pdev->dev);

		return r;

	}



	dss_debugfs_create_file("hdmi", hdmi_dump_regs);

	dss_debugfs_create_file("hdmi", hdmi_dump_regs);





	return 0;

	return 0;
@@ -593,6 +715,9 @@ static int omapdss_hdmihw_probe(struct platform_device *pdev) 




static int __exit omapdss_hdmihw_remove(struct platform_device *pdev)

static int __exit omapdss_hdmihw_remove(struct platform_device *pdev)

{

{

	if (hdmi.audio_pdev)

		platform_device_unregister(hdmi.audio_pdev);



	hdmi_uninit_output(pdev);

	hdmi_uninit_output(pdev);





	hdmi_pll_uninit(&hdmi.pll);

	hdmi_pll_uninit(&hdmi.pll);