Do we want Convertor or Converter? This patch fixes the misspellings
if we want it spelled
properly.
Signed-off-by: Benjamin Kerensa <bkerensa at ubuntu.com>
---
tools/intel_audio_dump.c | 50 ++++++++++++++++++++++++------------------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/tools/intel_audio_dump.c b/tools/intel_audio_dump.c
index 077e096..c8f8e84 100644
--- a/tools/intel_audio_dump.c
+++ b/tools/intel_audio_dump.c
@@ -543,7 +543,7 @@ static void dump_ironlake(void)
dump_reg(AUD_MISC_CTRL_B, "Audio MISC Control for Transcoder B");
dump_reg(AUD_VID_DID, "Audio Vendor ID / Device ID");
dump_reg(AUD_RID, "Audio Revision ID");
- dump_reg(AUD_PWRST, "Audio Power State (Function Group,
Convertor, Pin Widget)");
+ dump_reg(AUD_PWRST, "Audio Power State (Function Group,
Converter, Pin Widget)");
dump_reg(AUD_PORT_EN_HD_CFG, "Audio Port Enable HDAudio Config");
dump_reg(AUD_OUT_DIG_CNVT_A, "Audio Digital Converter - Conv A");
dump_reg(AUD_OUT_DIG_CNVT_B, "Audio Digital Converter - Conv B");
@@ -673,10 +673,10 @@ static void dump_ironlake(void)
dword = INREG(AUD_PWRST);
printf("AUD_PWRST
Function_Group_Device_Power_State_Current\t%s\n",
power_state[BITS(dword, 23, 22)]);
printf("AUD_PWRST Function_Group_Device_Power_State_Set
\t%s\n", power_state[BITS(dword, 21, 20)]);
- printf("AUD_PWRST ConvertorB_Widget_Power_State_Current
\t%s\n", power_state[BITS(dword, 19, 18)]);
- printf("AUD_PWRST ConvertorB_Widget_Power_State_Requested
\t%s\n", power_state[BITS(dword, 17, 16)]);
- printf("AUD_PWRST ConvertorA_Widget_Power_State_Current
\t%s\n", power_state[BITS(dword, 15, 14)]);
- printf("AUD_PWRST ConvertorA_Widget_Power_State_Requsted
\t%s\n", power_state[BITS(dword, 13, 12)]);
+ printf("AUD_PWRST ConverterB_Widget_Power_State_Current
\t%s\n", power_state[BITS(dword, 19, 18)]);
+ printf("AUD_PWRST ConverterB_Widget_Power_State_Requested
\t%s\n", power_state[BITS(dword, 17, 16)]);
+ printf("AUD_PWRST ConverterA_Widget_Power_State_Current
\t%s\n", power_state[BITS(dword, 15, 14)]);
+ printf("AUD_PWRST ConverterA_Widget_Power_State_Requsted
\t%s\n", power_state[BITS(dword, 13, 12)]);
printf("AUD_PWRST PinD_Widget_Power_State_Current
\t%s\n", power_state[BITS(dword, 11, 10)]);
printf("AUD_PWRST PinD_Widget_Power_State_Set
\t%s\n", power_state[BITS(dword, 9, 8)]);
printf("AUD_PWRST PinC_Widget_Power_State_Current
\t%s\n", power_state[BITS(dword, 7, 6)]);
@@ -685,10 +685,10 @@ static void dump_ironlake(void)
printf("AUD_PWRST PinB_Widget_Power_State_Set
\t%s\n", power_state[BITS(dword, 1, 0)]);
dword = INREG(AUD_PORT_EN_HD_CFG);
- printf("AUD_PORT_EN_HD_CFG Convertor_A_Digen\t\t\t%lu\n", BIT(dword, 0));
- printf("AUD_PORT_EN_HD_CFG Convertor_B_Digen\t\t\t%lu\n", BIT(dword, 1));
- printf("AUD_PORT_EN_HD_CFG
ConvertorA_Stream_ID\t\t%lu\n", BITS(dword, 7, 4));
- printf("AUD_PORT_EN_HD_CFG
ConvertorB_Stream_ID\t\t%lu\n", BITS(dword, 11, 8));
+ printf("AUD_PORT_EN_HD_CFG Converter_A_Digen\t\t\t%lu\n", BIT(dword, 0));
+ printf("AUD_PORT_EN_HD_CFG Converter_B_Digen\t\t\t%lu\n", BIT(dword, 1));
+ printf("AUD_PORT_EN_HD_CFG
ConverterA_Stream_ID\t\t%lu\n", BITS(dword, 7, 4));
+ printf("AUD_PORT_EN_HD_CFG
ConverterB_Stream_ID\t\t%lu\n", BITS(dword, 11, 8));
printf("AUD_PORT_EN_HD_CFG Port_B_Out_Enable\t\t\t%lu\n", BIT(dword, 12));
printf("AUD_PORT_EN_HD_CFG Port_C_Out_Enable\t\t\t%lu\n", BIT(dword, 13));
printf("AUD_PORT_EN_HD_CFG Port_D_Out_Enable\t\t\t%lu\n", BIT(dword, 14));
@@ -733,14 +733,14 @@ static void dump_ironlake(void)
dword = INREG(AUD_OUT_STR_DESC_A);
printf("AUD_OUT_STR_DESC_A HBR_enable\t\t\t\t%lu\n",
BITS(dword, 28, 27));
- printf("AUD_OUT_STR_DESC_A Convertor_Channel_Count\t\t%lu\n",
BITS(dword, 20, 16) + 1);
+ printf("AUD_OUT_STR_DESC_A Converter_Channel_Count\t\t%lu\n",
BITS(dword, 20, 16) + 1);
printf("AUD_OUT_STR_DESC_A Bits_per_Sample\t\t\t[%#lx] %s\n",
BITS(dword, 6, 4), OPNAME(bits_per_sample, BITS(dword, 6, 4)));
printf("AUD_OUT_STR_DESC_A
Number_of_Channels_in_a_Stream\t%lu\n", 1 + BITS(dword, 3, 0));
dword = INREG(AUD_OUT_STR_DESC_B);
printf("AUD_OUT_STR_DESC_B HBR_enable\t\t\t\t%lu\n",
BITS(dword, 28, 27));
- printf("AUD_OUT_STR_DESC_B Convertor_Channel_Count\t\t%lu\n",
BITS(dword, 20, 16) + 1);
+ printf("AUD_OUT_STR_DESC_B Converter_Channel_Count\t\t%lu\n",
BITS(dword, 20, 16) + 1);
printf("AUD_OUT_STR_DESC_B Bits_per_Sample\t\t\t[%#lx] %s\n",
BITS(dword, 6, 4), OPNAME(bits_per_sample, BITS(dword, 6, 4)));
printf("AUD_OUT_STR_DESC_B
Number_of_Channels_in_a_Stream\t%lu\n", 1 + BITS(dword, 3, 0));
@@ -938,7 +938,7 @@ static void dump_cpt(void)
dump_reg(AUD_MISC_CTRL_C, "Audio MISC Control for Transcoder C");
dump_reg(AUD_VID_DID, "Audio Vendor ID / Device ID");
dump_reg(AUD_RID, "Audio Revision ID");
- dump_reg(AUD_PWRST, "Audio Power State (Function Group,
Convertor, Pin Widget)");
+ dump_reg(AUD_PWRST, "Audio Power State (Function Group,
Converter, Pin Widget)");
dump_reg(AUD_PORT_EN_HD_CFG, "Audio Port Enable HDAudio Config");
dump_reg(AUD_OUT_DIG_CNVT_A, "Audio Digital Converter - Conv A");
dump_reg(AUD_OUT_DIG_CNVT_B, "Audio Digital Converter - Conv B");
@@ -1139,10 +1139,10 @@ static void dump_cpt(void)
dword = INREG(AUD_PWRST);
printf("AUD_PWRST Func_Grp_Dev_PwrSt_Curr
\t%s\n", power_state[BITS(dword, 27, 26)]);
printf("AUD_PWRST Func_Grp_Dev_PwrSt_Set
\t%s\n", power_state[BITS(dword, 25, 24)]);
- printf("AUD_PWRST ConvertorA_Widget_Power_State_Current
\t%s\n", power_state[BITS(dword, 15, 14)]);
- printf("AUD_PWRST ConvertorA_Widget_Power_State_Requsted
\t%s\n", power_state[BITS(dword, 13, 12)]);
- printf("AUD_PWRST ConvertorB_Widget_Power_State_Current
\t%s\n", power_state[BITS(dword, 19, 18)]);
- printf("AUD_PWRST ConvertorB_Widget_Power_State_Requested
\t%s\n", power_state[BITS(dword, 17, 16)]);
+ printf("AUD_PWRST ConverterA_Widget_Power_State_Current
\t%s\n", power_state[BITS(dword, 15, 14)]);
+ printf("AUD_PWRST ConverterA_Widget_Power_State_Requsted
\t%s\n", power_state[BITS(dword, 13, 12)]);
+ printf("AUD_PWRST ConverterB_Widget_Power_State_Current
\t%s\n", power_state[BITS(dword, 19, 18)]);
+ printf("AUD_PWRST ConverterB_Widget_Power_State_Requested
\t%s\n", power_state[BITS(dword, 17, 16)]);
printf("AUD_PWRST ConvC_Widget_PwrSt_Curr
\t%s\n", power_state[BITS(dword, 23, 22)]);
printf("AUD_PWRST ConvC_Widget_PwrSt_Req
\t%s\n", power_state[BITS(dword, 21, 20)]);
printf("AUD_PWRST PinB_Widget_Power_State_Current
\t%s\n", power_state[BITS(dword, 3, 2)]);
@@ -1153,12 +1153,12 @@ static void dump_cpt(void)
printf("AUD_PWRST PinD_Widget_Power_State_Set
\t%s\n", power_state[BITS(dword, 9, 8)]);
dword = INREG(AUD_PORT_EN_HD_CFG);
- printf("AUD_PORT_EN_HD_CFG Convertor_A_Digen\t\t\t%lu\n", BIT(dword, 0));
- printf("AUD_PORT_EN_HD_CFG Convertor_B_Digen\t\t\t%lu\n", BIT(dword, 1));
- printf("AUD_PORT_EN_HD_CFG Convertor_C_Digen\t\t\t%lu\n", BIT(dword, 2));
- printf("AUD_PORT_EN_HD_CFG
ConvertorA_Stream_ID\t\t%lu\n", BITS(dword, 7, 4));
- printf("AUD_PORT_EN_HD_CFG
ConvertorB_Stream_ID\t\t%lu\n", BITS(dword, 11, 8));
- printf("AUD_PORT_EN_HD_CFG
ConvertorC_Stream_ID\t\t%lu\n", BITS(dword, 15, 12));
+ printf("AUD_PORT_EN_HD_CFG Converter_A_Digen\t\t\t%lu\n", BIT(dword, 0));
+ printf("AUD_PORT_EN_HD_CFG Converter_B_Digen\t\t\t%lu\n", BIT(dword, 1));
+ printf("AUD_PORT_EN_HD_CFG Converter_C_Digen\t\t\t%lu\n", BIT(dword, 2));
+ printf("AUD_PORT_EN_HD_CFG
ConverterA_Stream_ID\t\t%lu\n", BITS(dword, 7, 4));
+ printf("AUD_PORT_EN_HD_CFG
ConverterB_Stream_ID\t\t%lu\n", BITS(dword, 11, 8));
+ printf("AUD_PORT_EN_HD_CFG
ConverterC_Stream_ID\t\t%lu\n", BITS(dword, 15, 12));
printf("AUD_PORT_EN_HD_CFG Port_B_Out_Enable\t\t\t%lu\n", BIT(dword, 16));
printf("AUD_PORT_EN_HD_CFG Port_C_Out_Enable\t\t\t%lu\n", BIT(dword, 17));
printf("AUD_PORT_EN_HD_CFG Port_D_Out_Enable\t\t\t%lu\n", BIT(dword, 18));
@@ -1215,21 +1215,21 @@ static void dump_cpt(void)
dword = INREG(AUD_OUT_STR_DESC_A);
printf("AUD_OUT_STR_DESC_A HBR_enable\t\t\t\t%lu\n",
BITS(dword, 28, 27));
- printf("AUD_OUT_STR_DESC_A Convertor_Channel_Count\t\t%lu\n",
BITS(dword, 20, 16) + 1);
+ printf("AUD_OUT_STR_DESC_A Converter_Channel_Count\t\t%lu\n",
BITS(dword, 20, 16) + 1);
printf("AUD_OUT_STR_DESC_A Bits_per_Sample\t\t\t[%#lx] %s\n",
BITS(dword, 6, 4), OPNAME(bits_per_sample, BITS(dword, 6, 4)));
printf("AUD_OUT_STR_DESC_A
Number_of_Channels_in_a_Stream\t%lu\n", 1 + BITS(dword, 3, 0));
dword = INREG(AUD_OUT_STR_DESC_B);
printf("AUD_OUT_STR_DESC_B HBR_enable\t\t\t\t%lu\n",
BITS(dword, 28, 27));
- printf("AUD_OUT_STR_DESC_B Convertor_Channel_Count\t\t%lu\n",
BITS(dword, 20, 16) + 1);
+ printf("AUD_OUT_STR_DESC_B Converter_Channel_Count\t\t%lu\n",
BITS(dword, 20, 16) + 1);
printf("AUD_OUT_STR_DESC_B Bits_per_Sample\t\t\t[%#lx] %s\n",
BITS(dword, 6, 4), OPNAME(bits_per_sample, BITS(dword, 6, 4)));
printf("AUD_OUT_STR_DESC_B
Number_of_Channels_in_a_Stream\t%lu\n", 1 + BITS(dword, 3, 0));
dword = INREG(AUD_OUT_STR_DESC_C);
printf("AUD_OUT_STR_DESC_C HBR_enable\t\t\t\t%lu\n",
BITS(dword, 28, 27));
- printf("AUD_OUT_STR_DESC_C Convertor_Channel_Count\t\t%lu\n",
BITS(dword, 20, 16) + 1);
+ printf("AUD_OUT_STR_DESC_C Converter_Channel_Count\t\t%lu\n",
BITS(dword, 20, 16) + 1);
printf("AUD_OUT_STR_DESC_C Bits_per_Sample\t\t\t[%#lx] %s\n",
BITS(dword, 6, 4), OPNAME(bits_per_sample, BITS(dword, 6, 4)));
printf("AUD_OUT_STR_DESC_C
Number_of_Channels_in_a_Stream\t%lu\n", 1 + BITS(dword, 3, 0));
--
1.8.0
