ALSA: hda/tas2781: add TAS2563 support for 14ARB7

The INT8866 belongs to the Lenovo Yoga 7 Gen 7 AMD 14ARB7
laptop. It has two TAS2563 amplifier. Add the PNP ID
and calibration functions to handle them.

ACPI excerpt:

Scope (_SB.I2CD)
{
    Device (TAS)
    {
        Name (_HID, "INT8866")  // _HID: Hardware ID
        Name (_UID, Zero)  // _UID: Unique ID
        Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
        {
            Name (RBUF, ResourceTemplate ()
            {
                I2cSerialBusV2 (0x004C, ControllerInitiated, 0x00061A80,
                    AddressingMode7Bit, "\\_SB.I2CD",
                    0x00, ResourceConsumer, , Exclusive,
                    )
                I2cSerialBusV2 (0x004D, ControllerInitiated, 0x00061A80,
                    AddressingMode7Bit, "\\_SB.I2CD",
                    0x00, ResourceConsumer, , Exclusive,
                    )
                GpioInt (Edge, ActiveLow, SharedAndWake, PullNone, 0x0000,
                    "\\_SB.GPIO", 0x00, ResourceConsumer, ,
                    )
                    {   // Pin list
                        0x0020
                    }
             })
             Return (RBUF) /* \_SB_.I2CD.TAS_._CRS.RBUF */
        }

        Method (_STA, 0, NotSerialized)  // _STA: Status
        {
            Return (0x0F)
        }
    }
}

Signed-off-by: Gergo Koteles <soyer@irl.hu>
Link: https://lore.kernel.org/r/3b8d4c602e1a46922f53bc9afc8b705d55aa4872.1703891777.git.soyer@irl.hu
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/include/sound/tas2781.h b/include/sound/tas2781.h
index dde9f8120d4c4fdbc4031a5f031727bc6118bcd0..0a86ab8d47b9806955b5e759d59cfa7acc76b49e 100644 (file)
--- a/include/sound/tas2781.h
+++ b/include/sound/tas2781.h
@@ -22,6 +22,7 @@
 #define TAS2781_DRV_VER                        1
 #define SMARTAMP_MODULE_NAME           "tas2781"
 #define TAS2781_GLOBAL_ADDR    0x40
+#define TAS2563_GLOBAL_ADDR    0x48
 #define TASDEVICE_RATES                        (SNDRV_PCM_RATE_44100 |\
        SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |\
        SNDRV_PCM_RATE_88200)

diff --git a/sound/pci/hda/tas2781_hda_i2c.c b/sound/pci/hda/tas2781_hda_i2c.c
index 503be3fbce56473403a672c30a599b4db7c40b30..4805cf0b6480826edc833ff0822d9a371d0c1af3 100644 (file)
--- a/sound/pci/hda/tas2781_hda_i2c.c
+++ b/sound/pci/hda/tas2781_hda_i2c.c
@@ -65,6 +65,24 @@ enum calib_data {
        CALIB_MAX
 };
 
