diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-21 15:48:44 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-21 15:48:43 -0800 |
| commit | ba2744213b512defa3a6d8704a78f64d2d6a64c6 (patch) | |
| tree | ef7ae23dfabfaafe9b43be8f043cd1750efd0733 | |
| parent | 16ec079f8ac6998c95b80ca06e0dd80bcc1c58d8 (diff) | |
| parent | cf29faa1eebfe1c786f4db6bf163a56b80a16769 (diff) | |
Merge "Revert "ASoC: wsa881x: Add cache-always mode for sdm660""
| -rw-r--r-- | Documentation/devicetree/bindings/sound/wcd_codec.txt | 5 | ||||
| -rw-r--r-- | sound/soc/codecs/wsa881x-regmap.c | 3 | ||||
| -rw-r--r-- | sound/soc/codecs/wsa881x.c | 4 | ||||
| -rw-r--r-- | sound/soc/codecs/wsa881x.h | 1 |
4 files changed, 0 insertions, 13 deletions
diff --git a/Documentation/devicetree/bindings/sound/wcd_codec.txt b/Documentation/devicetree/bindings/sound/wcd_codec.txt index b7a81efb768c..5b5d43a6323c 100644 --- a/Documentation/devicetree/bindings/sound/wcd_codec.txt +++ b/Documentation/devicetree/bindings/sound/wcd_codec.txt @@ -514,10 +514,6 @@ Required properties: which is also existing driver WSA881x that represents soundwire slave devices. -Optional Properties: - - qcom,cache-always : Boolean. This property is used in WSA slave - device to use cacheable for all registers. - Example: msm_sdw_codec: qcom,msm-sdw-codec@152c1000 { @@ -535,7 +531,6 @@ msm_sdw_codec: qcom,msm-sdw-codec@152c1000 { compatible = "qcom,wsa881x"; reg = <0x00 0x20170212>; qcom,spkr-sd-n-gpio = <&tlmm 80 0>; - qcom,cache-always; }; }; }; diff --git a/sound/soc/codecs/wsa881x-regmap.c b/sound/soc/codecs/wsa881x-regmap.c index faa44301286c..20dc3508a5af 100644 --- a/sound/soc/codecs/wsa881x-regmap.c +++ b/sound/soc/codecs/wsa881x-regmap.c @@ -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) { - if (cache_always) - return false; - switch (reg) { case WSA881X_CHIP_ID0: case WSA881X_CHIP_ID1: diff --git a/sound/soc/codecs/wsa881x.c b/sound/soc/codecs/wsa881x.c index ba74175dbe10..62547f25bfa1 100644 --- a/sound/soc/codecs/wsa881x.c +++ b/sound/soc/codecs/wsa881x.c @@ -78,7 +78,6 @@ enum { WSA881X_DEV_UP, }; -bool cache_always; /* * Private data Structure for wsa881x. All parameters related to * WSA881X codec needs to be defined here. @@ -1226,9 +1225,6 @@ static int wsa881x_swr_probe(struct swr_device *pdev) if (ret) goto err; } - - cache_always = of_property_read_bool(pdev->dev.of_node, - "qcom,cache-always"); wsa881x_gpio_ctrl(wsa881x, true); wsa881x->state = WSA881X_DEV_UP; diff --git a/sound/soc/codecs/wsa881x.h b/sound/soc/codecs/wsa881x.h index 178237555c54..9bd9f9587a2e 100644 --- a/sound/soc/codecs/wsa881x.h +++ b/sound/soc/codecs/wsa881x.h @@ -20,7 +20,6 @@ #define WSA881X_MAX_SWR_PORTS 4 -extern bool cache_always; extern int wsa881x_set_channel_map(struct snd_soc_codec *codec, u8 *port, u8 num_port, unsigned int *ch_mask, unsigned int *ch_rate); |