All of 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, slawomir.blauciak@intel.com,
	Bard liao <yung-chuan.liao@linux.intel.com>,
	Rander Wang <rander.wang@linux.intel.com>,
	Ranjani Sridharan <ranjani.sridharan@linux.intel.com>,
	Hui Wang <hui.wang@canonical.com>,
	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
	Sanyog Kale <sanyog.r.kale@intel.com>
Subject: [PATCH 12/16] soundwire: cadence: enable NORMAL operation in cdns_init()
Date: Wed, 11 Mar 2020 13:41:24 -0500	[thread overview]
Message-ID: <20200311184128.4212-13-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20200311184128.4212-1-pierre-louis.bossart@linux.intel.com>

Follow recommended programming sequences, this needs to be enabled
before the reset sequence.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 drivers/soundwire/cadence_master.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c
index dd8c9b051037..7757c51b200d 100644
--- a/drivers/soundwire/cadence_master.c
+++ b/drivers/soundwire/cadence_master.c
@@ -842,11 +842,6 @@ int sdw_cdns_exit_reset(struct sdw_cdns *cdns)
 		     CDNS_MCP_CONTROL_HW_RST,
 		     CDNS_MCP_CONTROL_HW_RST);
 
-	/* enable bus operations with clock and data */
-	cdns_updatel(cdns, CDNS_MCP_CONFIG,
-		     CDNS_MCP_CONFIG_OP,
-		     CDNS_MCP_CONFIG_OP_NORMAL);
-
 	/* commit changes */
 	return cdns_config_update(cdns);
 }
@@ -1097,6 +1092,10 @@ int sdw_cdns_init(struct sdw_cdns *cdns)
 	/* Configure mcp config */
 	val = cdns_readl(cdns, CDNS_MCP_CONFIG);
 
+	/* enable bus operations with clock and data */
+	val &= ~CDNS_MCP_CONFIG_OP;
+	val |= CDNS_MCP_CONFIG_OP_NORMAL;
+
 	/* Set cmd mode for Tx and Rx cmds */
 	val &= ~CDNS_MCP_CONFIG_CMD;
 
-- 
2.20.1


WARNING: multiple messages have this Message-ID (diff)
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
	tiwai@suse.de, gregkh@linuxfoundation.org,
	linux-kernel@vger.kernel.org,
	Ranjani Sridharan <ranjani.sridharan@linux.intel.com>,
	Hui Wang <hui.wang@canonical.com>,
	vkoul@kernel.org, broonie@kernel.org,
	srinivas.kandagatla@linaro.org, jank@cadence.com,
	slawomir.blauciak@intel.com,
	Sanyog Kale <sanyog.r.kale@intel.com>,
	Bard liao <yung-chuan.liao@linux.intel.com>,
	Rander Wang <rander.wang@linux.intel.com>
Subject: [PATCH 12/16] soundwire: cadence: enable NORMAL operation in cdns_init()
Date: Wed, 11 Mar 2020 13:41:24 -0500	[thread overview]
Message-ID: <20200311184128.4212-13-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20200311184128.4212-1-pierre-louis.bossart@linux.intel.com>

Follow recommended programming sequences, this needs to be enabled
before the reset sequence.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 drivers/soundwire/cadence_master.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c
index dd8c9b051037..7757c51b200d 100644
--- a/drivers/soundwire/cadence_master.c
+++ b/drivers/soundwire/cadence_master.c
@@ -842,11 +842,6 @@ int sdw_cdns_exit_reset(struct sdw_cdns *cdns)
 		     CDNS_MCP_CONTROL_HW_RST,
 		     CDNS_MCP_CONTROL_HW_RST);
 
-	/* enable bus operations with clock and data */
-	cdns_updatel(cdns, CDNS_MCP_CONFIG,
-		     CDNS_MCP_CONFIG_OP,
-		     CDNS_MCP_CONFIG_OP_NORMAL);
-
 	/* commit changes */
 	return cdns_config_update(cdns);
 }
@@ -1097,6 +1092,10 @@ int sdw_cdns_init(struct sdw_cdns *cdns)
 	/* Configure mcp config */
 	val = cdns_readl(cdns, CDNS_MCP_CONFIG);
 
+	/* enable bus operations with clock and data */
+	val &= ~CDNS_MCP_CONFIG_OP;
+	val |= CDNS_MCP_CONFIG_OP_NORMAL;
+
 	/* Set cmd mode for Tx and Rx cmds */
 	val &= ~CDNS_MCP_CONFIG_CMD;
 
