diff options
| author | Eric Miao <eric.miao@linaro.org> | 2012-01-04 22:03:26 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2012-01-04 22:03:26 +0800 |
| commit | 3bcec397c512a39c895442ee5d4a4823ff41b3c4 (patch) | |
| tree | a65d3c1082309a418ad92dd2e82d9bda5fa5f50e /arch/arm/plat-mxc/include/mach/dma.h | |
| parent | 34446571c23a815f3f2b0ac7567a7c2c8f43db45 (diff) | |
| parent | 1152a4e7443c928b8b061480dd06d813c4006ba6 (diff) | |
Merge branch 'topic/lt-3.2-imx6-audio' into lt-3.2-imx6backup/lt-3.2-imx6-2
* topic/lt-3.2-imx6-audio: (28 commits)
make sgtl5000 work -- need to split to small patch
ENGR00154525 SDMA: SDMA not works when event number bigger than 32
arm/imx6q: add cko1 clock
arm/imx6q: add imx-sgtl5000 device from sabrelite board
fw/imx: add sdma-imx6q-to1.bin.ihex
dts/imx6q: add sdma script
ARM: imx6q-sabrelite: add audmux
ARM: mxc/audmux-v2: add dt support
dma/imx-sdma: let imx6q choose dma driver
dts/imx6q: add ssi
alsa/imx-ssi: rename fsl,ssi-asynchronous-mode to fsl,ssi-synchronous-mode
ASoC: imx-ssi: add device tree probe support
dts/imx6q-sabrelite: add sgtl5000 audio codec
regulator/fixed: set apply_uV 0
dts/imx6q-sabrelite: add 2P5V and 3P3V regulators
regulator: pass device_node to of_get_regulator_init_data()
regulator: If a single voltage is set with device tree then set apply_uV
regulator: Fix regulator_register() API signature in Documentation
regulator: fix label names used in device tree bindings
regulator: Avoid potential NULL dereference in reg_fixed_voltage_probe()
...
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/dma.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/dma.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/include/mach/dma.h b/arch/arm/plat-mxc/include/mach/dma.h index dd41a6475be..2003f44fca5 100644 --- a/arch/arm/plat-mxc/include/mach/dma.h +++ b/arch/arm/plat-mxc/include/mach/dma.h @@ -67,8 +67,7 @@ static inline int imx_dma_is_ipu(struct dma_chan *chan) static inline int imx_dma_is_general_purpose(struct dma_chan *chan) { - return !strcmp(dev_name(chan->device->dev), "imx31-sdma") || - !strcmp(dev_name(chan->device->dev), "imx35-sdma") || + return strstr(dev_name(chan->device->dev), "sdma") || !strcmp(dev_name(chan->device->dev), "imx-dma"); } |