Skip to contentSkip to conversation

ASoC: Intel: Fix naming of HMDC register macros.

PATCH Applied Jie Yang 2 participants 2 messages Jul 30, 2014

Subsystems (3)
lore
Share & tools
lore

Jie Yang

author
#0 lore raw

PATCH 1/1 ASoC: Intel: Fix naming of HMDC register macros.

From: Liam Girdwood <[email protected]>

HMDC is the correct naming for this register.

---
 sound/soc/intel/sst-dsp.h         | 8 ++++----
 sound/soc/intel/sst-haswell-dsp.c | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)
sound/soc/intel/sst-dsp.h +4 -4
index 967fb32..21a85eb 100644
@@ -52,7 +52,7 @@
 #define SST_CLKCTL		0x78
 #define SST_CSR2		0x80
 #define SST_LTRC		0xE0
-#define SST_HDMC		0xE8
+#define SST_HMDC		0xE8
 
 #define SST_SHIM_BEGIN		SST_CSR
 #define SST_SHIM_END		SST_HDMC
@@ -122,9 +122,9 @@
 /* LTRC */
 #define SST_LTRC_VAL(x)		(x << 0)
 
-/* HDMC */
-#define SST_HDMC_HDDA0(x)	(x << 0)
-#define SST_HDMC_HDDA1(x)	(x << 7)
+/* HMDC */
+#define SST_HMDC_HDDA0(x)	(x << 0)
+#define SST_HMDC_HDDA1(x)	(x << 7)
 
 
 /* SST Vendor Defined Registers and bits */
sound/soc/intel/sst-haswell-dsp.c +3 -3
index 03ea282..4b6c163 100644
@@ -269,9 +269,9 @@ static void hsw_boot(struct sst_dsp *sst)
 		SST_CSR2_SDFD_SSP1);
 
 	/* enable DMA engine 0,1 all channels to access host memory */
-	sst_dsp_shim_update_bits_unlocked(sst, SST_HDMC,
-		SST_HDMC_HDDA1(0xff)  | SST_HDMC_HDDA0(0xff),
-		SST_HDMC_HDDA1(0xff) | SST_HDMC_HDDA0(0xff));
+	sst_dsp_shim_update_bits_unlocked(sst, SST_HMDC,
+		SST_HMDC_HDDA1(0xff) | SST_HMDC_HDDA0(0xff),
+		SST_HMDC_HDDA1(0xff) | SST_HMDC_HDDA0(0xff));
 
 	/* disable all clock gating */
 	writel(0x0, sst->addr.pci_cfg + SST_VDRTCTL2);
Signature · 1 line
1.8.3.2
maintainer Applied
#1 lore raw
Quoted 3 lines · Jie Yang

From: Liam Girdwood <[email protected]>

HMDC is the correct naming for this register.

Applied, thanks.