03 Apr, 2014
1 commit
-
Separate HW initialization from device creation.
This is needed for suspend/resume support.Signed-off-by: Ondrej Zary
Signed-off-by: Takashi Iwai
31 Mar, 2014
1 commit
-
…e/sound into for-linus
ASoC: Final updates for v3.15 merge window
A few more updates from last week - use of the tdm_slot mapping from
Xiubo plus a few smaller fixes and cleanups.
25 Mar, 2014
1 commit
-
The 'of_' is not appropriate here for there hasn't any DT parsing.
Signed-off-by: Xiubo Li
Signed-off-by: Mark Brown
24 Mar, 2014
1 commit
-
…e/sound into for-next
ASoC: Updates for v3.15
A few more updates for the merge window:
- Fixes for the simple-card DAI format DT mess.
- A new driver for Cirrus cs42xx8 devices.
- DT support for a couple more devices.
- A revert of a previous buggy fix for soc-pcm, plus a few more fixes
and cleanups.
23 Mar, 2014
1 commit
19 Mar, 2014
1 commit
-
Add a helper function to cast back from a component struct to the CODEC struct
it is embedded in. This is useful in situations where we know that a certain
component is a CODEC and want to get access to some CODEC specific properties.Signed-off-by: Lars-Peter Clausen
Signed-off-by: Mark Brown
14 Mar, 2014
1 commit
-
…e/sound into for-next
ASoC: Updates for v3.15
This is mostly a few additional fixes from Lars-Peter, a new driver and
cleaning up a git failure with merging the Intel branch (combined with
an xargs failure to pay attention to error codes). The history lists a
bunch of additional commits for the branch but the content of those
commits is actually present already but not recorded in history due to
git failing. Unfortunately xargs is used in the merge script and it
doesn't do a good job of noticing errors from the commands it invokes.
13 Mar, 2014
8 commits
-
ASoC: Updates for v3.15
Quite a busy release for ASoC this time, more on janitorial work than
exciting new features but welcome nontheless:- Lots of cleanups from Takashi for enumerations; the original API for
these was error prone so he's refactored lots of code to use more
modern APIs which avoid issues.
- Elimination of the ASoC level wrappers for I2C and SPI moving us
closer to converting to regmap completely and avoiding some
randconfig hassle.
- Provide both manually and transparently locked DAPM APIs rather than
a mix of the two fixing some concurrency issues.
- Start converting CODEC drivers to use separate bus interface drivers
rather than having them all in one file helping avoid dependency
issues.
- DPCM support for Intel Haswell and Bay Trail platforms.
- Lots of work on improvements for simple-card, DaVinci and the Renesas
rcar drivers.
- New drivers for Analog Devices ADAU1977, TI PCM512x and parts of the
CSR SiRF SoC. -
…c/topic/sh', 'asoc/topic/simple', 'asoc/topic/sirf', 'asoc/topic/sn95031', 'asoc/topic/ssm2602' and 'asoc/topic/stac9766' into asoc-next
-
…c/omap', 'asoc/topic/pxa' and 'asoc/topic/rcar' into asoc-next
11 Mar, 2014
3 commits
-
Now that all users have been converted to regmap and the config.reg_bits
and config.val_bits can be setted by each user through regmap core API.
So these two params are redundant here.Since the only control type that left is SND_SOC_REGMAP, so remove it. Drop
the control params and add struct regmap *regmap to simplify the code.Signed-off-by: Xiubo Li
Signed-off-by: Mark Brown -
…c/wm8991', 'fix/si476x' and 'fix/88pm860' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-io
-
This reverts commit 83fc3bc09518d42e8f5073e2a65884701dfadf19.
sh-specific "CCR" and "CCR2" have been prefixed by "SH_" in commit
a5f6ea29f9a918403629f8369ae55fac6b09cb53 ('sh: prefix sh-specific "CCR" and
"CCR2" by "SH_"').Signed-off-by: Geert Uytterhoeven
Signed-off-by: Takashi Iwai
10 Mar, 2014
2 commits
-
The function is not called outside soc-dapm.c so there is no need for it
to be exported.Signed-off-by: Mark Brown
-
Now that every DAI has a component we can track the DAIs on a per component
basis. This simplifies the DAI lookup when we are only interested in DAIs of a
specific component and also makes it possible to have multiple components with
the same parent device and also register DAIs.Signed-off-by: Lars-Peter Clausen
Signed-off-by: Mark Brown
06 Mar, 2014
7 commits
-
…e/sound into asoc-enum
Conflicts:
include/sound/soc.h -
In preparation for componentization move the ignore_pmdown_time field from the
snd_soc_codec struct to the snd_soc_component struct. Set it to true for non
CODEC components for now.Signed-off-by: Lars-Peter Clausen
Signed-off-by: Mark Brown -
There is no reason why active count tracking should only be done for CODECs but
not for other components. Moving the active count from the snd_soc_codec struct
to the snd_soc_component struct reduces the differences between CODECs and other
components and will eventually allow component to component DAI links (Which is
a prerequisite for converting CODECs to components).Signed-off-by: Lars-Peter Clausen
Signed-off-by: Mark Brown -
Keep track of which component registered a DAI. We'll need this as
componentization progresses.Signed-off-by: Lars-Peter Clausen
Signed-off-by: Mark Brown -
Instead of directly checking the 'active' field of the CODEC struct add a new
helper function that will return either true or false depending on whether the
CODEC is active. This will make the migration to the component level easier.The patch also updates all CODEC drivers that check the active attribute to use
the new helper function.Signed-off-by: Lars-Peter Clausen
Signed-off-by: Mark Brown -
We have the same code that increments and decrements the active field of the
various PCM runtime components (all with the same bugs). Factor this out into
common helper functions.Signed-off-by: Lars-Peter Clausen
Signed-off-by: Mark Brown -
For CODEC to CODEC links we should only immediately power down if both CODECs
are configured to ignore the power down delay. Factor the logic for this
into a helper function that can be used for both compressed and normal PCMs.Signed-off-by: Lars-Peter Clausen
Signed-off-by: Mark Brown
05 Mar, 2014
3 commits
-
R-Car sound has SCU unit which has SRC/CTU/MIX/DVC,
and current rsnd driver has scu.c and scu module.
Current scu.c has SRC support only.
My first concept was control these feature on scu.c
but, it become difficult and un-understandable now.
This patch rename scu to srcSigned-off-by: Kuninori Morimoto
Signed-off-by: Mark Brown -
Current rsnd driver is assuming that SCU/SRU ID is
same as SSIU/SSI ID, because Gen1 can't select it.
But, Gen2 can select it.
The SCU/SRU/SSIU/SSI pair depends on the platform.
This patch get correct SCU ID from platform info.
To keep compatible, it still assuming SCU ID = SSI ID
if platform doesn't have infoSigned-off-by: Kuninori Morimoto
Signed-off-by: Mark Brown -
R-Car sound DAI consists from SSI/SCU/SSIU/SRU...
Current R-Car sound DAI is decided from these settings,
but it is intuitively unclear, and is not good design for DT support.
This patch adds new rsnd_dai_platform_info to solve this issue.But now, many platform is using this driver without
rsnd_dai_platform_info.
So, this patch still supports DAI settings via SSI to keep compatible.
It will be removed in next Linux version.Signed-off-by: Kuninori Morimoto
Signed-off-by: Mark Brown
04 Mar, 2014
1 commit
-
We now no longer have any users of hw_read() in the kernel so remove the
code in order to prevent any new users being added. Users should be using
regmap.Signed-off-by: Mark Brown
03 Mar, 2014
1 commit
-
6f3ab6c1c022e7a4877d38940cd45ae7804a15e2
(ASoC: rsnd: remove pin sync option)
added unused RSND_SSI_CLK_FROM_ADG flag.
It should remove RSND_SSI_SYNC.Signed-off-by: Kuninori Morimoto
Signed-off-by: Mark Brown
01 Mar, 2014
7 commits
-
The hda codecs all use this struct and, with an HDA platform driver,
will be able to be built without PCI.Signed-off-by: Dylan Reid
Signed-off-by: Takashi Iwai -
MUXs and virtual MUXs are almost identical, the only difference is that for
virtual MUX there is no hardware backing register in which setting is stored.
This patch adds code, which is similar to what we already do for DAPM mixer
controls to support virtual mixer controls, to DAPM enum controls. The new code
will check if the enum does a hardware backing register and skip over reading
and writing to the register if it has not. This allows us to use the same code
path for both MUXs and virtual MUXs and a lot of nearly identical code can be
removed.Signed-off-by: Lars-Peter Clausen
Signed-off-by: Mark Brown -
With the upcoming consolidation of normal MUXs and virtual MUXs we need to be
able to distinguish between enums with and without a backing register at the
enum level. Use the same approach as used for virtual mixer controls by setting
the reg field of the enum to SND_SOC_NOPM for enums without a backing register.
This patch adds a set of helper macros that can be used to define such enums.Signed-off-by: Lars-Peter Clausen
Signed-off-by: Mark Brown -
MUXs and value MUXs are almost identical, the only difference is that a value
MUX uses a look-up table to map from the selected control item to a register
value, while MUXs use a direct mapping. This patch uses
snd_soc_enum_item_to_val() and snd_soc_enum_val_to_item(), which where earlier
introduced during the consolidation of enum and value enum controls, to hide
this difference. This allows us to use the same code path for both MUXs and
value MUXs and a lot of nearly duplicated code can be removed.Signed-off-by: Lars-Peter Clausen
Signed-off-by: Mark Brown -
The implementations for enum and value enum controls are almost identical. The
only difference is that the value enum uses an additional look-up table to map
the control value to the register value, while the enum control uses a direct
mapping. Enums and value enums can easily be distinguished at runtime, for value
enums the values field of the snd_soc_enum struct contains the look-up table,
while for enums it is NULL. This patch adds two new small helper functions
called snd_soc_enum_item_to_val() and snd_soc_enum_val_to_item() which map
between register value and control item. If the items field of the snd_soc_enum
struct is NULL the function will do a direct mapping otherwise they'll use the
look-up table to do the mapping. Using these small helper functions it is
possible to use the same kcontrol handlers for both enums and value enums. The
functions are added a inline functions in soc.h so they can also be used by the
DAPM code to accomplish similar consolidation.Signed-off-by: Lars-Peter Clausen
Signed-off-by: Mark Brown -
Signed-off-by: Lars-Peter Clausen
Signed-off-by: Mark Brown -
…topic/mc13783', 'fix/wm8994' and 'topic/wm8995' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-enum
25 Feb, 2014
1 commit
-
A few code cleanups and optimizations. In addition, drop
snd_device_disconnect() that isn't used at all, and drop the return
values from snd_device_free*().Another slight difference by this change is that now the device state
will become always SNDRV_DEV_REGISTERED no matter whether dev_register
ops is present or not. It's for better consistency. There should be
no impact for the current tree, as the state isn't checked.Signed-off-by: Takashi Iwai