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

Commit 6ee00c16 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/simple-card' into asoc-next

parents 2944c2f5 a4a2992c

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

+17 −18
Original line number Diff line number Diff line
@@ -686,21 +686,21 @@ static struct platform_device fsi_device = { 
	},

};



static struct asoc_simple_dai_init_info fsi2_ak4643_init_info = {

	.fmt		= SND_SOC_DAIFMT_LEFT_J,

	.codec_daifmt	= SND_SOC_DAIFMT_CBM_CFM,

	.cpu_daifmt	= SND_SOC_DAIFMT_CBS_CFS,

	.sysclk		= 11289600,

};



static struct asoc_simple_card_info fsi2_ak4643_info = {

	.name		= "AK4643",

	.card		= "FSI2A-AK4643",

	.cpu_dai	= "fsia-dai",

	.codec		= "ak4642-codec.0-0013",

	.platform	= "sh_fsi2",

	.codec_dai	= "ak4642-hifi",

	.init		= &fsi2_ak4643_init_info,

	.daifmt		= SND_SOC_DAIFMT_LEFT_J,

	.cpu_dai = {

		.name	= "fsia-dai",

		.fmt	= SND_SOC_DAIFMT_CBS_CFS,

	},

	.codec_dai = {

		.name	= "ak4642-hifi",

		.fmt	= SND_SOC_DAIFMT_CBM_CFM,

		.sysclk	= 11289600,

	},

};



static struct platform_device fsi_ak4643_device = {
@@ -809,19 +809,18 @@ static struct platform_device lcdc1_device = { 
	},

};



static struct asoc_simple_dai_init_info fsi2_hdmi_init_info = {

	.cpu_daifmt	= SND_SOC_DAIFMT_CBM_CFM |

			  SND_SOC_DAIFMT_IB_NF,

};



static struct asoc_simple_card_info fsi2_hdmi_info = {

	.name		= "HDMI",

	.card		= "FSI2B-HDMI",

	.cpu_dai	= "fsib-dai",

	.codec		= "sh-mobile-hdmi",

	.platform	= "sh_fsi2",

	.codec_dai	= "sh_mobile_hdmi-hifi",

	.init		= &fsi2_hdmi_init_info,

	.cpu_dai = {

		.name	= "fsib-dai",

		.fmt	= SND_SOC_DAIFMT_CBM_CFM | SND_SOC_DAIFMT_IB_NF,

	},

	.codec_dai = {

		.name	= "sh_mobile_hdmi-hifi",

	},

};



static struct platform_device fsi_hdmi_device = {

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

+17 −17
Original line number Diff line number Diff line
@@ -806,21 +806,21 @@ static struct platform_device fsi_device = { 
};



/* FSI-WM8978 */

static struct asoc_simple_dai_init_info fsi_wm8978_init_info = {

	.fmt		= SND_SOC_DAIFMT_I2S,

	.codec_daifmt	= SND_SOC_DAIFMT_CBM_CFM | SND_SOC_DAIFMT_NB_NF,

	.cpu_daifmt	= SND_SOC_DAIFMT_CBS_CFS,

	.sysclk		= 12288000,

};



static struct asoc_simple_card_info fsi_wm8978_info = {

	.name		= "wm8978",

	.card		= "FSI2A-WM8978",

	.cpu_dai	= "fsia-dai",

	.codec		= "wm8978.0-001a",

	.platform	= "sh_fsi2",

	.codec_dai	= "wm8978-hifi",

	.init		= &fsi_wm8978_init_info,

	.daifmt		= SND_SOC_DAIFMT_I2S,

	.cpu_dai = {

		.name	= "fsia-dai",

		.fmt	= SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_IB_NF,

	},

	.codec_dai = {

		.name	= "wm8978-hifi",

		.fmt	= SND_SOC_DAIFMT_CBM_CFM | SND_SOC_DAIFMT_NB_NF,

		.sysclk	= 12288000,

	},

};



static struct platform_device fsi_wm8978_device = {
@@ -832,18 +832,18 @@ static struct platform_device fsi_wm8978_device = { 
};



/* FSI-HDMI */

static struct asoc_simple_dai_init_info fsi2_hdmi_init_info = {

	.cpu_daifmt	= SND_SOC_DAIFMT_CBM_CFM,

};



static struct asoc_simple_card_info fsi2_hdmi_info = {

	.name		= "HDMI",

	.card		= "FSI2B-HDMI",

	.cpu_dai	= "fsib-dai",

	.codec		= "sh-mobile-hdmi",

	.platform	= "sh_fsi2",

	.codec_dai	= "sh_mobile_hdmi-hifi",

	.init		= &fsi2_hdmi_init_info,

	.cpu_dai = {

		.name	= "fsib-dai",

		.fmt	= SND_SOC_DAIFMT_CBM_CFM,

	},

	.codec_dai = {

		.name = "sh_mobile_hdmi-hifi",

	},

};



static struct platform_device fsi_hdmi_device = {

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

+10 −10
Original line number Diff line number Diff line
@@ -525,21 +525,21 @@ static struct platform_device fsi_device = { 
	},

};



static struct asoc_simple_dai_init_info fsi2_ak4648_init_info = {

