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

Commit 3f25c9cc authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: sh: fsi-hdmi: Add FSI port and HDMI selection 



This patch add platform_device_id which can control
PortA/PortB for FSI2-HDMI from platform data.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 3d23c73f

arch/arm/mach-shmobile/board-ap4evb.c

+5 −0
Original line number Diff line number Diff line
@@ -781,6 +781,10 @@ static struct platform_device hdmi_device = { 
	},

};



static struct platform_device fsi_hdmi_device = {

	.name		= "sh_fsi2_b_hdmi",

};



static long ap4evb_clk_optimize(unsigned long target, unsigned long *best_freq,

				unsigned long *parent_freq)

{
@@ -934,6 +938,7 @@ static struct platform_device *ap4evb_devices[] __initdata = { 
	&usb1_host_device,

	&fsi_device,

	&fsi_ak4643_device,

	&fsi_hdmi_device,

	&sh_mmcif_device,

	&lcdc1_device,

	&lcdc_device,

arch/arm/mach-shmobile/board-mackerel.c

+5 −0
Original line number Diff line number Diff line
@@ -400,6 +400,10 @@ static struct platform_device hdmi_device = { 
	},

};



static struct platform_device fsi_hdmi_device = {

	.name		= "sh_fsi2_b_hdmi",

};



static int __init hdmi_init_pm_clock(void)

{

	struct clk *hdmi_ick = clk_get(&hdmi_device.dev, "ick");
@@ -920,6 +924,7 @@ static struct platform_device *mackerel_devices[] __initdata = { 
	&leds_device,

	&fsi_device,

	&fsi_ak4643_device,

	&fsi_hdmi_device,

	&sdhi0_device,

#if !defined(CONFIG_MMC_SH_MMCIF)

	&sdhi1_device,

sound/soc/sh/fsi-hdmi.c

+61 −5
Original line number Diff line number Diff line
@@ -12,6 +12,12 @@ 
#include <linux/platform_device.h>

#include <sound/sh_fsi.h>



struct fsi_hdmi_data {

	const char *cpu_dai;

	const char *card;

	int id;

};



static int fsi_hdmi_dai_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_dai *cpu = rtd->cpu_dai;
@@ -25,7 +31,6 @@ static int fsi_hdmi_dai_init(struct snd_soc_pcm_runtime *rtd) 
static struct snd_soc_dai_link fsi_dai_link = {

	.name		= "HDMI",

	.stream_name	= "HDMI",

	.cpu_dai_name	= "fsib-dai", /* fsi B */

	.codec_dai_name	= "sh_mobile_hdmi-hifi",

	.platform_name	= "sh_fsi2",

	.codec_name	= "sh-mobile-hdmi",
@@ -33,21 +38,33 @@ static struct snd_soc_dai_link fsi_dai_link = { 
};



static struct snd_soc_card fsi_soc_card  = {

	.name		= "FSI (SH MOBILE HDMI)",

	.dai_link	= &fsi_dai_link,

	.num_links	= 1,

};



static struct platform_device *fsi_snd_device;



static int __init fsi_hdmi_init(void)

static int fsi_hdmi_probe(struct platform_device *pdev)

{

	int ret = -ENOMEM;

	const struct platform_device_id	*id_entry;

	struct fsi_hdmi_data *pdata;



	id_entry = pdev->id_entry;

	if (!id_entry) {

		dev_err(&pdev->dev, "unknown fsi hdmi\n");

		return -ENODEV;

	}



	pdata = (struct fsi_hdmi_data *)id_entry->driver_data;



	fsi_snd_device = platform_device_alloc("soc-audio", FSI_PORT_B);

	fsi_snd_device = platform_device_alloc("soc-audio", pdata->id);

	if (!fsi_snd_device)

		goto out;



	fsi_dai_link.cpu_dai_name	= pdata->cpu_dai;

	fsi_soc_card.name		= pdata->card;



	platform_set_drvdata(fsi_snd_device, &fsi_soc_card);

	ret = platform_device_add(fsi_snd_device);
@@ -58,9 +75,48 @@ static int __init fsi_hdmi_init(void) 
	return ret;

}



static void __exit fsi_hdmi_exit(void)

static int fsi_hdmi_remove(struct platform_device *pdev)

{

	platform_device_unregister(fsi_snd_device);

	return 0;

}



static struct fsi_hdmi_data fsi2_a_hdmi = {

	.cpu_dai	= "fsia-dai",

	.card		= "FSI2A (SH MOBILE HDMI)",

	.id		= FSI_PORT_A,

};



static struct fsi_hdmi_data fsi2_b_hdmi = {

	.cpu_dai	= "fsib-dai",

	.card		= "FSI2B (SH MOBILE HDMI)",

	.id		= FSI_PORT_B,

};



static struct platform_device_id fsi_id_table[] = {

	/* FSI 2 */

	{ "sh_fsi2_a_hdmi",	(kernel_ulong_t)&fsi2_a_hdmi },

	{ "sh_fsi2_b_hdmi",	(kernel_ulong_t)&fsi2_b_hdmi },

	{},

};



static struct platform_driver fsi_hdmi = {

	.driver = {

		.name	= "fsi-hdmi-audio",

	},

	.probe		= fsi_hdmi_probe,

	.remove		= fsi_hdmi_remove,

	.id_table	= fsi_id_table,

};



static int __init fsi_hdmi_init(void)

{

	return platform_driver_register(&fsi_hdmi);

}



static void __exit fsi_hdmi_exit(void)

{

	platform_driver_unregister(&fsi_hdmi);

}



module_init(fsi_hdmi_init);