You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge remote-tracking branches 'asoc/topic/rt5670', 'asoc/topic/rt5677', 'asoc/topic/s6000', 'asoc/topic/samsung' and 'asoc/topic/sh-fsi' into asoc-next
This commit is contained in:
Mark Brown
@@ -0,0 +1,35 @@
|
||||
Samsung Exynos Odroid X2/U3 audio complex with MAX98090 codec
|
||||
|
||||
Required properties:
|
||||
- compatible : "samsung,odroidx2-audio" - for Odroid X2 board,
|
||||
"samsung,odroidu3-audio" - for Odroid U3 board
|
||||
- samsung,model : the user-visible name of this sound complex
|
||||
- samsung,i2s-controller : the phandle of the I2S controller
|
||||
- samsung,audio-codec : the phandle of the MAX98090 audio codec
|
||||
- samsung,audio-routing : a list of the connections between audio
|
||||
components; each entry is a pair of strings, the first being the
|
||||
connection's sink, the second being the connection's source;
|
||||
valid names for sources and sinks are the MAX98090's pins (as
|
||||
documented in its binding), and the jacks on the board
|
||||
For Odroid X2:
|
||||
* Headphone Jack
|
||||
* Mic Jack
|
||||
* DMIC
|
||||
|
||||
For Odroid U3:
|
||||
* Headphone Jack
|
||||
* Speakers
|
||||
|
||||
Example:
|
||||
|
||||
sound {
|
||||
compatible = "samsung,odroidu3-audio";
|
||||
samsung,i2s-controller = <&i2s0>;
|
||||
samsung,audio-codec = <&max98090>;
|
||||
samsung,model = "Odroid-X2";
|
||||
samsung,audio-routing =
|
||||
"Headphone Jack", "HPL",
|
||||
"Headphone Jack", "HPR",
|
||||
"IN1", "Mic Jack",
|
||||
"Mic Jack", "MICBIAS";
|
||||
};
|
||||
@@ -3,15 +3,20 @@ Audio Binding for Snow boards
|
||||
Required properties:
|
||||
- compatible : Can be one of the following,
|
||||
"google,snow-audio-max98090" or
|
||||
"google,snow-audio-max98091" or
|
||||
"google,snow-audio-max98095"
|
||||
- samsung,i2s-controller: The phandle of the Samsung I2S controller
|
||||
- samsung,audio-codec: The phandle of the audio codec
|
||||
|
||||
Optional:
|
||||
- samsung,model: The name of the sound-card
|
||||
|
||||
Example:
|
||||
|
||||
sound {
|
||||
compatible = "google,snow-audio-max98095";
|
||||
|
||||
samsung,model = "Snow-I2S-MAX98095";
|
||||
samsung,i2s-controller = <&i2s0>;
|
||||
samsung,audio-codec = <&max98095>;
|
||||
};
|
||||
|
||||
@@ -15,15 +15,6 @@
|
||||
#define S3C64XX_AC97_GPE 1
|
||||
extern void s3c64xx_ac97_setup_gpio(int);
|
||||
|
||||
/*
|
||||
* The machine init code calls s5p*_spdif_setup_gpio with
|
||||
* one of these defines in order to select appropriate bank
|
||||
* of GPIO for S/PDIF pins
|
||||
*/
|
||||
#define S5PC100_SPDIF_GPD 0
|
||||
#define S5PC100_SPDIF_GPG3 1
|
||||
extern void s5pc100_spdif_setup_gpio(int);
|
||||
|
||||
struct samsung_i2s {
|
||||
/* If the Primary DAI has 5.1 Channels */
|
||||
#define QUIRK_PRI_6CHAN (1 << 0)
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
/*
|
||||
* linux/sound/rt5670.h -- Platform data for RT5670
|
||||
*
|
||||
* Copyright 2014 Realtek Microelectronics
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*/
|
||||
|
||||
#ifndef __LINUX_SND_RT5670_H
|
||||
#define __LINUX_SND_RT5670_H
|
||||
|
||||
struct rt5670_platform_data {
|
||||
int jd_mode;
|
||||
bool in2_diff;
|
||||
|
||||
bool dmic_en;
|
||||
unsigned int dmic1_data_pin;
|
||||
/* 0 = GPIO6; 1 = IN2P; 3 = GPIO7*/
|
||||
unsigned int dmic2_data_pin;
|
||||
/* 0 = GPIO8; 1 = IN3N; */
|
||||
unsigned int dmic3_data_pin;
|
||||
/* 0 = GPIO9; 1 = GPIO10; 2 = GPIO5*/
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -80,6 +80,7 @@ config SND_SOC_ALL_CODECS
|
||||
select SND_SOC_RT5640 if I2C
|
||||
select SND_SOC_RT5645 if I2C
|
||||
select SND_SOC_RT5651 if I2C
|
||||
select SND_SOC_RT5670 if I2C
|
||||
select SND_SOC_RT5677 if I2C
|
||||
select SND_SOC_SGTL5000 if I2C
|
||||
select SND_SOC_SI476X if MFD_SI476X_CORE
|
||||
@@ -452,9 +453,13 @@ config SND_SOC_RL6231
|
||||
default y if SND_SOC_RT5640=y
|
||||
default y if SND_SOC_RT5645=y
|
||||
default y if SND_SOC_RT5651=y
|
||||
default y if SND_SOC_RT5670=y
|
||||
default y if SND_SOC_RT5677=y
|
||||
default m if SND_SOC_RT5640=m
|
||||
default m if SND_SOC_RT5645=m
|
||||
default m if SND_SOC_RT5651=m
|
||||
default m if SND_SOC_RT5670=m
|
||||
default m if SND_SOC_RT5677=m
|
||||
|
||||
config SND_SOC_RT286
|
||||
tristate
|
||||
@@ -471,6 +476,9 @@ config SND_SOC_RT5645
|
||||
config SND_SOC_RT5651
|
||||
tristate
|
||||
|
||||
config SND_SOC_RT5670
|
||||
tristate
|
||||
|
||||
config SND_SOC_RT5677
|
||||
tristate
|
||||
|
||||
|
||||
@@ -74,6 +74,7 @@ snd-soc-rt5631-objs := rt5631.o
|
||||
snd-soc-rt5640-objs := rt5640.o
|
||||
snd-soc-rt5645-objs := rt5645.o
|
||||
snd-soc-rt5651-objs := rt5651.o
|
||||
snd-soc-rt5670-objs := rt5670.o
|
||||
snd-soc-rt5677-objs := rt5677.o
|
||||
snd-soc-sgtl5000-objs := sgtl5000.o
|
||||
snd-soc-alc5623-objs := alc5623.o
|
||||
@@ -243,6 +244,7 @@ obj-$(CONFIG_SND_SOC_RT5631) += snd-soc-rt5631.o
|
||||
obj-$(CONFIG_SND_SOC_RT5640) += snd-soc-rt5640.o
|
||||
obj-$(CONFIG_SND_SOC_RT5645) += snd-soc-rt5645.o
|
||||
obj-$(CONFIG_SND_SOC_RT5651) += snd-soc-rt5651.o
|
||||
obj-$(CONFIG_SND_SOC_RT5670) += snd-soc-rt5670.o
|
||||
obj-$(CONFIG_SND_SOC_RT5677) += snd-soc-rt5677.o
|
||||
obj-$(CONFIG_SND_SOC_SGTL5000) += snd-soc-sgtl5000.o
|
||||
obj-$(CONFIG_SND_SOC_SIGMADSP) += snd-soc-sigmadsp.o
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
/*
|
||||
* rt5670-dsp.h -- RT5670 ALSA SoC DSP driver
|
||||
*
|
||||
* Copyright 2014 Realtek Microelectronics
|
||||
* Author: Bard Liao <bardliao@realtek.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*/
|
||||
|
||||
#ifndef __RT5670_DSP_H__
|
||||
#define __RT5670_DSP_H__
|
||||
|
||||
#define RT5670_DSP_CTRL1 0xe0
|
||||
#define RT5670_DSP_CTRL2 0xe1
|
||||
#define RT5670_DSP_CTRL3 0xe2
|
||||
#define RT5670_DSP_CTRL4 0xe3
|
||||
#define RT5670_DSP_CTRL5 0xe4
|
||||
|
||||
/* DSP Control 1 (0xe0) */
|
||||
#define RT5670_DSP_CMD_MASK (0xff << 8)
|
||||
#define RT5670_DSP_CMD_PE (0x0d << 8) /* Patch Entry */
|
||||
#define RT5670_DSP_CMD_MW (0x3b << 8) /* Memory Write */
|
||||
#define RT5670_DSP_CMD_MR (0x37 << 8) /* Memory Read */
|
||||
#define RT5670_DSP_CMD_RR (0x60 << 8) /* Register Read */
|
||||
#define RT5670_DSP_CMD_RW (0x68 << 8) /* Register Write */
|
||||
#define RT5670_DSP_REG_DATHI (0x26 << 8) /* High Data Addr */
|
||||
#define RT5670_DSP_REG_DATLO (0x25 << 8) /* Low Data Addr */
|
||||
#define RT5670_DSP_CLK_MASK (0x3 << 6)
|
||||
#define RT5670_DSP_CLK_SFT 6
|
||||
#define RT5670_DSP_CLK_768K (0x0 << 6)
|
||||
#define RT5670_DSP_CLK_384K (0x1 << 6)
|
||||
#define RT5670_DSP_CLK_192K (0x2 << 6)
|
||||
#define RT5670_DSP_CLK_96K (0x3 << 6)
|
||||
#define RT5670_DSP_BUSY_MASK (0x1 << 5)
|
||||
#define RT5670_DSP_RW_MASK (0x1 << 4)
|
||||
#define RT5670_DSP_DL_MASK (0x3 << 2)
|
||||
#define RT5670_DSP_DL_0 (0x0 << 2)
|
||||
#define RT5670_DSP_DL_1 (0x1 << 2)
|
||||
#define RT5670_DSP_DL_2 (0x2 << 2)
|
||||
#define RT5670_DSP_DL_3 (0x3 << 2)
|
||||
#define RT5670_DSP_I2C_AL_16 (0x1 << 1)
|
||||
#define RT5670_DSP_CMD_EN (0x1)
|
||||
|
||||
struct rt5670_dsp_param {
|
||||
u16 cmd_fmt;
|
||||
u16 addr;
|
||||
u16 data;
|
||||
u8 cmd;
|
||||
};
|
||||
|
||||
#endif /* __RT5670_DSP_H__ */
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
+91
-181
File diff suppressed because it is too large
Load Diff
@@ -1393,13 +1393,6 @@
|
||||
#define RT5677_DSP_IB_9_L (0x1 << 1)
|
||||
#define RT5677_DSP_IB_9_L_SFT 1
|
||||
|
||||
/* Debug String Length */
|
||||
#define RT5677_REG_DISP_LEN 23
|
||||
|
||||
#define RT5677_NO_JACK BIT(0)
|
||||
#define RT5677_HEADSET_DET BIT(1)
|
||||
#define RT5677_HEADPHO_DET BIT(2)
|
||||
|
||||
/* System Clock Source */
|
||||
enum {
|
||||
RT5677_SCLK_S_MCLK,
|
||||
@@ -1425,14 +1418,6 @@ enum {
|
||||
RT5677_AIFS,
|
||||
};
|
||||
|
||||
struct rt5677_pll_code {
|
||||
bool m_bp; /* Indicates bypass m code or not. */
|
||||
bool k_bp; /* Indicates bypass k code or not. */
|
||||
int m_code;
|
||||
int n_code;
|
||||
int k_code;
|
||||
};
|
||||
|
||||
struct rt5677_priv {
|
||||
struct snd_soc_codec *codec;
|
||||
struct rt5677_platform_data pdata;
|
||||
|
||||
+10
-3
@@ -1,17 +1,24 @@
|
||||
config SND_S6000_SOC
|
||||
tristate "SoC Audio for the Stretch s6000 family"
|
||||
depends on XTENSA_VARIANT_S6000
|
||||
depends on XTENSA_VARIANT_S6000 || COMPILE_TEST
|
||||
depends on HAS_IOMEM
|
||||
select SND_S6000_SOC_PCM if XTENSA_VARIANT_S6000
|
||||
help
|
||||
Say Y or M if you want to add support for codecs attached to
|
||||
s6000 family chips. You will also need to select the platform
|
||||
to support below.
|
||||
|
||||
config SND_S6000_SOC_PCM
|
||||
tristate
|
||||
|
||||
config SND_S6000_SOC_I2S
|
||||
tristate
|
||||
|
||||
config SND_S6000_SOC_S6IPCAM
|
||||
tristate "SoC Audio support for Stretch 6105 IP Camera"
|
||||
depends on SND_S6000_SOC && XTENSA_PLATFORM_S6105
|
||||
bool "SoC Audio support for Stretch 6105 IP Camera"
|
||||
depends on SND_S6000_SOC=y
|
||||
depends on I2C=y
|
||||
depends on XTENSA_PLATFORM_S6105 || COMPILE_TEST
|
||||
select SND_S6000_SOC_I2S
|
||||
select SND_SOC_TLV320AIC3X
|
||||
help
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
snd-soc-s6000-objs := s6000-pcm.o
|
||||
snd-soc-s6000-i2s-objs := s6000-i2s.o
|
||||
|
||||
obj-$(CONFIG_SND_S6000_SOC) += snd-soc-s6000.o
|
||||
obj-$(CONFIG_SND_S6000_SOC_PCM) += snd-soc-s6000.o
|
||||
obj-$(CONFIG_SND_S6000_SOC_I2S) += snd-soc-s6000-i2s.o
|
||||
|
||||
# s6105 Machine Support
|
||||
|
||||
@@ -19,8 +19,6 @@
|
||||
#include <sound/pcm.h>
|
||||
#include <sound/soc.h>
|
||||
|
||||
#include <variant/dmac.h>
|
||||
|
||||
#include "s6000-pcm.h"
|
||||
#include "s6000-i2s.h"
|
||||
|
||||
@@ -135,22 +133,8 @@ static const struct snd_kcontrol_new audio_out_mux = {
|
||||
/* Logic for a aic3x as connected on the s6105 ip camera ref design */
|
||||
static int s6105_aic3x_init(struct snd_soc_pcm_runtime *rtd)
|
||||
{
|
||||
struct snd_soc_codec *codec = rtd->codec;
|
||||
struct snd_soc_dapm_context *dapm = &codec->dapm;
|
||||
struct snd_soc_card *card = rtd->card;
|
||||
|
||||
/* not present */
|
||||
snd_soc_dapm_nc_pin(dapm, "MONO_LOUT");
|
||||
snd_soc_dapm_nc_pin(dapm, "LINE2L");
|
||||
snd_soc_dapm_nc_pin(dapm, "LINE2R");
|
||||
|
||||
/* not connected */
|
||||
snd_soc_dapm_nc_pin(dapm, "MIC3L"); /* LINE2L on this chip */
|
||||
snd_soc_dapm_nc_pin(dapm, "MIC3R"); /* LINE2R on this chip */
|
||||
snd_soc_dapm_nc_pin(dapm, "LLOUT");
|
||||
snd_soc_dapm_nc_pin(dapm, "RLOUT");
|
||||
snd_soc_dapm_nc_pin(dapm, "HPRCOM");
|
||||
|
||||
/* must correspond to audio_out_mux.private_value initializer */
|
||||
snd_soc_dapm_disable_pin(&card->dapm, "Audio Out Differential");
|
||||
|
||||
@@ -182,6 +166,7 @@ static struct snd_soc_card snd_soc_card_s6105 = {
|
||||
.num_dapm_widgets = ARRAY_SIZE(aic3x_dapm_widgets),
|
||||
.dapm_routes = audio_map,
|
||||
.num_dapm_routes = ARRAY_SIZE(audio_map),
|
||||
.fully_routed = true,
|
||||
};
|
||||
|
||||
static struct s6000_snd_platform_data s6105_snd_data __initdata = {
|
||||
|
||||
+18
-22
@@ -1,25 +1,16 @@
|
||||
config SND_SOC_SAMSUNG
|
||||
tristate "ASoC support for Samsung"
|
||||
depends on PLAT_SAMSUNG
|
||||
select S3C2410_DMA if ARCH_S3C24XX
|
||||
select S3C64XX_PL080 if ARCH_S3C64XX
|
||||
select SND_S3C_DMA if !ARCH_S3C24XX
|
||||
select SND_S3C_DMA_LEGACY if ARCH_S3C24XX
|
||||
select SND_SOC_GENERIC_DMAENGINE_PCM if !ARCH_S3C24XX
|
||||
depends on S3C64XX_PL080 || !ARCH_S3C64XX
|
||||
depends on S3C24XX_DMAC || !ARCH_S3C24XX
|
||||
select SND_SOC_GENERIC_DMAENGINE_PCM
|
||||
help
|
||||
Say Y or M if you want to add support for codecs attached to
|
||||
the Samsung SoCs' Audio interfaces. You will also need to
|
||||
select the audio interfaces to support below.
|
||||
|
||||
config SND_S3C_DMA
|
||||
tristate
|
||||
|
||||
config SND_S3C_DMA_LEGACY
|
||||
tristate
|
||||
|
||||
config SND_S3C24XX_I2S
|
||||
tristate
|
||||
select S3C24XX_DMA
|
||||
|
||||
config SND_S3C_I2SV2_SOC
|
||||
tristate
|
||||
@@ -27,7 +18,6 @@ config SND_S3C_I2SV2_SOC
|
||||
config SND_S3C2412_SOC_I2S
|
||||
tristate
|
||||
select SND_S3C_I2SV2_SOC
|
||||
select S3C2410_DMA
|
||||
|
||||
config SND_SAMSUNG_PCM
|
||||
tristate
|
||||
@@ -55,7 +45,7 @@ config SND_SOC_SAMSUNG_NEO1973_WM8753
|
||||
|
||||
config SND_SOC_SAMSUNG_JIVE_WM8750
|
||||
tristate "SoC I2S Audio support for Jive"
|
||||
depends on SND_SOC_SAMSUNG && MACH_JIVE
|
||||
depends on SND_SOC_SAMSUNG && MACH_JIVE && I2C
|
||||
select SND_SOC_WM8750
|
||||
select SND_S3C2412_SOC_I2S
|
||||
help
|
||||
@@ -63,7 +53,7 @@ config SND_SOC_SAMSUNG_JIVE_WM8750
|
||||
|
||||
config SND_SOC_SAMSUNG_SMDK_WM8580
|
||||
tristate "SoC I2S Audio support for WM8580 on SMDK"
|
||||
depends on SND_SOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDK6440 || MACH_SMDK6450 || MACH_SMDKV210 || MACH_SMDKC110)
|
||||
depends on SND_SOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDKV210 || MACH_SMDKC110)
|
||||
depends on REGMAP_I2C
|
||||
select SND_SOC_WM8580
|
||||
select SND_SAMSUNG_I2S
|
||||
@@ -83,7 +73,6 @@ config SND_SOC_SAMSUNG_SMDK_WM8994
|
||||
config SND_SOC_SAMSUNG_SMDK2443_WM9710
|
||||
tristate "SoC AC97 Audio support for SMDK2443 - WM9710"
|
||||
depends on SND_SOC_SAMSUNG && MACH_SMDK2443
|
||||
select S3C2410_DMA
|
||||
select AC97_BUS
|
||||
select SND_SOC_AC97_CODEC
|
||||
select SND_SAMSUNG_AC97
|
||||
@@ -94,7 +83,6 @@ config SND_SOC_SAMSUNG_SMDK2443_WM9710
|
||||
config SND_SOC_SAMSUNG_LN2440SBC_ALC650
|
||||
tristate "SoC AC97 Audio support for LN2440SBC - ALC650"
|
||||
depends on SND_SOC_SAMSUNG && ARCH_S3C24XX
|
||||
select S3C2410_DMA
|
||||
select AC97_BUS
|
||||
select SND_SOC_AC97_CODEC
|
||||
select SND_SAMSUNG_AC97
|
||||
@@ -154,7 +142,7 @@ config SND_SOC_SAMSUNG_SMDK_WM9713
|
||||
|
||||
config SND_SOC_SMARTQ
|
||||
tristate "SoC I2S Audio support for SmartQ board"
|
||||
depends on SND_SOC_SAMSUNG && MACH_SMARTQ
|
||||
depends on SND_SOC_SAMSUNG && MACH_SMARTQ && I2C
|
||||
select SND_SAMSUNG_I2S
|
||||
select SND_SOC_WM8750
|
||||
|
||||
@@ -178,7 +166,7 @@ config SND_SOC_SAMSUNG_SMDK_SPDIF
|
||||
|
||||
config SND_SOC_SMDK_WM8580_PCM
|
||||
tristate "SoC PCM Audio support for WM8580 on SMDK"
|
||||
depends on SND_SOC_SAMSUNG && (MACH_SMDK6450 || MACH_SMDKV210 || MACH_SMDKC110)
|
||||
depends on SND_SOC_SAMSUNG && (MACH_SMDKV210 || MACH_SMDKC110)
|
||||
depends on REGMAP_I2C
|
||||
select SND_SOC_WM8580
|
||||
select SND_SAMSUNG_PCM
|
||||
@@ -206,7 +194,7 @@ config SND_SOC_SPEYSIDE
|
||||
|
||||
config SND_SOC_TOBERMORY
|
||||
tristate "Audio support for Wolfson Tobermory"
|
||||
depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 && INPUT
|
||||
depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 && INPUT && I2C
|
||||
select SND_SAMSUNG_I2S
|
||||
select SND_SOC_WM8962
|
||||
|
||||
@@ -222,7 +210,7 @@ config SND_SOC_BELLS
|
||||
|
||||
config SND_SOC_LOWLAND
|
||||
tristate "Audio support for Wolfson Lowland"
|
||||
depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410
|
||||
depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 && I2C
|
||||
select SND_SAMSUNG_I2S
|
||||
select SND_SOC_WM5100
|
||||
select SND_SOC_WM9081
|
||||
@@ -236,10 +224,18 @@ config SND_SOC_LITTLEMILL
|
||||
|
||||
config SND_SOC_SNOW
|
||||
tristate "Audio support for Google Snow boards"
|
||||
depends on SND_SOC_SAMSUNG
|
||||
depends on SND_SOC_SAMSUNG && I2C
|
||||
select SND_SOC_MAX98090
|
||||
select SND_SOC_MAX98095
|
||||
select SND_SAMSUNG_I2S
|
||||
help
|
||||
Say Y if you want to add audio support for various Snow
|
||||
boards based on Exynos5 series of SoCs.
|
||||
|
||||
config SND_SOC_ODROIDX2
|
||||
tristate "Audio support for Odroid-X2 and Odroid-U3"
|
||||
depends on SND_SOC_SAMSUNG
|
||||
select SND_SOC_MAX98090
|
||||
select SND_SAMSUNG_I2S
|
||||
help
|
||||
Say Y here to enable audio support for the Odroid-X2/U3.
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
# S3c24XX Platform Support
|
||||
snd-soc-s3c-dma-objs := dmaengine.o
|
||||
snd-soc-s3c-dma-legacy-objs := dma.o
|
||||
snd-soc-idma-objs := idma.o
|
||||
snd-soc-s3c24xx-i2s-objs := s3c24xx-i2s.o
|
||||
snd-soc-s3c2412-i2s-objs := s3c2412-i2s.o
|
||||
@@ -10,8 +9,7 @@ snd-soc-samsung-spdif-objs := spdif.o
|
||||
snd-soc-pcm-objs := pcm.o
|
||||
snd-soc-i2s-objs := i2s.o
|
||||
|
||||
obj-$(CONFIG_SND_S3C_DMA) += snd-soc-s3c-dma.o
|
||||
obj-$(CONFIG_SND_S3C_DMA_LEGACY) += snd-soc-s3c-dma-legacy.o
|
||||
obj-$(CONFIG_SND_SOC_SAMSUNG) += snd-soc-s3c-dma.o
|
||||
obj-$(CONFIG_SND_S3C24XX_I2S) += snd-soc-s3c24xx-i2s.o
|
||||
obj-$(CONFIG_SND_SAMSUNG_AC97) += snd-soc-ac97.o
|
||||
obj-$(CONFIG_SND_S3C2412_SOC_I2S) += snd-soc-s3c2412-i2s.o
|
||||
@@ -46,6 +44,7 @@ snd-soc-tobermory-objs := tobermory.o
|
||||
snd-soc-lowland-objs := lowland.o
|
||||
snd-soc-littlemill-objs := littlemill.o
|
||||
snd-soc-bells-objs := bells.o
|
||||
snd-soc-odroidx2-max98090-objs := odroidx2_max98090.o
|
||||
|
||||
obj-$(CONFIG_SND_SOC_SAMSUNG_JIVE_WM8750) += snd-soc-jive-wm8750.o
|
||||
obj-$(CONFIG_SND_SOC_SAMSUNG_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o
|
||||
@@ -71,3 +70,4 @@ obj-$(CONFIG_SND_SOC_TOBERMORY) += snd-soc-tobermory.o
|
||||
obj-$(CONFIG_SND_SOC_LOWLAND) += snd-soc-lowland.o
|
||||
obj-$(CONFIG_SND_SOC_LITTLEMILL) += snd-soc-littlemill.o
|
||||
obj-$(CONFIG_SND_SOC_BELLS) += snd-soc-bells.o
|
||||
obj-$(CONFIG_SND_SOC_ODROIDX2) += snd-soc-odroidx2-max98090.o
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
|
||||
#include <sound/soc.h>
|
||||
|
||||
#include <mach/dma.h>
|
||||
#include "regs-ac97.h"
|
||||
#include <linux/platform_data/asoc-s3c.h>
|
||||
|
||||
@@ -39,30 +38,15 @@ struct s3c_ac97_info {
|
||||
};
|
||||
static struct s3c_ac97_info s3c_ac97;
|
||||
|
||||
static struct s3c_dma_client s3c_dma_client_out = {
|
||||
.name = "AC97 PCMOut"
|
||||
};
|
||||
|
||||
static struct s3c_dma_client s3c_dma_client_in = {
|
||||
.name = "AC97 PCMIn"
|
||||
};
|
||||
|
||||
static struct s3c_dma_client s3c_dma_client_micin = {
|
||||
.name = "AC97 MicIn"
|
||||
};
|
||||
|
||||
static struct s3c_dma_params s3c_ac97_pcm_out = {
|
||||
.client = &s3c_dma_client_out,
|
||||
.dma_size = 4,
|
||||
};
|
||||
|
||||
static struct s3c_dma_params s3c_ac97_pcm_in = {
|
||||
.client = &s3c_dma_client_in,
|
||||
.dma_size = 4,
|
||||
};
|
||||
|
||||
static struct s3c_dma_params s3c_ac97_mic_in = {
|
||||
.client = &s3c_dma_client_micin,
|
||||
.dma_size = 4,
|
||||
};
|
||||
|
||||
@@ -225,9 +209,6 @@ static int s3c_ac97_trigger(struct snd_pcm_substream *substream, int cmd,
|
||||
struct snd_soc_dai *dai)
|
||||
{
|
||||
u32 ac_glbctrl;
|
||||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||
struct s3c_dma_params *dma_data =
|
||||
snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
|
||||
|
||||
ac_glbctrl = readl(s3c_ac97.regs + S3C_AC97_GLBCTRL);
|
||||
if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
|
||||
@@ -253,11 +234,6 @@ static int s3c_ac97_trigger(struct snd_pcm_substream *substream, int cmd,
|
||||
|
||||
writel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL);
|
||||
|
||||
if (!dma_data->ops)
|
||||
dma_data->ops = samsung_dma_get_ops();
|
||||
|
||||
dma_data->ops->started(dma_data->channel);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -265,9 +241,6 @@ static int s3c_ac97_mic_trigger(struct snd_pcm_substream *substream,
|
||||
int cmd, struct snd_soc_dai *dai)
|
||||
{
|
||||
u32 ac_glbctrl;
|
||||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||
struct s3c_dma_params *dma_data =
|
||||
snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
|
||||
|
||||
ac_glbctrl = readl(s3c_ac97.regs + S3C_AC97_GLBCTRL);
|
||||
ac_glbctrl &= ~S3C_AC97_GLBCTRL_MICINTM_MASK;
|
||||
@@ -287,11 +260,6 @@ static int s3c_ac97_mic_trigger(struct snd_pcm_substream *substream,
|
||||
|
||||
writel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL);
|
||||
|
||||
if (!dma_data->ops)
|
||||
dma_data->ops = samsung_dma_get_ops();
|
||||
|
||||
dma_data->ops->started(dma_data->channel);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,454 +0,0 @@
|
||||
/*
|
||||
* dma.c -- ALSA Soc Audio Layer
|
||||
*
|
||||
* (c) 2006 Wolfson Microelectronics PLC.
|
||||
* Graeme Gregory graeme.gregory@wolfsonmicro.com or linux@wolfsonmicro.com
|
||||
*
|
||||
* Copyright 2004-2005 Simtec Electronics
|
||||
* http://armlinux.simtec.co.uk/
|
||||
* Ben Dooks <ben@simtec.co.uk>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version.
|
||||
*/
|
||||
|
||||
#include <linux/slab.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/module.h>
|
||||
|
||||
#include <sound/soc.h>
|
||||
#include <sound/pcm_params.h>
|
||||
|
||||
#include <asm/dma.h>
|
||||
#include <mach/hardware.h>
|
||||
#include <mach/dma.h>
|
||||
|
||||
#include "dma.h"
|
||||
|
||||
#define ST_RUNNING (1<<0)
|
||||
#define ST_OPENED (1<<1)
|
||||
|
||||
static const struct snd_pcm_hardware dma_hardware = {
|
||||
.info = SNDRV_PCM_INFO_INTERLEAVED |
|
||||
SNDRV_PCM_INFO_BLOCK_TRANSFER |
|
||||
SNDRV_PCM_INFO_MMAP |
|
||||
SNDRV_PCM_INFO_MMAP_VALID,
|
||||
.buffer_bytes_max = 128*1024,
|
||||
.period_bytes_min = PAGE_SIZE,
|
||||
.period_bytes_max = PAGE_SIZE*2,
|
||||
.periods_min = 2,
|
||||
.periods_max = 128,
|
||||
.fifo_size = 32,
|
||||
};
|
||||
|
||||
struct runtime_data {
|
||||
spinlock_t lock;
|
||||
int state;
|
||||
unsigned int dma_loaded;
|
||||
unsigned int dma_period;
|
||||
dma_addr_t dma_start;
|
||||
dma_addr_t dma_pos;
|
||||
dma_addr_t dma_end;
|
||||
struct s3c_dma_params *params;
|
||||
};
|
||||
|
||||
static void audio_buffdone(void *data);
|
||||
|
||||
/* dma_enqueue
|
||||
*
|
||||
* place a dma buffer onto the queue for the dma system
|
||||
* to handle.
|
||||
*/
|
||||
static void dma_enqueue(struct snd_pcm_substream *substream)
|
||||
{
|
||||
struct runtime_data *prtd = substream->runtime->private_data;
|
||||
dma_addr_t pos = prtd->dma_pos;
|
||||
unsigned int limit;
|
||||
struct samsung_dma_prep dma_info;
|
||||
|
||||
pr_debug("Entered %s\n", __func__);
|
||||
|
||||
limit = (prtd->dma_end - prtd->dma_start) / prtd->dma_period;
|
||||
|
||||
pr_debug("%s: loaded %d, limit %d\n",
|
||||
__func__, prtd->dma_loaded, limit);
|
||||
|
||||
dma_info.cap = (samsung_dma_has_circular() ? DMA_CYCLIC : DMA_SLAVE);
|
||||
dma_info.direction =
|
||||
(substream->stream == SNDRV_PCM_STREAM_PLAYBACK
|
||||
? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM);
|
||||
dma_info.fp = audio_buffdone;
|
||||
dma_info.fp_param = substream;
|
||||
dma_info.period = prtd->dma_period;
|
||||
dma_info.len = prtd->dma_period*limit;
|
||||
|
||||
if (dma_info.cap == DMA_CYCLIC) {
|
||||
dma_info.buf = pos;
|
||||
prtd->params->ops->prepare(prtd->params->ch, &dma_info);
|
||||
prtd->dma_loaded += limit;
|
||||
return;
|
||||
}
|
||||
|
||||
while (prtd->dma_loaded < limit) {
|
||||
pr_debug("dma_loaded: %d\n", prtd->dma_loaded);
|
||||
|
||||
if ((pos + dma_info.period) > prtd->dma_end) {
|
||||
dma_info.period = prtd->dma_end - pos;
|
||||
pr_debug("%s: corrected dma len %ld\n",
|
||||
__func__, dma_info.period);
|
||||
}
|
||||
|
||||
dma_info.buf = pos;
|
||||
prtd->params->ops->prepare(prtd->params->ch, &dma_info);
|
||||
|
||||
prtd->dma_loaded++;
|
||||
pos += prtd->dma_period;
|
||||
if (pos >= prtd->dma_end)
|
||||
pos = prtd->dma_start;
|
||||
}
|
||||
|
||||
prtd->dma_pos = pos;
|
||||
}
|
||||
|
||||
static void audio_buffdone(void *data)
|
||||
{
|
||||
struct snd_pcm_substream *substream = data;
|
||||
struct runtime_data *prtd = substream->runtime->private_data;
|
||||
|
||||
pr_debug("Entered %s\n", __func__);
|
||||
|
||||
if (prtd->state & ST_RUNNING) {
|
||||
prtd->dma_pos += prtd->dma_period;
|
||||
if (prtd->dma_pos >= prtd->dma_end)
|
||||
prtd->dma_pos = prtd->dma_start;
|
||||
|
||||
if (substream)
|
||||
snd_pcm_period_elapsed(substream);
|
||||
|
||||
spin_lock(&prtd->lock);
|
||||
if (!samsung_dma_has_circular()) {
|
||||
prtd->dma_loaded--;
|
||||
dma_enqueue(substream);
|
||||
}
|
||||
spin_unlock(&prtd->lock);
|
||||
}
|
||||
}
|
||||
|
||||
static int dma_hw_params(struct snd_pcm_substream *substream,
|
||||
struct snd_pcm_hw_params *params)
|
||||
{
|
||||
struct snd_pcm_runtime *runtime = substream->runtime;
|
||||
struct runtime_data *prtd = runtime->private_data;
|
||||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||
unsigned long totbytes = params_buffer_bytes(params);
|
||||
struct s3c_dma_params *dma =
|
||||
snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
|
||||
struct samsung_dma_req req;
|
||||
struct samsung_dma_config config;
|
||||
|
||||
pr_debug("Entered %s\n", __func__);
|
||||
|
||||
/* return if this is a bufferless transfer e.g.
|
||||
* codec <--> BT codec or GSM modem -- lg FIXME */
|
||||
if (!dma)
|
||||
return 0;
|
||||
|
||||
/* this may get called several times by oss emulation
|
||||
* with different params -HW */
|
||||
if (prtd->params == NULL) {
|
||||
/* prepare DMA */
|
||||
prtd->params = dma;
|
||||
|
||||
pr_debug("params %p, client %p, channel %d\n", prtd->params,
|
||||
prtd->params->client, prtd->params->channel);
|
||||
|
||||
prtd->params->ops = samsung_dma_get_ops();
|
||||
|
||||
req.cap = (samsung_dma_has_circular() ?
|
||||
DMA_CYCLIC : DMA_SLAVE);
|
||||
req.client = prtd->params->client;
|
||||
config.direction =
|
||||
(substream->stream == SNDRV_PCM_STREAM_PLAYBACK
|
||||
? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM);
|
||||
config.width = prtd->params->dma_size;
|
||||
config.fifo = prtd->params->dma_addr;
|
||||
prtd->params->ch = prtd->params->ops->request(
|
||||
prtd->params->channel, &req, rtd->cpu_dai->dev,
|
||||
prtd->params->ch_name);
|
||||
if (!prtd->params->ch) {
|
||||
pr_err("Failed to allocate DMA channel\n");
|
||||
return -ENXIO;
|
||||
}
|
||||
prtd->params->ops->config(prtd->params->ch, &config);
|
||||
}
|
||||
|
||||
snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);
|
||||
|
||||
runtime->dma_bytes = totbytes;
|
||||
|
||||
spin_lock_irq(&prtd->lock);
|
||||
prtd->dma_loaded = 0;
|
||||
prtd->dma_period = params_period_bytes(params);
|
||||
prtd->dma_start = runtime->dma_addr;
|
||||
prtd->dma_pos = prtd->dma_start;
|
||||
prtd->dma_end = prtd->dma_start + totbytes;
|
||||
spin_unlock_irq(&prtd->lock);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int dma_hw_free(struct snd_pcm_substream *substream)
|
||||
{
|
||||
struct runtime_data *prtd = substream->runtime->private_data;
|
||||
|
||||
pr_debug("Entered %s\n", __func__);
|
||||
|
||||
snd_pcm_set_runtime_buffer(substream, NULL);
|
||||
|
||||
if (prtd->params) {
|
||||
prtd->params->ops->flush(prtd->params->ch);
|
||||
prtd->params->ops->release(prtd->params->ch,
|
||||
prtd->params->client);
|
||||
prtd->params = NULL;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int dma_prepare(struct snd_pcm_substream *substream)
|
||||
{
|
||||
struct runtime_data *prtd = substream->runtime->private_data;
|
||||
int ret = 0;
|
||||
|
||||
pr_debug("Entered %s\n", __func__);
|
||||
|
||||
/* return if this is a bufferless transfer e.g.
|
||||
* codec <--> BT codec or GSM modem -- lg FIXME */
|
||||
if (!prtd->params)
|
||||
return 0;
|
||||
|
||||
/* flush the DMA channel */
|
||||
prtd->params->ops->flush(prtd->params->ch);
|
||||
|
||||
prtd->dma_loaded = 0;
|
||||
prtd->dma_pos = prtd->dma_start;
|
||||
|
||||
/* enqueue dma buffers */
|
||||
dma_enqueue(substream);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int dma_trigger(struct snd_pcm_substream *substream, int cmd)
|
||||
{
|
||||
struct runtime_data *prtd = substream->runtime->private_data;
|
||||
int ret = 0;
|
||||
|
||||
pr_debug("Entered %s\n", __func__);
|
||||
|
||||
spin_lock(&prtd->lock);
|
||||
|
||||
switch (cmd) {
|
||||
case SNDRV_PCM_TRIGGER_START:
|
||||
prtd->state |= ST_RUNNING;
|
||||
prtd->params->ops->trigger(prtd->params->ch);
|
||||
break;
|
||||
|
||||
case SNDRV_PCM_TRIGGER_STOP:
|
||||
prtd->state &= ~ST_RUNNING;
|
||||
prtd->params->ops->stop(prtd->params->ch);
|
||||
break;
|
||||
|
||||
default:
|
||||
ret = -EINVAL;
|
||||
break;
|
||||
}
|
||||
|
||||
spin_unlock(&prtd->lock);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static snd_pcm_uframes_t
|
||||
dma_pointer(struct snd_pcm_substream *substream)
|
||||
{
|
||||
struct snd_pcm_runtime *runtime = substream->runtime;
|
||||
struct runtime_data *prtd = runtime->private_data;
|
||||
unsigned long res;
|
||||
|
||||
pr_debug("Entered %s\n", __func__);
|
||||
|
||||
res = prtd->dma_pos - prtd->dma_start;
|
||||
|
||||
pr_debug("Pointer offset: %lu\n", res);
|
||||
|
||||
/* we seem to be getting the odd error from the pcm library due
|
||||
* to out-of-bounds pointers. this is maybe due to the dma engine
|
||||
* not having loaded the new values for the channel before being
|
||||
* called... (todo - fix )
|
||||
*/
|
||||
|
||||
if (res >= snd_pcm_lib_buffer_bytes(substream)) {
|
||||
if (res == snd_pcm_lib_buffer_bytes(substream))
|
||||
res = 0;
|
||||
}
|
||||
|
||||
return bytes_to_frames(substream->runtime, res);
|
||||
}
|
||||
|
||||
static int dma_open(struct snd_pcm_substream *substream)
|
||||
{
|
||||
struct snd_pcm_runtime *runtime = substream->runtime;
|
||||
struct runtime_data *prtd;
|
||||
|
||||
pr_debug("Entered %s\n", __func__);
|
||||
|
||||
snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);
|
||||
snd_soc_set_runtime_hwparams(substream, &dma_hardware);
|
||||
|
||||
prtd = kzalloc(sizeof(struct runtime_data), GFP_KERNEL);
|
||||
if (prtd == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
spin_lock_init(&prtd->lock);
|
||||
|
||||
runtime->private_data = prtd;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int dma_close(struct snd_pcm_substream *substream)
|
||||
{
|
||||
struct snd_pcm_runtime *runtime = substream->runtime;
|
||||
struct runtime_data *prtd = runtime->private_data;
|
||||
|
||||
pr_debug("Entered %s\n", __func__);
|
||||
|
||||
if (!prtd)
|
||||
pr_debug("dma_close called with prtd == NULL\n");
|
||||
|
||||
kfree(prtd);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int dma_mmap(struct snd_pcm_substream *substream,
|
||||
struct vm_area_struct *vma)
|
||||
{
|
||||
struct snd_pcm_runtime *runtime = substream->runtime;
|
||||
|
||||
pr_debug("Entered %s\n", __func__);
|
||||
|
||||
return dma_mmap_writecombine(substream->pcm->card->dev, vma,
|
||||
runtime->dma_area,
|
||||
runtime->dma_addr,
|
||||
runtime->dma_bytes);
|
||||
}
|
||||
|
||||
static struct snd_pcm_ops dma_ops = {
|
||||
.open = dma_open,
|
||||
.close = dma_close,
|
||||
.ioctl = snd_pcm_lib_ioctl,
|
||||
.hw_params = dma_hw_params,
|
||||
.hw_free = dma_hw_free,
|
||||
.prepare = dma_prepare,
|
||||
.trigger = dma_trigger,
|
||||
.pointer = dma_pointer,
|
||||
.mmap = dma_mmap,
|
||||
};
|
||||
|
||||
static int preallocate_dma_buffer(struct snd_pcm *pcm, int stream)
|
||||
{
|
||||
struct snd_pcm_substream *substream = pcm->streams[stream].substream;
|
||||
struct snd_dma_buffer *buf = &substream->dma_buffer;
|
||||
size_t size = dma_hardware.buffer_bytes_max;
|
||||
|
||||
pr_debug("Entered %s\n", __func__);
|
||||
|
||||
buf->dev.type = SNDRV_DMA_TYPE_DEV;
|
||||
buf->dev.dev = pcm->card->dev;
|
||||
buf->private_data = NULL;
|
||||
buf->area = dma_alloc_writecombine(pcm->card->dev, size,
|
||||
&buf->addr, GFP_KERNEL);
|
||||
if (!buf->area)
|
||||
return -ENOMEM;
|
||||
buf->bytes = size;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void dma_free_dma_buffers(struct snd_pcm *pcm)
|
||||
{
|
||||
struct snd_pcm_substream *substream;
|
||||
struct snd_dma_buffer *buf;
|
||||
int stream;
|
||||
|
||||
pr_debug("Entered %s\n", __func__);
|
||||
|
||||
for (stream = 0; stream < 2; stream++) {
|
||||
substream = pcm->streams[stream].substream;
|
||||
if (!substream)
|
||||
continue;
|
||||
|
||||
buf = &substream->dma_buffer;
|
||||
if (!buf->area)
|
||||
continue;
|
||||
|
||||
dma_free_writecombine(pcm->card->dev, buf->bytes,
|
||||
buf->area, buf->addr);
|
||||
buf->area = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
static int dma_new(struct snd_soc_pcm_runtime *rtd)
|
||||
{
|
||||
struct snd_card *card = rtd->card->snd_card;
|
||||
struct snd_pcm *pcm = rtd->pcm;
|
||||
int ret;
|
||||
|
||||
pr_debug("Entered %s\n", __func__);
|
||||
|
||||
ret = dma_coerce_mask_and_coherent(card->dev, DMA_BIT_MASK(32));
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
|
||||
ret = preallocate_dma_buffer(pcm,
|
||||
SNDRV_PCM_STREAM_PLAYBACK);
|
||||
if (ret)
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
|
||||
ret = preallocate_dma_buffer(pcm,
|
||||
SNDRV_PCM_STREAM_CAPTURE);
|
||||
if (ret)
|
||||
goto out;
|
||||
}
|
||||
out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static struct snd_soc_platform_driver samsung_asoc_platform = {
|
||||
.ops = &dma_ops,
|
||||
.pcm_new = dma_new,
|
||||
.pcm_free = dma_free_dma_buffers,
|
||||
};
|
||||
|
||||
void samsung_asoc_init_dma_data(struct snd_soc_dai *dai,
|
||||
struct s3c_dma_params *playback,
|
||||
struct s3c_dma_params *capture)
|
||||
{
|
||||
snd_soc_dai_init_dma_data(dai, playback, capture);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(samsung_asoc_init_dma_data);
|
||||
|
||||
int samsung_asoc_dma_platform_register(struct device *dev)
|
||||
{
|
||||
return devm_snd_soc_register_platform(dev, &samsung_asoc_platform);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(samsung_asoc_dma_platform_register);
|
||||
|
||||
MODULE_AUTHOR("Ben Dooks, <ben@simtec.co.uk>");
|
||||
MODULE_DESCRIPTION("Samsung ASoC DMA Driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
@@ -14,17 +14,10 @@
|
||||
|
||||
#include <sound/dmaengine_pcm.h>
|
||||
|
||||
struct s3c_dma_client {
|
||||
char *name;
|
||||
};
|
||||
|
||||
struct s3c_dma_params {
|
||||
struct s3c_dma_client *client; /* stream identifier */
|
||||
int channel; /* Channel ID */
|
||||
dma_addr_t dma_addr;
|
||||
int dma_size; /* Size of the DMA transfer */
|
||||
unsigned ch;
|
||||
struct samsung_dma_ops *ops;
|
||||
char *ch_name;
|
||||
struct snd_dmaengine_dai_dma_data dma_data;
|
||||
};
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/amba/pl08x.h>
|
||||
#include <linux/platform_data/dma-s3c24xx.h>
|
||||
|
||||
#include <sound/core.h>
|
||||
#include <sound/pcm.h>
|
||||
@@ -29,6 +30,8 @@
|
||||
|
||||
#ifdef CONFIG_ARCH_S3C64XX
|
||||
#define filter_fn pl08x_filter_id
|
||||
#elif defined(CONFIG_ARCH_S3C24XX)
|
||||
#define filter_fn s3c24xx_dma_filter
|
||||
#else
|
||||
#define filter_fn NULL
|
||||
#endif
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user