Merge remote-tracking branches 'asoc/topic/sgtl5000', 'asoc/topic/simple', 'asoc...

[cascardo/linux.git] / sound / soc / sunxi / sun4i-codec.c

diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
index 0e19c50..e047ec0 100644 (file)
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@ -96,8 +96,8 @@
 /* Other various ADC registers */
 #define SUN4I_CODEC_DAC_TXCNT                  (0x30)
 #define SUN4I_CODEC_ADC_RXCNT                  (0x34)
-#define SUN4I_CODEC_AC_SYS_VERI                        (0x38)
-#define SUN4I_CODEC_AC_MIC_PHONE_CAL           (0x3c)
+#define SUN7I_CODEC_AC_DAC_CAL                 (0x38)
+#define SUN7I_CODEC_AC_MIC_PHONE_CAL           (0x3c)
 
 struct sun4i_codec {
        struct device   *dev;
@@ -509,7 +509,7 @@ static const struct snd_kcontrol_new sun4i_codec_pa_mute =
 
 static DECLARE_TLV_DB_SCALE(sun4i_codec_pa_volume_scale, -6300, 100, 1);
 
-static const struct snd_kcontrol_new sun4i_codec_widgets[] = {
+static const struct snd_kcontrol_new sun4i_codec_controls[] = {
        SOC_SINGLE_TLV("Power Amplifier Volume", SUN4I_CODEC_DAC_ACTL,
                       SUN4I_CODEC_DAC_ACTL_PA_VOL, 0x3F, 0,
                       sun4i_codec_pa_volume_scale),
@@ -629,8 +629,8 @@ static const struct snd_soc_dapm_route sun4i_codec_codec_dapm_routes[] = {
 
 static struct snd_soc_codec_driver sun4i_codec_codec = {
        .component_driver = {
-               .controls               = sun4i_codec_widgets,
-               .num_controls           = ARRAY_SIZE(sun4i_codec_widgets),
+               .controls               = sun4i_codec_controls,
+               .num_controls           = ARRAY_SIZE(sun4i_codec_controls),
                .dapm_widgets           = sun4i_codec_codec_dapm_widgets,
                .num_dapm_widgets       = ARRAY_SIZE(sun4i_codec_codec_dapm_widgets),
                .dapm_routes            = sun4i_codec_codec_dapm_routes,
@@ -682,12 +682,37 @@ static const struct regmap_config sun4i_codec_regmap_config = {
        .reg_bits       = 32,
        .reg_stride     = 4,
        .val_bits       = 32,
-       .max_register   = SUN4I_CODEC_AC_MIC_PHONE_CAL,
+       .max_register   = SUN4I_CODEC_ADC_RXCNT,
+};
+
+static const struct regmap_config sun7i_codec_regmap_config = {
+       .reg_bits       = 32,
+       .reg_stride     = 4,
+       .val_bits       = 32,
+       .max_register   = SUN7I_CODEC_AC_MIC_PHONE_CAL,
+};
+
+struct sun4i_codec_quirks {
+       const struct regmap_config *regmap_config;
+};
+
+static const struct sun4i_codec_quirks sun4i_codec_quirks = {
+       .regmap_config = &sun4i_codec_regmap_config,
+};
+
+static const struct sun4i_codec_quirks sun7i_codec_quirks = {
+       .regmap_config = &sun7i_codec_regmap_config,
 };
 
 static const struct of_device_id sun4i_codec_of_match[] = {
-       { .compatible = "allwinner,sun4i-a10-codec" },
-       { .compatible = "allwinner,sun7i-a20-codec" },
+       {
+               .compatible = "allwinner,sun4i-a10-codec",
+               .data = &sun4i_codec_quirks,
+       },
+       {
+               .compatible = "allwinner,sun7i-a20-codec",
+               .data = &sun7i_codec_quirks,
+       },
        {}
 };
 MODULE_DEVICE_TABLE(of, sun4i_codec_of_match);
@@ -760,6 +785,7 @@ static int sun4i_codec_probe(struct platform_device *pdev)
 {
        struct snd_soc_card *card;
        struct sun4i_codec *scodec;
+       const struct sun4i_codec_quirks *quirks;
        struct resource *res;
        void __iomem *base;
        int ret;
@@ -777,8 +803,14 @@ static int sun4i_codec_probe(struct platform_device *pdev)
                return PTR_ERR(base);
        }
 
+       quirks = of_device_get_match_data(&pdev->dev);
+       if (quirks == NULL) {
+               dev_err(&pdev->dev, "Failed to determine the quirks to use\n");
+               return -ENODEV;
+       }
+
        scodec->regmap = devm_regmap_init_mmio(&pdev->dev, base,
-                                            &sun4i_codec_regmap_config);
+                                              quirks->regmap_config);
        if (IS_ERR(scodec->regmap)) {
                dev_err(&pdev->dev, "Failed to create our regmap\n");
                return PTR_ERR(scodec->regmap);