	.fmt		= SND_SOC_DAIFMT_LEFT_J,

	.codec_daifmt	= SND_SOC_DAIFMT_CBM_CFM,

	.cpu_daifmt	= SND_SOC_DAIFMT_CBS_CFS,

	.sysclk		= 11289600,

};



static struct asoc_simple_card_info fsi2_ak4648_info = {

	.name		= "AK4648",

	.card		= "FSI2A-AK4648",

	.cpu_dai	= "fsia-dai",

	.codec		= "ak4642-codec.0-0012",

	.platform	= "sh_fsi2",

	.codec_dai	= "ak4642-hifi",

	.init		= &fsi2_ak4648_init_info,

	.daifmt		= SND_SOC_DAIFMT_LEFT_J,

	.cpu_dai = {

		.name	= "fsia-dai",

		.fmt	= SND_SOC_DAIFMT_CBS_CFS,

	},

	.codec_dai = {

		.name	= "ak4642-hifi",

		.fmt	= SND_SOC_DAIFMT_CBM_CFM,

		.sysclk	= 11289600,

	},

};



static struct platform_device fsi_ak4648_device = {

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

+17 −18
Original line number Diff line number Diff line
@@ -502,19 +502,18 @@ static struct platform_device hdmi_lcdc_device = { 
	},

};



static struct asoc_simple_dai_init_info fsi2_hdmi_init_info = {

	.cpu_daifmt	= SND_SOC_DAIFMT_CBM_CFM |

			  SND_SOC_DAIFMT_IB_NF,

};



static struct asoc_simple_card_info fsi2_hdmi_info = {

	.name		= "HDMI",

	.card		= "FSI2B-HDMI",

	.cpu_dai	= "fsib-dai",

	.codec		= "sh-mobile-hdmi",

	.platform	= "sh_fsi2",

	.codec_dai	= "sh_mobile_hdmi-hifi",

	.init		= &fsi2_hdmi_init_info,

	.cpu_dai = {

		.name	= "fsib-dai",

		.fmt	= SND_SOC_DAIFMT_CBM_CFM | SND_SOC_DAIFMT_IB_NF,

	},

	.codec_dai = {

		.name	= "sh_mobile_hdmi-hifi",

	},

};



static struct platform_device fsi_hdmi_device = {
@@ -893,21 +892,21 @@ static struct platform_device fsi_device = { 
	},

};



static struct asoc_simple_dai_init_info fsi2_ak4643_init_info = {

	.fmt		= SND_SOC_DAIFMT_LEFT_J,

	.codec_daifmt	= SND_SOC_DAIFMT_CBM_CFM,

	.cpu_daifmt	= SND_SOC_DAIFMT_CBS_CFS,

	.sysclk		= 11289600,

};



static struct asoc_simple_card_info fsi2_ak4643_info = {

	.name		= "AK4643",

	.card		= "FSI2A-AK4643",

	.cpu_dai	= "fsia-dai",

	.codec		= "ak4642-codec.0-0013",

	.platform	= "sh_fsi2",

	.codec_dai	= "ak4642-hifi",

	.init		= &fsi2_ak4643_init_info,

	.daifmt		= SND_SOC_DAIFMT_LEFT_J,

	.cpu_dai = {

		.name	= "fsia-dai",

		.fmt	= SND_SOC_DAIFMT_CBS_CFS,

	},

	.codec_dai = {

		.name	= "ak4642-hifi",

		.fmt	= SND_SOC_DAIFMT_CBM_CFM,

		.sysclk	= 11289600,

	},

};



static struct platform_device fsi_ak4643_device = {

arch/sh/boards/mach-ecovec24/setup.c

+9 −10
Original line number Diff line number Diff line
@@ -907,21 +907,20 @@ static struct platform_device fsi_device = { 
	.resource	= fsi_resources,

};



static struct asoc_simple_dai_init_info fsi_da7210_init_info = {

	.fmt		= SND_SOC_DAIFMT_I2S,

	.codec_daifmt	= SND_SOC_DAIFMT_CBM_CFM,

	.cpu_daifmt	= SND_SOC_DAIFMT_CBS_CFS |

			  SND_SOC_DAIFMT_IB_NF,

};



static struct asoc_simple_card_info fsi_da7210_info = {

	.name		= "DA7210",

	.card		= "FSIB-DA7210",

	.cpu_dai	= "fsib-dai",

	.codec		= "da7210.0-001a",

	.platform	= "sh_fsi.0",

	.codec_dai	= "da7210-hifi",

	.init		= &fsi_da7210_init_info,

	.daifmt		= SND_SOC_DAIFMT_I2S,

	.cpu_dai = {

		.name	= "fsib-dai",

		.fmt	= SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_IB_NF,

	},

	.codec_dai = {

		.name	= "da7210-hifi",

		.fmt	= SND_SOC_DAIFMT_CBM_CFM,

	},

};



static struct platform_device fsi_da7210_device = {