ASoC: tlv320aic3x: Use snd_soc_read and snd_soc_write
Subsystems (3)
PATCH 1/3 ASoC: tlv320aic3x: Use snd_soc_read and snd_soc_write
Start phasing out aic3x_read_reg_cache, aic3x_write_reg_cache, aic3x_read and aic3x_write calls in order to switch to soc-cache helpers.
This patch replaces aic3x_read_reg_cache and aic3x_write with snd_soc_read and snd_soc_write. This is basically null-op since .read and .write in soc_codec_dev_aic3x points to aic3x_read_reg_cache and aic3x_write.
--- sound/soc/codecs/tlv320aic3x.c | 194 ++++++++++++++++++++-------------------- 1 files changed, 98 insertions(+), 96 deletions(-)
sound/soc/codecs/tlv320aic3x.c +98 -96
@@ -839,8 +839,7 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream,int clk;/* select data word length */ - data = -aic3x_read_reg_cache (codec,AIC3X_ASD_INTF_CTRLB ) & (~(0x3 <<4 )); + data =snd_soc_read (codec,AIC3X_ASD_INTF_CTRLB ) & (~(0x3 <<4 ));switch (params_format (params)) {case SNDRV_PCM_FORMAT_S16_LE :break ;
@@ -854,7 +853,7 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream, data |= (0x03 <<4 );break ; } -aic3x_write (codec,AIC3X_ASD_INTF_CTRLB , data); +snd_soc_write (codec,AIC3X_ASD_INTF_CTRLB , data);/* Fsref can be 44100 or 48000 */ fsref = (params_rate (params) %11025 ==0 ) ?44100 :48000 ;
@@ -869,17 +868,17 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream,if (bypass_pll) { pll_q &=0xf ; -aic3x_write (codec,AIC3X_PLL_PROGA_REG , pll_q <<PLLQ_SHIFT ); -aic3x_write (codec,AIC3X_GPIOB_REG ,CODEC_CLKIN_CLKDIV ); +snd_soc_write (codec,AIC3X_PLL_PROGA_REG , pll_q <<PLLQ_SHIFT ); +snd_soc_write (codec,AIC3X_GPIOB_REG ,CODEC_CLKIN_CLKDIV );/* disable PLL if it is bypassed */ - reg =aic3x_read_reg_cache (codec,AIC3X_PLL_PROGA_REG ); -aic3x_write (codec,AIC3X_PLL_PROGA_REG , reg & ~PLL_ENABLE ); + reg =snd_soc_read (codec,AIC3X_PLL_PROGA_REG ); +snd_soc_write (codec,AIC3X_PLL_PROGA_REG , reg & ~PLL_ENABLE ); }else { -aic3x_write (codec,AIC3X_GPIOB_REG ,CODEC_CLKIN_PLLDIV ); +snd_soc_write (codec,AIC3X_GPIOB_REG ,CODEC_CLKIN_PLLDIV );/* enable PLL when it is used */ - reg =aic3x_read_reg_cache (codec,AIC3X_PLL_PROGA_REG ); -aic3x_write (codec,AIC3X_PLL_PROGA_REG , reg |PLL_ENABLE ); + reg =snd_soc_read (codec,AIC3X_PLL_PROGA_REG ); +snd_soc_write (codec,AIC3X_PLL_PROGA_REG , reg |PLL_ENABLE ); }/* Route Left DAC to left channel input and
@@ -888,7 +887,7 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream, data |= (fsref ==44100 ) ?FSREF_44100 :FSREF_48000 ;if (params_rate (params) >=64000 ) data |=DUAL_RATE_MODE ; -aic3x_write (codec,AIC3X_CODEC_DATAPATH_REG , data); +snd_soc_write (codec,AIC3X_CODEC_DATAPATH_REG , data);/* codec sample rate select */ data = (fsref *20 ) /params_rate (params);
@@ -897,7 +896,7 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream, data /=5 ; data -=2 ; data |= (data <<4 ); -aic3x_write (codec,AIC3X_SAMPLE_RATE_SEL_REG , data); +snd_soc_write (codec,AIC3X_SAMPLE_RATE_SEL_REG , data);if (bypass_pll)return 0 ;
@@ -966,13 +965,16 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream, } found: - data =aic3x_read_reg_cache (codec,AIC3X_PLL_PROGA_REG ); -aic3x_write (codec,AIC3X_PLL_PROGA_REG , data | (pll_p <<PLLP_SHIFT )); -aic3x_write (codec,AIC3X_OVRF_STATUS_AND_PLLR_REG , pll_r <<PLLR_SHIFT ); -aic3x_write (codec,AIC3X_PLL_PROGB_REG , pll_j <<PLLJ_SHIFT ); -aic3x_write (codec,AIC3X_PLL_PROGC_REG , (pll_d >>6 ) <<PLLD_MSB_SHIFT ); -aic3x_write (codec,AIC3X_PLL_PROGD_REG , - (pll_d &0x3F ) <<PLLD_LSB_SHIFT ); + data =snd_soc_read (codec,AIC3X_PLL_PROGA_REG ); +snd_soc_write (codec,AIC3X_PLL_PROGA_REG , + data | (pll_p <<PLLP_SHIFT )); +snd_soc_write (codec,AIC3X_OVRF_STATUS_AND_PLLR_REG , + pll_r <<PLLR_SHIFT ); +snd_soc_write (codec,AIC3X_PLL_PROGB_REG , pll_j <<PLLJ_SHIFT ); +snd_soc_write (codec,AIC3X_PLL_PROGC_REG , + (pll_d >>6 ) <<PLLD_MSB_SHIFT ); +snd_soc_write (codec,AIC3X_PLL_PROGD_REG , + (pll_d &0x3F ) <<PLLD_LSB_SHIFT );return 0 ; }
@@ -980,15 +982,15 @@ found:static int aic3x_mute (struct snd_soc_dai *dai,int mute) {struct snd_soc_codec *codec = dai->codec; -u8 ldac_reg =aic3x_read_reg_cache (codec,LDAC_VOL ) & ~MUTE_ON ; -u8 rdac_reg =aic3x_read_reg_cache (codec,RDAC_VOL ) & ~MUTE_ON ; +u8 ldac_reg =snd_soc_read (codec,LDAC_VOL ) & ~MUTE_ON ; +u8 rdac_reg =snd_soc_read (codec,RDAC_VOL ) & ~MUTE_ON ;if (mute) { -aic3x_write (codec,LDAC_VOL , ldac_reg |MUTE_ON ); -aic3x_write (codec,RDAC_VOL , rdac_reg |MUTE_ON ); +snd_soc_write (codec,LDAC_VOL , ldac_reg |MUTE_ON ); +snd_soc_write (codec,RDAC_VOL , rdac_reg |MUTE_ON ); }else { -aic3x_write (codec,LDAC_VOL , ldac_reg); -aic3x_write (codec,RDAC_VOL , rdac_reg); +snd_soc_write (codec,LDAC_VOL , ldac_reg); +snd_soc_write (codec,RDAC_VOL , rdac_reg); }return 0 ;
@@ -1012,8 +1014,8 @@ static int aic3x_set_dai_fmt(struct snd_soc_dai *codec_dai,u8 iface_areg, iface_breg;int delay =0 ; - iface_areg =aic3x_read_reg_cache (codec,AIC3X_ASD_INTF_CTRLA ) &0x3f ; - iface_breg =aic3x_read_reg_cache (codec,AIC3X_ASD_INTF_CTRLB ) &0x3f ; + iface_areg =snd_soc_read (codec,AIC3X_ASD_INTF_CTRLA ) &0x3f ; + iface_breg =snd_soc_read (codec,AIC3X_ASD_INTF_CTRLB ) &0x3f ;/* set master/slave audio interface */ switch (fmt &SND_SOC_DAIFMT_MASTER_MASK ) {
@@ -1052,9 +1054,9 @@ static int aic3x_set_dai_fmt(struct snd_soc_dai *codec_dai, }/* set iface */ -aic3x_write (codec,AIC3X_ASD_INTF_CTRLA , iface_areg); -aic3x_write (codec,AIC3X_ASD_INTF_CTRLB , iface_breg); -aic3x_write (codec,AIC3X_ASD_INTF_CTRLC , delay); +snd_soc_write (codec,AIC3X_ASD_INTF_CTRLA , iface_areg); +snd_soc_write (codec,AIC3X_ASD_INTF_CTRLB , iface_breg); +snd_soc_write (codec,AIC3X_ASD_INTF_CTRLC , delay);return 0 ; }
@@ -1072,18 +1074,18 @@ static int aic3x_set_bias_level(struct snd_soc_codec *codec,if (codec->bias_level ==SND_SOC_BIAS_STANDBY && aic3x->master) {/* enable pll */ - reg =aic3x_read_reg_cache (codec,AIC3X_PLL_PROGA_REG ); -aic3x_write (codec,AIC3X_PLL_PROGA_REG , - reg |PLL_ENABLE ); + reg =snd_soc_read (codec,AIC3X_PLL_PROGA_REG ); +snd_soc_write (codec,AIC3X_PLL_PROGA_REG , + reg |PLL_ENABLE ); }break ;case SND_SOC_BIAS_STANDBY :if (codec->bias_level ==SND_SOC_BIAS_PREPARE && aic3x->master) {/* disable pll */ - reg =aic3x_read_reg_cache (codec,AIC3X_PLL_PROGA_REG ); -aic3x_write (codec,AIC3X_PLL_PROGA_REG , - reg & ~PLL_ENABLE ); + reg =snd_soc_read (codec,AIC3X_PLL_PROGA_REG ); +snd_soc_write (codec,AIC3X_PLL_PROGA_REG , + reg & ~PLL_ENABLE ); }break ;case SND_SOC_BIAS_OFF :
@@ -1098,8 +1100,8 @@ void aic3x_set_gpio(struct snd_soc_codec *codec, int gpio, int state) {u8 reg = gpio ?AIC3X_GPIO2_REG :AIC3X_GPIO1_REG ;u8 bit = gpio ?3 :0 ; -u8 val =aic3x_read_reg_cache (codec, reg) & ~(1 << bit); -aic3x_write (codec, reg, val | (!!state << bit)); +u8 val =snd_soc_read (codec, reg) & ~(1 << bit); +snd_soc_write (codec, reg, val | (!!state << bit)); }EXPORT_SYMBOL_GPL (aic3x_set_gpio);
@@ -1128,7 +1130,7 @@ void aic3x_set_headset_detection(struct snd_soc_codec *codec, int detect,if (detect &AIC3X_HEADSET_DETECT_MASK ) val |=AIC3X_HEADSET_DETECT_ENABLED ; -aic3x_write (codec,AIC3X_HEADSET_DETECT_CTRL_A , val); +snd_soc_write (codec,AIC3X_HEADSET_DETECT_CTRL_A , val); }EXPORT_SYMBOL_GPL (aic3x_set_headset_detection);
@@ -1211,81 +1213,81 @@ static int aic3x_init(struct snd_soc_codec *codec)struct aic3x_priv *aic3x =snd_soc_codec_get_drvdata (codec);int reg; -aic3x_write (codec,AIC3X_PAGE_SELECT ,PAGE0_SELECT ); -aic3x_write (codec,AIC3X_RESET ,SOFT_RESET ); +snd_soc_write (codec,AIC3X_PAGE_SELECT ,PAGE0_SELECT ); +snd_soc_write (codec,AIC3X_RESET ,SOFT_RESET );/* DAC default volume and mute */ -aic3x_write (codec,LDAC_VOL ,DEFAULT_VOL |MUTE_ON ); -aic3x_write (codec,RDAC_VOL ,DEFAULT_VOL |MUTE_ON ); +snd_soc_write (codec,LDAC_VOL ,DEFAULT_VOL |MUTE_ON ); +snd_soc_write (codec,RDAC_VOL ,DEFAULT_VOL |MUTE_ON );/* DAC to HP default volume and route to Output mixer */ -aic3x_write (codec,DACL1_2_HPLOUT_VOL ,DEFAULT_VOL |ROUTE_ON ); -aic3x_write (codec,DACR1_2_HPROUT_VOL ,DEFAULT_VOL |ROUTE_ON ); -aic3x_write (codec,DACL1_2_HPLCOM_VOL ,DEFAULT_VOL |ROUTE_ON ); -aic3x_write (codec,DACR1_2_HPRCOM_VOL ,DEFAULT_VOL |ROUTE_ON ); +snd_soc_write (codec,DACL1_2_HPLOUT_VOL ,DEFAULT_VOL |ROUTE_ON ); +snd_soc_write (codec,DACR1_2_HPROUT_VOL ,DEFAULT_VOL |ROUTE_ON ); +snd_soc_write (codec,DACL1_2_HPLCOM_VOL ,DEFAULT_VOL |ROUTE_ON ); +snd_soc_write (codec,DACR1_2_HPRCOM_VOL ,DEFAULT_VOL |ROUTE_ON );/* DAC to Line Out default volume and route to Output mixer */ -aic3x_write (codec,DACL1_2_LLOPM_VOL ,DEFAULT_VOL |ROUTE_ON ); -aic3x_write (codec,DACR1_2_RLOPM_VOL ,DEFAULT_VOL |ROUTE_ON ); +snd_soc_write (codec,DACL1_2_LLOPM_VOL ,DEFAULT_VOL |ROUTE_ON ); +snd_soc_write (codec,DACR1_2_RLOPM_VOL ,DEFAULT_VOL |ROUTE_ON );/* DAC to Mono Line Out default volume and route to Output mixer */ -aic3x_write (codec,DACL1_2_MONOLOPM_VOL ,DEFAULT_VOL |ROUTE_ON ); -aic3x_write (codec,DACR1_2_MONOLOPM_VOL ,DEFAULT_VOL |ROUTE_ON ); +snd_soc_write (codec,DACL1_2_MONOLOPM_VOL ,DEFAULT_VOL |ROUTE_ON ); +snd_soc_write (codec,DACR1_2_MONOLOPM_VOL ,DEFAULT_VOL |ROUTE_ON );/* unmute all outputs */ - reg =aic3x_read_reg_cache (codec,LLOPM_CTRL ); -aic3x_write (codec,LLOPM_CTRL , reg |UNMUTE ); - reg =aic3x_read_reg_cache (codec,RLOPM_CTRL ); -aic3x_write (codec,RLOPM_CTRL , reg |UNMUTE ); - reg =aic3x_read_reg_cache (codec,MONOLOPM_CTRL ); -aic3x_write (codec,MONOLOPM_CTRL , reg |UNMUTE ); - reg =aic3x_read_reg_cache (codec,HPLOUT_CTRL ); -aic3x_write (codec,HPLOUT_CTRL , reg |UNMUTE ); - reg =aic3x_read_reg_cache (codec,HPROUT_CTRL ); -aic3x_write (codec,HPROUT_CTRL , reg |UNMUTE ); - reg =aic3x_read_reg_cache (codec,HPLCOM_CTRL ); -aic3x_write (codec,HPLCOM_CTRL , reg |UNMUTE ); - reg =aic3x_read_reg_cache (codec,HPRCOM_CTRL ); -aic3x_write (codec,HPRCOM_CTRL , reg |UNMUTE ); + reg =snd_soc_read (codec,LLOPM_CTRL ); +snd_soc_write (codec,LLOPM_CTRL , reg |UNMUTE ); + reg =snd_soc_read (codec,RLOPM_CTRL ); +snd_soc_write (codec,RLOPM_CTRL , reg |UNMUTE ); + reg =snd_soc_read (codec,MONOLOPM_CTRL ); +snd_soc_write (codec,MONOLOPM_CTRL , reg |UNMUTE ); + reg =snd_soc_read (codec,HPLOUT_CTRL ); +snd_soc_write (codec,HPLOUT_CTRL , reg |UNMUTE ); + reg =snd_soc_read (codec,HPROUT_CTRL ); +snd_soc_write (codec,HPROUT_CTRL , reg |UNMUTE ); + reg =snd_soc_read (codec,HPLCOM_CTRL ); +snd_soc_write (codec,HPLCOM_CTRL , reg |UNMUTE ); + reg =snd_soc_read (codec,HPRCOM_CTRL ); +snd_soc_write (codec,HPRCOM_CTRL , reg |UNMUTE );/* ADC default volume and unmute */ -aic3x_write (codec,LADC_VOL ,DEFAULT_GAIN ); -aic3x_write (codec,RADC_VOL ,DEFAULT_GAIN ); +snd_soc_write (codec,LADC_VOL ,DEFAULT_GAIN ); +snd_soc_write (codec,RADC_VOL ,DEFAULT_GAIN );/* By default route Line1 to ADC PGA mixer */ -aic3x_write (codec,LINE1L_2_LADC_CTRL ,0x0 ); -aic3x_write (codec,LINE1R_2_RADC_CTRL ,0x0 ); +snd_soc_write (codec,LINE1L_2_LADC_CTRL ,0x0 ); +snd_soc_write (codec,LINE1R_2_RADC_CTRL ,0x0 );/* PGA to HP Bypass default volume, disconnect from Output Mixer */ -aic3x_write (codec,PGAL_2_HPLOUT_VOL ,DEFAULT_VOL ); -aic3x_write (codec,PGAR_2_HPROUT_VOL ,DEFAULT_VOL ); -aic3x_write (codec,PGAL_2_HPLCOM_VOL ,DEFAULT_VOL ); -aic3x_write (codec,PGAR_2_HPRCOM_VOL ,DEFAULT_VOL ); +snd_soc_write (codec,PGAL_2_HPLOUT_VOL ,DEFAULT_VOL ); +snd_soc_write (codec,PGAR_2_HPROUT_VOL ,DEFAULT_VOL ); +snd_soc_write (codec,PGAL_2_HPLCOM_VOL ,DEFAULT_VOL ); +snd_soc_write (codec,PGAR_2_HPRCOM_VOL ,DEFAULT_VOL );/* PGA to Line Out default volume, disconnect from Output Mixer */ -aic3x_write (codec,PGAL_2_LLOPM_VOL ,DEFAULT_VOL ); -aic3x_write (codec,PGAR_2_RLOPM_VOL ,DEFAULT_VOL ); +snd_soc_write (codec,PGAL_2_LLOPM_VOL ,DEFAULT_VOL ); +snd_soc_write (codec,PGAR_2_RLOPM_VOL ,DEFAULT_VOL );/* PGA to Mono Line Out default volume, disconnect from Output Mixer */ -aic3x_write (codec,PGAL_2_MONOLOPM_VOL ,DEFAULT_VOL ); -aic3x_write (codec,PGAR_2_MONOLOPM_VOL ,DEFAULT_VOL ); +snd_soc_write (codec,PGAL_2_MONOLOPM_VOL ,DEFAULT_VOL ); +snd_soc_write (codec,PGAR_2_MONOLOPM_VOL ,DEFAULT_VOL );/* Line2 to HP Bypass default volume, disconnect from Output Mixer */ -aic3x_write (codec,LINE2L_2_HPLOUT_VOL ,DEFAULT_VOL ); -aic3x_write (codec,LINE2R_2_HPROUT_VOL ,DEFAULT_VOL ); -aic3x_write (codec,LINE2L_2_HPLCOM_VOL ,DEFAULT_VOL ); -aic3x_write (codec,LINE2R_2_HPRCOM_VOL ,DEFAULT_VOL ); +snd_soc_write (codec,LINE2L_2_HPLOUT_VOL ,DEFAULT_VOL ); +snd_soc_write (codec,LINE2R_2_HPROUT_VOL ,DEFAULT_VOL ); +snd_soc_write (codec,LINE2L_2_HPLCOM_VOL ,DEFAULT_VOL ); +snd_soc_write (codec,LINE2R_2_HPRCOM_VOL ,DEFAULT_VOL );/* Line2 Line Out default volume, disconnect from Output Mixer */ -aic3x_write (codec,LINE2L_2_LLOPM_VOL ,DEFAULT_VOL ); -aic3x_write (codec,LINE2R_2_RLOPM_VOL ,DEFAULT_VOL ); +snd_soc_write (codec,LINE2L_2_LLOPM_VOL ,DEFAULT_VOL ); +snd_soc_write (codec,LINE2R_2_RLOPM_VOL ,DEFAULT_VOL );/* Line2 to Mono Out default volume, disconnect from Output Mixer */ -aic3x_write (codec,LINE2L_2_MONOLOPM_VOL ,DEFAULT_VOL ); -aic3x_write (codec,LINE2R_2_MONOLOPM_VOL ,DEFAULT_VOL ); +snd_soc_write (codec,LINE2L_2_MONOLOPM_VOL ,DEFAULT_VOL ); +snd_soc_write (codec,LINE2R_2_MONOLOPM_VOL ,DEFAULT_VOL );if (aic3x->model ==AIC3X_MODEL_3007 ) {/* Class-D speaker driver init; datasheet p. 46 */ -aic3x_write (codec,AIC3X_PAGE_SELECT ,0x0D ); -aic3x_write (codec,0xD ,0x0D ); -aic3x_write (codec,0x8 ,0x5C ); -aic3x_write (codec,0x8 ,0x5D ); -aic3x_write (codec,0x8 ,0x5C ); -aic3x_write (codec,AIC3X_PAGE_SELECT ,0x00 ); -aic3x_write (codec,CLASSD_CTRL ,0 ); +snd_soc_write (codec,AIC3X_PAGE_SELECT ,0x0D ); +snd_soc_write (codec,0xD ,0x0D ); +snd_soc_write (codec,0x8 ,0x5C ); +snd_soc_write (codec,0x8 ,0x5D ); +snd_soc_write (codec,0x8 ,0x5C ); +snd_soc_write (codec,AIC3X_PAGE_SELECT ,0x00 ); +snd_soc_write (codec,CLASSD_CTRL ,0 ); }/* off, with power on */
@@ -1305,10 +1307,10 @@ static int aic3x_probe(struct snd_soc_codec *codec)if (aic3x->setup) {/* setup GPIO functions */ -aic3x_write (codec,AIC3X_GPIO1_REG , - (aic3x->setup->gpio_func[0 ] &0xf ) <<4 ); -aic3x_write (codec,AIC3X_GPIO2_REG , - (aic3x->setup->gpio_func[1 ] &0xf ) <<4 ); +snd_soc_write (codec,AIC3X_GPIO1_REG , + (aic3x->setup->gpio_func[0 ] &0xf ) <<4 ); +snd_soc_write (codec,AIC3X_GPIO2_REG , + (aic3x->setup->gpio_func[1 ] &0xf ) <<4 ); } snd_soc_add_controls(codec, aic3x_snd_controls,
Signature · 1 line
1.7.1
PATCH 2/3 ASoC: tlv320aic3x: Switch to soc-cache helpers
Continue phasing out aic3x_read_reg_cache, aic3x_write_reg_cache, aic3x_read and aic3x_write calls.
This patch takes the soc-cache in use and removes aic3x_read_reg_cache and aic3x_write.
--- sound/soc/codecs/tlv320aic3x.c | 46 +++++++-------------------------------- 1 files changed, 9 insertions(+), 37 deletions(-)
sound/soc/codecs/tlv320aic3x.c +9 -37
@@ -112,18 +112,6 @@ static const u8 aic3x_reg[AIC3X_CACHEREGNUM] = { };/* -* read aic3x register cache -*/ -static inline unsigned int aic3x_read_reg_cache (struct snd_soc_codec *codec, -unsigned int reg) -{ -u8 *cache = codec->reg_cache; -if (reg >=AIC3X_CACHEREGNUM ) -return -1 ; -return cache[reg]; -} - -/* * write aic3x register cache */ static inline void aic3x_write_reg_cache(struct snd_soc_codec *codec,
@@ -136,28 +124,6 @@ static inline void aic3x_write_reg_cache(struct snd_soc_codec *codec, }/* -* write to the aic3x register space -*/ -static int aic3x_write (struct snd_soc_codec *codec,unsigned int reg, -unsigned int value) -{ -u8 data[2 ]; - -/* data is -* D15..D8 aic3x register offset -* D7...D0 register data -*/ - data[0 ] = reg &0xff ; - data[1 ] = value &0xff ; - -aic3x_write_reg_cache (codec, data[0 ], data[1 ]); -if (codec->hw_write (codec->control_data, data,2 ) ==2 ) -return 0 ; -else -return -EIO ; -} - -/* * read from the aic3x register space */ static int aic3x_read(struct snd_soc_codec *codec, unsigned int reg,
@@ -1299,10 +1265,16 @@ static int aic3x_init(struct snd_soc_codec *codec)static int aic3x_probe (struct snd_soc_codec *codec) {struct aic3x_priv *aic3x =snd_soc_codec_get_drvdata (codec); +int ret; - codec->hw_write = (hw_write_t ) i2c_master_send; codec->control_data = aic3x->control_data; + ret =snd_soc_codec_set_cache_io (codec,8 ,8 , aic3x->control_type); +if (ret !=0 ) { +dev_err (codec->dev,"Failed to set cache I/O: %d\n" , ret); +return ret; + } +aic3x_init (codec);if (aic3x->setup) {
@@ -1330,8 +1302,6 @@ static int aic3x_remove(struct snd_soc_codec *codec) }static struct snd_soc_codec_driver soc_codec_dev_aic3x = { - .read = aic3x_read_reg_cache, - .write = aic3x_write, .set_bias_level = aic3x_set_bias_level, .reg_cache_size =ARRAY_SIZE (aic3x_reg), .reg_word_size =sizeof (u8),
@@ -1375,6 +1345,8 @@ static int aic3x_i2c_probe(struct i2c_client *i2c, } aic3x->control_data = i2c; + aic3x->control_type =SND_SOC_I2C ; +i2c_set_clientdata (i2c, aic3x);if (pdata) { aic3x->gpio_reset = pdata->gpio_reset;
Signature · 1 line
1.7.1
Re: [PATCH 2/3] ASoC: tlv320aic3x: Switch to soc-cache helpers
Quoted 7 lines · Jarkko Nikula
Continue phasing out
aic3x_read_reg_cache,aic3x_write_reg_cache,aic3x_readandaic3x_writecalls.This patch takes the soc-cache in use and removes
aic3x_read_reg_cacheandaic3x_write.Signed-off-by Jarkko Nikula <[email protected]>
PATCH 3/3 ASoC: tlv320aic3x: Complete the soc-cache conversion
In reply to Jarkko NikulaComplete the phasing out of aic3x_read_reg_cache, aic3x_write_reg_cache, aic3x_read and aic3x_write calls.
This patch replaces the aic3x_read with codec->hw_read that points to a function implemented by soc-cache. There is no need to cache the value from chip since the functions using aic3x_read are interested only read-only bits.
--- sound/soc/codecs/tlv320aic3x.c | 32 +++----------------------------- 1 files changed, 3 insertions(+), 29 deletions(-)
sound/soc/codecs/tlv320aic3x.c +3 -29
@@ -111,32 +111,6 @@ static const u8 aic3x_reg[AIC3X_CACHEREGNUM] = { 0x00, 0x00, 0x02, /* 100 */ }; -/* -* write aic3x register cache -*/ -static inline void aic3x_write_reg_cache (struct snd_soc_codec *codec, -u8 reg,u8 value) -{ -u8 *cache = codec->reg_cache; -if (reg >=AIC3X_CACHEREGNUM ) -return ; - cache[reg] = value; -} - -/* -* read from the aic3x register space -*/ -static int aic3x_read (struct snd_soc_codec *codec,unsigned int reg, -u8 *value) -{ - *value = reg &0xff ; - - value[0 ] =i2c_smbus_read_byte_data (codec->control_data, value[0 ]); - -aic3x_write_reg_cache (codec, reg, *value); -return 0 ; -} -#define SOC_DAPM_SINGLE_AIC3X (xname, reg, shift, mask, invert) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ .info = snd_soc_info_volsw, \
@@ -1076,7 +1050,7 @@ int aic3x_get_gpio(struct snd_soc_codec *codec, int gpio)u8 reg = gpio ?AIC3X_GPIO2_REG :AIC3X_GPIO1_REG ;u8 val, bit = gpio ?2 :1 ; -aic3x_read (codec, reg, &val); + val = codec->hw_read (codec, reg);return (val >> bit) &1 ; }EXPORT_SYMBOL_GPL (aic3x_get_gpio);
@@ -1103,7 +1077,7 @@ EXPORT_SYMBOL_GPL(aic3x_set_headset_detection);int aic3x_headset_detected (struct snd_soc_codec *codec) {u8 val; -aic3x_read (codec,AIC3X_HEADSET_DETECT_CTRL_B , &val); + val = codec->hw_read (codec,AIC3X_HEADSET_DETECT_CTRL_B );return (val >>4 ) &1 ; }EXPORT_SYMBOL_GPL (aic3x_headset_detected);
@@ -1111,7 +1085,7 @@ EXPORT_SYMBOL_GPL(aic3x_headset_detected);int aic3x_button_pressed (struct snd_soc_codec *codec) {u8 val; -aic3x_read (codec,AIC3X_HEADSET_DETECT_CTRL_B , &val); + val = codec->hw_read (codec,AIC3X_HEADSET_DETECT_CTRL_B );return (val >>5 ) &1 ; }EXPORT_SYMBOL_GPL (aic3x_button_pressed);
Signature · 1 line
1.7.1
Re: [PATCH 3/3] ASoC: tlv320aic3x: Complete the soc-cache conversion
Quoted 9 lines · Jarkko Nikula
Complete the phasing out of
aic3x_read_reg_cache,aic3x_write_reg_cache,aic3x_readandaic3x_writecalls.This patch replaces the
aic3x_readwithcodec->hw_readthat points to a function implemented by soc-cache. There is no need to cache the value from chip since the functions usingaic3x_readare interested only read-only bits.Signed-off-by Jarkko Nikula <[email protected]>
It'd be a bit nicer to do this by using snd_soc_read() here also and marking the registers as volatile. This makes the process much less error prone since users can just use snd_soc_read() and the register cache code will work out if it needs to go to the chip or not.
Re: [PATCH 3/3] ASoC: tlv320aic3x: Complete the soc-cache conversion
Quoted 9 lines · On Tue, 14 Sep 2010 13:04:58 +0100 Mark Brown…
Quoted 8 lines · Jarkko Nikula
Complete the phasing out of
aic3x_read_reg_cache,aic3x_write_reg_cache,aic3x_readandaic3x_writecalls.This patch replaces the
aic3x_readwithcodec->hw_readthat points to a function implemented by soc-cache. There is no need to cache the value from chip since the functions usingaic3x_readare interested only read-only bits.
Quoted 6 lines
Quoted 1 line
Signed-off-by Jarkko Nikula <[email protected]>It'd be a bit nicer to do this by using
snd_soc_read()here also and marking the registers as volatile. This makes the process much less error prone since users can just usesnd_soc_read()and the register cache code will work out if it needs to go to the chip or not.
Actually I looked that but problem with aic3x is that most of the volatile bits are with r/w configuration bits in the same registers. There are a few completely volatile read-only registers but currently there is no use for them.
Signature · 1 line
Jarkko
Re: [PATCH 3/3] ASoC: tlv320aic3x: Complete the soc-cache conversion
Quoted 11 lines · Jarkko Nikula
Quoted 4 lines · Mark Brown
It'd be a bit nicer to do this by using
snd_soc_read()here also and marking the registers as volatile. This makes the process much less error prone since users can just usesnd_soc_read()and the register cache code will work out if it needs to go to the chip or not.Actually I looked that but problem with aic3x is that most of the volatile bits are with r/w configuration bits in the same registers. There are a few completely volatile read-only registers but currently there is no use for them.
Oh, so you would essentially kill the cache? Sad. It'd be nice to put comments somewhere in the driver noting this to discourage people doing the change.
Re: [PATCH 3/3] ASoC: tlv320aic3x: Complete the soc-cache conversion
Quoted 8 lines · On Tue, 14 Sep 2010 13:21:39 +0100 Mark Brown…
Quoted 6 lines · Jarkko Nikula
Quoted 4 lines · Mark Brown
It'd be a bit nicer to do this by using
snd_soc_read()here also and marking the registers as volatile. This makes the process much less error prone since users can just usesnd_soc_read()and the register cache code will work out if it needs to go to the chip or not.
Quoted 8 lines
Quoted 4 lines
Actually I looked that but problem with aic3x is that most of the volatile bits are with r/w configuration bits in the same registers. There are a few completely volatile read-only registers but currently there is no use for them.
Oh, so you would essentially kill the cache? Sad. It'd be nice to put comments somewhere in the driver noting this to discourage people doing the change.
Well cache is then out of sync with regarding of those gpio & headset detect bits here but there wasn't use for them elsewhere so at the moment it looks like null-op to write value to cache.
But is it marking register as volatile due 1-2 bits causing more problems if we don't cache rest of the r/w bits?
Signature · 1 line
Jarkko
Re: [PATCH 3/3] ASoC: tlv320aic3x: Complete the soc-cache conversion
Quoted 2 lines · Jarkko Nikula
But is it marking register as volatile due 1-2 bits causing more problems if we don't cache rest of the r/w bits?
Depends on what else is there - ultimately if the chip has read support then the register cache is just a performance improvement.
PATCH v2 3/3 ASoC: tlv320aic3x: Complete the soc-cache conversion
Complete the phasing out of aic3x_read_reg_cache, aic3x_write_reg_cache, aic3x_read and aic3x_write calls.
This patch uses in aic3x_read the codec->hw_read that points to a function implemented by soc-cache. Only use for aic3x_read is if wanting to read volatile bits from those registers that has both read-only and read/write bits. All other cases should use snd_soc_read.
--- sound/soc/codecs/tlv320aic3x.c | 25 +++++++++---------------- 1 files changed, 9 insertions(+), 16 deletions(-)
sound/soc/codecs/tlv320aic3x.c +9 -16
@@ -112,28 +112,21 @@ static const u8 aic3x_reg[AIC3X_CACHEREGNUM] = { };/* -* write aic3x register cache -*/ -static inline void aic3x_write_reg_cache (struct snd_soc_codec *codec, -u8 reg,u8 value) -{ -u8 *cache = codec->reg_cache; -if (reg >=AIC3X_CACHEREGNUM ) -return ; - cache[reg] = value; -} - -/* -* read from the aic3x register space +* read from the aic3x register space. Only use for this function is if +* wanting to read volatile bits from those registers that has both read-only +* and read/write bits. All other cases should use snd_soc_read. */ static int aic3x_read (struct snd_soc_codec *codec,unsigned int reg,u8 *value) { - *value = reg &0xff ; +u8 *cache = codec->reg_cache; + +if (reg >=AIC3X_CACHEREGNUM ) +return -1 ; - value[0 ] =i2c_smbus_read_byte_data (codec->control_data, value[0 ]); + *value = codec->hw_read (codec, reg); + cache[reg] = *value; -aic3x_write_reg_cache (codec, reg, *value);return 0 ; }
Signature · 1 line
1.7.1
Re: [PATCHv2 3/3] ASoC: tlv320aic3x: Complete the soc-cache conversion
Quoted 9 lines · Jarkko Nikula
Complete the phasing out of
aic3x_read_reg_cache,aic3x_write_reg_cache,aic3x_readandaic3x_writecalls.This patch uses in
aic3x_readthecodec->hw_readthat points to a function implemented by soc-cache. Only use foraic3x_readis if wanting to read volatile bits from those registers that has both read-only and read/write bits. All other cases should usesnd_soc_read.Signed-off-by Jarkko Nikula <[email protected]>
Re: [PATCHv2 3/3] ASoC: tlv320aic3x: Complete the soc-cache conversion
Quoted 4 lines · Mark Brown
Quoted 3 lines · Jarkko Nikula
Complete the phasing out of
aic3x_read_reg_cache,aic3x_write_reg_cache,aic3x_readandaic3x_writecalls.
Quoted 8 lines
Quoted 6 lines
This patch uses in
aic3x_readthecodec->hw_readthat points to a function implemented by soc-cache. Only use foraic3x_readis if wanting to read volatile bits from those registers that has both read-only and read/write bits. All other cases should usesnd_soc_read.Signed-off-by Jarkko Nikula <[email protected]>Acked-by Mark Brown <[email protected]>
All applied.
Thanks
Liam
Signature · 3 lines
Freelance Developer, SlimLogic Ltd ASoC and Voltage Regulator Maintainer. http://www.slimlogic.co.uk
Quoted 8 lines · Jarkko Nikula
Start phasing out
aic3x_read_reg_cache,aic3x_write_reg_cache,aic3x_readandaic3x_writecalls in order to switch to soc-cache helpers.This patch replaces
aic3x_read_reg_cacheandaic3x_writewithsnd_soc_readandsnd_soc_write. This is basically null-op since .read and .write insoc_codec_dev_aic3xpoints toaic3x_read_reg_cacheandaic3x_write.Signed-off-by Jarkko Nikula <[email protected]>