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

Commit 4d805f7b authored Jan 20, 2011 by Kuninori Morimoto Committed by Mark Brown Jan 21, 2011

ASoC: sh: fsi: Add snd_soc_dai_set_fmt support



This patch add snd_soc_dai_ops :: set_fmt to FSI driver and
select master/slave clock mode by snd_soc_dai_set_fmt on
fsi-xxx.c instead of platform infomation code.
This patch remove fsi_is_master function which is no longer needed.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

parent 0d032c19

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -119,9 +119,7 @@ static struct platform_device keysc_device = {

		/* FSI A */
		static struct sh_fsi_platform_info fsi_info = {
		.porta_flags = SH_FSI_OUT_SLAVE_MODE \|
		SH_FSI_IN_SLAVE_MODE \|
		SH_FSI_OFMT(I2S) \|
		.porta_flags = SH_FSI_OFMT(I2S) \|
		SH_FSI_IFMT(I2S),
		};

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -674,8 +674,6 @@ static int fsi_set_rate(struct device *dev, int is_porta, int rate, int enable)

		static struct sh_fsi_platform_info fsi_info = {
		.porta_flags = SH_FSI_BRS_INV \|
		SH_FSI_OUT_SLAVE_MODE \|
		SH_FSI_IN_SLAVE_MODE \|
		SH_FSI_OFMT(PCM) \|
		SH_FSI_IFMT(PCM),

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -611,8 +611,6 @@ static int fsi_set_rate(struct device *dev, int is_porta, int rate, int enable)

		static struct sh_fsi_platform_info fsi_info = {
		.porta_flags = SH_FSI_BRS_INV \|
		SH_FSI_OUT_SLAVE_MODE \|
		SH_FSI_IN_SLAVE_MODE \|
		SH_FSI_OFMT(PCM) \|
		SH_FSI_IFMT(PCM),

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -724,8 +724,6 @@ static struct platform_device camera_devices[] = {
		/* FSI */
		static struct sh_fsi_platform_info fsi_info = {
		.portb_flags = SH_FSI_BRS_INV \|
		SH_FSI_OUT_SLAVE_MODE \|
		SH_FSI_IN_SLAVE_MODE \|
		SH_FSI_OFMT(I2S) \|
		SH_FSI_IFMT(I2S),
		};

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -287,8 +287,6 @@ static struct platform_device ceu1_device = {
		/* change J20, J21, J22 pin to 1-2 connection to use slave mode */
		static struct sh_fsi_platform_info fsi_info = {
		.porta_flags = SH_FSI_BRS_INV \|
		SH_FSI_OUT_SLAVE_MODE \|
		SH_FSI_IN_SLAVE_MODE \|
		SH_FSI_OFMT(PCM) \|
		SH_FSI_IFMT(PCM),
		};