On Sat, 27 Apr 2019 19:59:38 +0200, Mark Brown wrote:
On Tue, Apr 23, 2019 at 04:13:35PM +0200, Takashi Iwai wrote:
+/*
- register patch.
- */
+static const struct reg_sequence cx2072x_patch[] = {
- { 0x71A4, 0x080 }, /* DC offset Calibration */
- { 0x7328, 0x65f }, /* disable the PA */
- { 0x71a8, 0x289 }, /* Set the spkeaer output gain */
- { 0x7310, 0xf05 },
- { 0x7290, 0x380 },
- { 0x7328, 0xb90 },
- { 0x7124, 0x001 }, /* Enable 30 Hz High pass filter */
- { 0x718c, 0x300 }, /* Disable PCBEEP pad */
- { 0x731c, 0x100 }, /* Disable SnM mode */
- { 0x641c, 0x020 }, /* Enable PortD input */
- { 0x0458, 0x040 }, /* Enable GPIO7 pin for button */
- { 0x0464, 0x040 }, /* Enable UM for GPIO7 */
- { 0x0420, 0x080 }, /* Enable button response */
- { 0x7230, 0x0c4 }, /* Enable headset button */
- { 0x7200, 0x415 }, /* Power down class-D during idle */
- { 0x6e04, 0x00f }, /* Enable I2S TX */
- { 0x6e08, 0x00f }, /* Enable I2S RX */
+};
This looks *very* much like board configuration rather than a patch - there's no kind of test bit and the comments talk specifically about things like gain settings and pad configuration which look very board specific. Register patches are supposed to be for things like early revisions of the chip which have different register defaults or magic sequences that vendors tell you to run on startup, usually to tune test registers.
OK, will replace with the straight regmap_multi_reg_write().
+/* return register size */ +static unsigned int cx2072x_register_size(struct device *dev, unsigned int reg) +{
- switch (reg) {
This is *not* going to play well with regmap...
The code seems trying to unify the register access with the same width, while the register size differs depending on the register index. So the read/write ops adjust it by checking this register size *internally*. IOW, it's hiding the internal register size difference from the outside so that regmap can work.
(Actually the zero check in the caller side is bogus -- this function never returns an error.)
I'm going to rewrite the whole these tables. Maybe better to have a single register attribute table.
+static int cx2072x_reg_bulk_write(struct snd_soc_component *codec,
unsigned int reg,const void *val, size_t val_count)+{
- struct i2c_client *client = to_i2c_client(codec->dev);
- struct device *dev = &client->dev;
- u8 buf[2 + CX2072X_MAX_EQ_COEFF];
- int ret;
- if (val_count > CX2072X_MAX_EQ_COEFF) {
dev_err(dev,"cx2072x_reg_bulk_write failed, writing count = %d\n",(int)val_count);return -EINVAL;- }
So this only works for the EQ registers?
I guess this was meant only as a sanity check. It's an internal function that is called from a few helper functions, and the check above is to assure not overflowing the temporary buffer on the stack. It can be simply WARN_ON() like if (WARN_ON(val_count + 2 > sizeof(buf))) return -EINVAL;
If so there should be validation to confirm that it only gets used for them. If not there should be handling for register size variation issues.
+#define cx2072x_plbk_eq_en_info snd_ctl_boolean_mono_info
Why not just use the function directly rather than hiding it?
Just a standard idiom. Can be replaced if preferred.
- /* do nothing if the value is the same */
- if (memcmp(cache, param, CX2072X_PLBK_EQ_COEF_LEN))
goto unlock;Is this test not inverted - shouldn't we be skipping if memcmp returns 0?
Oh yeah, indeed, it looks like a real bug. This shows that I have never played with the EQ stuff :)
(IOW, I'm fine to drop the untested EQ stuff, but someone else might play with it...)
- SOC_DOUBLE_R_TLV("DAC1 Volume", CX2072X_DAC1_AMP_GAIN_LEFT,
CX2072X_DAC1_AMP_GAIN_RIGHT, 0, 0x4a, 0, dac_tlv),- SOC_DOUBLE_R("DAC1 Mute Switch", CX2072X_DAC1_AMP_GAIN_LEFT,
CX2072X_DAC1_AMP_GAIN_RIGHT, 7, 1, 0),Should just be DAC1 Switch so it gets joined up with DAC1 Volume in UIs and the "Mute" is redundant anyway.
OK.
+int snd_soc_cx2072x_enable_jack_detect(struct snd_soc_component *codec) +{
- struct cx2072x_priv *cx2072x = snd_soc_component_get_drvdata(codec);
- struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(codec);
- /* No-sticky input type */
- regmap_write(cx2072x->regmap, CX2072X_GPIO_STICKY_MASK, 0x1f);
- /* Use GPOI0 as interrupt pin */
- regmap_write(cx2072x->regmap, CX2072X_UM_INTERRUPT_CRTL_E, 0x12 << 24);
This isn't board specific is it?
I have no idea. It's been so from the original code, and there doesn't seem any other hardware implementations.
+int snd_soc_cx2072x_get_jack_state(struct snd_soc_component *codec) +{
- struct cx2072x_priv *cx2072x = snd_soc_component_get_drvdata(codec);
- unsigned int jack;
- unsigned int type = 0;
- int state = 0;
- bool need_cache_bypass =
snd_soc_component_get_bias_level(codec) == SND_SOC_BIAS_OFF;- if (need_cache_bypass)
regcache_cache_only(cx2072x->regmap, false);This looks funky and racy - what's going on here? If the register map is live and usable why is it in cache only mode?
Not to read the register while the chip is turned off, I suppose. The jack detection in ASoC is anyway a bit funky, especially when involved with PM...
- dev_dbg(codec->dev, "CX2072X_HSDETECT type=0x%X,Jack state = %x\n",
type, state);- return state;
+} +EXPORT_SYMBOL_GPL(snd_soc_cx2072x_get_jack_state);
Why is this symbol exported?
It's called from the machine driver. snd_soc_jack_add_gpios() is called in the machine driver side, and it needs the jack_status_check callback that calls this function.
+static void cx2072x_shutdown(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai)+{
- struct snd_soc_component *codec = dai->component;
- struct cx2072x_priv *cx2072x = snd_soc_component_get_drvdata(codec);
- /* shutdown codec */
- regcache_cache_only(cx2072x->regmap, false);
- regmap_write(cx2072x->regmap, CX2072X_PORTA_POWER_STATE, 3);
- regmap_write(cx2072x->regmap, CX2072X_PORTB_POWER_STATE, 3);
- regmap_write(cx2072x->regmap, CX2072X_PORTC_POWER_STATE, 3);
- regmap_write(cx2072x->regmap, CX2072X_PORTD_POWER_STATE, 3);
- regmap_write(cx2072x->regmap, CX2072X_PORTE_POWER_STATE, 3);
- regmap_write(cx2072x->regmap, CX2072X_PORTG_POWER_STATE, 3);
- regmap_write(cx2072x->regmap, CX2072X_MIXER_POWER_STATE, 3);
- regmap_write(cx2072x->regmap, CX2072X_ADC1_POWER_STATE, 3);
- regmap_write(cx2072x->regmap, CX2072X_ADC2_POWER_STATE, 3);
- regmap_write(cx2072x->regmap, CX2072X_DAC1_POWER_STATE, 3);
- regmap_write(cx2072x->regmap, CX2072X_DAC2_POWER_STATE, 3);
Why isn't DAPM powering things off for us?
Honestly speaking, no idea. It seems to have been added some revision of the original code. Let's try to rip off.
- /* use flat eq by default */
- for (ch = 0 ; ch < 2 ; ch++) {
for (band = 0; band < CX2072X_PLBK_EQ_BAND_NUM; band++) {cx2072x->plbk_eq[ch][band][1] = 64;cx2072x->plbk_eq[ch][band][10] = 3;}- }
Why not use the register defaults?
Because it'll become too messy for put flatten array values? The initialization using loop makes more sense in such a case, IMO.
+static bool cx2072x_readable_register(struct device *dev, unsigned int reg) +{
- switch (reg) {
- case CX2072X_VENDOR_ID:
It's weird that this is a long way away from the other regmap functions.
Agreed, will move to a former place.
Thanks!
Takashi