-- 
2.20.1


  parent reply	other threads:[~2020-03-11 18:42 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-11 18:41 [PATCH 00/16] SoundWire: cadence: add clock stop and fix programming sequences Pierre-Louis Bossart
2020-03-11 18:41 ` Pierre-Louis Bossart
2020-03-11 18:41 ` [PATCH 01/16] soundwire: cadence: s/update_config/config_update Pierre-Louis Bossart
2020-03-11 18:41   ` Pierre-Louis Bossart
2020-03-11 18:41 ` [PATCH 02/16] soundwire: cadence: simplifiy cdns_init() Pierre-Louis Bossart
2020-03-11 18:41   ` Pierre-Louis Bossart
2020-03-11 18:41 ` [PATCH 03/16] soundwire: cadence: add interface to check clock status Pierre-Louis Bossart
2020-03-11 18:41   ` Pierre-Louis Bossart
2020-03-13 12:06   ` Vinod Koul
2020-03-13 12:06     ` Vinod Koul
2020-03-13 16:31     ` Pierre-Louis Bossart
2020-03-14  9:50       ` Vinod Koul
2020-03-11 18:41 ` [PATCH 04/16] soundwire: cadence: handle error cases with CONFIG_UPDATE Pierre-Louis Bossart
2020-03-11 18:41   ` Pierre-Louis Bossart
2020-03-13 12:08   ` Vinod Koul
2020-03-13 12:08     ` Vinod Koul
2020-03-13 17:09     ` Pierre-Louis Bossart
2020-03-13 17:09       ` Pierre-Louis Bossart
2020-03-11 18:41 ` [PATCH 05/16] soundwire: cadence: add clock_stop/restart routines Pierre-Louis Bossart
2020-03-11 18:41   ` Pierre-Louis Bossart
2020-03-13 12:21   ` Vinod Koul
2020-03-13 12:21     ` Vinod Koul
2020-03-13 17:07     ` Pierre-Louis Bossart
2020-03-14  9:52       ` Vinod Koul
2020-03-11 18:41 ` [PATCH 06/16] soundwire: cadence: fix a io timeout issue in S3 test Pierre-Louis Bossart
2020-03-11 18:41   ` Pierre-Louis Bossart
2020-03-11 18:41 ` [PATCH 07/16] soundwire: cadence: mask Slave interrupt before stopping clock Pierre-Louis Bossart
2020-03-11 18:41   ` Pierre-Louis Bossart
2020-03-13 12:24   ` Vinod Koul
2020-03-13 12:24     ` Vinod Koul
2020-03-13 16:33     ` Pierre-Louis Bossart
2020-03-11 18:41 ` [PATCH 08/16] soundwire: cadence: merge routines to clear/set bits Pierre-Louis Bossart
2020-03-11 18:41   ` Pierre-Louis Bossart
2020-03-11 18:41 ` [PATCH 09/16] soundwire: cadence: move clock/SSP related inits to dedicated function Pierre-Louis Bossart
2020-03-11 18:41   ` Pierre-Louis Bossart
2020-03-11 18:41 ` [PATCH 10/16] soundwire: cadence: make SSP interval programmable Pierre-Louis Bossart
2020-03-11 18:41   ` Pierre-Louis Bossart
2020-03-11 18:41 ` [PATCH 11/16] soundwire: cadence: reorder MCP_CONFIG settings Pierre-Louis Bossart
2020-03-11 18:41   ` Pierre-Louis Bossart
2020-03-11 18:41 ` Pierre-Louis Bossart [this message]
2020-03-11 18:41   ` [PATCH 12/16] soundwire: cadence: enable NORMAL operation in cdns_init() Pierre-Louis Bossart
2020-03-11 18:41 ` [PATCH 13/16] soundwire: cadence: remove PREQ_DELAY assignment Pierre-Louis Bossart
2020-03-11 18:41   ` Pierre-Louis Bossart
2020-03-11 18:41 ` [PATCH 14/16] soundwire: cadence: remove automatic command retries Pierre-Louis Bossart
2020-03-11 18:41   ` Pierre-Louis Bossart
2020-03-11 18:41 ` [PATCH 15/16] soundwire: cadence: commit changes in the exit_reset() sequence Pierre-Louis Bossart
2020-03-11 18:41   ` Pierre-Louis Bossart
2020-03-11 18:41 ` [PATCH 16/16] soundwire: cadence: multi-link support Pierre-Louis Bossart
2020-03-11 18:41   ` Pierre-Louis Bossart

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=20200311184128.4212-13-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=hui.wang@canonical.com \
    --cc=jank@cadence.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rander.wang@linux.intel.com \
    --cc=ranjani.sridharan@linux.intel.com \
    --cc=sanyog.r.kale@intel.com \
    --cc=slawomir.blauciak@intel.com \
    --cc=srinivas.kandagatla@linaro.org \
    --cc=tiwai@suse.de \
    --cc=vkoul@kernel.org \
    --cc=yung-chuan.liao@linux.intel.com \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.