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

Commit abca7581 authored Dec 16, 2012 by Kuninori Morimoto Committed by Mark Brown Dec 24, 2012

ASoC: fsi: remove SH_FSI_xxx_INV flags



3449f5fa
(ASoC: fsi: add SND_SOC_DAIFMT_INV_xxx support)
added clock inversion support via snd_soc_dai_set_fmt().
Thus, this patch removed SH_FSI_xxx_INV and fsi_get_info()
from fsi driver, and modified platform settings to use new style.
Then, it cleaned up meaningless settings from platform.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

parent 6cbdbffb

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

+3 −8

Original line number	Diff line number	Diff line
		@@ -657,14 +657,8 @@ static struct platform_device lcdc_device = {
		/* FSI */
		#define IRQ_FSI evt2irq(0x1840)
		static struct sh_fsi_platform_info fsi_info = {
		.port_a = {
		.flags = SH_FSI_BRS_INV,
		},
		.port_b = {
		.flags = SH_FSI_BRS_INV \|
		SH_FSI_BRM_INV \|
		SH_FSI_LRS_INV \|
		SH_FSI_CLK_CPG \|
		.flags = SH_FSI_CLK_CPG \|
		SH_FSI_FMT_SPDIF,
		},
		};
		@@ -816,7 +810,8 @@ static struct platform_device lcdc1_device = {
		};

		static struct asoc_simple_dai_init_info fsi2_hdmi_init_info = {
		.cpu_daifmt = SND_SOC_DAIFMT_CBM_CFM,
		.cpu_daifmt = SND_SOC_DAIFMT_CBM_CFM \|
		SND_SOC_DAIFMT_IB_NF,
		};

		static struct asoc_simple_card_info fsi2_hdmi_info = {

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

+4 −7

Original line number	Diff line number	Diff line
		@@ -503,7 +503,8 @@ 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,
		.cpu_daifmt = SND_SOC_DAIFMT_CBM_CFM \|
		SND_SOC_DAIFMT_IB_NF,
		};

		static struct asoc_simple_card_info fsi2_hdmi_info = {
		@@ -858,15 +859,11 @@ static struct platform_device leds_device = {
		#define IRQ_FSI evt2irq(0x1840)
		static struct sh_fsi_platform_info fsi_info = {
		.port_a = {
		.flags = SH_FSI_BRS_INV,
		.tx_id = SHDMA_SLAVE_FSIA_TX,
		.rx_id = SHDMA_SLAVE_FSIA_RX,
		},
		.port_b = {
		.flags = SH_FSI_BRS_INV \|
		SH_FSI_BRM_INV \|
		SH_FSI_LRS_INV \|
		SH_FSI_CLK_CPG \|
		.flags = SH_FSI_CLK_CPG \|
		SH_FSI_FMT_SPDIF,
		}
		};

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

+2 −10

Original line number	Diff line number	Diff line
		@@ -877,12 +877,6 @@ static struct platform_device camera_devices[] = {
		};

		/* FSI */
		static struct sh_fsi_platform_info fsi_info = {
		.port_b = {
		.flags = SH_FSI_BRS_INV,
		},
		};

		static struct resource fsi_resources[] = {
		[0] = {
		.name = "FSI",
		@@ -901,15 +895,13 @@ static struct platform_device fsi_device = {
		.id = 0,
		.num_resources = ARRAY_SIZE(fsi_resources),
		.resource = fsi_resources,
		.dev = {
		.platform_data = &fsi_info,
		},
		};

		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,
		.cpu_daifmt = SND_SOC_DAIFMT_CBS_CFS \|
		SND_SOC_DAIFMT_IB_NF,
		};

		static struct asoc_simple_card_info fsi_da7210_info = {

arch/sh/boards/mach-se/7724/setup.c

+2 −10

Original line number	Diff line number	Diff line
		@@ -279,12 +279,6 @@ static struct platform_device ceu1_device = {

		/* FSI */
		/* change J20, J21, J22 pin to 1-2 connection to use slave mode */
		static struct sh_fsi_platform_info fsi_info = {
		.port_a = {
		.flags = SH_FSI_BRS_INV,
		},
		};

		static struct resource fsi_resources[] = {
		[0] = {
		.name = "FSI",
		@@ -303,15 +297,13 @@ static struct platform_device fsi_device = {
		.id = 0,
		.num_resources = ARRAY_SIZE(fsi_resources),
		.resource = fsi_resources,
		.dev = {
		.platform_data = &fsi_info,
		},
		};

		static struct asoc_simple_dai_init_info fsi2_ak4642_init_info = {
		.fmt = SND_SOC_DAIFMT_LEFT_J,
		.codec_daifmt = SND_SOC_DAIFMT_CBM_CFM,
		.cpu_daifmt = SND_SOC_DAIFMT_CBS_CFS,
		.cpu_daifmt = SND_SOC_DAIFMT_CBS_CFS \|
		SND_SOC_DAIFMT_IB_NF,
		.sysclk = 11289600,
		};

include/sound/sh_fsi.h

+0 −7

Original line number	Diff line number	Diff line
		@@ -29,13 +29,6 @@
		* D: clock selecter if master mode
		*/

		/* A: clock inversion */
		#define SH_FSI_INVERSION_MASK 0x0000000F
		#define SH_FSI_LRM_INV (1 << 0)
		#define SH_FSI_BRM_INV (1 << 1)
		#define SH_FSI_LRS_INV (1 << 2)
		#define SH_FSI_BRS_INV (1 << 3)

		/* B: format mode */
		#define SH_FSI_FMT_MASK 0x000000F0
		#define SH_FSI_FMT_DAI (0 << 4)