audio/alc5658: fix trivial typo
authorJunhwan Park <junhwan.park@samsung.com>
Tue, 1 Aug 2017 11:06:50 +0000 (20:06 +0900)
committerIvan Galkin <ivan.galkin@samsung.com>
Sun, 27 Aug 2017 06:24:37 +0000 (15:24 +0900)
We tested Realtek's ALC5658 codec.

Change-Id: I8dcce0afc01ac79aaf441bc54e7418f391ddcd4f
Signed-off-by: Junhwan Park <junhwan.park@samsung.com>
os/drivers/audio/alc5658.c
os/drivers/audio/alc5658.h
os/drivers/audio/alc5658char.c
os/drivers/audio/alc5658char.h

index f7cce82..edbc82a 100644 (file)
@@ -1706,12 +1706,12 @@ FAR struct audio_lowerhalf_s *alc5658_initialize(FAR struct i2c_dev_s *i2c, FAR
                 * default state.
                 */
 
-               alc5658_writereg(priv, ACL5658_RESET, 0);
+               alc5658_writereg(priv, ALC5658_RESET, 0);
                alc5658_dump_registers(&priv->dev, "After reset");
 
                /* Verify that ALC5658 is present and available on this I2C */
 
-               regval = alc5658_readreg(priv, ACL5658_RESET);
+               regval = alc5658_readreg(priv, ALC5658_RESET);
                if (regval != 0) {
                        auddbg("ERROR: ALC5658 not found: ID=%04x\n", regval);
                        goto errout_with_dev;
index 5bad99e..c0ee5ed 100644 (file)
 /* Registers Addresses ******************************************************/
 
 typedef enum {
-       ACL5658_RESET = 0x0000,
-       ACL5658_SPO_VOL = 0x0001,
-       ACL5658_HP_VOL = 0x0002,
-       ACL5658_LOUT_CTRL1 = 0x0003,
-       ACL5658_LOUT_CTRL2 = 0x0004,
-       ACL5658_HPOUT_VLML = 0x0005,
-       ACL5658_HPOUT_VLMR = 0x0006,
-       ACL5658_SPDIF_CTRL1 = 0x0008,
-       ACL5658_SPDIF_CTRL2 = 0x0009,
-       ACL5658_SPDIF_CTRL3 = 0x0036,
-       ACL5658_IN1_CTRL = 0x000C,
-       ACL5658_INL_VLM = 0x000F,
-
-       ACL5658_SIDETONE = 0x0018,
+       ALC5658_RESET = 0x0000,
+       ALC5658_SPO_VOL = 0x0001,
+       ALC5658_HP_VOL = 0x0002,
+       ALC5658_LOUT_CTRL1 = 0x0003,
+       ALC5658_LOUT_CTRL2 = 0x0004,
+       ALC5658_HPOUT_VLML = 0x0005,
+       ALC5658_HPOUT_VLMR = 0x0006,
+       ALC5658_SPDIF_CTRL1 = 0x0008,
+       ALC5658_SPDIF_CTRL2 = 0x0009,
+       ALC5658_SPDIF_CTRL3 = 0x0036,
+       ALC5658_IN1_CTRL = 0x000C,
+       ALC5658_INL_VLM = 0x000F,
+
+       ALC5658_SIDETONE = 0x0018,
 
        /* DIGITAL Volume*/
-       ACL5658_DAC_L1R1_VLM = 0x0019,
-       ACL5658_DAC_L2R2_VLM = 0x001A,
-       ACL5658_DAC_L2R2_MUTE = 0x001B,
+       ALC5658_DAC_L1R1_VLM = 0x0019,
+       ALC5658_DAC_L2R2_VLM = 0x001A,
+       ALC5658_DAC_L2R2_MUTE = 0x001B,
 
        /* DIGITAL Mixers*/
-       ACL5658_ADC_2_DAC_MXR = 0x0029,
-       ACL5658_DAC_STR_MXR = 0x002A,
-       ACL5658_DAC_MN_MXR = 0x002B,
-       ACL5658_DAC_LB_SDTONE = 0x002C,
-       ACL5658_COPY_MODE = 0x002F,
+       ALC5658_ADC_2_DAC_MXR = 0x0029,
+       ALC5658_DAC_STR_MXR = 0x002A,
+       ALC5658_DAC_MN_MXR = 0x002B,
+       ALC5658_DAC_LB_SDTONE = 0x002C,
+       ALC5658_COPY_MODE = 0x002F,
 
        /* Analog DAC Source */
-       ACL5658_DAC_SRC = 0x002D,
+       ALC5658_DAC_SRC = 0x002D,
 
        /* ANALOG Mixers */
-       ACL5658_SPKMIXL = 0x0046,
-       ACL5658_SPKMIXR = 0x0047,
-       ACL5658_SPOMIX = 0x0048,
-       ACL5658_OUTMIXL1 = 0x004D,
-       ACL5658_OUTMIXL2 = 0x004E,
-       ACL5658_OUTMIXR1 = 0x004F,
-       ACL5658_OUTMIXR2 = 0x0050,
-       ACL5658_LOUTMIX = 0x0052,
+       ALC5658_SPKMIXL = 0x0046,
+       ALC5658_SPKMIXR = 0x0047,
+       ALC5658_SPOMIX = 0x0048,
+       ALC5658_OUTMIXL1 = 0x004D,
+       ALC5658_OUTMIXL2 = 0x004E,
+       ALC5658_OUTMIXR1 = 0x004F,
+       ALC5658_OUTMIXR2 = 0x0050,
+       ALC5658_LOUTMIX = 0x0052,
 
        /* Power management */
-       ACL5658_PWR_MNG1 = 0x0061,
-       ACL5658_PWR_MNG2 = 0x0062,
-       ACL5658_PWR_MNG3 = 0x0063,
-       ACL5658_PWR_MNG4 = 0x0064,
-       ACL5658_PWR_MNG5 = 0x0065,
-       ACL5658_PWR_MNG6 = 0x0066,
-       ACL5658_PWR_MNG7 = 0x0067,
+       ALC5658_PWR_MNG1 = 0x0061,
+       ALC5658_PWR_MNG2 = 0x0062,
+       ALC5658_PWR_MNG3 = 0x0063,
+       ALC5658_PWR_MNG4 = 0x0064,
+       ALC5658_PWR_MNG5 = 0x0065,
+       ALC5658_PWR_MNG6 = 0x0066,
+       ALC5658_PWR_MNG7 = 0x0067,
 
        /* DIGITAL ports comtrol */
-       ACL5658_IF_DTCT = 0x006B,
-       ACL5658_I2S1_CTRL = 0x0070,
-       ACL5658_I2S2_CTRL = 0x0071,
-       ACL5658_ADDA_CLK = 0x0073,
-       ACL5658_ADDA_HPF = 0x0074,
+       ALC5658_IF_DTCT = 0x006B,
+       ALC5658_I2S1_CTRL = 0x0070,
+       ALC5658_I2S2_CTRL = 0x0071,
+       ALC5658_ADDA_CLK = 0x0073,
+       ALC5658_ADDA_HPF = 0x0074,
 
        /* TDM */
-       ACL5658_TDM_CTRL1 = 0x0077,
-       ACL5658_TDM_CTRL2 = 0x0078,
-       ACL5658_TDM_CTRL3 = 0x0079,
-       ACL5658_TDM_CTRL4 = 0x007A,
+       ALC5658_TDM_CTRL1 = 0x0077,
+       ALC5658_TDM_CTRL2 = 0x0078,
+       ALC5658_TDM_CTRL3 = 0x0079,
+       ALC5658_TDM_CTRL4 = 0x007A,
 
        /* Global Clock*/
-       ACL5658_GLBL_CLK = 0x0080,
-       ACL5658_GLBL_PLL1 = 0x0081,
-       ACL5658_GLBL_PLL2 = 0x0082,
-       ACL5658_GLBL_ASRC1 = 0x0083,
-       ACL5658_GLBL_ASRC2 = 0x0084,
-       ACL5658_GLBL_ASRC3 = 0x0085,
-       ACL5658_GLBL_ASRC4 = 0x008A,
+       ALC5658_GLBL_CLK = 0x0080,
+       ALC5658_GLBL_PLL1 = 0x0081,
+       ALC5658_GLBL_PLL2 = 0x0082,
+       ALC5658_GLBL_ASRC1 = 0x0083,
+       ALC5658_GLBL_ASRC2 = 0x0084,
+       ALC5658_GLBL_ASRC3 = 0x0085,
+       ALC5658_GLBL_ASRC4 = 0x008A,
 
        /* Amplifiers */
-       ACL5658_HP_AMP = 0x008E,
-       ACL5658_SPK_AMP = 0x00A0,
+       ALC5658_HP_AMP = 0x008E,
+       ALC5658_SPK_AMP = 0x00A0,
 
 } ALC5658_REG;
 
index c569fd5..b02324b 100644 (file)
@@ -326,14 +326,14 @@ static void alc5658char_setvolume(FAR struct alc5658char_dev_s *priv)
        }
 
        if (priv->mute) {
-               alc5658char_writereg(priv, ACL5658_HPOUT_MUTE, 0x8080);
+               alc5658char_writereg(priv, ALC5658_HPOUT_MUTE, 0x8080);
        } else {
-               alc5658char_writereg(priv, ACL5658_HPOUT_MUTE, 0x0000);
+               alc5658char_writereg(priv, ALC5658_HPOUT_MUTE, 0x0000);
        }
 
-       alc5658char_writereg(priv, ACL5658_HPOUT_VLML, vol_l << 8);
-       alc5658char_writereg(priv, ACL5658_HPOUT_VLMR, vol_r << 8);
-       audvdbg("MUTE %x, VOLL %x VOLR %x\n", (uint32_t) alc5658char_readreg(priv, ACL5658_HPOUT_MUTE), (uint32_t) alc5658char_readreg(priv, ACL5658_HPOUT_VLML), (uint32_t) alc5658char_readreg(priv, ACL5658_HPOUT_VLMR));
+       alc5658char_writereg(priv, ALC5658_HPOUT_VLML, vol_l << 8);
+       alc5658char_writereg(priv, ALC5658_HPOUT_VLMR, vol_r << 8);
+       audvdbg("MUTE %x, VOLL %x VOLR %x\n", (uint32_t) alc5658char_readreg(priv, ALC5658_HPOUT_MUTE), (uint32_t) alc5658char_readreg(priv, ALC5658_HPOUT_VLML), (uint32_t) alc5658char_readreg(priv, ALC5658_HPOUT_VLMR));
 
 }
 
