Commit 71d2893a authored by Shenghao Ding's avatar Shenghao Ding Committed by Takashi Iwai
Browse files

ALSA: hda/tas2781: Fix the order of TAS2781 calibrated-data 



A bug reported by one of my customers that the order of TAS2781
calibrated-data is incorrect, the correct way is to move R0_Low
and insert it between R0 and InvR0.

Fixes: 4fe23851 ("ALSA: hda/tas2781: Move and unified the calibrated-data getting function for SPI and I2C into the tas2781_hda lib")
Signed-off-by: default avatarShenghao Ding <shenghao-ding@ti.com>
Link: https://patch.msgid.link/20250907222728.988-1-shenghao-ding@ti.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ad64c073

sound/hda/codecs/side-codecs/tas2781_hda.c

+20 −5
Original line number Diff line number Diff line
@@ -33,6 +33,23 @@ const efi_guid_t tasdev_fct_efi_guid[] = { 
};

EXPORT_SYMBOL_NS_GPL(tasdev_fct_efi_guid, "SND_HDA_SCODEC_TAS2781");



/*

 * The order of calibrated-data writing function is a bit different from the

 * order in UEFI. Here is the conversion to match the order of calibrated-data

 * writing function.

 */

static void cali_cnv(unsigned char *data, unsigned int base, int offset)

{

	struct cali_reg reg_data;



	memcpy(&reg_data, &data[base], sizeof(reg_data));

	/* the data order has to be swapped between r0_low_reg and inv0_reg */

	swap(reg_data.r0_low_reg, reg_data.invr0_reg);



	cpu_to_be32_array((__force __be32 *)(data + offset + 1),

		(u32 *)&reg_data, TASDEV_CALIB_N);

}



static void tas2781_apply_calib(struct tasdevice_priv *p)

{

	struct calidata *cali_data = &p->cali_data;
@@ -103,8 +120,7 @@ static void tas2781_apply_calib(struct tasdevice_priv *p) 


				data[l] = k;

				oft++;

				for (i = 0; i < TASDEV_CALIB_N * 4; i++)

					data[l + i + 1] = data[4 * oft + i];

				cali_cnv(data, 4 * oft, l);

				k++;

			}

		}
@@ -130,9 +146,8 @@ static void tas2781_apply_calib(struct tasdevice_priv *p) 


		for (j = p->ndev - 1; j >= 0; j--) {

			l = j * (cali_data->cali_dat_sz_per_dev + 1);

			for (i = TASDEV_CALIB_N * 4; i > 0 ; i--)

				data[l + i] = data[p->index * 5 + i];

			data[l+i] = j;

			cali_cnv(data, cali_data->cali_dat_sz_per_dev * j, l);

			data[l] = j;

		}

	}