提交 · b21a415d78201bd10f99ea995e757eec5d344e48 · openanolis / cloud-kernel

14 8月, 2011 17 次提交

M

Merge branch 'for-3.1' into for-3.2 · b21a415d
由 Mark Brown 提交于 8月 14, 2011

b21a415d

ASoC: rx1950: Fix compilation error due to missing header · b8487928

由 Vasily Khoruzhick 提交于 8月 12, 2011

Add linux/types.h to fix this compilation error:

In file included from arch/arm/mach-s3c2410/include/mach/gpio-fns.h:27:0,
from arch/arm/mach-s3c2410/include/mach/gpio.h:27,
from /home/anarsoul/work/pda-linux/linux-next/arch/arm/include/asm/gpio.h:5,
from include/linux/gpio.h:18,
from sound/soc/samsung/rx1950_uda1380.c:20:
arch/arm/plat-samsung/include/plat/gpio-cfg.h:29:34: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘s3c_gpio_pull_t’
arch/arm/plat-samsung/include/plat/gpio-cfg.h:30:34: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘s5p_gpio_drvstr_t’
arch/arm/plat-samsung/include/plat/gpio-cfg.h:57:2: error: expected specifier-qualifier-list before ‘s3c_gpio_pull_t’
arch/arm/plat-samsung/include/plat/gpio-cfg.h:148:47: error: expected declaration specifiers or ‘...’ before ‘s3c_gpio_pull_t’
arch/arm/plat-samsung/include/plat/gpio-cfg.h:156:24: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘s3c_gpio_getpull’
arch/arm/plat-samsung/include/plat/gpio-cfg.h:175:24: error: expected declaration specifiers or ‘...’ before ‘s3c_gpio_pull_t’
arch/arm/plat-samsung/include/plat/gpio-cfg.h: In function ‘s3c_gpio_cfgrange_nopull’:
arch/arm/plat-samsung/include/plat/gpio-cfg.h:180:47: error: ‘s3c_gpio_pull_t’ undeclared (first use in this function)
arch/arm/plat-samsung/include/plat/gpio-cfg.h:180:47: note: each undeclared identifier is reported only once for each function it appears in
arch/arm/plat-samsung/include/plat/gpio-cfg.h:180:47: error: expected ‘)’ before numeric constant
arch/arm/plat-samsung/include/plat/gpio-cfg.h:180:47: error: too many arguments to function ‘s3c_gpio_cfgall_range’
arch/arm/plat-samsung/include/plat/gpio-cfg.h:174:12: note: declared here
arch/arm/plat-samsung/include/plat/gpio-cfg.h: At top level:
arch/arm/plat-samsung/include/plat/gpio-cfg.h:199:26: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘s5p_gpio_get_drvstr’
arch/arm/plat-samsung/include/plat/gpio-cfg.h:210:50: error: expected declaration specifiers or ‘...’ before ‘s5p_gpio_drvstr_t’
Signed-off-by: NVasily Khoruzhick <anarsoul@gmail.com>
Acked-by: NJassi Brar <jassisinghbrar@gmail.com>
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>

b8487928

ASoC: h1940: Fix compilation error due to missing header · fd049755

由 Vasily Khoruzhick 提交于 8月 12, 2011

Add linux/types.h to fix this compilation error:

fd049755

ASoC: Support !CONFIG_REGMAP builds · 4835ff9a

由 Mark Brown 提交于 8月 13, 2011

Since we changed regmap to be selected and register per bus rather than
via the core only we can't rely on it being enabled by the ASoC core.
Support compiling it out.
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Reported-by: NAxel Lin <axel.lin@gmail.com>

4835ff9a

M

Merge branch 'for-3.1' into for-3.2 · afe8db5f
由 Mark Brown 提交于 8月 14, 2011

afe8db5f

ASoC: Remove redundant -codec from WM8750 · dc5de62b

由 Mark Brown 提交于 8月 03, 2011

Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: NLiam Girdwood <lrg@ti.com>

dc5de62b

ASoC: Move WM8962 CLKREG_OVD earlier · a115c728

由 Mark Brown 提交于 8月 04, 2011

When the clocking registers are not overriden some of the registers are
not writable.
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: NLiam Girdwood <lrg@ti.com>
Cc: stable@kernel.org

a115c728

ASoC: Disable WM8994 VMID for digital only paths · 4b7ed83a

由 Mark Brown 提交于 8月 10, 2011

On WM8994 class devices only the analogue portions of the CODEC require
VMID so when running digital only paths we can leave VMID disabled.
On some earlier devices the FLL uses VMID so we don't use DAPM reference
counting alone, we maintain an internal reference count which is also
enabled and disabled by the FLL startup.
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: NLiam Girdwood <lrg@ti.com>

