LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: linux-kernel@vger.kernel.org, tiwai@suse.de, broonie@kernel.org,
	vkoul@kernel.org, gregkh@linuxfoundation.org, jank@cadence.com,
	srinivas.kandagatla@linaro.org,
	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
	Sanyog Kale <sanyog.r.kale@intel.com>
Subject: [PATCH v2 07/15] soundwire: mipi-disco: fix clock stop modes
Date: Wed, 22 May 2019 14:47:23 -0500	[thread overview]
Message-ID: <20190522194732.25704-8-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20190522194732.25704-1-pierre-louis.bossart@linux.intel.com>

Fix support for clock_stop_mode0 and 1. The existing code uses a
bitmask between enums, one of which being zero. Or-ing with zero is
not very useful in general...Fix by or-ing with a BIT dependent on the
enum value.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 drivers/soundwire/mipi_disco.c | 4 ++--
 include/linux/soundwire/sdw.h  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/soundwire/mipi_disco.c b/drivers/soundwire/mipi_disco.c
index b1770af43fa8..efb87ee0e7fc 100644
--- a/drivers/soundwire/mipi_disco.c
+++ b/drivers/soundwire/mipi_disco.c
@@ -50,11 +50,11 @@ int sdw_master_read_prop(struct sdw_bus *bus)
 
 	if (fwnode_property_read_bool(link,
 				      "mipi-sdw-clock-stop-mode0-supported"))
-		prop->clk_stop_mode = SDW_CLK_STOP_MODE0;
+		prop->clk_stop_modes |= BIT(SDW_CLK_STOP_MODE0);
 
 	if (fwnode_property_read_bool(link,
 				      "mipi-sdw-clock-stop-mode1-supported"))
-		prop->clk_stop_mode |= SDW_CLK_STOP_MODE1;
+		prop->clk_stop_modes |= BIT(SDW_CLK_STOP_MODE1);
 
 	fwnode_property_read_u32(link,
 				 "mipi-sdw-max-clock-frequency",
diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h
index c6ded0d7a9f2..0e3fdd03e589 100644
--- a/include/linux/soundwire/sdw.h
+++ b/include/linux/soundwire/sdw.h
@@ -364,7 +364,7 @@ struct sdw_slave_prop {
 /**
  * struct sdw_master_prop - Master properties
  * @revision: MIPI spec version of the implementation
- * @clk_stop_mode: Bitmap for Clock Stop modes supported
+ * @clk_stop_modes: Bitmap, bit N set when clock-stop-modeN supported
  * @max_clk_freq: Maximum Bus clock frequency, in Hz
  * @num_clk_gears: Number of clock gears supported
  * @clk_gears: Clock gears supported
@@ -379,7 +379,7 @@ struct sdw_slave_prop {
  */
 struct sdw_master_prop {
 	u32 revision;
-	enum sdw_clk_stop_mode clk_stop_mode;
+	u32 clk_stop_modes;
 	u32 max_clk_freq;
 	u32 num_clk_gears;
 	u32 *clk_gears;
-- 
2.20.1


  parent reply	other threads:[~2019-05-22 19:48 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-22 19:47 [PATCH v2 00/15] soundwire: corrections to ACPI/DisCo/Intel support Pierre-Louis Bossart
2019-05-22 19:47 ` [PATCH v2 01/15] soundwire: intel: filter SoundWire controller device search Pierre-Louis Bossart
2019-05-22 19:47 ` [PATCH v2 02/15] soundwire: mipi_disco: fix master/link error Pierre-Louis Bossart
2019-05-22 19:47 ` [PATCH v2 03/15] soundwire: add port-related definitions Pierre-Louis Bossart
2019-05-22 19:47 ` [PATCH v2 04/15] soundwire: remove master data port properties Pierre-Louis Bossart
2019-05-22 19:47 ` [PATCH v2 05/15] soundwire: mipi-disco: remove master_count property for masters Pierre-Louis Bossart
2019-05-22 19:47 ` [PATCH v2 06/15] soundwire: rename 'freq' fields Pierre-Louis Bossart
2019-05-22 19:47 ` Pierre-Louis Bossart [this message]
2019-05-22 19:47 ` [PATCH v2 08/15] soundwire: clarify comment Pierre-Louis Bossart
2019-05-22 19:47 ` [PATCH v2 09/15] soundwire: rename/clarify MIPI DisCo properties Pierre-Louis Bossart
2019-05-22 19:47 ` [PATCH v2 10/15] soundwire: cadence_master: use rate_limited dynamic debug Pierre-Louis Bossart
2019-05-22 19:47 ` [PATCH v2 11/15] soundwire: cadence_master: log Slave status mask on errors Pierre-Louis Bossart
2019-05-22 19:47 ` [PATCH v2 12/15] soundwire: cadence_master: check the number of bidir PDIs Pierre-Louis Bossart
2019-05-22 19:47 ` [PATCH v2 13/15] soundwire: Intel: add log for number of PCM and PDM PDIs Pierre-Louis Bossart
2019-05-22 19:47 ` [PATCH v2 14/15] soundwire: fix typo in comments Pierre-Louis Bossart
2019-05-22 19:47 ` [PATCH v2 15/15] soundwire: intel_init: add checks on link numbers Pierre-Louis Bossart
2019-05-27  5:23 ` [PATCH v2 00/15] soundwire: corrections to ACPI/DisCo/Intel support Vinod Koul

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190522194732.25704-8-pierre-louis.bossart@linux.intel.com \
    --to=pierre-louis.bossart@linux.intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=jank@cadence.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sanyog.r.kale@intel.com \
    --cc=srinivas.kandagatla@linaro.org \
    --cc=tiwai@suse.de \
    --cc=vkoul@kernel.org \
    --subject='Re: [PATCH v2 07/15] soundwire: mipi-disco: fix clock stop modes' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).