diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-14 06:55:33 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-14 06:55:33 +0900 |
| commit | 2eebcef31a133b27a09c457f3a7ad509bf237822 (patch) | |
| tree | a717becc4cbe8dae31bb29af90f3cbd5f635497e /arch/sh/boards/mach-se | |
| parent | f89983ef61677afc828ed32b3c42ef5a71eb0686 (diff) | |
| parent | fd974e52dbbdb27910d40d8feea7000f26545683 (diff) | |
Merge branch 'topic/fsi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-simple-card
Diffstat (limited to 'arch/sh/boards/mach-se')
| -rw-r--r-- | arch/sh/boards/mach-se/7724/setup.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c index 35f6efa3ac0e..975608f5e805 100644 --- a/arch/sh/boards/mach-se/7724/setup.c +++ b/arch/sh/boards/mach-se/7724/setup.c @@ -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, }; |