Merge branch 'for-3.0' into for-3.1 (3f9c42ed) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/sh/fsi-ak4642.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -97,7 +97,7 @@ static int fsi_ak4642_remove(struct platform_device *pdev)

		static struct fsi_ak4642_data fsi_a_ak4642 = {
		.name = "AK4642",
		.card = "FSIA (AK4642)",
		.card = "FSIA-AK4642",
		.cpu_dai = "fsia-dai",
		.codec = "ak4642-codec.0-0012",
		.platform = "sh_fsi.0",
		@@ -106,7 +106,7 @@ static struct fsi_ak4642_data fsi_a_ak4642 = {

		static struct fsi_ak4642_data fsi_b_ak4642 = {
		.name = "AK4642",
		.card = "FSIB (AK4642)",
		.card = "FSIB-AK4642",
		.cpu_dai = "fsib-dai",
		.codec = "ak4642-codec.0-0012",
		.platform = "sh_fsi.0",
		@@ -115,7 +115,7 @@ static struct fsi_ak4642_data fsi_b_ak4642 = {

		static struct fsi_ak4642_data fsi_a_ak4643 = {
		.name = "AK4643",
		.card = "FSIA (AK4643)",
		.card = "FSIA-AK4643",
		.cpu_dai = "fsia-dai",
		.codec = "ak4642-codec.0-0013",
		.platform = "sh_fsi.0",
		@@ -124,7 +124,7 @@ static struct fsi_ak4642_data fsi_a_ak4643 = {

		static struct fsi_ak4642_data fsi_b_ak4643 = {
		.name = "AK4643",
		.card = "FSIB (AK4643)",
		.card = "FSIB-AK4643",
		.cpu_dai = "fsib-dai",
		.codec = "ak4642-codec.0-0013",
		.platform = "sh_fsi.0",
		@@ -133,7 +133,7 @@ static struct fsi_ak4642_data fsi_b_ak4643 = {

		static struct fsi_ak4642_data fsi2_a_ak4642 = {
		.name = "AK4642",
		.card = "FSI2A (AK4642)",
		.card = "FSI2A-AK4642",
		.cpu_dai = "fsia-dai",
		.codec = "ak4642-codec.0-0012",
		.platform = "sh_fsi2",
		@@ -142,7 +142,7 @@ static struct fsi_ak4642_data fsi2_a_ak4642 = {

		static struct fsi_ak4642_data fsi2_b_ak4642 = {
		.name = "AK4642",
		.card = "FSI2B (AK4642)",
		.card = "FSI2B-AK4642",
		.cpu_dai = "fsib-dai",
		.codec = "ak4642-codec.0-0012",
		.platform = "sh_fsi2",
		@@ -151,7 +151,7 @@ static struct fsi_ak4642_data fsi2_b_ak4642 = {

		static struct fsi_ak4642_data fsi2_a_ak4643 = {
		.name = "AK4643",
		.card = "FSI2A (AK4643)",
		.card = "FSI2A-AK4643",
		.cpu_dai = "fsia-dai",
		.codec = "ak4642-codec.0-0013",
		.platform = "sh_fsi2",
		@@ -160,7 +160,7 @@ static struct fsi_ak4642_data fsi2_a_ak4643 = {

		static struct fsi_ak4642_data fsi2_b_ak4643 = {
		.name = "AK4643",
		.card = "FSI2B (AK4643)",
		.card = "FSI2B-AK4643",
		.cpu_dai = "fsib-dai",
		.codec = "ak4642-codec.0-0013",
		.platform = "sh_fsi2",

sound/soc/sh/fsi-da7210.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ static struct snd_soc_dai_link fsi_da7210_dai = {
		};

		static struct snd_soc_card fsi_soc_card = {
		.name = "FSI (DA7210)",
		.name = "FSI-DA7210",
		.dai_link = &fsi_da7210_dai,
		.num_links = 1,
		};

sound/soc/sh/fsi-hdmi.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -83,13 +83,13 @@ static int fsi_hdmi_remove(struct platform_device *pdev)

		static struct fsi_hdmi_data fsi2_a_hdmi = {
		.cpu_dai = "fsia-dai",
		.card = "FSI2A (SH MOBILE HDMI)",
		.card = "FSI2A-HDMI",
		.id = FSI_PORT_A,
		};

		static struct fsi_hdmi_data fsi2_b_hdmi = {
		.cpu_dai = "fsib-dai",
		.card = "FSI2B (SH MOBILE HDMI)",
		.card = "FSI2B-HDMI",
		.id = FSI_PORT_B,
		};