4b7ed83a

ASoC: Add VMID widget for wm_hubs devices · 4e04adaf

由 Mark Brown 提交于 7月 15, 2011

Currently this does not actually do anything, it is being introduced in
order to facilitate additional power optimisations for current generation
devices.
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: NLiam Girdwood <lrg@ti.com>

4e04adaf

ASoC: Add device tree binding for WM8753 · 70e14122

由 Mark Brown 提交于 8月 08, 2011

Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: NLiam Girdwood <lrg@ti.com>

70e14122

ASoC: Add device tree binding for WM8750 · ce31a0f5

由 Mark Brown 提交于 8月 03, 2011

Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: NLiam Girdwood <lrg@ti.com>

ce31a0f5

ASoC: Add device tree binding for WM8737 · 53a5a83d

由 Mark Brown 提交于 8月 03, 2011

Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: NLiam Girdwood <lrg@ti.com>

53a5a83d

ASoC: Add device tree binding for WM8728 · 45b4d043

由 Mark Brown 提交于 8月 03, 2011

Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: NLiam Girdwood <lrg@ti.com>

45b4d043

ASoC: Add device tree binding for WM8711 · 1552c8f6

由 Mark Brown 提交于 8月 03, 2011

Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: NLiam Girdwood <lrg@ti.com>

1552c8f6

ASoC: Add device tree support for WM8580 · 733eef3e

由 Mark Brown 提交于 8月 02, 2011

Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: NLiam Girdwood <lrg@ti.com>

733eef3e

ASoC: Add device tree binding for WM8523 · bf5a85be

由 Mark Brown 提交于 8月 02, 2011

Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: NLiam Girdwood <lrg@ti.com>

bf5a85be

ASoC: Add device tree binding for WM8510 · 0a422e1a

由 Mark Brown 提交于 8月 02, 2011

Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: NLiam Girdwood <lrg@ti.com>

0a422e1a

13 8月, 2011 1 次提交

ASoC: Fix compile warning in wm8750.c · f6b864a9

由 Takashi Iwai 提交于 8月 12, 2011

sound/soc/codecs/wm8750.c:784:2: warning: missing braces around initializer
sound/soc/codecs/wm8750.c:784:2: warning: (near initialization for ‘wm8750_spi_ids[2].name’)

It's because struct spi_device_id.name is a char array, not a pointer,
while the driver initializes explicitly with 0.
Signed-off-by: NTakashi Iwai <tiwai@suse.de>

f6b864a9

12 8月, 2011 7 次提交

M
ASoC: Add bitfield definitions for WM8958 MICBIAS registers · c18eee31
由 Mark Brown 提交于 8月 10, 2011
```
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: NLiam Girdwood <lrg@ti.com>
```
c18eee31

ASoC: soc-io: Fix CONFIG_REGMAP_I2C/SPI guards to support regmap modules · 81bca762

由 Stephen Warren 提交于 8月 11, 2011

When CONFIG_REGMAP_I2C/SPI are m, CONFIG_REGMAP_I2C_MODULE is set in the
pre-processor instead of CONFIG_REGMAP_I2C. This removes SND_SOC_I2C as a
valid option for snd_soc_codec_set_cache_io()'s control parameter, and
causes any ASoC regmap-using codec built as a module to fail to initialize.
Signed-off-by: NStephen Warren <swarren@nvidia.com>
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>

81bca762

ASoC: Allow userspace control of Speyside headphone output · 68d5a59e

由 Mark Brown 提交于 8月 04, 2011

In order to facilitate the widest range of use cases (especially things
like speakerphone) allow the headphone output to be enabled and disabled
by the application layer.
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: NLiam Girdwood <lrg@ti.com>

68d5a59e

M

Merge branch 'for-3.1' into for-3.2 · 42bef686
由 Mark Brown 提交于 8月 12, 2011

42bef686

ASoC: omap: Update e-mail address of Jarkko Nikula · 7ec41ee5

由 Jarkko Nikula 提交于 8月 11, 2011

My gmail account got disabled and I'm not going to reopen it.
Signed-off-by: NJarkko Nikula <jarkko.nikula@bitmer.com>
Acked-by: NLiam Girdwood <lrg@ti.com>
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>

7ec41ee5

ASoC: sgtl5000: fix module device table type for sgtl5000_dt_ids · 4c54c6de

由 Axel Lin 提交于 8月 11, 2011

The module device table for of_device_id should use "of" type.
Signed-off-by: NAxel Lin <axel.lin@gmail.com>
Acked-by: NLiam Girdwood <lrg@ti.com>
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>

4c54c6de

