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

Commit a23af4ab authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/cs42l51', 'asoc/fix/cs42l52',... 

Merge remote-tracking branches 'asoc/fix/cs42l51', 'asoc/fix/cs42l52', 'asoc/fix/cs42l73', 'asoc/fix/rcar', 'asoc/fix/spear' and 'asoc/fix/tegra' into asoc-linus
parents 758fc06d 7272e051 d31a33dd 1555b652 6fa387b2 bde24030 591d14f0

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

+1 −3
Original line number Diff line number Diff line
@@ -988,14 +988,12 @@ static struct asoc_simple_card_info fsi_wm8978_info = { 
	.card		= "FSI2A-WM8978",

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

	.platform	= "sh_fsi2",

	.daifmt		= SND_SOC_DAIFMT_I2S,

	.daifmt		= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBM_CFM,

	.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,

	},

};

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

+5 −11
Original line number Diff line number Diff line
@@ -429,14 +429,12 @@ static struct asoc_simple_card_info rsnd_card_info[] = { 
		.card		= "SSI56-AK4643",

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

		.platform	= "rcar_sound",

		.daifmt		= SND_SOC_DAIFMT_LEFT_J,

		.daifmt		= SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_CBM_CFM,

		.cpu_dai = {

			.name	= "rsnd-dai.0",

			.fmt	= SND_SOC_DAIFMT_CBS_CFS,

		},

		.codec_dai = {

			.name	= "ak4642-hifi",

			.fmt	= SND_SOC_DAIFMT_CBM_CFM,

			.sysclk	= 11289600,

		},

	},
@@ -446,10 +444,9 @@ static struct asoc_simple_card_info rsnd_card_info[] = { 
		.card		= "SSI3-AK4554(playback)",

		.codec		= "ak4554-adc-dac.0",

		.platform	= "rcar_sound",

		.daifmt		= SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_RIGHT_J,

		.cpu_dai = {

			.name	= "rsnd-dai.1",

			.fmt	= SND_SOC_DAIFMT_CBM_CFM |

				  SND_SOC_DAIFMT_RIGHT_J,

		},

		.codec_dai = {

			.name	= "ak4554-hifi",
@@ -461,10 +458,9 @@ static struct asoc_simple_card_info rsnd_card_info[] = { 
		.card		= "SSI4-AK4554(capture)",

		.codec		= "ak4554-adc-dac.0",

		.platform	= "rcar_sound",

		.daifmt		= SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_LEFT_J,

		.cpu_dai = {

			.name	= "rsnd-dai.2",

			.fmt	= SND_SOC_DAIFMT_CBM_CFM |

				  SND_SOC_DAIFMT_LEFT_J,

		},

		.codec_dai = {

			.name	= "ak4554-hifi",
@@ -476,10 +472,9 @@ static struct asoc_simple_card_info rsnd_card_info[] = { 
		.card		= "SSI7-AK4554(playback)",

		.codec		= "ak4554-adc-dac.1",

		.platform	= "rcar_sound",

		.daifmt		= SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_RIGHT_J,

		.cpu_dai = {

			.name	= "rsnd-dai.3",

			.fmt	= SND_SOC_DAIFMT_CBM_CFM |

				  SND_SOC_DAIFMT_RIGHT_J,

		},

		.codec_dai = {

			.name	= "ak4554-hifi",
@@ -491,10 +486,9 @@ static struct asoc_simple_card_info rsnd_card_info[] = { 
		.card		= "SSI8-AK4554(capture)",

		.codec		= "ak4554-adc-dac.1",

		.platform	= "rcar_sound",

		.daifmt		= SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_LEFT_J,

		.cpu_dai = {

			.name	= "rsnd-dai.4",

			.fmt	= SND_SOC_DAIFMT_CBM_CFM |

				  SND_SOC_DAIFMT_LEFT_J,

		},

		.codec_dai = {

			.name	= "ak4554-hifi",

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

+1 −3
Original line number Diff line number Diff line
@@ -589,14 +589,12 @@ static struct asoc_simple_card_info fsi2_ak4648_info = { 
	.card		= "FSI2A-AK4648",

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

	.platform	= "sh_fsi2",

	.daifmt		= SND_SOC_DAIFMT_LEFT_J,

	.daifmt		= SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_CBM_CFM,

	.cpu_dai = {

		.name	= "fsia-dai",

		.fmt	= SND_SOC_DAIFMT_CBS_CFS,

	},

	.codec_dai = {

		.name	= "ak4642-hifi",

		.fmt	= SND_SOC_DAIFMT_CBM_CFM,

		.sysclk	= 11289600,

	},

};

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

+2 −4
Original line number Diff line number Diff line
@@ -509,9 +509,9 @@ static struct asoc_simple_card_info fsi2_hdmi_info = { 
	.card		= "FSI2B-HDMI",

	.codec		= "sh-mobile-hdmi",

	.platform	= "sh_fsi2",

	.daifmt		= SND_SOC_DAIFMT_CBS_CFS,

	.cpu_dai = {

		.name	= "fsib-dai",

		.fmt	= SND_SOC_DAIFMT_CBM_CFM | SND_SOC_DAIFMT_IB_NF,

	},

	.codec_dai = {

		.name	= "sh_mobile_hdmi-hifi",
@@ -905,14 +905,12 @@ static struct asoc_simple_card_info fsi2_ak4643_info = { 
	.card		= "FSI2A-AK4643",

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

	.platform	= "sh_fsi2",

	.daifmt		= SND_SOC_DAIFMT_LEFT_J,

	.daifmt		= SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_CBM_CFM,

	.cpu_dai = {

		.name	= "fsia-dai",

		.fmt	= SND_SOC_DAIFMT_CBS_CFS,

	},

	.codec_dai = {

		.name	= "ak4642-hifi",

		.fmt	= SND_SOC_DAIFMT_CBM_CFM,

		.sysclk	= 11289600,

	},

};

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

+1 −3
Original line number Diff line number Diff line
@@ -861,14 +861,12 @@ static struct asoc_simple_card_info fsi_da7210_info = { 
	.card		= "FSIB-DA7210",

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

	.platform	= "sh_fsi.0",

	.daifmt		= SND_SOC_DAIFMT_I2S,

	.daifmt		= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBM_CFM,

	.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,

	},

};