Merge "RTC6226: keep tuned to valid lower band channel for dwell time" (3b868e67) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/media/radio/rtc6226/radio-rtc6226-common.c

+34 −27

Original line number	Original line	Diff line number	Diff line
	@@ -384,33 +384,6 @@ void rtc6226_scan(struct work_struct *work)
	FMDBG("%s valid channel %d, rssi %d\n", __func__,		FMDBG("%s valid channel %d, rssi %d\n", __func__,
	next_freq_khz, radio->registers[RSSI] & RSSI_RSSI);		next_freq_khz, radio->registers[RSSI] & RSSI_RSSI);

	if (radio->registers[STATUS] & STATUS_SF) {
	FMDERR("%s Seek one more time if lower freq is valid\n",
	__func__);
	retval = rtc6226_set_seek(radio, SRCH_UP, WRAP_ENABLE);
	if (retval < 0) {
	FMDERR("%s seek fail %d\n", __func__, retval);
	goto seek_tune_fail;
	}
	if (!wait_for_completion_timeout(&radio->completion,
	msecs_to_jiffies(WAIT_TIMEOUT_MSEC))) {
	FMDERR("timeout didn't receive STC for seek\n");
	} else {
	FMDERR("%s: received STC for seek\n", __func__);
	retval = rtc6226_get_freq(radio,
	&next_freq_khz);
	if (retval < 0) {
	FMDERR("%s getFreq failed\n", __func__);
	goto seek_tune_fail;
	}
	if ((radio->recv_conf.band_low_limit *
	TUNE_STEP_SIZE) ==
	next_freq_khz)
	rtc6226_q_event(radio,
	RTC6226_EVT_TUNE_SUCC);
	}
	break;
	}
	if (radio->g_search_mode == SCAN)		if (radio->g_search_mode == SCAN)
	rtc6226_q_event(radio, RTC6226_EVT_TUNE_SUCC);		rtc6226_q_event(radio, RTC6226_EVT_TUNE_SUCC);
	/*		/*
	@@ -440,6 +413,40 @@ void rtc6226_scan(struct work_struct *work)
	rtc6226_update_search_list(radio, next_freq_khz);		rtc6226_update_search_list(radio, next_freq_khz);
	}		}

			if (radio->registers[STATUS] & STATUS_SF) {
			FMDERR("%s Seek one more time if lower freq is valid\n",
			__func__);
			retval = rtc6226_set_seek(radio, SRCH_UP, WRAP_ENABLE);
			if (retval < 0) {
			FMDERR("%s seek fail %d\n", __func__, retval);
			goto seek_tune_fail;
			}
			if (!wait_for_completion_timeout(&radio->completion,
			msecs_to_jiffies(WAIT_TIMEOUT_MSEC))) {
			FMDERR("timeout didn't receive STC for seek\n");
			} else {
			FMDERR("%s: received STC for seek\n", __func__);
			retval = rtc6226_get_freq(radio,
			&next_freq_khz);
			if (retval < 0) {
			FMDERR("%s getFreq failed\n", __func__);
			goto seek_tune_fail;
			}
			if ((radio->recv_conf.band_low_limit *
			TUNE_STEP_SIZE) ==
			next_freq_khz) {
			FMDERR("lower band freq is valid\n");
			rtc6226_q_event(radio,
			RTC6226_EVT_TUNE_SUCC);
			/* sleep for dwell period */
			msleep(radio->dwell_time_sec * 1000);
			rtc6226_q_event(radio,
			RTC6226_EVT_SCAN_NEXT);
			}
			}
			break;
			}

	}		}

	seek_tune_fail:		seek_tune_fail: