Merge "drivers: iio: adc: Update wait times for end of conversion check" (7b9e6688) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/iio/adc/qcom-spmi-adc5.c

+9 −5

Original line number	Diff line number	Diff line
		@@ -80,7 +80,8 @@
		*/
		#define ADC_CONV_TIME_MIN_US 263
		#define ADC_CONV_TIME_MAX_US 264
		#define ADC_CONV_TIME_RETRY 400
		#define ADC_CONV_TIME_RETRY_POLL 570
		#define ADC_CONV_TIME_RETRY 190
		#define ADC_CONV_TIMEOUT msecs_to_jiffies(100)

		/* CAL peripheral */
		@@ -268,12 +269,15 @@ static int adc_read_voltage_data(struct adc_chip adc, u16 data)
		return ret;
		}

		static int adc_poll_wait_eoc(struct adc_chip *adc)
		static int adc_poll_wait_eoc(struct adc_chip *adc, bool poll_only)
		{
		unsigned int count, retry;
		u8 status1;
		int ret;

		if (poll_only)
		retry = ADC_CONV_TIME_RETRY_POLL;
		else
		retry = ADC_CONV_TIME_RETRY;

		for (count = 0; count < retry; count++) {
		@@ -295,7 +299,7 @@ static int adc_wait_eoc(struct adc_chip *adc)
		int ret;

		if (adc->poll_eoc) {
		ret = adc_poll_wait_eoc(adc);
		ret = adc_poll_wait_eoc(adc, true);
		if (ret < 0) {
		pr_err("EOC bit not set\n");
		return ret;
		@@ -305,7 +309,7 @@ static int adc_wait_eoc(struct adc_chip *adc)
		ADC_CONV_TIMEOUT);
		if (!ret) {
		pr_debug("Did not get completion timeout.\n");
		ret = adc_poll_wait_eoc(adc);
		ret = adc_poll_wait_eoc(adc, false);
		if (ret < 0) {
		pr_err("EOC bit not set\n");
		return ret;