summaryrefslogtreecommitdiffstats
path: root/sound/soc/rockchip
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2014-12-141-1/+0
|\
| * ASoC: rockchip: drop owner assignment from platform_driversWolfram Sang2014-10-201-1/+0
| |
| \
*-. \ Merge remote-tracking branches 'asoc/topic/rcar', 'asoc/topic/rockchip', 'aso...Mark Brown2014-12-081-2/+7
|\ \ \ | | |/ | |/|
| | * ASoC: rockchip: i2s: Fix Kconfig for I2S device driverAndreas Ruprecht2014-11-241-2/+2
| | * ASoC: rockchip: i2s: add text after tristate for SND_SOC_ROCKCHIP_I2SJianqun2014-11-031-1/+6
| |/
* / ASoC: rockchip-i2s: fix infinite loop in rockchip_snd_rxctrlJianqun2014-10-291-1/+3
|/
* ASoC: rockchip-i2s: fix infinite loop in rockchip_snd_txctrlSonny Rao2014-10-081-1/+3
*-. Merge remote-tracking branches 'asoc/topic/max98090', 'asoc/topic/rockchip', ...Mark Brown2014-10-063-13/+20
|\ \
| | * ASoC: rockchip-i2s: add dma data to snd_soc_daiJianqun2014-09-131-10/+13
| | * ASoC: rockchip-i2s: fix rockchip i2s defination more reasonableJianqun2014-09-132-3/+2
| | * ASoC: rockchip-i2s: enable "hclk" for rockchip I2S controllerJianqun2014-09-131-0/+5
| |/
* | ASoC: rockchip-i2s: fix registers' property of rockchip i2s controllerJianqun2014-09-131-3/+3
* | ASoC: rockchip-i2s: fix master mode set bit errorJianqun2014-09-131-3/+4
|/
* ASoC: rockchip: remove redundant dev_err call in rockchip_i2s_probe()Wei Yongjun2014-07-281-3/+1
* ASoC: rockchip: fix duplicated argument to && or ||xujianqun2014-07-141-5/+5
* ASoC: rockchip: add missing module.h includexujianqun2014-07-111-0/+1
* ASoC: add driver for Rockchip RK3xxx I2S controllerJianqun Xu2014-07-094-0/+769