evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Revert "ASoC: wsa881x: Add cache-always mode for sdm660""

Browse source
This commit is contained in:
Linux Build Service Account 2017-02-21 15:48:44 -08:00 • committed by Gerrit - the friendly Code Review server
commit ba2744213b
4 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Documentation/devicetree/bindings/sound/wcd_codec.txt
View file

@ -514,10 +514,6 @@ Required properties:
which is also existing driver WSA881x that represents which is also existing driver WSA881x that represents
soundwire slave devices. soundwire slave devices.
Optional Properties:
- qcom,cache-always : Boolean. This property is used in WSA slave
device to use cacheable for all registers.
Example: Example:
msm_sdw_codec: qcom,msm-sdw-codec@152c1000 { msm_sdw_codec: qcom,msm-sdw-codec@152c1000 {
@ -535,7 +531,6 @@ msm_sdw_codec: qcom,msm-sdw-codec@152c1000 {
compatible = "qcom,wsa881x"; compatible = "qcom,wsa881x";
reg = <0x00 0x20170212>; reg = <0x00 0x20170212>;
qcom,spkr-sd-n-gpio = <&tlmm 80 0>; qcom,spkr-sd-n-gpio = <&tlmm 80 0>;
qcom,cache-always;
}; };
}; };
}; };

3
sound/soc/codecs/wsa881x-regmap.c
View file

@ -216,9 +216,6 @@ static bool wsa881x_readable_register(struct device *dev, unsigned int reg)
static bool wsa881x_volatile_register(struct device *dev, unsigned int reg) static bool wsa881x_volatile_register(struct device *dev, unsigned int reg)
{ {
if (cache_always)
return false;
switch (reg) { switch (reg) {
case WSA881X_CHIP_ID0: case WSA881X_CHIP_ID0:
case WSA881X_CHIP_ID1: case WSA881X_CHIP_ID1:

4
sound/soc/codecs/wsa881x.c
View file

@ -78,7 +78,6 @@ enum {
WSA881X_DEV_UP, WSA881X_DEV_UP,
}; };
bool cache_always;
/* /*
* Private data Structure for wsa881x. All parameters related to * Private data Structure for wsa881x. All parameters related to
* WSA881X codec needs to be defined here. * WSA881X codec needs to be defined here.
@ -1226,9 +1225,6 @@ static int wsa881x_swr_probe(struct swr_device *pdev)
if (ret) if (ret)
goto err; goto err;
} }
cache_always = of_property_read_bool(pdev->dev.of_node,
"qcom,cache-always");
wsa881x_gpio_ctrl(wsa881x, true); wsa881x_gpio_ctrl(wsa881x, true);
wsa881x->state = WSA881X_DEV_UP; wsa881x->state = WSA881X_DEV_UP;

1
sound/soc/codecs/wsa881x.h
View file

@ -20,7 +20,6 @@
#define WSA881X_MAX_SWR_PORTS 4 #define WSA881X_MAX_SWR_PORTS 4
extern bool cache_always;
extern int wsa881x_set_channel_map(struct snd_soc_codec *codec, u8 *port, extern int wsa881x_set_channel_map(struct snd_soc_codec *codec, u8 *port,
u8 num_port, unsigned int *ch_mask, u8 num_port, unsigned int *ch_mask,
unsigned int *ch_rate); unsigned int *ch_rate);