History

Merge tag 'sound-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound updates from Takashi Iwai: "Not much dramatic changes at this time, but we've received quite a lot of changes for ASoC, while there are still a few fixes and quirks for usual HD- and USB-auido. Here are some highlights. ASoC: - Overhaul of endianness specification for data formats, avoiding needless restrictions due to CODECs - Initial stages of Intel AVS driver merge - Introduction of v4 IPC mechanism for SOF - TDM mode support for AK4613 - Support for Analog Devices ADAU1361, Cirrus Logic CS35L45, Maxim MAX98396, MediaTek MT8186, NXP i.MX8 micfil and SAI interfaces, nVidia Tegra186 ASRC, and Texas Instruments TAS2764 and TAS2780 Others: - A few regression fixes after the USB-audio endpoint management refactoring - More enhancements for Cirrus HD-audio codec support (still ongoing) - Addition of generic serial MIDI driver" * tag 'sound-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (504 commits) ALSA: hda/realtek - Add new type for ALC245 ALSA: usb-audio: Configure sync endpoints before data ALSA: ctxfi: fix typo in comment ALSA: cs5535audio: fix typo in comment ALSA: ctxfi: Add SB046x PCI ID ALSA: usb-audio: Add missing ep_idx in fixed EP quirks ALSA: usb-audio: Workaround for clock setup on TEAC devices ALSA: lola: Bounds check loop iterator against streams array size ASoC: max98090: Move check for invalid values before casting in max98090_put_enab_tlv() ASoC: rt1308-sdw: add the default value of register 0xc320 ASoC: rt9120: Use pm_runtime and regcache to optimize 'pwdnn' logic ASoC: rt9120: Fix 3byte read, valule offset typo ASoC: amd: acp: Set Speaker enable/disable pin through rt1019 codec driver. ASoC: amd: acp: Set Speaker enable/disable pin through rt1019 codec driver ASoC: wm2000: fix missing clk_disable_unprepare() on error in wm2000_anc_transition() ASoC: codecs: lpass: Fix passing zero to 'PTR_ERR' ASoC: SOF: sof-client-ipc-flood-test: use pm_runtime_resume_and_get() ASoC: SOF: mediatek: remove duplicate include in mt8195.c ASoC: SOF: mediatek: Add mt8195 debug dump ASoC: SOF: mediatek: Add mediatek common debug dump ...

Linus Torvalds committed 4 years ago

Commit d7227782 parents 2518f22 6057192571 files · +25832 −9278Browse files

Showing the changes to include/linux/platform_data (1 of 571 files). Show all

Unified · Split

include/linux/platform_data/dma-imx.h+0−68
@@ -1,68 +0,0 @@
1/* SPDX-License-Identifier: GPL-2.0-only */
2/*
3 * Copyright 2004-2009 Freescale Semiconductor, Inc. All Rights Reserved.
4 */
5
6#ifndef __ASM_ARCH_MXC_DMA_H__
7#define __ASM_ARCH_MXC_DMA_H__
8
9#include <linux/scatterlist.h>
10#include <linux/device.h>
11#include <linux/dmaengine.h>
12
13/*
14 * This enumerates peripheral types. Used for SDMA.
15 */
16enum sdma_peripheral_type {
17 IMX_DMATYPE_SSI, /* MCU domain SSI */
18 IMX_DMATYPE_SSI_SP, /* Shared SSI */
19 IMX_DMATYPE_MMC, /* MMC */
20 IMX_DMATYPE_SDHC, /* SDHC */
21 IMX_DMATYPE_UART, /* MCU domain UART */
22 IMX_DMATYPE_UART_SP, /* Shared UART */
23 IMX_DMATYPE_FIRI, /* FIRI */
24 IMX_DMATYPE_CSPI, /* MCU domain CSPI */
25 IMX_DMATYPE_CSPI_SP, /* Shared CSPI */
26 IMX_DMATYPE_SIM, /* SIM */
27 IMX_DMATYPE_ATA, /* ATA */
28 IMX_DMATYPE_CCM, /* CCM */
29 IMX_DMATYPE_EXT, /* External peripheral */
30 IMX_DMATYPE_MSHC, /* Memory Stick Host Controller */
31 IMX_DMATYPE_MSHC_SP, /* Shared Memory Stick Host Controller */
32 IMX_DMATYPE_DSP, /* DSP */
33 IMX_DMATYPE_MEMORY, /* Memory */
34 IMX_DMATYPE_FIFO_MEMORY,/* FIFO type Memory */
35 IMX_DMATYPE_SPDIF, /* SPDIF */
36 IMX_DMATYPE_IPU_MEMORY, /* IPU Memory */
37 IMX_DMATYPE_ASRC, /* ASRC */
38 IMX_DMATYPE_ESAI, /* ESAI */
39 IMX_DMATYPE_SSI_DUAL, /* SSI Dual FIFO */
40 IMX_DMATYPE_ASRC_SP, /* Shared ASRC */
41 IMX_DMATYPE_SAI, /* SAI */
42};
43
44enum imx_dma_prio {
45 DMA_PRIO_HIGH = 0,
46 DMA_PRIO_MEDIUM = 1,
47 DMA_PRIO_LOW = 2
48};
49
50struct imx_dma_data {
51 int dma_request; /* DMA request line */
52 int dma_request2; /* secondary DMA request line */
53 enum sdma_peripheral_type peripheral_type;
54 int priority;
55};
56
57static inline int imx_dma_is_ipu(struct dma_chan *chan)
58{
59 return !strcmp(dev_name(chan->device->dev), "ipu-core");
60}
61
62static inline int imx_dma_is_general_purpose(struct dma_chan *chan)
63{
64 return !strcmp(chan->device->dev->driver->name, "imx-sdma") ||
65 !strcmp(chan->device->dev->driver->name, "imx-dma");
66}
67
68#endif