@@ -347,8 +347,8 @@ static void alc5658char_setvolume(FAR struct alc5658char_dev_s *priv)
 
 static void alc5658char_setmic(FAR struct alc5658char_dev_s *priv)
 {
-       alc5658char_writereg(priv, ACL5658_IN1_CTRL, (priv->micgain + 16) << 8);
-       audvdbg("MIC GAIN 0x%x\n", (uint32_t) alc5658char_readreg(priv, ACL5658_IN1_CTRL));
+       alc5658char_writereg(priv, ALC5658_IN1_CTRL, (priv->micgain + 16) << 8);
+       audvdbg("MIC GAIN 0x%x\n", (uint32_t) alc5658char_readreg(priv, ALC5658_IN1_CTRL));
 }
 
 /****************************************************************************
@@ -809,7 +809,7 @@ int alc5658char_register(FAR struct i2s_dev_s *i2s, FAR struct i2c_dev_s *i2c, F
                sem_init(&priv->cnt_rxsem, 0, 0);       /* Assume we did not receive anything yet!!! */
                priv->rx_cnt = 0;               /* Count allocated RX buffers */
 
-               regval = alc5658char_readreg(priv, ACL5658_RESET);
+               regval = alc5658char_readreg(priv, ALC5658_RESET);
                if (regval != 0) {
                        auddbg("ERROR: ALC5658 not found: ID=%04x\n", regval);
                        return -ENODEV;
index 67a8c5d..6f38332 100644 (file)
 /* Registers Addresses ******************************************************/
 
 typedef enum {
-       ACL5658_RESET = 0x0000,
-       ACL5658_SPO_VOL = 0x0001,
-       ACL5658_HPOUT_MUTE = 0x0002,
-       ACL5658_LOUT_CTRL1 = 0x0003,
-       ACL5658_LOUT_CTRL2 = 0x0004,
-       ACL5658_HPOUT_VLML = 0x0005,
-       ACL5658_HPOUT_VLMR = 0x0006,
-       ACL5658_SPDIF_CTRL1 = 0x0008,
-       ACL5658_SPDIF_CTRL2 = 0x0009,
-       ACL5658_SPDIF_CTRL3 = 0x0036,
-       ACL5658_IN1_CTRL = 0x000C,
-       ACL5658_INL_VLM = 0x000F,
-       ACL5658_SIDETONE = 0x0018,
+       ALC5658_RESET = 0x0000,
+       ALC5658_SPO_VOL = 0x0001,
+       ALC5658_HPOUT_MUTE = 0x0002,
+       ALC5658_LOUT_CTRL1 = 0x0003,
+       ALC5658_LOUT_CTRL2 = 0x0004,
+       ALC5658_HPOUT_VLML = 0x0005,
+       ALC5658_HPOUT_VLMR = 0x0006,
+       ALC5658_SPDIF_CTRL1 = 0x0008,
+       ALC5658_SPDIF_CTRL2 = 0x0009,
+       ALC5658_SPDIF_CTRL3 = 0x0036,
+       ALC5658_IN1_CTRL = 0x000C,
+       ALC5658_INL_VLM = 0x000F,
+       ALC5658_SIDETONE = 0x0018,
        /* DIGITAL Volume */
-       ACL5658_DAC_L1R1_VLM = 0x0019,
-       ACL5658_DAC_L2R2_VLM = 0x001A,
-       ACL5658_DAC_L2R2_MUTE = 0x001B,
+       ALC5658_DAC_L1R1_VLM = 0x0019,
+       ALC5658_DAC_L2R2_VLM = 0x001A,
+       ALC5658_DAC_L2R2_MUTE = 0x001B,
        /* DIGITAL Mixers */
        ALC5658_ADC_STR1_MXR = 0x0026,
        ALC5658_ADC_MONO_MXR = 0x0027,
-       ACL5658_ADC_2_DAC_MXR = 0x0029,
-       ACL5658_DAC_STR_MXR = 0x002A,
-       ACL5658_DAC_MONO_MXR = 0x002B,
-       ACL5658_DAC_LB_SDTONE = 0x002C,
-       ACL5658_COPY_MODE = 0x002F,
+       ALC5658_ADC_2_DAC_MXR = 0x0029,
+       ALC5658_DAC_STR_MXR = 0x002A,
+       ALC5658_DAC_MONO_MXR = 0x002B,
+       ALC5658_DAC_LB_SDTONE = 0x002C,
+       ALC5658_COPY_MODE = 0x002F,
        /* Analog DAC Source */
-       ACL5658_DAC_SRC = 0x002D,
-       ACL5658_RECMIX1L_CTRL_1 = 0x003B,
-       ACL5658_RECMIX1L_CTRL_2 = 0x003C,
-       ACL5658_RECMIX1R_CTRL_1 = 0x003D,
-       ACL5658_RECMIX1R_CTRL_2 = 0x003E,
+       ALC5658_DAC_SRC = 0x002D,
+       ALC5658_RECMIX1L_CTRL_1 = 0x003B,
+       ALC5658_RECMIX1L_CTRL_2 = 0x003C,
+       ALC5658_RECMIX1R_CTRL_1 = 0x003D,
+       ALC5658_RECMIX1R_CTRL_2 = 0x003E,
        /* ANALOG Mixers */
-       ACL5658_SPKMIXL = 0x0046,
-       ACL5658_SPKMIXR = 0x0047,
-       ACL5658_SPOMIX = 0x0048,
-       ACL5658_OUTMIXL1 = 0x004D,
-       ACL5658_OUTMIXL2 = 0x004E,
-       ACL5658_OUTMIXR1 = 0x004F,
-       ACL5658_OUTMIXR2 = 0x0050,
-       ACL5658_LOUTMIX = 0x0052,
+       ALC5658_SPKMIXL = 0x0046,
+       ALC5658_SPKMIXR = 0x0047,
+       ALC5658_SPOMIX = 0x0048,
+       ALC5658_OUTMIXL1 = 0x004D,
+       ALC5658_OUTMIXL2 = 0x004E,
+       ALC5658_OUTMIXR1 = 0x004F,
+       ALC5658_OUTMIXR2 = 0x0050,
+       ALC5658_LOUTMIX = 0x0052,
        /* Power management */
-       ACL5658_PWR_MNG1 = 0x0061,
-       ACL5658_PWR_MNG2 = 0x0062,
-       ACL5658_PWR_MNG3 = 0x0063,
-       ACL5658_PWR_MNG4 = 0x0064,
-       ACL5658_PWR_MNG5 = 0x0065,
-       ACL5658_PWR_MNG6 = 0x0066,
-       ACL5658_PWR_MNG7 = 0x0067,
+       ALC5658_PWR_MNG1 = 0x0061,
+       ALC5658_PWR_MNG2 = 0x0062,
+       ALC5658_PWR_MNG3 = 0x0063,
+       ALC5658_PWR_MNG4 = 0x0064,
+       ALC5658_PWR_MNG5 = 0x0065,
+       ALC5658_PWR_MNG6 = 0x0066,
+       ALC5658_PWR_MNG7 = 0x0067,
        /* DIGITAL ports control */
-       ACL5658_IF_DTCT = 0x006B,
+       ALC5658_IF_DTCT = 0x006B,
        ALC5658_006E = 0x006E,
        ALC5658_006F = 0x006F,
-       ACL5658_I2S1_CTRL = 0x0070,
-       ACL5658_I2S2_CTRL = 0x0071,
-       ACL5658_ADDA_CLK = 0x0073,
-       ACL5658_ADDA_HPF = 0x0074,
+       ALC5658_I2S1_CTRL = 0x0070,
+       ALC5658_I2S2_CTRL = 0x0071,
+       ALC5658_ADDA_CLK = 0x0073,
+       ALC5658_ADDA_HPF = 0x0074,
        ALC5658_007B = 0x007B,
        /* TDM */
-       ACL5658_TDM_CTRL1 = 0x0077,
-       ACL5658_TDM_CTRL2 = 0x0078,
-       ACL5658_TDM_CTRL3 = 0x0079,
-       ACL5658_TDM_CTRL4 = 0x007A,
+       ALC5658_TDM_CTRL1 = 0x0077,
+       ALC5658_TDM_CTRL2 = 0x0078,
+       ALC5658_TDM_CTRL3 = 0x0079,
+       ALC5658_TDM_CTRL4 = 0x007A,
        /* Global Clock */
-       ACL5658_GLBL_CLK = 0x0080,
-       ACL5658_GLBL_PLL1 = 0x0081,
-       ACL5658_GLBL_PLL2 = 0x0082,
-       ACL5658_GLBL_ASRC1 = 0x0083,
-       ACL5658_GLBL_ASRC2 = 0x0084,
-       ACL5658_GLBL_ASRC3 = 0x0085,
-       ACL5658_GLBL_ASRC4 = 0x008A,
+       ALC5658_GLBL_CLK = 0x0080,
+       ALC5658_GLBL_PLL1 = 0x0081,
+       ALC5658_GLBL_PLL2 = 0x0082,
+       ALC5658_GLBL_ASRC1 = 0x0083,
+       ALC5658_GLBL_ASRC2 = 0x0084,
+       ALC5658_GLBL_ASRC3 = 0x0085,
+       ALC5658_GLBL_ASRC4 = 0x008A,
        /* Amplifiers */
-       ACL5658_HP_AMP = 0x008E,
-       ACL5658_SPK_AMP = 0x00A0,
+       ALC5658_HP_AMP = 0x008E,
+       ALC5658_SPK_AMP = 0x00A0,
        ALC5658_0091 = 0x0091,
        ALC5658_INTCLK_CTRL = 0x0094,
        ALC5658_GNRL_CTRL = 0x00FA,
@@ -178,40 +178,40 @@ typedef struct {
 } t_codec_dump_entry;
 
 t_codec_init_script_entry codec_reset_script[] = {
-       {ACL5658_RESET, 0x0000, 0},     /* Reset */
+       {ALC5658_RESET, 0x0000, 0},     /* Reset */
 };
 
 t_codec_init_script_entry codec_stop_script[] = {
-       {ACL5658_RESET, 0x0000, 0},     /* Reset */
-       {ACL5658_I2S1_CTRL, 0x8000, 0}, /* Switch into slave to stop data transfer */
+       {ALC5658_RESET, 0x0000, 0},     /* Reset */
+       {ALC5658_I2S1_CTRL, 0x8000, 0}, /* Switch into slave to stop data transfer */
 };
 
 t_codec_init_script_entry codec_init_script[] = {
-       {ACL5658_RESET, 0x0000, 0},     /* Reset */
+       {ALC5658_RESET, 0x0000, 0},     /* Reset */
        {ALC5658_006E, 0xFFFF, 0},      /* NO INFO IN DOCUMENTATION!!! */
        {ALC5658_006F, 0xFFFF, 0},      /* NO INFO IN DOCUMENTATION!!! */
-       {ACL5658_GLBL_CLK, 0x8000, 0},  /* RC CLK, No dividers */
+       {ALC5658_GLBL_CLK, 0x8000, 0},  /* RC CLK, No dividers */
        {ALC5658_INTCLK_CTRL, 0x0280, 0},       /* ??? Enable ALL int CLK, even more than in documentation */
        {ALC5658_0111, 0xA502, 0},      /* NO INFO IN DOCUMENTATION!!! */
        {ALC5658_0125, 0x0430, 0},      /* NO INFO IN DOCUMENTATION!!! */
        {ALC5658_ADDA_RST1, 0x3020, 0}, /* ??? DAC1, DAC2 + alpha clock enable */
-       {ACL5658_ADDA_CLK, 0x1770, 0},  /* I2Sprediv1 = 2, bclk_ms2 = 16bits(32FS), I2Sprediv2 = 7, something reserved, dac/adc 128Fs */
-       {ACL5658_I2S1_CTRL, 0x0000, 0}, /* Master, off/normal/I2S...  16bit */
+       {ALC5658_ADDA_CLK, 0x1770, 0},  /* I2Sprediv1 = 2, bclk_ms2 = 16bits(32FS), I2Sprediv2 = 7, something reserved, dac/adc 128Fs */
+       {ALC5658_I2S1_CTRL, 0x0000, 0}, /* Master, off/normal/I2S...  16bit */
        {ALC5658_007B, 0x0003, 0},      /* Select 64*FS for BCLK in master mode, No Info in documentation  */
        {ALC5658_GNRL_CTRL, 0x0001, 0}, /* Enable Gate mode, Use(pass) Noise Gain Mode2 CTRL */
        {ALC5658_0091, 0x0C16, 0},      /* NO INFO IN DOCUMENTATION!!! */
-       {ACL5658_PWR_MNG3, 0xA23E, 60}, /* VREF1 on, fast VREF1, VREF2 on, fast VREF2, MBIAS on, LOUT off, MBIAS bandgap off, HP L/R ON, HPamp x5, LDO1 out 1.2V */
-       {ACL5658_PWR_MNG3, 0xF23E, 50}, /* VREF1 on, SLOW VREF1, VREF2 on, SLOW VREF2, MBIAS on, LOUT off, MBIAS bandgap off, HP L/R ON, HPamp x5, LDO1 out 1.2V */
-       {ACL5658_PWR_MNG2, 0x0400, 50}, /* pow_dac_stereo1_filter ON */
-       {ACL5658_PWR_MNG1, 0x8080, 10}, /* en_i2s1, Pow_ldo_dacref ON */
-       {ACL5658_ADC_2_DAC_MXR, 0x8080, 0},     /* Mu_stereo1_adc_mixer_l/r MUTE */
-       {ACL5658_DAC_STR_MXR, 0xAAAA, 0},       /* Default, mute all */
-       {ACL5658_DAC_SRC, 0x0000, 0},   /* Default, no mixers (direct) */
-       {ACL5658_HP_AMP, 0x0009, 50},   /* en_out_hp - OFF, pow_pump_hp - ON, pow_capless - ON */
-       {ACL5658_PWR_MNG1, 0x8C80, 50}, /* en_i2s1, pow_dac1_l/r, Pow_ldo_dacref - ON */
+       {ALC5658_PWR_MNG3, 0xA23E, 60}, /* VREF1 on, fast VREF1, VREF2 on, fast VREF2, MBIAS on, LOUT off, MBIAS bandgap off, HP L/R ON, HPamp x5, LDO1 out 1.2V */
+       {ALC5658_PWR_MNG3, 0xF23E, 50}, /* VREF1 on, SLOW VREF1, VREF2 on, SLOW VREF2, MBIAS on, LOUT off, MBIAS bandgap off, HP L/R ON, HPamp x5, LDO1 out 1.2V */
+       {ALC5658_PWR_MNG2, 0x0400, 50}, /* pow_dac_stereo1_filter ON */
+       {ALC5658_PWR_MNG1, 0x8080, 10}, /* en_i2s1, Pow_ldo_dacref ON */
+       {ALC5658_ADC_2_DAC_MXR, 0x8080, 0},     /* Mu_stereo1_adc_mixer_l/r MUTE */
+       {ALC5658_DAC_STR_MXR, 0xAAAA, 0},       /* Default, mute all */
+       {ALC5658_DAC_SRC, 0x0000, 0},   /* Default, no mixers (direct) */
+       {ALC5658_HP_AMP, 0x0009, 50},   /* en_out_hp - OFF, pow_pump_hp - ON, pow_capless - ON */
+       {ALC5658_PWR_MNG1, 0x8C80, 50}, /* en_i2s1, pow_dac1_l/r, Pow_ldo_dacref - ON */
        {ALC5658_0091, 0x0E16, 50},     /* NO INFO IN DOCUMENTATION!!! */
        {ALC5658_0040, 0x0505, 0},      /* NO INFO IN DOCUMENTATION!!! */
-       {ACL5658_PWR_MNG5, 0x0180, 0},  /* Does not match with documentation */
+       {ALC5658_PWR_MNG5, 0x0180, 0},  /* Does not match with documentation */
        {ALC5658_0x013C, 0x3C05, 0},    /* NO INFO IN DOCUMENTATION!!! */
        {ALC5658_0x01DF, 0x02C1, 0},    /* NO INFO IN DOCUMENTATION!!! */
        {ALC5658_0x01DF, 0x2CC1, 0},    /* NO INFO IN DOCUMENTATION!!! */
@@ -223,19 +223,19 @@ t_codec_init_script_entry codec_init_script[] = {
        {ALC5658_0x01E4, 0x0016, 0},    /* NO INFO IN DOCUMENTATION!!! */
        {ALC5658_0x01DE, 0xC900, 250},  /* NO INFO IN DOCUMENTATION!!! */
        {ALC5658_0x01DF, 0x2CC1, 0},    /* NO INFO IN DOCUMENTATION!!! */
-       {ACL5658_HPOUT_MUTE, 0x0000, 0},        /* UNMUTE HP Output */
+       {ALC5658_HPOUT_MUTE, 0x0000, 0},        /* UNMUTE HP Output */
        {ALC5658_0x01DE, 0x4500, 0},    /* NO INFO IN DOCUMENTATION!!! */
        {ALC5658_0x01E4, 0x001F, 0},    /* NO INFO IN DOCUMENTATION!!! */
        {ALC5658_0x01DE, 0xC500, 800},  /* NO INFO IN DOCUMENTATION!!! */
        {ALC5658_0040, 0x0808, 0},      /* NO INFO IN DOCUMENTATION!!! */
-       {ACL5658_PWR_MNG5, 0x0000, 0},  /* Default, PLL, LDO2, Speaker VDD off */
+       {ALC5658_PWR_MNG5, 0x0000, 0},  /* Default, PLL, LDO2, Speaker VDD off */
        {ALC5658_0x013C, 0x2005, 0},    /* NO INFO IN DOCUMENTATION!!! */
        {ALC5658_0x01E4, 0x0000, 0},    /* NO INFO IN DOCUMENTATION!!! */
        {ALC5658_0x01DF, 0x20C0, 0},    /* NO INFO IN DOCUMENTATION!!! */
-       {ACL5658_ADDA_CLK, 0x0770, 0},  /* I2Sprediv1 = 2, bclk_ms2 = 16bits(32FS), I2Sprediv2 = 7, something reserved, dac/adc 128Fs */
-       {ACL5658_GLBL_CLK, 0x0000, 0},  /* MCLK, No dividers */
+       {ALC5658_ADDA_CLK, 0x0770, 0},  /* I2Sprediv1 = 2, bclk_ms2 = 16bits(32FS), I2Sprediv2 = 7, something reserved, dac/adc 128Fs */
+       {ALC5658_GLBL_CLK, 0x0000, 0},  /* MCLK, No dividers */
        {ALC5658_NOISE_G_M2_CTRL, 0x8EC0, 0},   /* Stereo_noise_gate_mode2_en - ENABLE */
-       {ACL5658_HP_AMP, 0x0019, 0},    /* en_out_hp - ON, pow_pump_hp - ON, pow_capless - ON  */
+       {ALC5658_HP_AMP, 0x0019, 0},    /* en_out_hp - ON, pow_pump_hp - ON, pow_capless - ON  */
        {ALC5658_NOISE_G_M1_CTRL1, 0xC0F0, 0},  /* Noise_gate_mode1_en, Noise_gate_mode1_auto_en - EN, Noise_gate_mode1_threshold -78dB, DOES NOT MATCH WITH DOCUMENTATION !!! */
        {ALC5658_NOISE_G_M1_CTRL1, 0x87F9, 0},  /* Blah blah blah, eventually enable Noise gate function >:( */
        {ALC5658_INTCLK_CTRL, 0x0180, 0},       /* Probably enable Pow_int_clk1/2, does not match with DOC !!! */
@@ -243,29 +243,29 @@ t_codec_init_script_entry codec_init_script[] = {
 };
 
 t_codec_init_script_entry codec_initial_script[] = {
-       {ACL5658_RESET, 0x0000, 0},
+       {ALC5658_RESET, 0x0000, 0},
        {ALC5658_0111, 0xA502, 0},
        {ALC5658_ADDA_RST1, 0x3030, 0}, /* ??? DAC1, DAC2 + alpha clock enable */
        {ALC5658_006E, 0xEF00, 0},
        {ALC5658_006F, 0xEFFC, 0},
        {ALC5658_INTCLK_CTRL, 0x0280, 0},       /* ??? Enable ALL int CLK, even more than in documentation */
-       {ACL5658_GLBL_CLK, 0x8000, 0},  /* RC CLK, No dividers */
-       {ACL5658_I2S1_CTRL, 0x0000, 0}, /* Master, off/normal/I2S...  16bit */
-       {ACL5658_ADDA_CLK, 0x1770, 0},  /* I2Sprediv1 = 2, bclk_ms2 = 16bits(32FS), I2Sprediv2 = 7, something reserved, dac/adc 128Fs */
+       {ALC5658_GLBL_CLK, 0x8000, 0},  /* RC CLK, No dividers */
+       {ALC5658_I2S1_CTRL, 0x0000, 0}, /* Master, off/normal/I2S...  16bit */
+       {ALC5658_ADDA_CLK, 0x1770, 0},  /* I2Sprediv1 = 2, bclk_ms2 = 16bits(32FS), I2Sprediv2 = 7, something reserved, dac/adc 128Fs */
        {ALC5658_0091, 0x0C16, 0},
-       {ACL5658_PWR_MNG3, 0xAA7E, 60}, /* VREF1 on, fast VREF1, VREF2 on, fast VREF2, MBIAS on, LOUT off, MBIAS bandgap off, HP L/R ON, HPamp x5, LDO1 out 1.2V */
-       {ACL5658_PWR_MNG3, 0xFE7E, 50}, /* VREF1 on, SLOW VREF1, VREF2 on, SLOW VREF2, MBIAS on, LOUT off, MBIAS bandgap off, HP L/R ON, HPamp x5, LDO1 out 1.2V */
-       {ACL5658_PWR_MNG5, 0x0004, 0},  /* LDO2 ON */
-       {ACL5658_PWR_MNG2, 0x0400, 50}, /* pow_dac_stereo1_filter ON */
-       {ACL5658_PWR_MNG1, 0x0080, 10}, /* Pow_ldo_dacref ON */
-       {ACL5658_ADC_2_DAC_MXR, 0x8080, 0},     /* Mu_stereo1_adc_mixer_l/r MUTE */
-       {ACL5658_DAC_STR_MXR, 0xAAAA, 0},       /* Default, mute all */
-       {ACL5658_DAC_SRC, 0x0000, 0},   /* Default, no mixers (direct) */
-       {ACL5658_HP_AMP, 0x0009, 50},   /* en_out_hp - OFF, pow_pump_hp - ON, pow_capless - ON */
-       {ACL5658_PWR_MNG1, 0x0F80, 50}, /* pow_dac1_l/r, pow_dac2_l/r, Pow_ldo_dacref - ON */
+       {ALC5658_PWR_MNG3, 0xAA7E, 60}, /* VREF1 on, fast VREF1, VREF2 on, fast VREF2, MBIAS on, LOUT off, MBIAS bandgap off, HP L/R ON, HPamp x5, LDO1 out 1.2V */
+       {ALC5658_PWR_MNG3, 0xFE7E, 50}, /* VREF1 on, SLOW VREF1, VREF2 on, SLOW VREF2, MBIAS on, LOUT off, MBIAS bandgap off, HP L/R ON, HPamp x5, LDO1 out 1.2V */
+       {ALC5658_PWR_MNG5, 0x0004, 0},  /* LDO2 ON */
+       {ALC5658_PWR_MNG2, 0x0400, 50}, /* pow_dac_stereo1_filter ON */
+       {ALC5658_PWR_MNG1, 0x0080, 10}, /* Pow_ldo_dacref ON */
+       {ALC5658_ADC_2_DAC_MXR, 0x8080, 0},     /* Mu_stereo1_adc_mixer_l/r MUTE */
+       {ALC5658_DAC_STR_MXR, 0xAAAA, 0},       /* Default, mute all */
+       {ALC5658_DAC_SRC, 0x0000, 0},   /* Default, no mixers (direct) */
+       {ALC5658_HP_AMP, 0x0009, 50},   /* en_out_hp - OFF, pow_pump_hp - ON, pow_capless - ON */
+       {ALC5658_PWR_MNG1, 0x0F80, 50}, /* pow_dac1_l/r, pow_dac2_l/r, Pow_ldo_dacref - ON */
        {ALC5658_0091, 0x0E16, 50},
        {ALC5658_0040, 0x0505, 0},
-       {ACL5658_PWR_MNG5, 0x0184, 0},  /* ???NonDescribed,  LDO2 ON */
+       {ALC5658_PWR_MNG5, 0x0184, 0},  /* ???NonDescribed,  LDO2 ON */
        {ALC5658_0x013C, 0x3C05, 0},
        {ALC5658_0x01DF, 0x2cc1, 6},
        {ALC5658_0x01DE, 0x5100, 6},
@@ -277,92 +277,92 @@ t_codec_init_script_entry codec_initial_script[] = {
        {ALC5658_0x01E4, 0x0016, 0},
        {ALC5658_0x01DE, 0xC900, 250},
        {ALC5658_0x01DF, 0x2CC1, 0},
-       {ACL5658_HPOUT_MUTE, 0x0000, 0},        /* UNMUTE HP Output */
+       {ALC5658_HPOUT_MUTE, 0x0000, 0},        /* UNMUTE HP Output */
        {ALC5658_0x01DE, 0x4500, 0},
        {ALC5658_0x01E4, 0x001F, 0},
        {ALC5658_0x01DE, 0xC500, 600},
        {ALC5658_0x01E4, 0x0000, 0},
        {ALC5658_0x01DF, 0x20C0, 0},
        {ALC5658_0040, 0x0808, 0},
-       {ACL5658_PWR_MNG5, 0x0000, 0},  /* LDO2 OFF */
+       {ALC5658_PWR_MNG5, 0x0000, 0},  /* LDO2 OFF */
        {ALC5658_0x013C, 0x2005, 0},
-       {ACL5658_PWR_MNG6, 0x0000, 0},  /* MIXERs OFF */
-       {ACL5658_PWR_MNG7, 0x0000, 0},  /* VOL Out/In ctrl, MIC in det OFF */
-       {ACL5658_PWR_MNG1, 0x0000, 0},  /* I2S, DAC, ADC, SPDIFF, CLASS D OFF */
-       {ACL5658_PWR_MNG2, 0x0000, 0},  /* Filters, PDM I/F  OFF */
-       {ACL5658_PWR_MNG3, 0x003C, 0},  /* HP L/R ON, HPamp x5, LDO1 out 0.9V */
-       {ACL5658_GLBL_CLK, 0x0000, 0},  /* MCLK, No dividers */
-       {ACL5658_ADDA_CLK, 0x0770, 0},  /* I2Sprediv1 = 2, bclk_ms2 = 16bits(32FS), I2Sprediv2 = 7, something reserved, dac/adc 128Fs */
+       {ALC5658_PWR_MNG6, 0x0000, 0},  /* MIXERs OFF */
+       {ALC5658_PWR_MNG7, 0x0000, 0},  /* VOL Out/In ctrl, MIC in det OFF */
+       {ALC5658_PWR_MNG1, 0x0000, 0},  /* I2S, DAC, ADC, SPDIFF, CLASS D OFF */
+       {ALC5658_PWR_MNG2, 0x0000, 0},  /* Filters, PDM I/F  OFF */
+       {ALC5658_PWR_MNG3, 0x003C, 0},  /* HP L/R ON, HPamp x5, LDO1 out 0.9V */
+       {ALC5658_GLBL_CLK, 0x0000, 0},  /* MCLK, No dividers */
+       {ALC5658_ADDA_CLK, 0x0770, 0},  /* I2Sprediv1 = 2, bclk_ms2 = 16bits(32FS), I2Sprediv2 = 7, something reserved, dac/adc 128Fs */
        {ALC5658_INTCLK_CTRL, 0x0080, 0},       /* Probably enable Pow_int_clk1/2, does not match with DOC !!! */
 };
 
 t_codec_init_script_entry codec_init_out_script[] = {
-       {ACL5658_RESET, 0x0000, 0},
+       {ALC5658_RESET, 0x0000, 0},
        {ALC5658_006E, 0xFFFF, 0},
        {ALC5658_006F, 0xFFFF, 0},
        {ALC5658_GNRL_CTRL, 0x8001, 0}, /* Bypass_noise_gate_mode2 BYPASS, digital_gate_ctrl ENABLE */
        {ALC5658_ADDA_RST1, 0x3030, 0}, /* ??? DAC1, DAC2 + alpha clock enable */
-       {ACL5658_GLBL_PLL1, 0x0302, 0}, /* k = 2, n = 8 */
-       {ACL5658_GLBL_PLL2, 0x0800, 0}, /* m - bypass */
-       {ACL5658_ADDA_CLK, 0x1110, 0},  /* I2Sprediv1 = 2, bclk_ms2 = 16bits(32FS), I2Sprediv2 = 2, something reserved, dac/adc 128Fs */
+       {ALC5658_GLBL_PLL1, 0x0302, 0}, /* k = 2, n = 8 */
+       {ALC5658_GLBL_PLL2, 0x0800, 0}, /* m - bypass */
+       {ALC5658_ADDA_CLK, 0x1110, 0},  /* I2Sprediv1 = 2, bclk_ms2 = 16bits(32FS), I2Sprediv2 = 2, something reserved, dac/adc 128Fs */
        {ALC5658_0091, 0x0C16, 0},
-       {ACL5658_PWR_MNG3, 0xA23E, 20}, /* VREF1 on, fast VREF1, VREF2 on, fast VREF2, MBIAS on, LOUT off, MBIAS bandgap off, HP L/R ON, HPamp x5, LDO1 out 1.2V */
-       {ACL5658_PWR_MNG3, 0xF23E, 0},  /* VREF1 on, SLOW VREF1, VREF2 on, SLOW VREF2, MBIAS on, LOUT off, MBIAS bandgap off, HP L/R ON, HPamp x5, LDO1 out 1.2V */
-       {ACL5658_PWR_MNG5, 0x0040, 0},  /* LDO2 ON */
-       {ACL5658_GLBL_CLK, 0x4000, 0},  /* PLL1, No dividers */
-       {ACL5658_GLBL_ASRC4, 0x0100, 0},        /* sel_i2s2_asrc = ASRC2 */
-       {ACL5658_GLBL_ASRC1, 0x1300, 0},        /* En_i2s2_asrc - EN, Sel_mono_dac_l/r_mode EN */
-       {ACL5658_GLBL_ASRC2, 0x0220, 0},        /* sel_da_filter_monol_track = clk_i2s2_track, sel_da_filter_monor_track = clk_i2s2_track */
-       {ACL5658_PWR_MNG1, 0xC080, 0},  /* en_i2s1/en_i2s2, Pow_ldo_dacref ON */
-       {ACL5658_HP_AMP, 0x0009, 0},    /* en_out_hp - OFF, pow_pump_hp - ON, pow_capless - ON */
-       {ACL5658_PWR_MNG1, 0xCC80, 0},  /* en_i2s1/en_i2s2, pow_dac1_l/r, Pow_ldo_dacref ON */
+       {ALC5658_PWR_MNG3, 0xA23E, 20}, /* VREF1 on, fast VREF1, VREF2 on, fast VREF2, MBIAS on, LOUT off, MBIAS bandgap off, HP L/R ON, HPamp x5, LDO1 out 1.2V */
+       {ALC5658_PWR_MNG3, 0xF23E, 0},  /* VREF1 on, SLOW VREF1, VREF2 on, SLOW VREF2, MBIAS on, LOUT off, MBIAS bandgap off, HP L/R ON, HPamp x5, LDO1 out 1.2V */
+       {ALC5658_PWR_MNG5, 0x0040, 0},  /* LDO2 ON */
+       {ALC5658_GLBL_CLK, 0x4000, 0},  /* PLL1, No dividers */
+       {ALC5658_GLBL_ASRC4, 0x0100, 0},        /* sel_i2s2_asrc = ASRC2 */
+       {ALC5658_GLBL_ASRC1, 0x1300, 0},        /* En_i2s2_asrc - EN, Sel_mono_dac_l/r_mode EN */
+       {ALC5658_GLBL_ASRC2, 0x0220, 0},        /* sel_da_filter_monol_track = clk_i2s2_track, sel_da_filter_monor_track = clk_i2s2_track */
+       {ALC5658_PWR_MNG1, 0xC080, 0},  /* en_i2s1/en_i2s2, Pow_ldo_dacref ON */
+       {ALC5658_HP_AMP, 0x0009, 0},    /* en_out_hp - OFF, pow_pump_hp - ON, pow_capless - ON */
+       {ALC5658_PWR_MNG1, 0xCC80, 0},  /* en_i2s1/en_i2s2, pow_dac1_l/r, Pow_ldo_dacref ON */
        {ALC5658_0091, 0x0E16, 0},
-       {ACL5658_PWR_MNG2, 0x0700, 0},  /* pow_dac_stereo1_filter, pow_dac_monol/r_filter ON  */
-       {ACL5658_HPOUT_MUTE, 0x0000, 0},        /* OFF */
+       {ALC5658_PWR_MNG2, 0x0700, 0},  /* pow_dac_stereo1_filter, pow_dac_monol/r_filter ON  */
+       {ALC5658_HPOUT_MUTE, 0x0000, 0},        /* OFF */
        {ALC5658_0091, 0x0E1E, 0},
        {ALC5658_006E, 0xFFFF, 0},
        {ALC5658_006F, 0xFFFF, 0},
-       {ACL5658_I2S1_CTRL, 0x0000, 0}, //MASTER 32FS
-       {ACL5658_DAC_STR_MXR, 0x2A8A, 0},       /* mu_stereo_dacl1_mixl, mu_stereo_dacr1_mixr unmute */
-       {ACL5658_DAC_SRC, 0x000F, 0},   /* DAC1 stereo, DAC2 mono */
-       {ACL5658_HP_AMP, 0x0019, 0},    /* en_out_hp - ON, pow_pump_hp - ON, pow_capless - ON  */
-       {ACL5658_TDM_CTRL2, 0x000C, 0}, //loopback
+       {ALC5658_I2S1_CTRL, 0x0000, 0}, //MASTER 32FS
+       {ALC5658_DAC_STR_MXR, 0x2A8A, 0},       /* mu_stereo_dacl1_mixl, mu_stereo_dacr1_mixr unmute */
+       {ALC5658_DAC_SRC, 0x000F, 0},   /* DAC1 stereo, DAC2 mono */
+       {ALC5658_HP_AMP, 0x0019, 0},    /* en_out_hp - ON, pow_pump_hp - ON, pow_capless - ON  */
+       {ALC5658_TDM_CTRL2, 0x000C, 0}, //loopback
 };
 
 t_codec_init_script_entry codec_init_in_script[] = {
-       {ACL5658_RESET, 0x0000, 0},
+       {ALC5658_RESET, 0x0000, 0},
        {ALC5658_ADDA_RST1, 0x3030, 0}, /* ??? DAC1, DAC2 + alpha clock enable */
        {ALC5658_ADDA_RST2, 0x3030, 0}, /* ??? ADC1, ADC2 + alpha clock enable */
        {ALC5658_006E, 0xEF00, 0},
        {ALC5658_006F, 0xEFFC, 0},
-       {ACL5658_I2S1_CTRL, 0x0000, 0}, /* Master, off/normal/I2S...  16bit */
+       {ALC5658_I2S1_CTRL, 0x0000, 0}, /* Master, off/normal/I2S...  16bit */
        {ALC5658_GNRL_CTRL, 0x8001, 0}, /* Bypass_noise_gate_mode2 BYPASS, digital_gate_ctrl ENABLE */
-       {ACL5658_ADDA_CLK, 0x0000, 0},  /* I2Sprediv1 = 1, bclk_ms2 = 16bits(32FS), I2Sprediv2 = 1, something reserved, dac/adc 128Fs */
-       {ACL5658_PWR_MNG3, 0xA2BE, 50}, /* VREF1 on, fast VREF1, VREF2 on, fast VREF2, MBIAS on, LOUT off, MBIAS bandgap ON, HP L/R ON, HPamp x5, LDO1 out 1.2V */
-       {ACL5658_PWR_MNG3, 0xF2BE, 0},  /* VREF1 on, slow VREF1, VREF2 on, slow VREF2, MBIAS on, LOUT off, MBIAS bandgap ON, HP L/R ON, HPamp x5, LDO1 out 1.2V */
-       {ACL5658_PWR_MNG1, 0x8098, 0},  /* en_i2s1, Pow_ldo_dacref, pow_adc1_l/r ON */
-       {ACL5658_PWR_MNG1, 0x8C80, 0},  /* en_i2s1, pow_dac1_l/r Pow_ldo_dacref, pow_adc1_l/r ON */
+       {ALC5658_ADDA_CLK, 0x0000, 0},  /* I2Sprediv1 = 1, bclk_ms2 = 16bits(32FS), I2Sprediv2 = 1, something reserved, dac/adc 128Fs */
+       {ALC5658_PWR_MNG3, 0xA2BE, 50}, /* VREF1 on, fast VREF1, VREF2 on, fast VREF2, MBIAS on, LOUT off, MBIAS bandgap ON, HP L/R ON, HPamp x5, LDO1 out 1.2V */
+       {ALC5658_PWR_MNG3, 0xF2BE, 0},  /* VREF1 on, slow VREF1, VREF2 on, slow VREF2, MBIAS on, LOUT off, MBIAS bandgap ON, HP L/R ON, HPamp x5, LDO1 out 1.2V */
+       {ALC5658_PWR_MNG1, 0x8098, 0},  /* en_i2s1, Pow_ldo_dacref, pow_adc1_l/r ON */
+       {ALC5658_PWR_MNG1, 0x8C80, 0},  /* en_i2s1, pow_dac1_l/r Pow_ldo_dacref, pow_adc1_l/r ON */
        {ALC5658_0091, 0x0E16, 0},
-       {ACL5658_PWR_MNG2, 0xB400, 0},  /* pow_adc_stereo1_filter, pow_adc_monol/r_filter,  pow_dac_stereo1_filter ON */
+       {ALC5658_PWR_MNG2, 0xB400, 0},  /* pow_adc_stereo1_filter, pow_adc_monol/r_filter,  pow_dac_stereo1_filter ON */
        {ALC5658_0010, 0x3040, 0},      //CRT Mbias1 path
-       {ACL5658_PWR_MNG4, 0xC860, 0},  //enable mbias1 /* pow_bst1, pow_bst2, pow_micbias1_digital, pow_bst1-2, pow_bst2-2 ON   */
-       {ACL5658_PWR_MNG1, 0x8C98, 0},  /* en_i2s1, pow_dac1_l/r, Pow_ldo_dacref, pow_adc1_l/r ON */
-       {ACL5658_PWR_MNG6, 0x0C00, 0},  /* pow_recmix1l/r ON */
-       {ACL5658_PWR_MNG7, 0x0300, 0},  /* ?extra bits set? pow_inl_vol ON */
-       {ACL5658_IN1_CTRL, 0x3000, 0},  /* Gain -12dB + 0.75dB*0x30  */
-       {ACL5658_RECMIX1L_CTRL_2, 0x005F, 0},   /* Default, all mute */
-       {ACL5658_RECMIX1R_CTRL_2, 0x005F, 0},   /* Default, all mute */
+       {ALC5658_PWR_MNG4, 0xC860, 0},  //enable mbias1 /* pow_bst1, pow_bst2, pow_micbias1_digital, pow_bst1-2, pow_bst2-2 ON   */
+       {ALC5658_PWR_MNG1, 0x8C98, 0},  /* en_i2s1, pow_dac1_l/r, Pow_ldo_dacref, pow_adc1_l/r ON */
+       {ALC5658_PWR_MNG6, 0x0C00, 0},  /* pow_recmix1l/r ON */
+       {ALC5658_PWR_MNG7, 0x0300, 0},  /* ?extra bits set? pow_inl_vol ON */
+       {ALC5658_IN1_CTRL, 0x3000, 0},  /* Gain -12dB + 0.75dB*0x30  */
+       {ALC5658_RECMIX1L_CTRL_2, 0x005F, 0},   /* Default, all mute */
+       {ALC5658_RECMIX1R_CTRL_2, 0x005F, 0},   /* Default, all mute */
        {ALC5658_ADC_STR1_MXR, 0x6020, 0},      /* mu_stereo1_adcl1 unmute, sel_stereo1_adc1 Sel, mu_stereo1_adcr1 unmute */
-       {ACL5658_ADC_2_DAC_MXR, 0x0000, 100},   /* Mu_stereo1_adc_mixer_l/r unmute */
-       {ACL5658_DAC_MONO_MXR, 0x2A8A, 0},      /* mu_mono_dacl1_mixl/r unmute */
+       {ALC5658_ADC_2_DAC_MXR, 0x0000, 100},   /* Mu_stereo1_adc_mixer_l/r unmute */
+       {ALC5658_DAC_MONO_MXR, 0x2A8A, 0},      /* mu_mono_dacl1_mixl/r unmute */
        {ALC5658_ADC_MONO_MXR, 0x4040, 0},      /* mu_mono_adcl1 UM, sel_mono_adcl1/2 - Mono_DAC_Mixer_L, mu_mono_adcr1 UM, Sel_mono_adcr1/2 - Mono_DAC_Mixer_R, sel_mono_adcr - ADC1_L, Sel_mono_dmic_r - DMIC1_R */
-       {ACL5658_DAC_SRC, 0x000F, 0},   /* DAC1 stereo, DAC2 mono */
-       {ACL5658_TDM_CTRL1, 0x00F0, 0}, /* TDM IN/OUT 32bit LEN Applicable in master mode ??? */
-       {ACL5658_TDM_CTRL2, 0x0000, 0}, /* rx_adc_data_sel - IF_ADC1 / IF_ADC2 / DAC_REF / Null */
+       {ALC5658_DAC_SRC, 0x000F, 0},   /* DAC1 stereo, DAC2 mono */
+       {ALC5658_TDM_CTRL1, 0x00F0, 0}, /* TDM IN/OUT 32bit LEN Applicable in master mode ??? */
+       {ALC5658_TDM_CTRL2, 0x0000, 0}, /* rx_adc_data_sel - IF_ADC1 / IF_ADC2 / DAC_REF / Null */
 };
 
 t_codec_init_script_entry codec_init_inout_script1[] = {
-       {ACL5658_RESET, 0x0000, 0},
+       {ALC5658_RESET, 0x0000, 0},
        {ALC5658_006E, 0xEF00, 0},
        {ALC5658_006F, 0xEFFC, 0},
        {ALC5658_GNRL_CTRL, 0x8001, 0},
@@ -371,150 +371,150 @@ t_codec_init_script_entry codec_init_inout_script1[] = {
 };
 
 t_codec_init_script_entry codec_init_pll_8K[] = {
-       {ACL5658_GLBL_PLL1, 0x0302, 0},
-       {ACL5658_GLBL_PLL2, 0x0800, 0},
-       {ACL5658_ADDA_CLK, 0x6110, 0},
+       {ALC5658_GLBL_PLL1, 0x0302, 0},
+       {ALC5658_GLBL_PLL2, 0x0800, 0},
+       {ALC5658_ADDA_CLK, 0x6110, 0},
 };
 
 t_codec_init_script_entry codec_init_pll_11K[] = {
-       {ACL5658_GLBL_PLL1, 0x4883, 0},
-       {ACL5658_GLBL_PLL2, 0xE000, 0},
-       {ACL5658_ADDA_CLK, 0x5110, 0},
+       {ALC5658_GLBL_PLL1, 0x4883, 0},
+       {ALC5658_GLBL_PLL2, 0xE000, 0},
+       {ALC5658_ADDA_CLK, 0x5110, 0},
 };
 
 t_codec_init_script_entry codec_init_pll_16K[] = {
-       {ACL5658_GLBL_PLL1, 0x0302, 0},
-       {ACL5658_GLBL_PLL2, 0x0800, 0},
-       {ACL5658_ADDA_CLK, 0x4110, 0},
+       {ALC5658_GLBL_PLL1, 0x0302, 0},
+       {ALC5658_GLBL_PLL2, 0x0800, 0},
+       {ALC5658_ADDA_CLK, 0x4110, 0},
 };
 
 t_codec_init_script_entry codec_init_pll_22K[] = {
-       {ACL5658_GLBL_PLL1, 0x4883, 0},
-       {ACL5658_GLBL_PLL2, 0xE000, 0},
-       {ACL5658_ADDA_CLK, 0x3110, 0},
+       {ALC5658_GLBL_PLL1, 0x4883, 0},
+       {ALC5658_GLBL_PLL2, 0xE000, 0},
+       {ALC5658_ADDA_CLK, 0x3110, 0},
 };
 
 t_codec_init_script_entry codec_init_pll_32K[] = {
-       {ACL5658_GLBL_PLL1, 0x0302, 0},
-       {ACL5658_GLBL_PLL2, 0x0800, 0},
-       {ACL5658_ADDA_CLK, 0x2110, 0},
+       {ALC5658_GLBL_PLL1, 0x0302, 0},
+       {ALC5658_GLBL_PLL2, 0x0800, 0},
+       {ALC5658_ADDA_CLK, 0x2110, 0},
 };
 
 t_codec_init_script_entry codec_init_pll_44K[] = {
-       {ACL5658_GLBL_PLL1, 0x4883, 0},
-       {ACL5658_GLBL_PLL2, 0xE000, 0},
-       {ACL5658_ADDA_CLK, 0x1110, 0},
+       {ALC5658_GLBL_PLL1, 0x4883, 0},
+       {ALC5658_GLBL_PLL2, 0xE000, 0},
+       {ALC5658_ADDA_CLK, 0x1110, 0},
 };
 
 t_codec_init_script_entry codec_init_pll_48K[] = {
-       {ACL5658_GLBL_PLL1, 0x0302, 0},
-       {ACL5658_GLBL_PLL2, 0x0800, 0},
-       {ACL5658_ADDA_CLK, 0x1110, 0},
+       {ALC5658_GLBL_PLL1, 0x0302, 0},
+       {ALC5658_GLBL_PLL2, 0x0800, 0},
+       {ALC5658_ADDA_CLK, 0x1110, 0},
 };
 
 t_codec_init_script_entry codec_init_inout_script2[] = {
        {ALC5658_0091, 0x0C16, 0},
-       {ACL5658_PWR_MNG3, 0xA2BE, 20},
-       {ACL5658_PWR_MNG3, 0xF2BE, 0},
-       {ACL5658_PWR_MNG5, 0x0040, 0},
-       {ACL5658_GLBL_CLK, 0x4000, 0},
-       {ACL5658_GLBL_ASRC4, 0x0100, 0},
-       {ACL5658_GLBL_ASRC1, 0x1300, 0},
-       {ACL5658_GLBL_ASRC2, 0x0220, 0},
-       {ACL5658_PWR_MNG1, 0xC080, 0},
-       {ACL5658_HP_AMP, 0x0009, 0},
-       {ACL5658_PWR_MNG1, 0xCC80, 0},
-       {ACL5658_PWR_MNG1, 0xCC98, 0},
+       {ALC5658_PWR_MNG3, 0xA2BE, 20},
+       {ALC5658_PWR_MNG3, 0xF2BE, 0},
+       {ALC5658_PWR_MNG5, 0x0040, 0},
+       {ALC5658_GLBL_CLK, 0x4000, 0},
+       {ALC5658_GLBL_ASRC4, 0x0100, 0},
+       {ALC5658_GLBL_ASRC1, 0x1300, 0},
+       {ALC5658_GLBL_ASRC2, 0x0220, 0},
+       {ALC5658_PWR_MNG1, 0xC080, 0},
+       {ALC5658_HP_AMP, 0x0009, 0},
+       {ALC5658_PWR_MNG1, 0xCC80, 0},
+       {ALC5658_PWR_MNG1, 0xCC98, 0},
        {ALC5658_0091, 0x0E16, 0},
-       {ACL5658_PWR_MNG2, 0xB700, 0},
-       {ACL5658_PWR_MNG4, 0xC860, 0},          //enable mbias1
-       {ACL5658_PWR_MNG6, 0x0C00, 0},
-       {ACL5658_PWR_MNG7, 0x0300, 0},
-       {ACL5658_HPOUT_MUTE, 0x8080, 0},                // MUTE OUTPUT
+       {ALC5658_PWR_MNG2, 0xB700, 0},
+       {ALC5658_PWR_MNG4, 0xC860, 0},          //enable mbias1
+       {ALC5658_PWR_MNG6, 0x0C00, 0},
+       {ALC5658_PWR_MNG7, 0x0300, 0},
+       {ALC5658_HPOUT_MUTE, 0x8080, 0},                // MUTE OUTPUT
        {ALC5658_0091, 0x0E1E, 0},
-       {ACL5658_I2S1_CTRL, 0x0000, 0},
-       {ACL5658_DAC_STR_MXR, 0x2A8A, 0},
-       {ACL5658_DAC_SRC, 0x000F, 0},
-       {ACL5658_HP_AMP, 0x0019, 0},
+       {ALC5658_I2S1_CTRL, 0x0000, 0},
+       {ALC5658_DAC_STR_MXR, 0x2A8A, 0},
+       {ALC5658_DAC_SRC, 0x000F, 0},
+       {ALC5658_HP_AMP, 0x0019, 0},
        {ALC5658_0010, 0x3040, 0},              //CRT Mbias1 path
-       {ACL5658_IN1_CTRL, 0x0000, 0},          //BST1 gain (minimal)
-       {ACL5658_RECMIX1L_CTRL_2, 0x005F, 0},           //BST1
-       {ACL5658_RECMIX1R_CTRL_2, 0x005F, 0},           //BST1
+       {ALC5658_IN1_CTRL, 0x0000, 0},          //BST1 gain (minimal)
+       {ALC5658_RECMIX1L_CTRL_2, 0x005F, 0},           //BST1
+       {ALC5658_RECMIX1R_CTRL_2, 0x005F, 0},           //BST1
        {ALC5658_ADC_STR1_MXR, 0x6020, 0},
-       {ACL5658_ADC_2_DAC_MXR, 0x8080, 100},
-       {ACL5658_DAC_MONO_MXR, 0x2A8A, 0},
+       {ALC5658_ADC_2_DAC_MXR, 0x8080, 100},
+       {ALC5658_DAC_MONO_MXR, 0x2A8A, 0},
        {ALC5658_ADC_MONO_MXR, 0x4040, 0},
-       {ACL5658_DAC_SRC, 0x000F, 0},
-       {ACL5658_TDM_CTRL1, 0x00F0, 0},
-       {ACL5658_TDM_CTRL2, 0x0000, 0},
+       {ALC5658_DAC_SRC, 0x000F, 0},
+       {ALC5658_TDM_CTRL1, 0x00F0, 0},
+       {ALC5658_TDM_CTRL2, 0x0000, 0},
 
 };
 
 t_codec_dump_entry codec_dump_script[] = {
-       {ACL5658_RESET, "ACL5658_RESET"},
-       {ACL5658_SPO_VOL, "ACL5658_SPO_VOL"},
-       {ACL5658_HPOUT_MUTE, "ACL5658_HPOUT_MUTE"},
-       {ACL5658_LOUT_CTRL1, "ACL5658_LOUT_CTRL1"},
-       {ACL5658_LOUT_CTRL2, "ACL5658_LOUT_CTRL2"},
-       {ACL5658_HPOUT_VLML, "ACL5658_HPOUT_VLML"},
-       {ACL5658_HPOUT_VLMR, "ACL5658_HPOUT_VLMR"},
-       {ACL5658_SPDIF_CTRL1, "ACL5658_SPDIF_CTRL1"},
-       {ACL5658_SPDIF_CTRL2, "ACL5658_SPDIF_CTRL2"},
-       {ACL5658_SPDIF_CTRL3, "ACL5658_SPDIF_CTRL3"},
-       {ACL5658_IN1_CTRL, "ACL5658_IN1_CTRL"},
-       {ACL5658_INL_VLM, "ACL5658_INL_VLM"},
-       {ACL5658_SIDETONE, "ACL5658_SIDETONE"},
-       {ACL5658_DAC_L1R1_VLM, "ACL5658_DAC_L1R1_VLM"},
-       {ACL5658_DAC_L2R2_VLM, "ACL5658_DAC_L2R2_VLM"},
-       {ACL5658_DAC_L2R2_MUTE, "ACL5658_DAC_L2R2_MUTE"},
+       {ALC5658_RESET, "ALC5658_RESET"},
+       {ALC5658_SPO_VOL, "ALC5658_SPO_VOL"},
+       {ALC5658_HPOUT_MUTE, "ALC5658_HPOUT_MUTE"},
+       {ALC5658_LOUT_CTRL1, "ALC5658_LOUT_CTRL1"},
+       {ALC5658_LOUT_CTRL2, "ALC5658_LOUT_CTRL2"},
+       {ALC5658_HPOUT_VLML, "ALC5658_HPOUT_VLML"},
+       {ALC5658_HPOUT_VLMR, "ALC5658_HPOUT_VLMR"},
+       {ALC5658_SPDIF_CTRL1, "ALC5658_SPDIF_CTRL1"},
+       {ALC5658_SPDIF_CTRL2, "ALC5658_SPDIF_CTRL2"},
+       {ALC5658_SPDIF_CTRL3, "ALC5658_SPDIF_CTRL3"},
+       {ALC5658_IN1_CTRL, "ALC5658_IN1_CTRL"},
+       {ALC5658_INL_VLM, "ALC5658_INL_VLM"},
+       {ALC5658_SIDETONE, "ALC5658_SIDETONE"},
+       {ALC5658_DAC_L1R1_VLM, "ALC5658_DAC_L1R1_VLM"},
+       {ALC5658_DAC_L2R2_VLM, "ALC5658_DAC_L2R2_VLM"},
+       {ALC5658_DAC_L2R2_MUTE, "ALC5658_DAC_L2R2_MUTE"},
        {ALC5658_ADC_STR1_MXR, "ALC5658_ADC_STR1_MXR"},
        {ALC5658_ADC_MONO_MXR, "ALC5658_ADC_MONO_MXR"},
-       {ACL5658_ADC_2_DAC_MXR, "ACL5658_ADC_2_DAC_MXR"},
-       {ACL5658_DAC_STR_MXR, "ACL5658_DAC_STR_MXR"},
-       {ACL5658_DAC_MONO_MXR, "ACL5658_DAC_MONO_MXR"},
-       {ACL5658_DAC_LB_SDTONE, "ACL5658_DAC_LB_SDTONE"},
-       {ACL5658_COPY_MODE, "ACL5658_COPY_MODE"},
-       {ACL5658_DAC_SRC, "ACL5658_DAC_SRC"},
-       {ACL5658_RECMIX1L_CTRL_1, "ACL5658_RECMIX1L_CTRL_1"},
-       {ACL5658_RECMIX1L_CTRL_2, "ACL5658_RECMIX1L_CTRL_2"},
-       {ACL5658_RECMIX1R_CTRL_1, "ACL5658_RECMIX1R_CTRL_1"},
-       {ACL5658_RECMIX1R_CTRL_2, "ACL5658_RECMIX1R_CTRL_2"},
-       {ACL5658_SPKMIXL, "ACL5658_SPKMIXL"},
-       {ACL5658_SPKMIXR, "ACL5658_SPKMIXR"},
-       {ACL5658_SPOMIX, "ACL5658_SPOMIX"},
-       {ACL5658_OUTMIXL1, "ACL5658_OUTMIXL1"},
-       {ACL5658_OUTMIXL2, "ACL5658_OUTMIXL2"},
-       {ACL5658_OUTMIXR1, "ACL5658_OUTMIXR1"},
-       {ACL5658_OUTMIXR2, "ACL5658_OUTMIXR2"},
-       {ACL5658_LOUTMIX, "ACL5658_LOUTMIX"},
-       {ACL5658_PWR_MNG1, "ACL5658_PWR_MNG1"},
-       {ACL5658_PWR_MNG2, "ACL5658_PWR_MNG2"},
-       {ACL5658_PWR_MNG3, "ACL5658_PWR_MNG3"},
-       {ACL5658_PWR_MNG4, "ACL5658_PWR_MNG4"},
-       {ACL5658_PWR_MNG5, "ACL5658_PWR_MNG5"},
-       {ACL5658_PWR_MNG6, "ACL5658_PWR_MNG6"},
-       {ACL5658_PWR_MNG7, "ACL5658_PWR_MNG7"},
-       {ACL5658_IF_DTCT, "ACL5658_IF_DTCT"},
+       {ALC5658_ADC_2_DAC_MXR, "ALC5658_ADC_2_DAC_MXR"},
+       {ALC5658_DAC_STR_MXR, "ALC5658_DAC_STR_MXR"},
+       {ALC5658_DAC_MONO_MXR, "ALC5658_DAC_MONO_MXR"},
+       {ALC5658_DAC_LB_SDTONE, "ALC5658_DAC_LB_SDTONE"},
+       {ALC5658_COPY_MODE, "ALC5658_COPY_MODE"},
+       {ALC5658_DAC_SRC, "ALC5658_DAC_SRC"},
+       {ALC5658_RECMIX1L_CTRL_1, "ALC5658_RECMIX1L_CTRL_1"},
+       {ALC5658_RECMIX1L_CTRL_2, "ALC5658_RECMIX1L_CTRL_2"},
+       {ALC5658_RECMIX1R_CTRL_1, "ALC5658_RECMIX1R_CTRL_1"},
+       {ALC5658_RECMIX1R_CTRL_2, "ALC5658_RECMIX1R_CTRL_2"},
+       {ALC5658_SPKMIXL, "ALC5658_SPKMIXL"},
+       {ALC5658_SPKMIXR, "ALC5658_SPKMIXR"},
+       {ALC5658_SPOMIX, "ALC5658_SPOMIX"},
+       {ALC5658_OUTMIXL1, "ALC5658_OUTMIXL1"},
+       {ALC5658_OUTMIXL2, "ALC5658_OUTMIXL2"},
+       {ALC5658_OUTMIXR1, "ALC5658_OUTMIXR1"},
+       {ALC5658_OUTMIXR2, "ALC5658_OUTMIXR2"},
+       {ALC5658_LOUTMIX, "ALC5658_LOUTMIX"},
+       {ALC5658_PWR_MNG1, "ALC5658_PWR_MNG1"},
+       {ALC5658_PWR_MNG2, "ALC5658_PWR_MNG2"},
+       {ALC5658_PWR_MNG3, "ALC5658_PWR_MNG3"},
+       {ALC5658_PWR_MNG4, "ALC5658_PWR_MNG4"},
+       {ALC5658_PWR_MNG5, "ALC5658_PWR_MNG5"},
+       {ALC5658_PWR_MNG6, "ALC5658_PWR_MNG6"},
+       {ALC5658_PWR_MNG7, "ALC5658_PWR_MNG7"},
+       {ALC5658_IF_DTCT, "ALC5658_IF_DTCT"},
        {ALC5658_006E, "ALC5658_006E"},
        {ALC5658_006F, "ALC5658_006F"},
-       {ACL5658_I2S1_CTRL, "ACL5658_I2S1_CTRL"},
-       {ACL5658_I2S2_CTRL, "ACL5658_I2S2_CTRL"},
-       {ACL5658_ADDA_CLK, "ACL5658_ADDA_CLK"},
-       {ACL5658_ADDA_HPF, "ACL5658_ADDA_HPF"},
+       {ALC5658_I2S1_CTRL, "ALC5658_I2S1_CTRL"},
+       {ALC5658_I2S2_CTRL, "ALC5658_I2S2_CTRL"},
+       {ALC5658_ADDA_CLK, "ALC5658_ADDA_CLK"},
+       {ALC5658_ADDA_HPF, "ALC5658_ADDA_HPF"},
        {ALC5658_007B, "ALC5658_007B"},
-       {ACL5658_TDM_CTRL1, "ACL5658_TDM_CTRL1"},
-       {ACL5658_TDM_CTRL2, "ACL5658_TDM_CTRL2"},
-       {ACL5658_TDM_CTRL3, "ACL5658_TDM_CTRL3"},
-       {ACL5658_TDM_CTRL4, "ACL5658_TDM_CTRL4"},
-       {ACL5658_GLBL_CLK, "ACL5658_GLBL_CLK"},
-       {ACL5658_GLBL_PLL1, "ACL5658_GLBL_PLL1"},
-       {ACL5658_GLBL_PLL2, "ACL5658_GLBL_PLL2"},
-       {ACL5658_GLBL_ASRC1, "ACL5658_GLBL_ASRC1"},
-       {ACL5658_GLBL_ASRC2, "ACL5658_GLBL_ASRC2"},
-       {ACL5658_GLBL_ASRC3, "ACL5658_GLBL_ASRC3"},
-       {ACL5658_GLBL_ASRC4, "ACL5658_GLBL_ASRC4"},
-       {ACL5658_HP_AMP, "ACL5658_HP_AMP"},
-       {ACL5658_SPK_AMP, "ACL5658_SPK_AMP"},
+       {ALC5658_TDM_CTRL1, "ALC5658_TDM_CTRL1"},
+       {ALC5658_TDM_CTRL2, "ALC5658_TDM_CTRL2"},
+       {ALC5658_TDM_CTRL3, "ALC5658_TDM_CTRL3"},
+       {ALC5658_TDM_CTRL4, "ALC5658_TDM_CTRL4"},
+       {ALC5658_GLBL_CLK, "ALC5658_GLBL_CLK"},
+       {ALC5658_GLBL_PLL1, "ALC5658_GLBL_PLL1"},
+       {ALC5658_GLBL_PLL2, "ALC5658_GLBL_PLL2"},
+       {ALC5658_GLBL_ASRC1, "ALC5658_GLBL_ASRC1"},
+       {ALC5658_GLBL_ASRC2, "ALC5658_GLBL_ASRC2"},
+       {ALC5658_GLBL_ASRC3, "ALC5658_GLBL_ASRC3"},
+       {ALC5658_GLBL_ASRC4, "ALC5658_GLBL_ASRC4"},
+       {ALC5658_HP_AMP, "ALC5658_HP_AMP"},
+       {ALC5658_SPK_AMP, "ALC5658_SPK_AMP"},
        {ALC5658_0091, "ALC5658_0091"},
        {ALC5658_INTCLK_CTRL, "ALC5658_INTCLK_CTRL"},
        {ALC5658_GNRL_CTRL, "ALC5658_GNRL_CTRL"},