From 24ee04393822a34be6a3b053bf1ed3c87fc7cfd7 Mon Sep 17 00:00:00 2001 From: Seppo Ingalsuo Date: Tue, 19 Jun 2018 18:14:51 +0300 Subject: [PATCH] DMIC: Rename HW version 2 bitfield to follow specification Signed-off-by: Seppo Ingalsuo --- src/drivers/dmic.c | 4 ++-- src/include/sof/dmic.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/drivers/dmic.c b/src/drivers/dmic.c index 70942a228..cbc714f64 100644 --- a/src/drivers/dmic.c +++ b/src/drivers/dmic.c @@ -820,7 +820,7 @@ static int configure_registers(struct dai *dai, struct dmic_configuration *cfg, OUTCONTROL0_FCI(0) | OUTCONTROL0_BFTH(bfth) | OUTCONTROL0_OF(of0) | - OUTCONTROL0_NUMBER_OF_DECIMATORS(ipm) | + OUTCONTROL0_IPM(ipm) | OUTCONTROL0_IPM_SOURCE_1(source[0]) | OUTCONTROL0_IPM_SOURCE_2(source[1]) | OUTCONTROL0_IPM_SOURCE_3(source[2]) | @@ -835,7 +835,7 @@ static int configure_registers(struct dai *dai, struct dmic_configuration *cfg, OUTCONTROL1_FCI(0) | OUTCONTROL1_BFTH(bfth) | OUTCONTROL1_OF(of1) | - OUTCONTROL1_NUMBER_OF_DECIMATORS(ipm) | + OUTCONTROL1_IPM(ipm) | OUTCONTROL1_IPM_SOURCE_1(source[0]) | OUTCONTROL1_IPM_SOURCE_2(source[1]) | OUTCONTROL1_IPM_SOURCE_3(source[2]) | diff --git a/src/include/sof/dmic.h b/src/include/sof/dmic.h index 290da9fff..afdd0b572 100644 --- a/src/include/sof/dmic.h +++ b/src/include/sof/dmic.h @@ -160,7 +160,7 @@ #define OUTCONTROL0_FCI(x) SET_BIT(24, x) #define OUTCONTROL0_BFTH(x) SET_BITS(23, 20, x) #define OUTCONTROL0_OF(x) SET_BITS(19, 18, x) -#define OUTCONTROL0_NUMBER_OF_DECIMATORS(x) SET_BITS(17, 15, x) +#define OUTCONTROL0_IPM(x) SET_BITS(17, 15, x) #define OUTCONTROL0_IPM_SOURCE_1(x) SET_BITS(14, 13, x) #define OUTCONTROL0_IPM_SOURCE_2(x) SET_BITS(12, 11, x) #define OUTCONTROL0_IPM_SOURCE_3(x) SET_BITS(10, 9, x) @@ -178,7 +178,7 @@ #define OUTCONTROL1_FCI(x) SET_BIT(24, x) #define OUTCONTROL1_BFTH(x) SET_BITS(23, 20, x) #define OUTCONTROL1_OF(x) SET_BITS(19, 18, x) -#define OUTCONTROL1_NUMBER_OF_DECIMATORS(x) SET_BITS(17, 15, x) +#define OUTCONTROL1_IPM(x) SET_BITS(17, 15, x) #define OUTCONTROL1_IPM_SOURCE_1(x) SET_BITS(14, 13, x) #define OUTCONTROL1_IPM_SOURCE_2(x) SET_BITS(12, 11, x) #define OUTCONTROL1_IPM_SOURCE_3(x) SET_BITS(10, 9, x)