+#define TAS2563_MAX_CHANNELS   4
+
+#define TAS2563_CAL_POWER      TASDEVICE_REG(0, 0x0d, 0x3c)
+#define TAS2563_CAL_R0         TASDEVICE_REG(0, 0x0f, 0x34)
+#define TAS2563_CAL_INVR0      TASDEVICE_REG(0, 0x0f, 0x40)
+#define TAS2563_CAL_R0_LOW     TASDEVICE_REG(0, 0x0f, 0x48)
+#define TAS2563_CAL_TLIM       TASDEVICE_REG(0, 0x10, 0x14)
+#define TAS2563_CAL_N          5
+#define TAS2563_CAL_DATA_SIZE  4
+#define TAS2563_CAL_CH_SIZE    20
+#define TAS2563_CAL_ARRAY_SIZE 80
+
+static unsigned int cal_regs[TAS2563_CAL_N] = {
+       TAS2563_CAL_POWER, TAS2563_CAL_R0, TAS2563_CAL_INVR0,
+       TAS2563_CAL_R0_LOW, TAS2563_CAL_TLIM,
+};
+
+
 struct tas2781_hda {
        struct device *dev;
        struct tasdevice_priv *priv;
@@ -404,6 +422,69 @@ static const struct snd_kcontrol_new tas2781_dsp_conf_ctrl = {
        .put = tasdevice_config_put,
 };
 
+static void tas2563_apply_calib(struct tasdevice_priv *tas_priv)
+{
+       unsigned int data;
+       int offset = 0;
+       int ret;
+
+       for (int i = 0; i < tas_priv->ndev; i++) {
+               for (int j = 0; j < TAS2563_CAL_N; ++j) {
+                       data = cpu_to_be32(
+                               *(uint32_t *)&tas_priv->cali_data.data[offset]);
+                       ret = tasdevice_dev_bulk_write(tas_priv, i, cal_regs[j],
+                               (unsigned char *)&data, TAS2563_CAL_DATA_SIZE);
+                       if (ret)
+                               dev_err(tas_priv->dev,
+                                       "Error writing calib regs\n");
+                       offset += TAS2563_CAL_DATA_SIZE;
+               }
+       }
+}
+
+static int tas2563_save_calibration(struct tasdevice_priv *tas_priv)
+{
+       static efi_guid_t efi_guid = EFI_GUID(0x1f52d2a1, 0xbb3a, 0x457d, 0xbc,
+               0x09, 0x43, 0xa3, 0xf4, 0x31, 0x0a, 0x92);
+
+       static efi_char16_t *efi_vars[TAS2563_MAX_CHANNELS][TAS2563_CAL_N] = {
+               { L"Power_1", L"R0_1", L"InvR0_1", L"R0_Low_1", L"TLim_1" },
+               { L"Power_2", L"R0_2", L"InvR0_2", L"R0_Low_2", L"TLim_2" },
+               { L"Power_3", L"R0_3", L"InvR0_3", L"R0_Low_3", L"TLim_3" },
+               { L"Power_4", L"R0_4", L"InvR0_4", L"R0_Low_4", L"TLim_4" },
+       };
+
+       unsigned long max_size = TAS2563_CAL_DATA_SIZE;
+       unsigned int offset = 0;
+       efi_status_t status;
+       unsigned int attr;
+
+       tas_priv->cali_data.data = devm_kzalloc(tas_priv->dev,
+                       TAS2563_CAL_ARRAY_SIZE, GFP_KERNEL);
+       if (!tas_priv->cali_data.data)
+               return -ENOMEM;
+
+       for (int i = 0; i < tas_priv->ndev; ++i) {
+               for (int j = 0; j < TAS2563_CAL_N; ++j) {
+                       status = efi.get_variable(efi_vars[i][j],
+                               &efi_guid, &attr, &max_size,
+                               &tas_priv->cali_data.data[offset]);
+                       if (status != EFI_SUCCESS ||
+                               max_size != TAS2563_CAL_DATA_SIZE) {
+                               dev_warn(tas_priv->dev,
+                               "Calibration data read failed %ld\n", status);
+                               return -EINVAL;
+                       }
+                       offset += TAS2563_CAL_DATA_SIZE;
+               }
+       }
+
+       tas_priv->cali_data.total_sz = offset;
+       tasdevice_apply_calibration(tas_priv);
+
+       return 0;
+}
+
 static void tas2781_apply_calib(struct tasdevice_priv *tas_priv)
 {
        static const unsigned char page_array[CALIB_MAX] = {
@@ -702,6 +783,11 @@ static int tas2781_hda_i2c_probe(struct i2c_client *clt)
                tas_hda->priv->save_calibration = tas2781_save_calibration;
                tas_hda->priv->apply_calibration = tas2781_apply_calib;
                tas_hda->priv->global_addr = TAS2781_GLOBAL_ADDR;
+       } else if (strstr(dev_name(&clt->dev), "INT8866")) {
+               device_name = "INT8866";
+               tas_hda->priv->save_calibration = tas2563_save_calibration;
+               tas_hda->priv->apply_calibration = tas2563_apply_calib;
+               tas_hda->priv->global_addr = TAS2563_GLOBAL_ADDR;
        } else
                return -ENODEV;
 
@@ -851,6 +937,7 @@ static const struct i2c_device_id tas2781_hda_i2c_id[] = {
 
 static const struct acpi_device_id tas2781_acpi_hda_match[] = {
        {"TIAS2781", 0 },
+       {"INT8866", 0 },
        {}
 };
 MODULE_DEVICE_TABLE(acpi, tas2781_acpi_hda_match);