soundwire: stream: Add read_only_wordlength flag to port properties

According to SoundWire Specification Version 1.2.
"A Data Port number X (in the range 0-14) which supports only one
value of WordLength may implement the WordLength field in the
DPX_BlockCtrl1 Register as Read-Only, returning the fixed value of
WordLength in response to reads."

As WSA881x interfaces in PDM mode making the only field "WordLength"
in DPX_BlockCtrl1" fixed and read-only. Behaviour of writing to this
register on WSA881x soundwire slave with Qualcomm Soundwire Controller
is throwing up an error. Not sure how other controllers deal with
writing to readonly registers, but this patch provides a way to avoid
writes to DPN_BlockCtrl1 register by providing a read_only_wordlength
flag in struct sdw_dpn_prop

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20200311113545.23773-2-srinivas.kandagatla@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c
index 178ae92b8cc1cce4274e969d2faf95aca16003c8..7fb89a94d9c0dcf485646d0772a28b282920360d 100644 (file)
--- a/drivers/soundwire/stream.c
+++ b/drivers/soundwire/stream.c
@@ -167,13 +167,15 @@ static int sdw_program_slave_port_params(struct sdw_bus *bus,
                return ret;
        }
 
-       /* Program DPN_BlockCtrl1 register */
-       ret = sdw_write(s_rt->slave, addr2, (p_params->bps - 1));
-       if (ret < 0) {
-               dev_err(&s_rt->slave->dev,
-                       "DPN_BlockCtrl1 register write failed for port %d\n",
-                       t_params->port_num);
-               return ret;
+       if (!dpn_prop->read_only_wordlength) {
+               /* Program DPN_BlockCtrl1 register */
+               ret = sdw_write(s_rt->slave, addr2, (p_params->bps - 1));
+               if (ret < 0) {
+                       dev_err(&s_rt->slave->dev,
+                               "DPN_BlockCtrl1 register write failed for port %d\n",
+                               t_params->port_num);
+                       return ret;
+               }
        }
 
        /* Program DPN_SampleCtrl1 register */

diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h
index b451bb62233584052a37892fd4cc62f76bc62a78..2dfe14ed3bb08b0e0a83f9f2a8a8b3e5aeed7637 100644 (file)
--- a/include/linux/soundwire/sdw.h
+++ b/include/linux/soundwire/sdw.h
@@ -284,6 +284,7 @@ struct sdw_dpn_audio_mode {
  * @max_async_buffer: Number of samples that this port can buffer in
  * asynchronous modes
  * @block_pack_mode: Type of block port mode supported
+ * @read_only_wordlength: Read Only wordlength field in DPN_BlockCtrl1 register
  * @port_encoding: Payload Channel Sample encoding schemes supported
  * @audio_modes: Audio modes supported
  */
@@ -307,6 +308,7 @@ struct sdw_dpn_prop {
        u32 modes;
        u32 max_async_buffer;
        bool block_pack_mode;
+       bool read_only_wordlength;
        u32 port_encoding;
        struct sdw_dpn_audio_mode *audio_modes;
 };