ASoC: SAMSUNG: Add I2S0 internal dma driver · f09aecd5

由 Sangbeom Kim 提交于 7月 20, 2011

I2S in Exynos4 and S5PC110(S5PV210) has a internal dma.
It can be used low power audio mode and 2nd channel transfer.
This patch can support idma.

[Reapplied after dependencies propagated through in 3.1-rc1. --broonie]
Signed-off-by: NSangbeom Kim <sbkim73@samsung.com>
Acked-by: NJassi Brar <jassisinghbrar@gmail.com>
Acked-by: NLiam Girdwood <lrg@ti.com>
Acked-by: NJassi Brar <jassisinghbrar@gmail.com>
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>

f09aecd5

11 8月, 2011 4 次提交
- M
  
  Merge branch 'for-3.1' into for-3.2 · 10645a7c
  由 Mark Brown 提交于 8月 11, 2011
  
  10645a7c
- M
  ASoC: Terminate WM8750 SPI device ID table · feb00dce
  由 Mark Brown 提交于 8月 11, 2011
```
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Reported-by: NStephen Rothwell <sfr@canb.auug.org.au>
```
  feb00dce
- M
  
  Merge branch 'for-3.1' into for-3.2 · 4158a057
  由 Mark Brown 提交于 8月 11, 2011
  
  4158a057
- M
  ASoC: Add missing break in WM8994 probe · 280ec8b7
  由 Mark Brown 提交于 8月 10, 2011
```
This error would have no effect on current silicon revisions, the fall
through case has the same behaviour.
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: NLiam Girdwood <lrg@ti.com>
```
  280ec8b7
10 8月, 2011 4 次提交

ASoC: soc-io: Add CONFIG_REGMAP_I2C/CONFIG_REGMAP_SPI guards for regmap_init_i2c/regmap_init_spi · f024d9a0

由 Axel Lin 提交于 8月 10, 2011

In the case of "make da8xx_omapl_defconfig;make", the SPI support is disabled.
Thus calling regmap_init_spi in soc-io.c has below build error.

ERROR: "regmap_init_spi" [sound/soc/snd-soc-core.ko] undefined!
make[1]: *** [__modpost] Error 1
make: *** [modules] Error 2

This patch fixes the build error by adding CONFIG_REGMAP_I2C/CONFIG_REGMAP_SPI
guards for regmap_init_i2c/regmap_init_spi.
Signed-off-by: NAxel Lin <axel.lin@gmail.com>
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>

f024d9a0

M
ASoC: Specify register defaults for WM8958 MICBIAS1 and MICBIAS2 · 53b2bb3a
由 Mark Brown 提交于 8月 10, 2011
```
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: NLiam Girdwood <lrg@ti.com>
```
53b2bb3a
M

Merge branch 'for-3.1' into for-3.2 · 29571ad6
由 Mark Brown 提交于 8月 10, 2011

29571ad6

ASoC: Fix typo in wm8750 spi_ids · 511d8cf0

由 Mark Brown 提交于 8月 10, 2011

Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Reported-by: NStephen Rothwell <sfr@canb.auug.org.au>

511d8cf0

09 8月, 2011 7 次提交

ASoC: Fix warning in WM1250-EV1 driver · c38071c0

由 Mark Brown 提交于 7月 29, 2011

Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: NLiam Girdwood <lrg@ti.com>

c38071c0

ASoC: Add SPI support for WM8741 · 39e9b8d2

由 Mark Brown 提交于 8月 03, 2011

Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: NLiam Girdwood <lrg@ti.com>

39e9b8d2

ASoC: Refactor WM8741 regulator handling into CODEC generic code · 398575db

由 Mark Brown 提交于 8月 03, 2011

No meaningful runtime impact but is more in line with other CODECs and
will support further work.
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: NLiam Girdwood <lrg@ti.com>

398575db

M

Merge branch 'for-3.1' into for-3.2 · 68817ee4
由 Mark Brown 提交于 8月 10, 2011

68817ee4
M
ASoC: Remove some more redundant -codecs from driver names · 0473e61b
由 Mark Brown 提交于 8月 03, 2011
```
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: NLiam Girdwood <lrg@ti.com>
```
0473e61b

ASoC: Update SMDKs for WM8580 -codec removal · 5d5d09b2

由 Mark Brown 提交于 8月 03, 2011

Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: NLiam Girdwood <lrg@ti.com>

5d5d09b2

ASoC: Fix warning in Speyside WM8962 · 371e7305

由 Mark Brown 提交于 8月 04, 2011

Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: NLiam Girdwood <lrg@ti.com>

371e7305

openanolis / cloud-kernel 接近 2 年 前同步成功

openanolis / cloud-kernel
接近 2 年前同步成功