diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-13 22:55:33 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-13 22:55:33 +0100 |
| commit | 2eebcef31a133b27a09c457f3a7ad509bf237822 (patch) | |
| tree | a717becc4cbe8dae31bb29af90f3cbd5f635497e /arch/sh/boards/mach-ecovec24 | |
| parent | ASoC: simple-card: use struct device pointer for dev_xxx() (diff) | |
| parent | ASoC: fsi: don't use platform info pointer on probe() (diff) | |
| download | linux-2eebcef31a133b27a09c457f3a7ad509bf237822.tar.xz linux-2eebcef31a133b27a09c457f3a7ad509bf237822.zip | |
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-ecovec24')
| -rw-r--r-- | arch/sh/boards/mach-ecovec24/setup.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c index 3fede4556c91..8ebe4c7a766b 100644 --- a/arch/sh/boards/mach-ecovec24/setup.c +++ b/arch/sh/boards/mach-ecovec24/setup.c @@ -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 = { |