ASoC: ak4671: Convert to direct regmap API usage

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

This helps us remove the ASoC level I/O functionality which is now just
a thin wrapper around regmap.

Signed-off-by: Mark Brown <broonie@linaro.org>

Mark Brown 12 years ago 7ac5a478 78c51bc6

+111 -112

2 changed files

expand all

sound

soc

codecs

ak4671.c

ak4671.h

+111 -110

sound/soc/codecs/ak4671.c

··· 15 15 #include <linux/init.h> 16 16 #include <linux/i2c.h> 17 17 #include <linux/delay.h> 18 + #include <linux/regmap.h> 18 19 #include <linux/slab.h> 19 20 #include <sound/soc.h> 20 21 #include <sound/initval.h> ··· 24 23 #include "ak4671.h" 25 24 26 25 27 - /* codec private data */ 28 - struct ak4671_priv { 29 - enum snd_soc_control_type control_type; 30 - }; 31 - 32 26 /* ak4671 register cache & default register settings */ 33 - static const u8 ak4671_reg[AK4671_CACHEREGNUM] = { 34 - 0x00, /* AK4671_AD_DA_POWER_MANAGEMENT (0x00) */ 35 - 0xf6, /* AK4671_PLL_MODE_SELECT0 (0x01) */ 36 - 0x00, /* AK4671_PLL_MODE_SELECT1 (0x02) */ 37 - 0x02, /* AK4671_FORMAT_SELECT (0x03) */ 38 - 0x00, /* AK4671_MIC_SIGNAL_SELECT (0x04) */ 39 - 0x55, /* AK4671_MIC_AMP_GAIN (0x05) */ 40 - 0x00, /* AK4671_MIXING_POWER_MANAGEMENT0 (0x06) */ 41 - 0x00, /* AK4671_MIXING_POWER_MANAGEMENT1 (0x07) */ 42 - 0xb5, /* AK4671_OUTPUT_VOLUME_CONTROL (0x08) */ 43 - 0x00, /* AK4671_LOUT1_SIGNAL_SELECT (0x09) */ 44 - 0x00, /* AK4671_ROUT1_SIGNAL_SELECT (0x0a) */ 45 - 0x00, /* AK4671_LOUT2_SIGNAL_SELECT (0x0b) */ 46 - 0x00, /* AK4671_ROUT2_SIGNAL_SELECT (0x0c) */ 47 - 0x00, /* AK4671_LOUT3_SIGNAL_SELECT (0x0d) */ 48 - 0x00, /* AK4671_ROUT3_SIGNAL_SELECT (0x0e) */ 49 - 0x00, /* AK4671_LOUT1_POWER_MANAGERMENT (0x0f) */ 50 - 0x00, /* AK4671_LOUT2_POWER_MANAGERMENT (0x10) */ 51 - 0x80, /* AK4671_LOUT3_POWER_MANAGERMENT (0x11) */ 52 - 0x91, /* AK4671_LCH_INPUT_VOLUME_CONTROL (0x12) */ 53 - 0x91, /* AK4671_RCH_INPUT_VOLUME_CONTROL (0x13) */ 54 - 0xe1, /* AK4671_ALC_REFERENCE_SELECT (0x14) */ 55 - 0x00, /* AK4671_DIGITAL_MIXING_CONTROL (0x15) */ 56 - 0x00, /* AK4671_ALC_TIMER_SELECT (0x16) */ 57 - 0x00, /* AK4671_ALC_MODE_CONTROL (0x17) */ 58 - 0x02, /* AK4671_MODE_CONTROL1 (0x18) */ 59 - 0x01, /* AK4671_MODE_CONTROL2 (0x19) */ 60 - 0x18, /* AK4671_LCH_OUTPUT_VOLUME_CONTROL (0x1a) */ 61 - 0x18, /* AK4671_RCH_OUTPUT_VOLUME_CONTROL (0x1b) */ 62 - 0x00, /* AK4671_SIDETONE_A_CONTROL (0x1c) */ 63 - 0x02, /* AK4671_DIGITAL_FILTER_SELECT (0x1d) */ 64 - 0x00, /* AK4671_FIL3_COEFFICIENT0 (0x1e) */ 65 - 0x00, /* AK4671_FIL3_COEFFICIENT1 (0x1f) */ 66 - 0x00, /* AK4671_FIL3_COEFFICIENT2 (0x20) */ 67 - 0x00, /* AK4671_FIL3_COEFFICIENT3 (0x21) */ 68 - 0x00, /* AK4671_EQ_COEFFICIENT0 (0x22) */ 69 - 0x00, /* AK4671_EQ_COEFFICIENT1 (0x23) */ 70 - 0x00, /* AK4671_EQ_COEFFICIENT2 (0x24) */ 71 - 0x00, /* AK4671_EQ_COEFFICIENT3 (0x25) */ 72 - 0x00, /* AK4671_EQ_COEFFICIENT4 (0x26) */ 73 - 0x00, /* AK4671_EQ_COEFFICIENT5 (0x27) */ 74 - 0xa9, /* AK4671_FIL1_COEFFICIENT0 (0x28) */ 75 - 0x1f, /* AK4671_FIL1_COEFFICIENT1 (0x29) */ 76 - 0xad, /* AK4671_FIL1_COEFFICIENT2 (0x2a) */ 77 - 0x20, /* AK4671_FIL1_COEFFICIENT3 (0x2b) */ 78 - 0x00, /* AK4671_FIL2_COEFFICIENT0 (0x2c) */ 79 - 0x00, /* AK4671_FIL2_COEFFICIENT1 (0x2d) */ 80 - 0x00, /* AK4671_FIL2_COEFFICIENT2 (0x2e) */ 81 - 0x00, /* AK4671_FIL2_COEFFICIENT3 (0x2f) */ 82 - 0x00, /* AK4671_DIGITAL_FILTER_SELECT2 (0x30) */ 83 - 0x00, /* this register not used */ 84 - 0x00, /* AK4671_E1_COEFFICIENT0 (0x32) */ 85 - 0x00, /* AK4671_E1_COEFFICIENT1 (0x33) */ 86 - 0x00, /* AK4671_E1_COEFFICIENT2 (0x34) */ 87 - 0x00, /* AK4671_E1_COEFFICIENT3 (0x35) */ 88 - 0x00, /* AK4671_E1_COEFFICIENT4 (0x36) */ 89 - 0x00, /* AK4671_E1_COEFFICIENT5 (0x37) */ 90 - 0x00, /* AK4671_E2_COEFFICIENT0 (0x38) */ 91 - 0x00, /* AK4671_E2_COEFFICIENT1 (0x39) */ 92 - 0x00, /* AK4671_E2_COEFFICIENT2 (0x3a) */ 93 - 0x00, /* AK4671_E2_COEFFICIENT3 (0x3b) */ 94 - 0x00, /* AK4671_E2_COEFFICIENT4 (0x3c) */ 95 - 0x00, /* AK4671_E2_COEFFICIENT5 (0x3d) */ 96 - 0x00, /* AK4671_E3_COEFFICIENT0 (0x3e) */ 97 - 0x00, /* AK4671_E3_COEFFICIENT1 (0x3f) */ 98 - 0x00, /* AK4671_E3_COEFFICIENT2 (0x40) */ 99 - 0x00, /* AK4671_E3_COEFFICIENT3 (0x41) */ 100 - 0x00, /* AK4671_E3_COEFFICIENT4 (0x42) */ 101 - 0x00, /* AK4671_E3_COEFFICIENT5 (0x43) */ 102 - 0x00, /* AK4671_E4_COEFFICIENT0 (0x44) */ 103 - 0x00, /* AK4671_E4_COEFFICIENT1 (0x45) */ 104 - 0x00, /* AK4671_E4_COEFFICIENT2 (0x46) */ 105 - 0x00, /* AK4671_E4_COEFFICIENT3 (0x47) */ 106 - 0x00, /* AK4671_E4_COEFFICIENT4 (0x48) */ 107 - 0x00, /* AK4671_E4_COEFFICIENT5 (0x49) */ 108 - 0x00, /* AK4671_E5_COEFFICIENT0 (0x4a) */ 109 - 0x00, /* AK4671_E5_COEFFICIENT1 (0x4b) */ 110 - 0x00, /* AK4671_E5_COEFFICIENT2 (0x4c) */ 111 - 0x00, /* AK4671_E5_COEFFICIENT3 (0x4d) */ 112 - 0x00, /* AK4671_E5_COEFFICIENT4 (0x4e) */ 113 - 0x00, /* AK4671_E5_COEFFICIENT5 (0x4f) */ 114 - 0x88, /* AK4671_EQ_CONTROL_250HZ_100HZ (0x50) */ 115 - 0x88, /* AK4671_EQ_CONTROL_3500HZ_1KHZ (0x51) */ 116 - 0x08, /* AK4671_EQ_CONTRO_10KHZ (0x52) */ 117 - 0x00, /* AK4671_PCM_IF_CONTROL0 (0x53) */ 118 - 0x00, /* AK4671_PCM_IF_CONTROL1 (0x54) */ 119 - 0x00, /* AK4671_PCM_IF_CONTROL2 (0x55) */ 120 - 0x18, /* AK4671_DIGITAL_VOLUME_B_CONTROL (0x56) */ 121 - 0x18, /* AK4671_DIGITAL_VOLUME_C_CONTROL (0x57) */ 122 - 0x00, /* AK4671_SIDETONE_VOLUME_CONTROL (0x58) */ 123 - 0x00, /* AK4671_DIGITAL_MIXING_CONTROL2 (0x59) */ 124 - 0x00, /* AK4671_SAR_ADC_CONTROL (0x5a) */ 27 + static const struct reg_default ak4671_reg_defaults[] = { 28 + { 0x00, 0x00 }, /* AK4671_AD_DA_POWER_MANAGEMENT (0x00) */ 29 + { 0x01, 0xf6 }, /* AK4671_PLL_MODE_SELECT0 (0x01) */ 30 + { 0x02, 0x00 }, /* AK4671_PLL_MODE_SELECT1 (0x02) */ 31 + { 0x03, 0x02 }, /* AK4671_FORMAT_SELECT (0x03) */ 32 + { 0x04, 0x00 }, /* AK4671_MIC_SIGNAL_SELECT (0x04) */ 33 + { 0x05, 0x55 }, /* AK4671_MIC_AMP_GAIN (0x05) */ 34 + { 0x06, 0x00 }, /* AK4671_MIXING_POWER_MANAGEMENT0 (0x06) */ 35 + { 0x07, 0x00 }, /* AK4671_MIXING_POWER_MANAGEMENT1 (0x07) */ 36 + { 0x08, 0xb5 }, /* AK4671_OUTPUT_VOLUME_CONTROL (0x08) */ 37 + { 0x09, 0x00 }, /* AK4671_LOUT1_SIGNAL_SELECT (0x09) */ 38 + { 0x0a, 0x00 }, /* AK4671_ROUT1_SIGNAL_SELECT (0x0a) */ 39 + { 0x0b, 0x00 }, /* AK4671_LOUT2_SIGNAL_SELECT (0x0b) */ 40 + { 0x0c, 0x00 }, /* AK4671_ROUT2_SIGNAL_SELECT (0x0c) */ 41 + { 0x0d, 0x00 }, /* AK4671_LOUT3_SIGNAL_SELECT (0x0d) */ 42 + { 0x0e, 0x00 }, /* AK4671_ROUT3_SIGNAL_SELECT (0x0e) */ 43 + { 0x0f, 0x00 }, /* AK4671_LOUT1_POWER_MANAGERMENT (0x0f) */ 44 + { 0x10, 0x00 }, /* AK4671_LOUT2_POWER_MANAGERMENT (0x10) */ 45 + { 0x11, 0x80 }, /* AK4671_LOUT3_POWER_MANAGERMENT (0x11) */ 46 + { 0x12, 0x91 }, /* AK4671_LCH_INPUT_VOLUME_CONTROL (0x12) */ 47 + { 0x13, 0x91 }, /* AK4671_RCH_INPUT_VOLUME_CONTROL (0x13) */ 48 + { 0x14, 0xe1 }, /* AK4671_ALC_REFERENCE_SELECT (0x14) */ 49 + { 0x15, 0x00 }, /* AK4671_DIGITAL_MIXING_CONTROL (0x15) */ 50 + { 0x16, 0x00 }, /* AK4671_ALC_TIMER_SELECT (0x16) */ 51 + { 0x17, 0x00 }, /* AK4671_ALC_MODE_CONTROL (0x17) */ 52 + { 0x18, 0x02 }, /* AK4671_MODE_CONTROL1 (0x18) */ 53 + { 0x19, 0x01 }, /* AK4671_MODE_CONTROL2 (0x19) */ 54 + { 0x1a, 0x18 }, /* AK4671_LCH_OUTPUT_VOLUME_CONTROL (0x1a) */ 55 + { 0x1b, 0x18 }, /* AK4671_RCH_OUTPUT_VOLUME_CONTROL (0x1b) */ 56 + { 0x1c, 0x00 }, /* AK4671_SIDETONE_A_CONTROL (0x1c) */ 57 + { 0x1d, 0x02 }, /* AK4671_DIGITAL_FILTER_SELECT (0x1d) */ 58 + { 0x1e, 0x00 }, /* AK4671_FIL3_COEFFICIENT0 (0x1e) */ 59 + { 0x1f, 0x00 }, /* AK4671_FIL3_COEFFICIENT1 (0x1f) */ 60 + { 0x20, 0x00 }, /* AK4671_FIL3_COEFFICIENT2 (0x20) */ 61 + { 0x21, 0x00 }, /* AK4671_FIL3_COEFFICIENT3 (0x21) */ 62 + { 0x22, 0x00 }, /* AK4671_EQ_COEFFICIENT0 (0x22) */ 63 + { 0x23, 0x00 }, /* AK4671_EQ_COEFFICIENT1 (0x23) */ 64 + { 0x24, 0x00 }, /* AK4671_EQ_COEFFICIENT2 (0x24) */ 65 + { 0x25, 0x00 }, /* AK4671_EQ_COEFFICIENT3 (0x25) */ 66 + { 0x26, 0x00 }, /* AK4671_EQ_COEFFICIENT4 (0x26) */ 67 + { 0x27, 0x00 }, /* AK4671_EQ_COEFFICIENT5 (0x27) */ 68 + { 0x28, 0xa9 }, /* AK4671_FIL1_COEFFICIENT0 (0x28) */ 69 + { 0x29, 0x1f }, /* AK4671_FIL1_COEFFICIENT1 (0x29) */ 70 + { 0x2a, 0xad }, /* AK4671_FIL1_COEFFICIENT2 (0x2a) */ 71 + { 0x2b, 0x20 }, /* AK4671_FIL1_COEFFICIENT3 (0x2b) */ 72 + { 0x2c, 0x00 }, /* AK4671_FIL2_COEFFICIENT0 (0x2c) */ 73 + { 0x2d, 0x00 }, /* AK4671_FIL2_COEFFICIENT1 (0x2d) */ 74 + { 0x2e, 0x00 }, /* AK4671_FIL2_COEFFICIENT2 (0x2e) */ 75 + { 0x2f, 0x00 }, /* AK4671_FIL2_COEFFICIENT3 (0x2f) */ 76 + { 0x30, 0x00 }, /* AK4671_DIGITAL_FILTER_SELECT2 (0x30) */ 77 + 78 + { 0x32, 0x00 }, /* AK4671_E1_COEFFICIENT0 (0x32) */ 79 + { 0x33, 0x00 }, /* AK4671_E1_COEFFICIENT1 (0x33) */ 80 + { 0x34, 0x00 }, /* AK4671_E1_COEFFICIENT2 (0x34) */ 81 + { 0x35, 0x00 }, /* AK4671_E1_COEFFICIENT3 (0x35) */ 82 + { 0x36, 0x00 }, /* AK4671_E1_COEFFICIENT4 (0x36) */ 83 + { 0x37, 0x00 }, /* AK4671_E1_COEFFICIENT5 (0x37) */ 84 + { 0x38, 0x00 }, /* AK4671_E2_COEFFICIENT0 (0x38) */ 85 + { 0x39, 0x00 }, /* AK4671_E2_COEFFICIENT1 (0x39) */ 86 + { 0x3a, 0x00 }, /* AK4671_E2_COEFFICIENT2 (0x3a) */ 87 + { 0x3b, 0x00 }, /* AK4671_E2_COEFFICIENT3 (0x3b) */ 88 + { 0x3c, 0x00 }, /* AK4671_E2_COEFFICIENT4 (0x3c) */ 89 + { 0x3d, 0x00 }, /* AK4671_E2_COEFFICIENT5 (0x3d) */ 90 + { 0x3e, 0x00 }, /* AK4671_E3_COEFFICIENT0 (0x3e) */ 91 + { 0x3f, 0x00 }, /* AK4671_E3_COEFFICIENT1 (0x3f) */ 92 + { 0x40, 0x00 }, /* AK4671_E3_COEFFICIENT2 (0x40) */ 93 + { 0x41, 0x00 }, /* AK4671_E3_COEFFICIENT3 (0x41) */ 94 + { 0x42, 0x00 }, /* AK4671_E3_COEFFICIENT4 (0x42) */ 95 + { 0x43, 0x00 }, /* AK4671_E3_COEFFICIENT5 (0x43) */ 96 + { 0x44, 0x00 }, /* AK4671_E4_COEFFICIENT0 (0x44) */ 97 + { 0x45, 0x00 }, /* AK4671_E4_COEFFICIENT1 (0x45) */ 98 + { 0x46, 0x00 }, /* AK4671_E4_COEFFICIENT2 (0x46) */ 99 + { 0x47, 0x00 }, /* AK4671_E4_COEFFICIENT3 (0x47) */ 100 + { 0x48, 0x00 }, /* AK4671_E4_COEFFICIENT4 (0x48) */ 101 + { 0x49, 0x00 }, /* AK4671_E4_COEFFICIENT5 (0x49) */ 102 + { 0x4a, 0x00 }, /* AK4671_E5_COEFFICIENT0 (0x4a) */ 103 + { 0x4b, 0x00 }, /* AK4671_E5_COEFFICIENT1 (0x4b) */ 104 + { 0x4c, 0x00 }, /* AK4671_E5_COEFFICIENT2 (0x4c) */ 105 + { 0x4d, 0x00 }, /* AK4671_E5_COEFFICIENT3 (0x4d) */ 106 + { 0x4e, 0x00 }, /* AK4671_E5_COEFFICIENT4 (0x4e) */ 107 + { 0x4f, 0x00 }, /* AK4671_E5_COEFFICIENT5 (0x4f) */ 108 + { 0x50, 0x88 }, /* AK4671_EQ_CONTROL_250HZ_100HZ (0x50) */ 109 + { 0x51, 0x88 }, /* AK4671_EQ_CONTROL_3500HZ_1KHZ (0x51) */ 110 + { 0x52, 0x08 }, /* AK4671_EQ_CONTRO_10KHZ (0x52) */ 111 + { 0x53, 0x00 }, /* AK4671_PCM_IF_CONTROL0 (0x53) */ 112 + { 0x54, 0x00 }, /* AK4671_PCM_IF_CONTROL1 (0x54) */ 113 + { 0x55, 0x00 }, /* AK4671_PCM_IF_CONTROL2 (0x55) */ 114 + { 0x56, 0x18 }, /* AK4671_DIGITAL_VOLUME_B_CONTROL (0x56) */ 115 + { 0x57, 0x18 }, /* AK4671_DIGITAL_VOLUME_C_CONTROL (0x57) */ 116 + { 0x58, 0x00 }, /* AK4671_SIDETONE_VOLUME_CONTROL (0x58) */ 117 + { 0x59, 0x00 }, /* AK4671_DIGITAL_MIXING_CONTROL2 (0x59) */ 118 + { 0x5a, 0x00 }, /* AK4671_SAR_ADC_CONTROL (0x5a) */ 125 119 }; 126 120 127 121 /* ··· 615 619 616 620 static int ak4671_probe(struct snd_soc_codec *codec) 617 621 { 618 - struct ak4671_priv *ak4671 = snd_soc_codec_get_drvdata(codec); 619 622 int ret; 620 623 621 - ret = snd_soc_codec_set_cache_io(codec, 8, 8, ak4671->control_type); 624 + ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); 622 625 if (ret < 0) { 623 626 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); 624 627 return ret; ··· 640 645 .set_bias_level = ak4671_set_bias_level, 641 646 .controls = ak4671_snd_controls, 642 647 .num_controls = ARRAY_SIZE(ak4671_snd_controls), 643 - .reg_cache_size = AK4671_CACHEREGNUM, 644 - .reg_word_size = sizeof(u8), 645 - .reg_cache_default = ak4671_reg, 646 648 .dapm_widgets = ak4671_dapm_widgets, 647 649 .num_dapm_widgets = ARRAY_SIZE(ak4671_dapm_widgets), 648 650 .dapm_routes = ak4671_intercon, 649 651 .num_dapm_routes = ARRAY_SIZE(ak4671_intercon), 650 652 }; 651 653 654 + static const struct regmap_config ak4671_regmap = { 655 + .reg_bits = 8, 656 + .val_bits = 8, 657 + 658 + .max_register = AK4671_SAR_ADC_CONTROL, 659 + .reg_defaults = ak4671_reg_defaults, 660 + .num_reg_defaults = ARRAY_SIZE(ak4671_reg_defaults), 661 + .cache_type = REGCACHE_RBTREE, 662 + }; 663 + 652 664 static int ak4671_i2c_probe(struct i2c_client *client, 653 665 const struct i2c_device_id *id) 654 666 { 655 - struct ak4671_priv *ak4671; 667 + struct regmap *regmap; 656 668 int ret; 657 669 658 - ak4671 = devm_kzalloc(&client->dev, sizeof(struct ak4671_priv), 659 - GFP_KERNEL); 660 - if (ak4671 == NULL) 661 - return -ENOMEM; 662 - 663 - i2c_set_clientdata(client, ak4671); 664 - ak4671->control_type = SND_SOC_I2C; 670 + regmap = devm_regmap_init_i2c(client, &ak4671_regmap); 671 + if (IS_ERR(regmap)) { 672 + ret = PTR_ERR(regmap); 673 + dev_err(&client->dev, "Failed to create regmap: %d\n", ret); 674 + return ret; 675 + } 665 676 666 677 ret = snd_soc_register_codec(&client->dev, 667 678 &soc_codec_dev_ak4671, &ak4671_dai, 1);

-2

sound/soc/codecs/ak4671.h

··· 105 105 #define AK4671_DIGITAL_MIXING_CONTROL2 0x59 106 106 #define AK4671_SAR_ADC_CONTROL 0x5a 107 107 108 - #define AK4671_CACHEREGNUM (AK4671_SAR_ADC_CONTROL + 1) 109 - 110 108 /* Bitfield Definitions */ 111 109 112 110 /* AK4671_AD_DA_POWER_MANAGEMENT (0x00) Fields */