Merge "ASoC: tfa98xx: Fix type casting error" (a52fe1a9) · Commits · e / devices / android_kernel_fairphone_FP3

sound/soc/codecs/tfa98xx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -478,7 +478,7 @@ static ssize_t tfa98xx_dbgfs_start_set(struct file *file,
		return -EINVAL;

		mutex_lock(&tfa98xx->dsp_lock);
		ret = tfa_calibrate(tfa98xx->tfa);
		ret = (enum tfa_error)tfa_calibrate(tfa98xx->tfa);
		if (ret == tfa_error_ok) {
		cal_profile = tfaContGetCalProfile(tfa98xx->tfa);
		if (cal_profile < 0) {

sound/soc/codecs/tfa_dsp.c

+16 −11

Original line number	Diff line number	Diff line
		@@ -3215,7 +3215,7 @@ enum tfa_error tfa_dev_start(struct tfa_device *tfa, int next_profile, int vstep
		error_exit:
		show_current_state(tfa);

		return err;
		return (enum tfa_error)err;
		}

		enum tfa_error tfa_dev_stop(struct tfa_device *tfa)
		@@ -3231,12 +3231,12 @@ enum tfa_error tfa_dev_stop(struct tfa_device *tfa)
		/* powerdown CF */
		err = tfa98xx_powerdown(tfa, 1);
		if (err != Tfa98xx_Error_Ok)
		return err;
		return (enum tfa_error)err;

		/* disable I2S output on TFA1 devices without TDM */
		err = tfa98xx_aec_output(tfa, 0);

		return err;
		return (enum tfa_error)err;
		}

		/*
		@@ -3785,7 +3785,8 @@ enum tfa_error tfa_dev_set_state(struct tfa_device *tfa, enum tfa_state state, i

		/* Make sure the DSP is running! */
		do {
		err = tfa98xx_dsp_system_stable(tfa, &ready);
		err = (enum tfa_error)tfa98xx_dsp_system_stable(tfa,
		&ready);
		if (err != tfa_error_ok)
		return err;
		if (ready)
		@@ -3793,7 +3794,7 @@ enum tfa_error tfa_dev_set_state(struct tfa_device *tfa, enum tfa_state state, i
		} while (loop--);
		if (((!tfa->is_probus_device) && (is_calibration)) \|\| ((tfa->rev & 0xff) == 0x13)) {
		/* Enable FAIM when clock is stable, to avoid MTP corruption */
		err = tfa98xx_faim_protect(tfa, 1);
		err = (enum tfa_error)tfa98xx_faim_protect(tfa, 1);
		if (tfa->verbose) {
		pr_debug("FAIM enabled (err:%d).\n", err);
		}
		@@ -3822,7 +3823,7 @@ enum tfa_error tfa_dev_set_state(struct tfa_device *tfa, enum tfa_state state, i
		}
		}
		if (((!tfa->is_probus_device) && (is_calibration)) \|\| ((tfa->rev & 0xff) == 0x13)) {
		err = tfa98xx_faim_protect(tfa, 0);
		err = (enum tfa_error)tfa98xx_faim_protect(tfa, 0);
		if (tfa->verbose) {
		pr_debug("FAIM disabled (err:%d).\n", err);
		}
		@@ -3941,16 +3942,19 @@ int tfa_dev_mtp_get(struct tfa_device *tfa, enum tfa_mtp item)
		return value;
		}

		enum tfa_error tfa_dev_mtp_set(struct tfa_device *tfa, enum tfa_mtp item, int value)
		enum tfa_error tfa_dev_mtp_set(struct tfa_device *tfa, enum tfa_mtp item,
		int value)
		{
		enum tfa_error err = tfa_error_ok;

		switch (item) {
		case TFA_MTP_OTC:
		err = tfa98xx_set_mtp(tfa, (uint16_t)value, TFA98XX_KEY2_PROTECTED_MTP0_MTPOTC_MSK);
		err = (enum tfa_error)tfa98xx_set_mtp(tfa, (uint16_t)value,
		TFA98XX_KEY2_PROTECTED_MTP0_MTPOTC_MSK);
		break;
		case TFA_MTP_EX:
		err = tfa98xx_set_mtp(tfa, (uint16_t)value, TFA98XX_KEY2_PROTECTED_MTP0_MTPEX_MSK);
		err = (enum tfa_error)tfa98xx_set_mtp(tfa, (uint16_t)value,
		TFA98XX_KEY2_PROTECTED_MTP0_MTPEX_MSK);
		break;
		case TFA_MTP_RE25:
		case TFA_MTP_RE25_PRIM:
		@@ -3978,7 +3982,7 @@ enum tfa_error tfa_dev_mtp_set(struct tfa_device *tfa, enum tfa_mtp item, int va
		break;
		}

		return err;
		return (enum tfa_error)err;
		}

		int tfa_get_pga_gain(struct tfa_device *tfa)
		@@ -4068,7 +4072,8 @@ int tfa_plop_noise_interrupt(struct tfa_device *tfa, int profile, int vstep)
		if (no_clk == 1) {
		/* Clock is lost. Set I2CR to remove POP noise */
		pr_info("No clock detected. Resetting the I2CR to avoid pop on 72! \n");
		err = tfa_dev_start(tfa, profile, vstep);
		err = (enum Tfa98xx_Error)tfa_dev_start(tfa, profile,
		vstep);
		if (err != Tfa98xx_Error_Ok) {
		pr_err("Error loading i2c registers (tfa_dev_start), err=%d\n", err);
		} else {