Received: by 2002:a9a:4c47:0:b029:116:c383:538 with SMTP id u7csp1215512lko; Tue, 13 Jul 2021 19:48:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJydEyVSLM+xK+mNqiUvU5XFhYVTVa9LBsTCxoR5mm9bOpShxgsykR4FgSjxLe5F7cxsloOP X-Received: by 2002:a05:6402:2788:: with SMTP id b8mr10129863ede.244.1626230909263; Tue, 13 Jul 2021 19:48:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626230909; cv=none; d=google.com; s=arc-20160816; b=mH3T3zbpmNTIX3kdCPZF7XLWBoJUZFUJxq+NMtHLCNlXYfdOF0qtboGvwDGHrLFbDc 543zyw5WkuaRpdQWwXv64fa9FmdrqGJtxO9MPEIxiP0fxq6Mau7r0VZaTy1T3snRjKgH 3RxSxdQBQnk3VgMxFuDYiDM9SGaQcL0IObEdy4sb0c2yZGAI6sfUQl0KMV9+tJ9QPJof zv8ZttfJbr/vByLlpv/ZJGYr2NJ5FOF9nssJUTEzpq8J7ZD//c9lRdsknRIp5KcSWFZx Mj/L1vrCxO/UVd1Yt73KBpVD48PBQ4T5c+dUibVksmvbBcsp/9eCTZE+mbzKti//1KP+ BxXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from; bh=kbZN6iaUbO7jRzSCN4e3cdCm72/mQNSDWA3CcjiunoY=; b=F1o/yaDWeeAQIV+uoJcwoo3ZHveTNgNyHV0DQOl3T74nl818ZCCGL+WFSXnhJlq3xG x8tWnan6Fg+XWGyLpPw5HrobWmBIfccgYLmCQRIjC5OX0Qk2dpOqtzZJUx1/mv6NrxnU jWcTFsjM3fwWgzeQtSMH0U7jCvkl1SVbOUlxWdK8A/a+Eevc07/Y1EVGs828igpvQfxF bGZJLOK4bPsjUB9EgGR6+lzZIwWAWEXDW78Z+PcrvaZ2L6DVrREyfp8NzzA6SdkwVmaK fMsIKWyLhBCm+nSQaRinbF1X+eCc1yY8yQhgfdNNc7emMYV37LFCAhAACx8XGrITS+YV Mdzw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z14si1052945edb.84.2021.07.13.19.48.06; Tue, 13 Jul 2021 19:48:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237665AbhGNCtY (ORCPT + 99 others); Tue, 13 Jul 2021 22:49:24 -0400 Received: from mga09.intel.com ([134.134.136.24]:8778 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237490AbhGNCtX (ORCPT ); Tue, 13 Jul 2021 22:49:23 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10044"; a="210253419" X-IronPort-AV: E=Sophos;i="5.84,238,1620716400"; d="scan'208";a="210253419" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jul 2021 19:46:33 -0700 X-IronPort-AV: E=Sophos;i="5.84,238,1620716400"; d="scan'208";a="493593216" Received: from bard-ubuntu.sh.intel.com ([10.239.185.57]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jul 2021 19:46:30 -0700 From: Bard Liao To: alsa-devel@alsa-project.org, vkoul@kernel.org Cc: vinod.koul@linaro.org, linux-kernel@vger.kernel.org, tiwai@suse.de, broonie@kernel.org, gregkh@linuxfoundation.org, srinivas.kandagatla@linaro.org, pierre-louis.bossart@linux.intel.com, sanyog.r.kale@intel.com, bard.liao@intel.com Subject: [PATCH 3/6] ASoC: SOF: intel: hda: remove HDA_DSP_REG_SNDW_WAKE_STS definition Date: Wed, 14 Jul 2021 10:46:11 +0800 Message-Id: <20210714024614.9357-4-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210714024614.9357-1-yung-chuan.liao@linux.intel.com> References: <20210714024614.9357-1-yung-chuan.liao@linux.intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org HDA_DSP_REG_SNDW_WAKE_STS is actually (SDW_SHIM_BASE + SDW_SHIM_WAKESTS) and SDW_SHIM_BASE is platform-dependent. Removing HDA_DSP_REG_SNDW_WAKE_STS and use (hdev->desc->sdw_shim_base + SDW_SHIM_WAKESTS) instead. Signed-off-by: Bard Liao Reviewed-by: Pierre-Louis Bossart Reviewed-by: Ranjani Sridharan --- sound/soc/sof/intel/hda.c | 2 +- sound/soc/sof/intel/hda.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index e1e368ff2b12..e48e030f6005 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -249,7 +249,7 @@ static bool hda_sdw_check_wakeen_irq(struct snd_sof_dev *sdev) hdev = sdev->pdata->hw_pdata; if (hdev->sdw && snd_sof_dsp_read(sdev, HDA_DSP_BAR, - HDA_DSP_REG_SNDW_WAKE_STS)) + hdev->desc->sdw_shim_base + SDW_SHIM_WAKESTS)) return true; return false; diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h index 4d44f8910393..06ea0006999a 100644 --- a/sound/soc/sof/intel/hda.h +++ b/sound/soc/sof/intel/hda.h @@ -233,7 +233,6 @@ #define HDA_DSP_REG_ADSPIS2 (HDA_DSP_GEN_BASE + 0x14) #define HDA_DSP_REG_ADSPIS2_SNDW BIT(5) -#define HDA_DSP_REG_SNDW_WAKE_STS 0x2C192 /* Intel HD Audio Inter-Processor Communication Registers */ #define HDA_DSP_IPC_BASE 0x40 -- 2.17.1